several fixes; adding direct loading of alprofile library

[ROCm/rocprofiler commit: 8270530fec]

projects/rocprofiler/src/util/hsa_rsrc_factory.cpp

@@ -24,6 +24,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "util/hsa_rsrc_factory.h"
 
+#include <dlfcn.h>
 #include <hsa.h>
 #include <hsa_ext_finalize.h>
 #include <stdint.h>
@@ -85,7 +86,10 @@ HsaRsrcFactory::HsaRsrcFactory() {
   // Get AqlProfile API table
   aqlprofile_api_ = {0};
   status = hsa_system_get_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, 1, 0, &aqlprofile_api_);
-  CHECK_STATUS("aqlprofile API table query failed", status);
+#ifdef ROCP_LOAD_AQLPROF
+  if (status != HSA_STATUS_SUCCESS) status = LoadAqlProfileLib(&aqlprofile_api_);
+#endif
+  CHECK_STATUS("aqlprofile API table load failed", status);
 
   // Get Loader API table
   loader_api_ = {0};
@@ -99,6 +103,39 @@ HsaRsrcFactory::~HsaRsrcFactory() {
   CHECK_STATUS("Error in hsa_shut_down", status);
 }
 
+hsa_status_t HsaRsrcFactory::LoadAqlProfileLib(aqlprofile_pfn_t* api) {
+    void* handle = dlopen(kAqlProfileLib, RTLD_NOW);
+    if (handle == NULL) {
+      fprintf(stderr, "Loading '%s' failed, %s\n", kAqlProfileLib, dlerror());
+      return HSA_STATUS_ERROR;
+    }
+    dlerror(); /* Clear any existing error */
+
+    api->hsa_ven_amd_aqlprofile_error_string =
+      (decltype(::hsa_ven_amd_aqlprofile_error_string)*)
+        dlsym(handle, "hsa_ven_amd_aqlprofile_error_string");
+    api->hsa_ven_amd_aqlprofile_validate_event =
+      (decltype(::hsa_ven_amd_aqlprofile_validate_event)*)
+        dlsym(handle, "hsa_ven_amd_aqlprofile_validate_event");
+    api->hsa_ven_amd_aqlprofile_start =
+      (decltype(::hsa_ven_amd_aqlprofile_start)*)
+        dlsym(handle, "hsa_ven_amd_aqlprofile_start");
+    api->hsa_ven_amd_aqlprofile_stop =
+      (decltype(::hsa_ven_amd_aqlprofile_stop)*)
+        dlsym(handle, "hsa_ven_amd_aqlprofile_stop");
+    api->hsa_ven_amd_aqlprofile_legacy_get_pm4 =
+      (decltype(::hsa_ven_amd_aqlprofile_legacy_get_pm4)*)
+        dlsym(handle, "hsa_ven_amd_aqlprofile_legacy_get_pm4");
+    api->hsa_ven_amd_aqlprofile_get_info =
+      (decltype(::hsa_ven_amd_aqlprofile_get_info)*)
+        dlsym(handle, "hsa_ven_amd_aqlprofile_get_info");
+    api->hsa_ven_amd_aqlprofile_iterate_data =
+      (decltype(::hsa_ven_amd_aqlprofile_iterate_data)*)
+        dlsym(handle, "hsa_ven_amd_aqlprofile_iterate_data");
+
+  return HSA_STATUS_SUCCESS;
+}
+
 // Add system agent info
 const AgentInfo* HsaRsrcFactory::AddAgentInfo(const hsa_agent_t agent) {
   // Determine if device is a Gpu agent

projects/rocprofiler/src/util/hsa_rsrc_factory.h

@@ -222,7 +222,8 @@ class HsaRsrcFactory {
   bool PrintGpuAgents(const std::string& header);
 
   // Return AqlProfile API table
-  const hsa_ven_amd_aqlprofile_1_00_pfn_t* AqlProfileApi() const { return &aqlprofile_api_; }
+  typedef hsa_ven_amd_aqlprofile_1_00_pfn_t aqlprofile_pfn_t;
+  const aqlprofile_pfn_t* AqlProfileApi() const { return &aqlprofile_api_; }
 
   // Return Loader API table
   const hsa_ven_amd_loader_1_00_pfn_t* LoaderApi() const { return &loader_api_; }
@@ -234,6 +235,9 @@ class HsaRsrcFactory {
   // Callback function to find and bind kernarg region of an agent
   static hsa_status_t FindMemRegionsCallback(hsa_region_t region, void* data);
 
+  // Load AQL profile HSA extension library directly
+  static hsa_status_t LoadAqlProfileLib(aqlprofile_pfn_t* api);
+
   // Constructor of the class. Will initialize the Hsa Runtime and
   // query the system topology to get the list of Cpu and Gpu devices
   HsaRsrcFactory();
@@ -257,7 +261,7 @@ class HsaRsrcFactory {
   std::map<hsa_agent_handle_t, const AgentInfo*> agent_map_;
 
   // AqlProfile API table
-  hsa_ven_amd_aqlprofile_1_00_pfn_t aqlprofile_api_;
+  aqlprofile_pfn_t aqlprofile_api_;
 
   // Loader API table
   hsa_ven_amd_loader_1_00_pfn_t loader_api_;