AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-235295 - Move addDeviceProgram() to lazy loading

Browse Source 
Change-Id: I8fe07e370e58844496e18c858bb528393556854f
This commit is contained in:
kjayapra-amd
2020-06-01 21:06:43 -04:00
committed by Rahul Garg
parent 1c0d737e1f
commit 348066d21f
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/hip_internal.hpp
+3
View File
@@ -292,6 +292,9 @@ private:
std::unordered_map<const void*,
std::pair<hipModule_t, std::string>> symbols_;
typedef std::pair<const void*, size_t> CodeObjPairType;
std::unordered_map<amd::Program*, CodeObjPairType> code_obj_;
static PlatformState* platform_;
PlatformState() {}
rocclr/hip_platform.cpp
+30 -5
View File
@@ -133,7 +133,8 @@ hipError_t __hipExtractCodeObjectFromFatBinary(const void* data,
if (num_code_objs == devices.size()) {
return hipSuccess;
} else {
("hipErrorNoBinaryForGpu: Coudn't find binary for current devices!");
DevLogError("hipErrorNoBinaryForGpu: Coudn't find binary for current devices!");
guarantee(false); //Aborting the program
return hipErrorNoBinaryForGpu;
}
}
@@ -174,10 +175,8 @@ void PlatformState::digestFatBinary(const void* data, std::vector<std::pair<hipM
if (program == nullptr) {
return;
}
if (CL_SUCCESS == program->addDeviceProgram(
*ctx->devices()[0], code_objs[dev].first, code_objs[dev].second, false)) {
programs.at(dev) = std::make_pair(reinterpret_cast<hipModule_t>(as_cl(program)) , false);
}
programs.at(dev) = std::make_pair(reinterpret_cast<hipModule_t>(as_cl(program)) , false);
code_obj_.insert(std::make_pair(program, std::make_pair(code_objs[dev].first, code_objs[dev].second)));
}
}
@@ -439,6 +438,19 @@ hipFunction_t PlatformState::getFunc(const void* hostFunction, int deviceId) {
hipModule_t module = (*devFunc.modules)[deviceId].first;
if (!(*devFunc.modules)[deviceId].second) {
amd::Program* program = as_amd(reinterpret_cast<cl_program>(module));
amd::Context* ctx = g_devices[deviceId]->asContext();
auto code_obj_it = code_obj_.find(program);
if (code_obj_.end() == code_obj_it) {
DevLogError("Cannot find image & size for static symbols");
guarantee(false); //Aborting the program
return nullptr;
}
if (CL_SUCCESS != program->addDeviceProgram(*ctx->devices()[0], code_obj_it->second.first,
code_obj_it->second.second, false)) {
DevLogError("Cannot add Device Program");
guarantee(false); //Aborting the program
return nullptr;
}
program->setVarInfoCallBack(&getSvarInfo);
if (CL_SUCCESS != program->build(g_devices[deviceId]->devices(), nullptr, nullptr, nullptr,
kOptionChangeable, kNewDevProg)) {
@@ -541,6 +553,19 @@ bool PlatformState::getGlobalVar(const char* hostVar, int deviceId, hipModule_t
if (!(*dvar->modules)[deviceId].second) {
amd::Program* program = as_amd(reinterpret_cast<cl_program>((*dvar->modules)[deviceId].first));
amd::Context* ctx = g_devices[deviceId]->asContext();
auto code_obj_it = code_obj_.find(program);
if (code_obj_.end() == code_obj_it) {
DevLogError("Cannot find image & size for static symbols");
guarantee(false); //Aborting the program
return false;
}
if (CL_SUCCESS != program->addDeviceProgram(*ctx->devices()[0], code_obj_it->second.first,
code_obj_it->second.second, false)) {
DevLogError("Cannot add Device Program");
guarantee(false) //Aborting the program
return false;
}
program->setVarInfoCallBack(&getSvarInfo);
if (CL_SUCCESS != program->build(g_devices[deviceId]->devices(), nullptr, nullptr, nullptr,
kOptionChangeable, kNewDevProg)) {