P4 to Git Change 1483021 by lmoriche@lmoriche_opencl_dev2 on 2017/11/15 21:49:30

SWDEV-118564 - [OCL-LC-ROCm] Disable HSAILProgram and HSAILKernel if the compiler library is not available.

Affected files ...

... //depot/stg/opencl/drivers/opencl/opencldefs#222 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#214 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#39 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#76 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.hpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#76 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#89 edit


[ROCm/clr commit: 5ec0d059a3]

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

@@ -1232,6 +1232,7 @@ bool Program::setBinary(const char* binaryIn, size_t size) {
 }
 
 bool Program::createBIFBinary(aclBinary* bin) {
+#if defined(WITH_COMPILER_LIB)
   acl_error err;
   char* binaryIn = NULL;
   size_t size;
@@ -1243,6 +1244,9 @@ bool Program::createBIFBinary(aclBinary* bin) {
   clBinary()->saveBIFBinary(binaryIn, size);
   aclFreeMem(bin, binaryIn);
   return true;
+#else // !defined(WITH_COMPILER_LIB)
+  return false;
+#endif // !defined(WITH_COMPILER_LIB)
 }
 
 ClBinary::ClBinary(const amd::Device& dev, BinaryImageFormat bifVer)