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

compatibility with pre-pcs rocprofiler version

Browse Source
This commit is contained in:
Evgeny committed 2020-03-11 11:33:27 -05:00
1 parent 7965a02680
commit 3568ca4dbb
3 files changed
+2 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/loader.h
-2
View File
@@ -205,8 +205,6 @@ typedef BaseLoader<RocTxApi> RocTxLoader;
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<> bool roctracer::RocpLoader::to_check_open_ = false; \
template<> bool roctracer::RocpLoader::to_check_symb_ = false; \
template<> const char* roctracer::HipLoader::lib_name_ = "libhip_hcc.so"; \
template<> bool roctracer::HipLoader::to_check_open_ = false; \
template<> const char* roctracer::HccLoader::lib_name_ = "libmcwamp.so"; \
src/core/roctracer.cpp
+1 -8
View File
@@ -853,14 +853,10 @@ static roctracer_status_t roctracer_enable_activity_fun(
roctracer::hsa_support::async_copy_callback_enabled = true;
} else {
const bool init_phase = (roctracer::RocpLoader::GetRef() == NULL);
if (roctracer::RocpLoader::Instance().InitActivityCallback == NULL) break;
if (init_phase == true) {
roctracer::RocpLoader::Instance().InitActivityCallback((void*)roctracer::HSA_AsyncActivityCallback,
(void*)pool);
}
if (roctracer::RocpLoader::Instance().EnableActivityCallback == NULL) {
EXC_RAISING(ROCTRACER_STATUS_ERROR, "EnableActivityCallback not found");
}
const bool succ = roctracer::RocpLoader::Instance().EnableActivityCallback(op, true);
if (succ == false) HCC_EXC_RAISING(ROCTRACER_STATUS_HSA_ERR, "HSA::EnableActivityCallback error");
}
@@ -953,10 +949,7 @@ static roctracer_status_t roctracer_disable_activity_fun(
if (op == HSA_OP_ID_COPY) {
roctracer::hsa_support::async_copy_callback_enabled = true;
} else {
if (roctracer::RocpLoader::Instance().InitActivityCallback == NULL) break;
if (roctracer::RocpLoader::Instance().EnableActivityCallback == NULL) {
EXC_RAISING(ROCTRACER_STATUS_ERROR, "EnableActivityCallback not found");
}
if (roctracer::RocpLoader::GetRef() == NULL) break;
const bool succ = roctracer::RocpLoader::Instance().EnableActivityCallback(op, false);
if (succ == false) HCC_EXC_RAISING(ROCTRACER_STATUS_HSA_ERR, "HSA::EnableActivityCallback(false) error, op(" << op << ")");
}