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

SWDEV-223674 - Return hipErrorNoBinaryForGpu in case particular binary is not found in clang offload bundler.

Browse Source 
Change-Id: Iaa08fcdc8ecb719edd9f81e4a1456ea642f362f4
This commit is contained in:
Karthik Jayaprakash
2020-02-19 19:31:10 -05:00
parent 13bf30569e
commit 4b2ff6ec91
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hipamd/vdi/hip_module.cpp
+6 -2
View File
@@ -118,7 +118,7 @@ hipError_t hipModuleLoadDataEx(hipModule_t *module, const void *image,
HIP_RETURN(ihipModuleLoadData(module, image));
}
extern bool __hipExtractCodeObjectFromFatBinary(const void* data,
extern hipError_t __hipExtractCodeObjectFromFatBinary(const void* data,
const std::vector<const char*>& devices,
std::vector<std::pair<const void*, size_t>>& code_objs);
@@ -180,8 +180,12 @@ bool ihipModuleRegisterGlobal(amd::Program* program, hipModule_t* module) {
hipError_t ihipModuleLoadData(hipModule_t *module, const void *image)
{
std::vector<std::pair<const void*, size_t>> code_objs;
if (__hipExtractCodeObjectFromFatBinary(image, {hip::getCurrentDevice()->devices()[0]->info().name_}, code_objs))
hipError_t code_obj_err = __hipExtractCodeObjectFromFatBinary(image, {hip::getCurrentDevice()->devices()[0]->info().name_}, code_objs);
if (code_obj_err == hipSuccess) {
image = code_objs[0].first;
} else if(code_obj_err == hipErrorNoBinaryForGpu) {
return code_obj_err;
}
amd::Program* program = new amd::Program(*hip::getCurrentDevice()->asContext());
if (program == NULL) {
hipamd/vdi/hip_platform.cpp
+5 -5
View File
@@ -79,13 +79,13 @@ static bool isCompatibleCodeObject(const std::string& codeobj_target_id,
// Extracts code objects from fat binary in data for device names given in devices.
// Returns true if code objects are extracted successfully.
bool __hipExtractCodeObjectFromFatBinary(const void* data,
hipError_t __hipExtractCodeObjectFromFatBinary(const void* data,
const std::vector<const char*>& devices,
std::vector<std::pair<const void*, size_t>>& code_objs)
{
std::string magic((const char*)data, sizeof(CLANG_OFFLOAD_BUNDLER_MAGIC_STR) - 1);
if (magic.compare(CLANG_OFFLOAD_BUNDLER_MAGIC_STR)) {
return false;
return hipErrorInvalidKernelFile;
}
code_objs.resize(devices.size());
@@ -123,9 +123,9 @@ bool __hipExtractCodeObjectFromFatBinary(const void* data,
}
}
if (num_code_objs == devices.size())
return true;
return hipSuccess;
else
return false;
return hipErrorNoBinaryForGpu;
}
extern "C" std::vector<std::pair<hipModule_t, bool>>* __hipRegisterFatBinary(const void* data)
@@ -150,7 +150,7 @@ void PlatformState::digestFatBinary(const void* data, std::vector<std::pair<hipM
devices.push_back(g_devices[dev]->devices()[0]->info().name_);
}
if (!__hipExtractCodeObjectFromFatBinary((char*)data, devices, code_objs)) {
if (hipSuccess != __hipExtractCodeObjectFromFatBinary((char*)data, devices, code_objs)) {
return;
}