P4 to Git Change 1308882 by lmoriche@lmoriche_opencl_dev on 2016/08/30 17:43:27

SWDEV-101678 - Create a new instance of the ROCm-OpenCL-Driver for each call to compileImpl and linkImpl.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#202 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#9 edit

rocclr/runtime/device/device.cpp

@@ -140,21 +140,19 @@ Device::BlitProgram::create(amd::Device* device,
     }
 
     // Build all kernels
-#if defined(WITH_LIGHTNING_COMPILER)
-    std::string opt = "";
-#else // !defined(WITH_LIGHTNING_COMPILER)
-    std::string opt = "-Wf,--force_disable_spir -fno-lib-no-inline "\
-        "-fno-sc-keep-calls -cl-internal-kernel ";
+    std::string opt = "-cl-internal-kernel "
+#if !defined(WITH_LIGHTNING_COMPILER)
+        "-Wf,--force_disable_spir -fno-lib-no-inline " \
+        "-fno-sc-keep-calls "
 #endif // !defined(WITH_LIGHTNING_COMPILER)
+        ;
 
     if (extraOptions != NULL) {
         opt += extraOptions;
     }
-#if !defined(WITH_LIGHTNING_COMPILER)
     if (!GPU_DUMP_BLIT_KERNELS) {
         opt += " -fno-enable-dump";
     }
-#endif // !defined(WITH_LIGHTNING_COMPILER)
     if (CL_SUCCESS != program_->build(devices, opt.c_str(),
         NULL, NULL, GPU_DUMP_BLIT_KERNELS)) {
         return false;