P4 to Git Change 1982056 by kjayapra@3_HIPWS_TXT_ROCM on 2019/08/12 21:16:51

SWDEV-199635 - Setting VarInfoCallBack before all program builds.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#36 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#33 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#58 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#97 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#106 edit

rocclr/runtime/device/pal/palprogram.cpp

@@ -250,7 +250,9 @@ bool HSAILProgram::setKernels(amd::option::Options* options, void* binary, size_
   hsa_code_object_t code_object;
   code_object.handle = reinterpret_cast<uint64_t>(binary);
 
-  defineUndefinedVars();
+  if (amd::IS_HIP) {
+    defineUndefinedVars();
+  }
 
   hsa_status_t status = executable_->LoadCodeObject(agent, code_object, nullptr);
   if (status != HSA_STATUS_SUCCESS) {
@@ -745,7 +747,9 @@ bool LightningProgram::setKernels(amd::option::Options* options, void* binary, s
   hsa_code_object_t code_object;
   code_object.handle = reinterpret_cast<uint64_t>(binary);
 
-  defineUndefinedVars();
+  if (amd::IS_HIP) {
+    defineUndefinedVars();
+  }
 
   hsa_status_t status = executable_->LoadCodeObject(agent, code_object, nullptr);
   if (status != HSA_STATUS_SUCCESS) {