HIP libraries static definition

Change-Id: I7cd45b491f35d5890246f8d4b1ce358f62b4c682
This commit is contained in:
Evgeny
2020-04-20 12:38:02 -05:00
parent e9045d889d
commit 95d05100a7
4 changed files with 1219 additions and 8 deletions
+9 -3
View File
@@ -198,19 +198,25 @@ typedef BaseLoader<RocTxApi> RocTxLoader;
} // namespace roctracer
#define LOADER_INSTANTIATE() \
#define LOADER_INSTANTIATE2(HIP_LIB, HCC_LIB) \
template<class T> typename roctracer::BaseLoader<T>::mutex_t roctracer::BaseLoader<T>::mutex_; \
template<class T> std::atomic<roctracer::BaseLoader<T>*> roctracer::BaseLoader<T>::instance_{}; \
template<class T> bool roctracer::BaseLoader<T>::to_load_ = false; \
template<class T> bool roctracer::BaseLoader<T>::to_check_open_ = true; \
template<class T> bool roctracer::BaseLoader<T>::to_check_symb_ = true; \
template<> const char* roctracer::RocpLoader::lib_name_ = "librocprofiler64.so"; \
template<> const char* roctracer::HipLoader::lib_name_ = "libhip_hcc.so"; \
template<> const char* roctracer::HipLoader::lib_name_ = HIP_LIB; \
template<> bool roctracer::HipLoader::to_check_open_ = false; \
template<> const char* roctracer::HccLoader::lib_name_ = "libmcwamp.so"; \
template<> const char* roctracer::HccLoader::lib_name_ = HCC_LIB; \
template<> bool roctracer::HccLoader::to_check_open_ = false; \
template<> const char* roctracer::KfdLoader::lib_name_ = "libkfdwrapper64.so"; \
template<> const char* roctracer::RocTxLoader::lib_name_ = "libroctx64.so"; \
template<> bool roctracer::RocTxLoader::to_load_ = true;
#if HIP_VDI
#define LOADER_INSTANTIATE() LOADER_INSTANTIATE2("libamdhip64.so", "libamdhip64.so");
#else
#define LOADER_INSTANTIATE() LOADER_INSTANTIATE2("libhip_hcc.so", "libmcwamp.so");
#endif
#endif // SRC_CORE_LOADER_H_
-5
View File
@@ -1133,11 +1133,6 @@ PUBLIC_API roctracer_status_t roctracer_set_properties(
}
case ACTIVITY_DOMAIN_HCC_OPS:
case ACTIVITY_DOMAIN_HIP_API: {
#if HIP_VDI
const char* hip_lib_name = "libamdhip64.so";
roctracer::HccLoader::SetLibName(hip_lib_name);
roctracer::HipLoader::SetLibName(hip_lib_name);
#endif
mark_api_callback_ptr = reinterpret_cast<mark_api_callback_t*>(properties);
break;
}