P4 to Git Change 2034910 by kjayapra@0_HIPWS_LNX1_ROCM on 2019/11/21 19:28:10

SWDEV-145570 - Revering CL#2033779 for now.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#48 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#49 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_platform.cpp#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#70 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.hpp#36 edit

hipamd/api/hip/hip_module.cpp

@@ -114,28 +114,6 @@ extern bool __hipExtractCodeObjectFromFatBinary(const void* data,
                                                 const std::vector<const char*>& devices,
                                                 std::vector<std::pair<const void*, size_t>>& code_objs);
 
-bool ihipModuleRegisterFunc(amd::Program* program, hipModule_t* module) {
-  std::vector<std::string> func_names;
-  device::Program* dev_program
-    = program->getDeviceProgram(*hip::getCurrentContext()->devices()[0]);
-
-  if (!dev_program->getFuncsFromCodeObj(&func_names)) {
-    return false;
-  }
-
-  for (auto it = func_names.begin(); it != func_names.end(); ++it) {
-    auto modules = new std::vector<std::pair<hipModule_t, bool>>(g_devices.size());
-    for (size_t dev = 0; dev < g_devices.size(); ++dev) {
-      modules->at(dev) = std::make_pair(*module, true);
-    }
-
-    PlatformState::DeviceFunction dfunc{std::string{it->c_str()}, modules,
-                                        std::vector<hipFunction_t>(g_devices.size())};
-    PlatformState::instance().registerFunction(it->c_str(), dfunc);
-  }
-
-  return true;
-}
 bool ihipModuleRegisterUndefined(amd::Program* program, hipModule_t* module) {
 
   std::vector<std::string> undef_vars;
@@ -218,10 +196,6 @@ hipError_t ihipModuleLoadData(hipModule_t *module, const void *image)
     return hipErrorSharedObjectSymbolNotFound;
   }
 
-  if (!ihipModuleRegisterFunc(program, module)) {
-    return hipErrorSharedObjectSymbolNotFound;
-  }
-
   if(CL_SUCCESS != program->build(hip::getCurrentContext()->devices(), nullptr, nullptr, nullptr)) {
     return hipErrorSharedObjectInitFailed;
   }