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/platform/program.cpp

@@ -63,7 +63,8 @@ Program::addDeviceProgram(Device& device, const void* image, size_t length, int
         return CL_SUCCESS;
     }
 
-    device::Program* program = rootDev.createProgram(oclVer);
+    bool hsail = (oclVer >= 200) || isIL_;
+    device::Program* program = rootDev.createProgram(hsail);
     if (program == NULL) {
         return CL_OUT_OF_HOST_MEMORY;
     }
@@ -92,7 +93,7 @@ Program::addDeviceProgram(Device& device, const void* image, size_t length, int
 
     devicePrograms_[&rootDev] = program;
 
-    program = rootDev.createProgram(oclVer);
+    program = rootDev.createProgram(hsail);
     if (program == NULL) {
         return CL_OUT_OF_HOST_MEMORY;
     }