P4 to Git Change 1516358 by emankov@em-hsa on 2018/02/15 08:04:51

SWDEV-143465 - Revert of #1516121

	[Reason]
	A plenty of tests are failed.
	After the changing stack logic a lot of tests should be fixed, a lot - to be removed from testing.
	#1516121 will be submitted again after renewal/removal of all the failed tests.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/common/v0_8/if_acl.cpp#10 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/v0_8/if_acl.cpp#98 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#583 edit

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -242,6 +242,7 @@ bool NullDevice::isHsailProgram(amd::option::Options* options) {
   bool isHSAILcapable = settings().hsail_;
   bool isBlit = false;
   bool isSPIRV = false;
+  bool isLangExt = false;
   bool isClang = false;
   bool isEDG = false;
   bool isLegacy = false;
@@ -269,6 +270,10 @@ bool NullDevice::isHsailProgram(amd::option::Options* options) {
     if (!isLegacy) {
       isLegacy = op->oVariables->Legacy;
     }
+    if (!isLangExt) {
+      isLangExt = op->isCStrOptionsEqual(op->oVariables->XLang, "clc++") ||
+          op->isCStrOptionsEqual(op->oVariables->XLang, "spir");
+    }
     // Checks Frontend option only from input *options, not from Env,
     // because they might be only calculated by RT based on the binaries to link.
     // -frontend is being queried now instead of -cl-std=CL2.0, because the last one
@@ -291,7 +296,7 @@ bool NullDevice::isHsailProgram(amd::option::Options* options) {
   if (isSPIRV || (isBlit && isCIPlus && isHSAILcapable) || isClang || isOCL20) {
     return true;
   }
-  if (isLegacy || !isHSAILcapable || isEDG) {
+  if (isLegacy || !isHSAILcapable || isEDG || isLangExt) {
     return false;
   }
   return true;