From 0560d99d0fc9d0c356562dd09dc5aee78094d806 Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Wed, 27 Nov 2019 19:10:53 -0600
Subject: [PATCH] hip_vdi: disabling calllback/activity disable

---
 src/core/loader.h                             | 6 +++---
 src/core/roctracer.cpp                        | 6 +++++-
 test/MatrixTranspose_test/MatrixTranspose.cpp | 2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/core/loader.h b/src/core/loader.h
index 9f62225d05..c7e95734b2 100644
--- a/src/core/loader.h
+++ b/src/core/loader.h
@@ -110,9 +110,9 @@ class HccApi {
   protected:
   void init(Loader* loader) {
 #if HIP_VDI
-    InitActivityCallback = loader->GetFun<hipInitAsyncActivityCallback_t>("InitActivityCallback");
-    EnableActivityCallback = loader->GetFun<hipEnableAsyncActivityCallback_t>("EnableActivityCallback");
-    GetOpName = loader->GetFun<hipGetOpName_t>("GetCmdName");
+    InitActivityCallback = loader->GetFun<hipInitAsyncActivityCallback_t>("hipInitActivityCallback");
+    EnableActivityCallback = loader->GetFun<hipEnableAsyncActivityCallback_t>("hipEnableActivityCallback");
+    GetOpName = loader->GetFun<hipGetOpName_t>("hipGetCmdName");
 #else
     InitActivityCallback = loader->GetFun<hipInitAsyncActivityCallback_t>("InitActivityCallbackImpl");
     EnableActivityCallback = loader->GetFun<hipEnableAsyncActivityCallback_t>("EnableActivityCallbackImpl");
diff --git a/src/core/roctracer.cpp b/src/core/roctracer.cpp
index 6a7cf115c0..0259c83e31 100644
--- a/src/core/roctracer.cpp
+++ b/src/core/roctracer.cpp
@@ -711,8 +711,10 @@ static roctracer_status_t roctracer_disable_callback_fun(
     case ACTIVITY_DOMAIN_HSA_API: break;
     case ACTIVITY_DOMAIN_HCC_OPS: break;
     case ACTIVITY_DOMAIN_HIP_API: {
+#if !HIP_VDI
       hipError_t hip_err = roctracer::HipLoader::Instance().RemoveApiCallback(op);
       if (hip_err != hipSuccess) HIP_EXC_RAISING(ROCTRACER_STATUS_HIP_API_ERR, "hipRemoveApiCallback error(" << hip_err << ")");
+#endif
       break;
     }
     case ACTIVITY_DOMAIN_ROCTX: {
@@ -900,8 +902,10 @@ static roctracer_status_t roctracer_disable_activity_fun(
       break;
     }
     case ACTIVITY_DOMAIN_HIP_API: {
+#if !HIP_VDI
       const hipError_t hip_err = roctracer::HipLoader::Instance().RemoveActivityCallback(op);
       if (hip_err != hipSuccess) HIP_EXC_RAISING(ROCTRACER_STATUS_HIP_API_ERR, "hipRemoveActivityCallback error(" << hip_err << ")");
+#endif
       break;
     }
     case ACTIVITY_DOMAIN_ROCTX: break;
@@ -1052,7 +1056,7 @@ PUBLIC_API roctracer_status_t roctracer_set_properties(
     }
     case ACTIVITY_DOMAIN_HCC_OPS:
     case ACTIVITY_DOMAIN_HIP_API: {
-#ifdef HIP_VDI
+#if HIP_VDI
       const char* hip_lib_name = "libamdhip64.so";
       roctracer::HccLoader::SetLibName(hip_lib_name);
       roctracer::HipLoader::SetLibName(hip_lib_name);
diff --git a/test/MatrixTranspose_test/MatrixTranspose.cpp b/test/MatrixTranspose_test/MatrixTranspose.cpp
index 57ab83ef18..1a7b2cb97a 100644
--- a/test/MatrixTranspose_test/MatrixTranspose.cpp
+++ b/test/MatrixTranspose_test/MatrixTranspose.cpp
@@ -317,6 +317,8 @@ void init_tracing() {
   // Enable KFD API tracing
   ROCTRACER_CALL(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_KFD_API, api_callback, NULL));
   ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_KFD_API));
+  // Enable rocTX
+  ROCTRACER_CALL(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_ROCTX, api_callback, NULL));
 }
 
 // Start tracing routine