P4 to Git Change 1613773 by gandryey@gera-w8 on 2018/10/02 18:37:59

SWDEV-79445 - OCL generic changes and code clean-up
	Program compilation clean-up:
	- Remove !defined(WITH_LIGHTNING_COMPILER), but appprofiler still requires more changes.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#232 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#10 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#112 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#68 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#81 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#59 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#101 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#38 edit


[ROCm/clr commit: 8ee6142811]

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

@@ -119,13 +119,10 @@ bool Device::BlitProgram::create(amd::Device* device, const char* extraKernels,
   }
 
   // Build all kernels
-  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)
-      ;
+  std::string opt = "-cl-internal-kernel ";
+  if (!device->settings().useLightning_) {
+    opt +=  "-Wf,--force_disable_spir -fno-lib-no-inline -fno-sc-keep-calls ";
+  }
 
   if (extraOptions != nullptr) {
     opt += extraOptions;