P4 to Git Change 1720794 by wchau@wchau_OCL_boltzmann on 2018/12/14 23:45:05

SWDEV-79445 - OCL generic changes and code clean-up
	- Allow ROCM build within the same workspace as PAL. Please note that ROCM defualt path in this case  will be HSAIL.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#105 edit


[ROCm/clr commit: 70e36f8299]

projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp

@@ -840,7 +840,7 @@ bool Device::populateOCLDeviceConstants() {
 
   std::ostringstream oss;
   oss << "gfx" << gfxipMajor << gfxipMinor << gfxipStepping;
-  if (IS_LIGHTNING && deviceInfo_.xnackEnabled_) {
+  if (settings().useLightning_ && deviceInfo_.xnackEnabled_) {
     oss << "-xnack";
   }
 
@@ -1059,8 +1059,7 @@ bool Device::populateOCLDeviceConstants() {
     return false;
   }
   std::stringstream ss;
-  ss << AMD_BUILD_STRING " (HSA" << major << "." << minor << "," IF(IS_LIGHTNING, "LC", "HSAIL");
-  if (IS_LIGHTNING && compilerHandle_) ss << "*,HSAIL";
+  ss << AMD_BUILD_STRING " (HSA" << major << "." << minor << "," << (settings().useLightning_ ? "LC" : "HSAIL");
   ss <<  ")";
 
   strcpy(info_.driverVersion_, ss.str().c_str());