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/device.cpp

@@ -6,6 +6,7 @@
 #include "thread/atomic.hpp"
 #include "thread/monitor.hpp"
 #include "utils/options.hpp"
+#include "comgrctx.hpp"
 
 #if defined(WITH_HSA_DEVICE)
 #include "device/rocm/rocdevice.hpp"
@@ -232,7 +233,6 @@ bool Device::ValidateComgr() {
 #if defined(USE_COMGR_LIBRARY)
   // Check if Lightning compiler was requested
   if (settings_->useLightning_) {
-    LogInfo("Loading COMGR library.");
     std::call_once(amd::Comgr::initialized, amd::Comgr::LoadLib);
     // Use Lightning only if it's available
     settings_->useLightning_ = amd::Comgr::IsReady();