SWDEV-423659: Disabling HIP_ACTIVITY when HSA_ACTIVITY is enabled.

Change-Id: If64fabdcd0d8a718dd0017c2bc821a94c999e87e

src/core/activity.cpp

@@ -40,7 +40,7 @@ THE SOFTWARE.
 #define PUBLIC_API __attribute__((visibility("default")))
 
 // Error handler
-void fatal(const std::string msg) {
+void fatal(const std::string msg) [[noreturn]] {
   fflush(stdout);
   fprintf(stderr, "%s\n\n", msg.c_str());
   fflush(stderr);

src/tools/tool.cpp

@@ -686,11 +686,11 @@ ROCPROFILER_EXPORT bool OnLoad(void* table, uint64_t runtime_version, uint64_t f
   std::vector<rocprofiler_tracer_activity_domain_t> apis_requested;
 
   if (getenv("ROCPROFILER_HIP_API_TRACE")) apis_requested.emplace_back(ACTIVITY_DOMAIN_HIP_API);
-  if (getenv("ROCPROFILER_HIP_ACTIVITY_TRACE"))
-    apis_requested.emplace_back(ACTIVITY_DOMAIN_HIP_OPS);
   if (getenv("ROCPROFILER_HSA_API_TRACE")) apis_requested.emplace_back(ACTIVITY_DOMAIN_HSA_API);
   if (getenv("ROCPROFILER_HSA_ACTIVITY_TRACE"))
     apis_requested.emplace_back(ACTIVITY_DOMAIN_HSA_OPS);
+  else if (getenv("ROCPROFILER_HIP_ACTIVITY_TRACE"))
+    apis_requested.emplace_back(ACTIVITY_DOMAIN_HIP_OPS);
   if (getenv("ROCPROFILER_ROCTX_TRACE")) apis_requested.emplace_back(ACTIVITY_DOMAIN_ROCTX);
 
   // ATT Parameters