P4 to Git Change 1720088 by gandryey@gera-w8 on 2018/12/13 14:29:40

SWDEV-162389 - Switch to dynamic COMGR load

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#181 edit
... //depot/stg/opencl/drivers/opencl/opencldefs#240 edit
... //depot/stg/opencl/drivers/opencl/runtime/build/Makefile.runtime#78 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.cpp#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/comgrctx.hpp#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#239 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#328 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#16 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.hpp#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#13 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#119 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#104 edit

rocclr/runtime/device/rocm/rocdevice.cpp

@@ -118,6 +118,12 @@ bool NullDevice::create(const AMDDeviceInfo& deviceInfo) {
     LogError("Error creating settings for nullptr HSA device");
     return false;
   }
+
+  if (!ValidateComgr()) {
+    LogError("Code object manager initialization failed!");
+    return false;
+  }
+
   // Report the device name
   ::strcpy(info_.name_, "AMD HSA Device");
   info_.extensions_ = getExtensionString();
@@ -599,6 +605,11 @@ bool Device::create() {
     return false;
   }
 
+  if (!ValidateComgr()) {
+    LogError("Code object manager initialization failed!");
+    return false;
+  }
+
   if (!amd::Device::create()) {
     return false;
   }