AI/rocm-systems
2
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

SWDEV-336448 - Support loading comgr versioned dll

Telusuri Sumber 
Change-Id: I03283fc2a200d778c5efa43e509624bba9ce0541
This commit is contained in:
Satyanvesh Dittakavi
2022-08-09 15:55:53 +00:00
committed by Maneesh Gupta
orang tua 50e0ddb055
melakukan 64c1c4757f
4 mengubah file dengan 38 tambahan dan 5 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/device/comgrctx.cpp
+30 -3
Melihat File
@@ -28,13 +28,40 @@ std::once_flag Comgr::initialized;
ComgrEntryPoints Comgr::cep_;
bool Comgr::is_ready_ = false;
bool Comgr::LoadLib() {
bool Comgr::LoadLib(bool is_versioned) {
#if defined(COMGR_DYN_DLL)
ClPrint(amd::LOG_INFO, amd::LOG_CODE, "Loading COMGR library.");
static constexpr const char* ComgrLibName =
if (is_versioned) {
#if defined(HIP_MAJOR_VERSION) && defined(HIP_MAJOR_VERSION)
std::string comgr_versioned_name, major_version, minor_version;
const std::string kComgrPrefix = "amd_comgr";
if (HIP_MAJOR_VERSION > 9) {
major_version = std::to_string(HIP_MAJOR_VERSION);
} else {
major_version = "0" + std::to_string(HIP_MAJOR_VERSION);
}
if (HIP_MINOR_VERSION > 9) {
minor_version = std::to_string(HIP_MINOR_VERSION);
} else {
minor_version = "0" + std::to_string(HIP_MINOR_VERSION);
}
comgr_versioned_name = kComgrPrefix + major_version + minor_version + std::string(".dll");
static const char* comgr_lib_name =
LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so.2"),
WINDOWS_SWITCH(comgr_versioned_name.c_str(), "libamd_comgr.so.2"));
cep_.handle = Os::loadLibrary(comgr_lib_name);
#endif
} else {
static constexpr const char* comgr_lib_name =
LP64_SWITCH(WINDOWS_SWITCH("amd_comgr32.dll", "libamd_comgr32.so.2"),
WINDOWS_SWITCH("amd_comgr.dll", "libamd_comgr.so.2"));
cep_.handle = Os::loadLibrary(ComgrLibName);
cep_.handle = Os::loadLibrary(comgr_lib_name);
}
if (nullptr == cep_.handle) {
ClPrint(amd::LOG_ERROR, amd::LOG_CODE, "Failed to load COMGR library.");
return false;