compatibility with pre-pcs rocprofiler version

[ROCm/roctracer commit: 3568ca4dbb]

projects/roctracer/src/core/loader.h

@@ -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"; \

projects/roctracer/src/core/roctracer.cpp

@@ -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 << ")");
       }

projects/roctracer/test/tool/tracer_tool.cpp

@@ -867,7 +867,7 @@ extern "C" PUBLIC_API bool OnLoad(HsaApiTable* table, uint64_t runtime_version,
     roctracer_set_properties(ACTIVITY_DOMAIN_HSA_OPS, &ops_properties);
 
     fprintf(stdout, "    HSA-activity-trace()\n"); fflush(stdout);
-    ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HSA_OPS));
+    ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HSA_OPS, HSA_OP_ID_COPY));
   }
 
   // Enable HIP API callbacks/activity