P4 to Git Change 1298635 by lmoriche@lmoriche_opencl_dev on 2016/08/03 15:14:04

SWDEV-94644 - Comment out sections of the rocm virtual device still using the compiler library.

Affected files ...

... //depot/stg/opencl/drivers/opencl/Makefile#55 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/Makefile#6 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#134 edit
... //depot/stg/opencl/drivers/opencl/compiler/Makefile#66 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/build/Makefile.utils#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#199 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#79 edit

rocclr/runtime/device/device.cpp

@@ -1163,6 +1163,7 @@ Program::initClBinary(char* binaryIn, size_t size)
     int encryptCode = 0;
     char* decryptedBin = NULL;
 
+#if !defined(WITH_LIGHTNING_COMPILER)
     bool isSPIRV = isSPIRVMagic(binaryIn, size);
     if (isSPIRV || isBcMagic(binaryIn))
     {
@@ -1212,6 +1213,7 @@ Program::initClBinary(char* binaryIn, size_t size)
         }
     }
     else
+#endif // defined(WITH_LIGHTNING_COMPILER)
     {
         size_t decryptedSize;
         if (!clBinary()->decryptElf(binaryIn,size,
@@ -1294,6 +1296,10 @@ Program::setBinary(char* binaryIn, size_t size)
 bool
 Program::createBIFBinary(aclBinary* bin)
 {
+#if defined(WITH_LIGHTNING_COMPILER)
+    assert(!"FIXME_Wilkin");
+    return false;
+#else // defined(WITH_LIGHTNING_COMPILER)
     acl_error err;
     char *binaryIn = NULL;
     size_t size;
@@ -1305,6 +1311,7 @@ Program::createBIFBinary(aclBinary* bin)
     clBinary()->saveBIFBinary(binaryIn, size);
     aclFreeMem(bin, binaryIn);
     return true;
+#endif // defined(WITH_LIGHTNING_COMPILER)
 }
 
 ClBinary::ClBinary(const amd::Device& dev, BinaryImageFormat bifVer)