From 4ee3447104ce05195004594fe947cbf594d6b330 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 14 Dec 2018 23:58:11 -0500 Subject: [PATCH] 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: 70e36f82998c0d8bd50e26544cbec97b51c4a6ba] --- projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp index fa9858ff3e..222bafd405 100644 --- a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp +++ b/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());