P4 to Git Change 1914428 by gandryey@gera-win10 on 2019/06/27 18:22:17

SWDEV-79445 - OCL generic changes and code clean-up
	- Remove all compilaiton flags for LC. LC should be selected dynamically only.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/OPTIONS.def#141 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#146 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#86 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#130 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#45 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#312 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/macros.hpp#12 edit

rocclr/runtime/device/pal/paldevice.cpp

@@ -114,8 +114,7 @@ bool NullDevice::init() {
   for (uint id = 0; id < sizeof(Gfx9PlusSubDeviceInfo) / sizeof(AMDDeviceInfo); ++id) {
     bool foundActive = false;
     bool foundDuplicate = false;
-    uint gfxipVersion = IS_LIGHTNING ? pal::Gfx9PlusSubDeviceInfo[id].gfxipVersionLC_
-                                     : pal::Gfx9PlusSubDeviceInfo[id].gfxipVersion_;
+    uint gfxipVersion = pal::Gfx9PlusSubDeviceInfo[id].gfxipVersion_;
 
     if (pal::Gfx9PlusSubDeviceInfo[id].machineTarget_[0] == '\0') {
       continue;

rocclr/runtime/device/pal/palsettings.cpp

@@ -138,7 +138,7 @@ Settings::Settings() {
       std::min(static_cast<uint64_t>(GPU_MAX_SUBALLOC_SIZE) * Ki, subAllocationChunkSize_);
 
   maxCmdBuffers_ = 12;
-  useLightning_ = amd::IS_HIP ? true : GPU_ENABLE_LC;
+  useLightning_ = amd::IS_HIP ? true : ((!flagIsDefault(GPU_ENABLE_LC)) ? GPU_ENABLE_LC : false);
   enableWgpMode_ = false;
   enableWave32Mode_ = false;
   hsailExplicitXnack_ = false;
@@ -196,7 +196,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
     case Pal::AsicRevision::Navi10_A0:
     case Pal::AsicRevision::Navi10Lite:
       gfx10Plus_ = true;
-      useLightning_ = (!flagIsDefault(GPU_ENABLE_LC)) ? GPU_ENABLE_LC : true;
+      useLightning_ = GPU_ENABLE_LC;
       hsailExplicitXnack_ =
           static_cast<uint>(palProp.gpuMemoryProperties.flags.pageMigrationEnabled ||
                             palProp.gpuMemoryProperties.flags.iommuv2Support);

rocclr/runtime/device/rocm/rocdevice.cpp

@@ -215,8 +215,7 @@ bool NullDevice::initCompiler(bool isOffline) {
   acl_error error;
   if (!compilerHandle_) {
     aclCompilerOptions opts = {
-      sizeof(aclCompilerOptions_0_8),
-      IF(IS_LIGHTNING, "libamdoclcl64.so", NULL),
+      sizeof(aclCompilerOptions_0_8), "libamdoclcl64.so",
       NULL, NULL, NULL, NULL, NULL, NULL
     };
     compilerHandle_ = aclCompilerInit(&opts, &error);

rocclr/runtime/device/rocm/rocsettings.cpp

@@ -67,7 +67,7 @@ Settings::Settings() {
   numDeviceEvents_ = 1024;
   numWaitEvents_ = 8;
 
-  useLightning_ = GPU_ENABLE_LC;
+  useLightning_ = (!flagIsDefault(GPU_ENABLE_LC)) ? GPU_ENABLE_LC : true;
 
   lcWavefrontSize64_ = true;
 }