SWDEV-308644 - merge roc blit kernels

Change-Id: I378e511959fe17c03fa45066022e9670a4d181f0 [ROCm/clr commit: f5c9ad5b1d]
2021-11-17 18:36:08 -05:00
parent 4d011fd9ae
commit ea2741f631
8 changed files with 29 additions and 58 deletions
@@ -834,22 +834,20 @@ void Device::ReleaseExclusiveGpuAccess(VirtualGPU& vgpu) const {

 bool Device::createBlitProgram() {
  bool result = true;
-  const char* extraKernel = nullptr;
+  std::string extraKernel;

 #if defined(USE_COMGR_LIBRARY)
-  std::string rocKernel;
  if (settings().useLightning_) {
    if (amd::IS_HIP) {
-      rocKernel = rocBlitLinearSourceCode;
+      extraKernel = rocBlitLinearSourceCode;
      if (info().cooperativeGroups_) {
-        rocKernel.append(GwsInitSourceCode);
-      } 
+        extraKernel.append(GwsInitSourceCode);
+      }
    }
    else {
-      rocKernel = SchedulerSourceCode;
+      extraKernel = SchedulerSourceCode;
    }
-  
-    extraKernel = rocKernel.c_str();
+
  }
 #endif  // USE_COMGR_LIBRARY