support for python apps profiling

src/core/loader.h

@@ -1,9 +1,15 @@
 #ifndef SRC_CORE_LOADER_H_
 #define SRC_CORE_LOADER_H_
 
+#include <atomic>
 #include <mutex>
 #include <dlfcn.h>
 
+#define LOADER_INSTANTIATE() \
+  std::atomic<roctracer::HipLoader*> roctracer::HipLoader::instance_{}; \
+  std::atomic<roctracer::HccLoader*> roctracer::HccLoader::instance_{}; \
+  roctracer::Loader::mutex_t roctracer::Loader::mutex_;
+
 namespace roctracer {
 
 // Base runtime loader class
@@ -95,13 +101,13 @@ class HccLoader : protected Loader {
     return *obj;
   }
 
-  HccLoader() : Loader("libmcwamp.so") {
+  HccLoader() : Loader("libmcwamp_hsa.so") {
     // Kalmar::CLAMP::InitActivityCallback
-    InitActivityCallback = GetFun<InitActivityCallback_t>("_ZN6Kalmar5CLAMP20InitActivityCallbackEPvS1_S1_");
+    InitActivityCallback = GetFun<InitActivityCallback_t>("InitActivityCallbackImpl");
     // Kalmar::CLAMP::EnableActivityIdCallback
-    EnableActivityCallback = GetFun<EnableActivityCallback_t>("_ZN6Kalmar5CLAMP22EnableActivityCallbackEjb");
+    EnableActivityCallback = GetFun<EnableActivityCallback_t>("EnableActivityCallbackImpl");
     // Kalmar::CLAMP::GetCmdName
-    GetCmdName = GetFun<GetCmdName_t>("_ZN6Kalmar5CLAMP10GetCmdNameEj");
+    GetCmdName = GetFun<GetCmdName_t>("GetCmdNameImpl");
   }
 
   InitActivityCallback_t* InitActivityCallback;

src/core/roctracer.cpp

@@ -439,12 +439,10 @@ std::atomic<util::Logger*> util::Logger::instance_{};
 MemoryPool* memory_pool = NULL;
 typedef std::recursive_mutex memory_pool_mutex_t;
 memory_pool_mutex_t memory_pool_mutex;
-
-Loader::mutex_t Loader::mutex_;
-std::atomic<HipLoader*> HipLoader::instance_{};
-std::atomic<HccLoader*> HccLoader::instance_{};
 }
 
+LOADER_INSTANTIATE();
+
 std::atomic<proxy::Tracker*> proxy::Tracker::instance_{};
 proxy::Tracker::mutex_t proxy::Tracker::glob_mutex_;
 proxy::Tracker::counter_t proxy::Tracker::counter_ = 0;