moving to non-deprecated get extension table HSA API

Change-Id: I356c6406eb5c2a1755202dc562298b30cb7acc06

src/util/hsa_rsrc_factory.cpp

@@ -134,13 +134,13 @@ HsaRsrcFactory::HsaRsrcFactory(bool initialize_hsa) : initialize_hsa_(initialize
 #ifdef ROCP_LD_AQLPROFILE
   status = LoadAqlProfileLib(&aqlprofile_api_);
 #else
-  status = hsa_system_get_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, 1, 0, &aqlprofile_api_);
+  status = hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, hsa_ven_amd_aqlprofile_VERSION_MAJOR, sizeof(aqlprofile_api_), &aqlprofile_api_);
 #endif
   CHECK_STATUS("aqlprofile API table load failed", status);
 
   // Get Loader API table
   loader_api_ = {0};
-  status = hsa_system_get_extension_table(HSA_EXTENSION_AMD_LOADER, 1, 0, &loader_api_);
+  status = hsa_system_get_major_extension_table(HSA_EXTENSION_AMD_LOADER, 1, sizeof(loader_api_), &loader_api_);
   CHECK_STATUS("loader API table query failed", status);
 
   // Instantiate HSA timer
@@ -527,6 +527,7 @@ bool HsaRsrcFactory::LoadAndFinalize(const AgentInfo* agent_info, const char* br
 
 // Print the various fields of Hsa Gpu Agents
 bool HsaRsrcFactory::PrintGpuAgents(const std::string& header) {
+  std::cout << std::flush;
   std::clog << header << " :" << std::endl;
 
   const AgentInfo* agent_info;

src/util/hsa_rsrc_factory.h

@@ -123,7 +123,7 @@ struct AgentInfo {
 // HSA timer class
 // Provides current HSA timestampa and system-clock/ns conversion API
 class HsaTimer {
-  public:
+ public:
   typedef uint64_t timestamp_t;
   static const timestamp_t TIMESTAMP_MAX = UINT64_MAX;
   typedef long double freq_t;
@@ -136,8 +136,12 @@ class HsaTimer {
   }
 
   // Methids for system-clock/ns conversion
-  timestamp_t sysclock_to_ns(const timestamp_t& sysclock) const { return timestamp_t((freq_t)sysclock * sysclock_factor_); }
-  timestamp_t ns_to_sysclock(const timestamp_t& time) const { return timestamp_t((freq_t)time / sysclock_factor_); }
+  timestamp_t sysclock_to_ns(const timestamp_t& sysclock) const {
+    return timestamp_t((freq_t)sysclock * sysclock_factor_);
+  }
+  timestamp_t ns_to_sysclock(const timestamp_t& time) const {
+    return timestamp_t((freq_t)time / sysclock_factor_);
+  }
 
   // Return timestamp in 'ns'
   timestamp_t timestamp_ns() const {
@@ -147,7 +151,7 @@ class HsaTimer {
     return sysclock_to_ns(sysclock);
   }
 
-  private:
+ private:
   // Timestamp frequency factor
   freq_t sysclock_factor_;
 };
@@ -273,7 +277,7 @@ class HsaRsrcFactory {
   static uint64_t Submit(hsa_queue_t* queue, const void* packet, size_t size_bytes);
 
   // Return AqlProfile API table
-  typedef hsa_ven_amd_aqlprofile_1_00_pfn_t aqlprofile_pfn_t;
+  typedef hsa_ven_amd_aqlprofile_pfn_t aqlprofile_pfn_t;
   const aqlprofile_pfn_t* AqlProfileApi() const { return &aqlprofile_api_; }
 
   // Return Loader API table