AI/rocm-systems
2
0
Forka 0
Codice Problemi Pull Request Actions Pacchetti Progetti Rilasci Wiki Attività

SWDEV-518317 - Don't attempt to remove managedVars when map is empty

Sfoglia il codice sorgente 
Change-Id: I25c33487dc08f96c087b6acc1abe42a4a666a609
This commit is contained in:
Pengda Xie
2025-02-28 11:07:43 -08:00
committato da Pengda Xie
parent c2d1776ebd
commit ae3b053ddf
1 ha cambiato i file con 41 aggiunte e 34 eliminazioni
Scarica il file Patch Scarica il file Diff Expand all files Collapse all files
hipamd/src/hip_code_object.cpp
+41 -34
Vedi File
@@ -1296,43 +1296,50 @@ FatBinaryInfo** StatCO::addFatBinary(const void* data, bool initialized, bool& s
hipError_t StatCO::removeFatBinary(FatBinaryInfo** module) {
amd::ScopedLock lock(sclock_);
auto hostVarsIter = module_to_hostVars_.find(module);
if (hostVarsIter != module_to_hostVars_.end()) {
for (auto& hostVar : hostVarsIter->second) {
auto varIter = vars_.find(hostVar);
if (varIter == vars_.end()) {
LogPrintfError("removeFatBinary: Unable to find module 0x%x hostVar 0x%x",
module, hostVar);
} else {
delete varIter->second;
vars_.erase(varIter);
}
}
module_to_hostVars_.erase(hostVarsIter);
} else {
LogPrintfError("removeFatBinary: Unable to find module 0x%x hostVars", module);
}
auto managedVarsIter = managedVars_.find(module);
if (managedVarsIter != managedVars_.end()) {
for (auto& managedVar : managedVarsIter->second) {
hipError_t err;
for (auto dev : g_devices) {
DeviceVar* dvar = nullptr;
IHIP_RETURN_ONFAIL(managedVar->getDeviceVarPtr(&dvar, dev->deviceId()));
if (dvar != nullptr) {
// free also deletes the device ptr
err = ihipFree(dvar->device_ptr());
assert(err == hipSuccess);
if (!module_to_hostVars_.empty()) {
auto hostVarsIter = module_to_hostVars_.find(module);
if (hostVarsIter != module_to_hostVars_.end()) {
for (auto& hostVar : hostVarsIter->second) {
auto varIter = vars_.find(hostVar);
if (varIter == vars_.end()) {
LogPrintfError(
"removeFatBinary: Unable to find module 0x%x hostVar 0x%x",
module, hostVar);
} else {
delete varIter->second;
vars_.erase(varIter);
}
}
err = ihipFree(*(static_cast<void**>(managedVar->getManagedVarPtr())));
assert(err == hipSuccess);
delete managedVar;
module_to_hostVars_.erase(hostVarsIter);
} else {
LogPrintfError(
"removeFatBinary: Unable to find module 0x%x hostVars", module);
}
}
if (!managedVars_.empty()) {
auto managedVarsIter = managedVars_.find(module);
if (managedVarsIter != managedVars_.end()) {
for (auto& managedVar : managedVarsIter->second) {
hipError_t err;
for (auto dev : g_devices) {
DeviceVar* dvar = nullptr;
IHIP_RETURN_ONFAIL(managedVar->getDeviceVarPtr(&dvar, dev->deviceId()));
if (dvar != nullptr) {
// free also deletes the device ptr
err = ihipFree(dvar->device_ptr());
assert(err == hipSuccess);
}
}
err = ihipFree(*(static_cast<void**>(managedVar->getManagedVarPtr())));
assert(err == hipSuccess);
delete managedVar;
}
managedVars_.erase(managedVarsIter);
} else {
LogPrintfError("removeFatBinary: Unable to find module 0x%x managedVars",
module);
}
managedVars_.erase(managedVarsIter);
} else {
LogPrintfError("removeFatBinary: Unable to find module 0x%x managedVars", module);
}
auto hostFuncsIter = module_to_hostFunctions_.find(module);