P4 to Git Change 1792742 by gandryey@gera-win10 on 2019/06/06 11:13:45

SWDEV-79445 - OCL generic changes and code clean-up
	- Update COMGR loader to avoid the build with device layers

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#244 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#16 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#45 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#25 edit

rocclr/runtime/device/comgrctx.cpp

@@ -3,6 +3,7 @@
 //
 #if defined(USE_COMGR_LIBRARY)
 #include "os/os.hpp"
+#include "utils/flags.hpp"
 #include "comgrctx.hpp"
 
 namespace amd {
@@ -12,6 +13,7 @@ bool Comgr::is_ready_ = false;
 
 bool Comgr::LoadLib() {
 #if defined(COMGR_DYN_DLL)
+  LogInfo("Loading COMGR library.");
   static const char* ComgrLibName =
     LP64_SWITCH(WINDOWS_SWITCH("amdcomgr.dll", "libamdcomgr32.so"),
                 WINDOWS_SWITCH("amdcomgr64.dll", "libamdcomgr64.so"));
@@ -69,4 +71,4 @@ bool Comgr::LoadLib() {
 }
 
 }
-#endif
+#endif