P4 to Git Change 1191906 by yaxunl@yaxunl_stg_win50 on 2015/09/17 20:52:47

ECR #354633 - SPIR-V: Always create HSAIL device program for SPIR-V since AMDIL path does not support it due to LLVM version.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.cpp#276 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.hpp#92 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#254 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#524 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#149 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.cpp#94 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.hpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.cpp#39 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.hpp#17 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#69 edit

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -205,10 +205,10 @@ NullDevice::create(CALtarget target)
 }
 
 device::Program*
-NullDevice::createProgram(int oclVer)
+NullDevice::createProgram(bool hsail)
 {
     device::Program* nullProgram;
-    if (settings().hsail_ || (oclVer == 200)) {
+    if (settings().hsail_ || hsail) {
         nullProgram = new HSAILProgram(*this);
     }
     else {
@@ -1064,10 +1064,10 @@ Device::createVirtualDevice(
 }
 
 device::Program*
-Device::createProgram(int oclVer)
+Device::createProgram(bool hsail)
 {
     device::Program* gpuProgram;
-    if (settings().hsail_ || (oclVer == 200)) {
+    if (settings().hsail_ || hsail) {
         gpuProgram = new HSAILProgram(*this);
     }
     else {