P4 to Git Change 1981324 by kjayapra@3_HIPWS_TXT_ROCM on 2019/08/11 18:44:40

SWDEV-188177 - Texture API implementation and support for extern variables.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_hcc.def.in#18 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_hcc.map.in#20 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#35 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#32 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_platform.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_texture.cpp#14 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#340 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#57 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#608 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#172 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#250 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#79 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#152 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.hpp#41 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#96 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.hpp#39 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#133 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#39 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#105 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#48 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#102 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.hpp#46 edit

rocclr/runtime/device/pal/palprogram.cpp

@@ -162,8 +162,8 @@ bool Segment::freeze(bool destroySysmem) {
 }
 
 const static char* Carrizo = "Carrizo";
-HSAILProgram::HSAILProgram(Device& device)
-    : Program(device),
+HSAILProgram::HSAILProgram(Device& device, amd::Program& owner)
+    : Program(device, owner),
       rawBinary_(nullptr),
       kernels_(nullptr),
       codeSegGpu_(nullptr),
@@ -181,8 +181,8 @@ HSAILProgram::HSAILProgram(Device& device)
   loader_ = amd::hsa::loader::Loader::Create(&loaderContext_);
 }
 
-HSAILProgram::HSAILProgram(NullDevice& device)
-    : Program(device),
+HSAILProgram::HSAILProgram(NullDevice& device, amd::Program& owner)
+    : Program(device, owner),
       rawBinary_(nullptr),
       kernels_(nullptr),
       codeSegGpu_(nullptr),
@@ -250,6 +250,8 @@ 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();
+
   hsa_status_t status = executable_->LoadCodeObject(agent, code_object, nullptr);
   if (status != HSA_STATUS_SUCCESS) {
     buildLog_ += "Error: AMD HSA Code Object loading failed.\n";
@@ -376,6 +378,20 @@ bool HSAILProgram::saveBinaryAndSetType(type_t type) {
   return true;
 }
 
+bool HSAILProgram::defineGlobalVar(const char* name, void* dptr) {
+  hsa_status_t hsa_status = HSA_STATUS_SUCCESS;
+  hsa_agent_t agent;
+
+  agent.handle = 1;
+  hsa_status = executable_->DefineAgentExternalVariable(name, agent, HSA_VARIABLE_SEGMENT_GLOBAL, dptr);
+  if(HSA_STATUS_SUCCESS != hsa_status) {
+    buildLog_ += "Could not define Program External Variable";
+    buildLog_ += "\n";
+  }
+
+  return (hsa_status == HSA_STATUS_SUCCESS);
+}
+
 bool HSAILProgram::createGlobalVarObj(amd::Memory** amd_mem_obj, void** device_pptr, size_t* bytes,
                                       const char* global_name) const {
   uint32_t length = 0;
@@ -729,6 +745,8 @@ 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();
+
   hsa_status_t status = executable_->LoadCodeObject(agent, code_object, nullptr);
   if (status != HSA_STATUS_SUCCESS) {
     buildLog_ += "Error: AMD HSA Code Object loading failed.\n";