minor changes

test/ctrl/test_hsa.cpp

@@ -79,8 +79,7 @@ bool TestHsa::Initialize(int arg_cnt, char** arg_list) {
   setup_timer_idx_ = hsa_timer_.CreateTimer();
   dispatch_timer_idx_ = hsa_timer_.CreateTimer();
 
-  hsa_rsrc_ = HsaInstantiate(agent_id_);
-  if (hsa_rsrc_ == NULL) {
+  if (HsaInstantiate(agent_id_) == NULL) {
     TEST_ASSERT(false);
     return false;
   }

test/util/hsa_rsrc_factory.cpp

@@ -120,8 +120,11 @@ HsaRsrcFactory::HsaRsrcFactory() {
 
   // Get AqlProfile API table
   aqlprofile_api_ = {0};
+#ifdef ROCP_LD_AQLPROFILE
+  status = LoadAqlProfileLib(&aqlprofile_api_);
+#else
   status = hsa_system_get_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, 1, 0, &aqlprofile_api_);
-  if (status != HSA_STATUS_SUCCESS) status = LoadAqlProfileLib(&aqlprofile_api_);
+#endif
   CHECK_STATUS("aqlprofile API table load failed", status);
 }