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

hipamd/api/hip/hip_module.cpp

@@ -114,7 +114,7 @@ bool ihipModuleRegisterGlobal(amd::Program* program, hipModule_t* module) {
   device::Program* dev_program
     = program->getDeviceProgram(*hip::getCurrentContext()->devices()[0]);
 
-  if (!dev_program->getGlobalSymbolsFromCodeObj(&var_names)) {
+  if (!dev_program->getGlobalVarFromCodeObj(&var_names)) {
     return false;
   }
 
@@ -124,7 +124,7 @@ bool ihipModuleRegisterGlobal(amd::Program* program, hipModule_t* module) {
       modules->at(dev) = std::make_pair(*module, false);
     }
 
-    PlatformState::DeviceVar dvar{it->c_str(), modules,
+    PlatformState::DeviceVar dvar{nullptr, it->c_str(), 0, modules,
       std::vector<PlatformState::RegisteredVar>{ g_devices.size()}};
     PlatformState::instance().registerVar(it->c_str(), dvar);
   }
@@ -417,3 +417,25 @@ hipError_t hipExtLaunchMultiKernelMultiDevice(hipLaunchParams* launchParamsList,
                                               int numDevices, unsigned int flags) {
   return ihipLaunchCooperativeKernelMultiDevice(launchParamsList, numDevices, flags, 0);
 }
+
+hipError_t hipModuleGetTexRef(textureReference** texRef, hipModule_t hmod, const char* name) {
+  HIP_INIT_API(texRef, hmod, name);
+
+  hipDeviceptr_t dptr = nullptr;
+  size_t bytes = 0;
+
+  /* input args check */
+  if ((texRef == nullptr) || (name == nullptr)) {
+    HIP_RETURN(hipErrorInvalidValue);
+  }
+
+   /* Get address and size for the global symbol */
+  if (!PlatformState::instance().getGlobalVar(name, ihipGetDevice(), &dptr,
+                                              &bytes)) {
+    HIP_RETURN(hipErrorUnknown);
+  }
+
+  *texRef = reinterpret_cast<textureReference*>(dptr);
+  HIP_RETURN(hipSuccess);
+}
+