P4 to Git Change 1717839 by gandryey@gera-w8 on 2018/12/07 17:54:13

SWDEV-162389 - Prepare the runtime code for enabling COMGR by default in the non-LC workspace
	- Make sure OCL runtime can dynamically switch between HSAIL and LC paths
	- For now use the both WITH_LIGHTNING_COMPILER and USE_COMGR_LIBRARY defines to identify LC specific code. The clean-up will come later

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#236 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#325 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#17 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#10 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#247 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#116 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#72 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#83 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#61 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#99 edit

rocclr/runtime/device/gpu/gpuresource.cpp

@@ -1,5 +1,6 @@
 // Copyright (c) 2008 Advanced Micro Devices, Inc. All rights reserved.
 //
+#include "device/device.hpp"
 
 #if defined(ATI_OS_WIN)
 #define WIN32_LEAN_AND_MEAN 1
@@ -8,10 +9,7 @@
 #include <GL/gl.h>
 #include "GL/glATIInternal.h"
 
-#include "platform/program.hpp"
-#include "platform/kernel.hpp"
 #include "os/os.hpp"
-#include "device/device.hpp"
 #include "utils/flags.hpp"
 #include "thread/monitor.hpp"
 #include "device/gpu/gpuresource.hpp"