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/utils/flags.hpp

@@ -123,7 +123,7 @@ release(bool, GPU_IFH_MODE, false,                                            \
         "1 = Enable GPU IFH (infinitely fast hardware) mode. Any other value keeps setting disabled.") \
 release(bool, GPU_MIPMAP, true,                                               \
         "Enables GPU mipmap extension")                                       \
-release(uint, GPU_ENABLE_PAL, IF(IS_LIGHTNING,1,2),                           \
+release(uint, GPU_ENABLE_PAL, 2,                                              \
         "Enables PAL backend. 0 - GSL(default), 1 - PAL, 2 - GSL and PAL")    \
 release(bool, DISABLE_DEFERRED_ALLOC, false,                                  \
         "Disables deferred memory allocation on device")                      \
@@ -169,7 +169,7 @@ release(uint, PAL_RGP_DISP_COUNT, 50,                                         \
         "The number of dispatches for RGP capture with SQTT")                 \
 release(bool, GPU_ENABLE_WAVE32_MODE, true,                                   \
         "Enables Wave32 compilation in HW if available")                      \
-release(bool, GPU_ENABLE_LC, IS_LIGHTNING,                                    \
+release(bool, GPU_ENABLE_LC, true,                                            \
         "Enables LC path")                                                    \
 release(bool, GPU_ENABLE_HW_P2P, false,                                       \
         "Enables HW P2P path")                                                \

rocclr/runtime/utils/macros.hpp

@@ -98,15 +98,6 @@
 #define NOT_WIN64(x) x
 #endif /*!_WIN64*/
 
-#ifdef WITH_LIGHTNING_COMPILER
-#define LIGHTNING_ONLY(x) x
-#define NOT_LIGHTNING(x)
-#define IS_LIGHTNING true
-#else /* !WITH_LIGHTNING_COMPILER */
-#define LIGHTNING_ONLY(x)
-#define NOT_LIGHTNING(x) x
-#endif /* !WITH_LIGHTNING_COMPILER */
-
 #ifndef IS_LINUX
 #define IS_LINUX false
 #endif
@@ -116,9 +107,6 @@
 #ifndef IS_WINDOWS
 #define IS_WINDOWS false
 #endif
-#ifndef IS_LIGHTNING
-#define IS_LIGHTNING false
-#endif
 
 #define IF_LEFT_true(x) x
 #define IF_LEFT_false(x)
@@ -129,7 +117,6 @@
 #define IF_RIGHT(cond, x) IF_RIGHT_##cond(x)
 #define IF(cond, x, y) IF_LEFT(cond, x) IF_RIGHT(cond, y)
 
-#define LIGHTNING_SWITCH(x, other) LIGHTNING_ONLY(x) NOT_LIGHTNING(other)
 #define LINUX_SWITCH(x, other) LINUX_ONLY(x) NOT_LINUX(other)
 #define MACOS_SWITCH(x, other) MACOS_ONLY(x) NOT_MACOS(other)
 #define WINDOWS_SWITCH(x, other) WINDOWS_ONLY(x) NOT_WINDOWS(other)