resources releasing; metrics

test/ctrl/test_aql.h

@@ -42,7 +42,7 @@ class TestAql {
   }
 
   TestAql* Test() { return test_; }
-  virtual AgentInfo* GetAgentInfo() { return (test_) ? test_->GetAgentInfo() : 0; }
+  virtual const AgentInfo* GetAgentInfo() { return (test_) ? test_->GetAgentInfo() : 0; }
   virtual hsa_queue_t* GetQueue() { return (test_) ? test_->GetQueue() : 0; }
   virtual HsaRsrcFactory* GetRsrcFactory() { return (test_) ? test_->GetRsrcFactory() : 0; }
 

test/ctrl/test_hsa.cpp

@@ -34,7 +34,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "util/hsa_rsrc_factory.h"
 
 HsaRsrcFactory* TestHsa::hsa_rsrc_ = NULL;
-AgentInfo* TestHsa::agent_info_ = NULL;
+const AgentInfo* TestHsa::agent_info_ = NULL;
 hsa_queue_t* TestHsa::hsa_queue_ = NULL;
 uint32_t TestHsa::agent_id_ = 0;
 
@@ -43,7 +43,7 @@ HsaRsrcFactory* TestHsa::HsaInstantiate(const uint32_t agent_ind) {
   if (hsa_rsrc_ == NULL) {
     agent_id_ = agent_ind;
 
-    hsa_rsrc_ = HsaRsrcFactory::Create();
+    hsa_rsrc_ = HsaRsrcFactory::CreateInstance();
 
     // Print properties of the agents
     hsa_rsrc_->PrintGpuAgents("> GPU agents");

test/ctrl/test_hsa.h

@@ -52,7 +52,7 @@ class TestHsa : public TestAql {
   }
 
   // Get methods for Agent Info, HAS queue, HSA Resourcse Manager
-  AgentInfo* GetAgentInfo() { return agent_info_; }
+  const AgentInfo* GetAgentInfo() { return agent_info_; }
   hsa_queue_t* GetQueue() { return hsa_queue_; }
   HsaRsrcFactory* GetRsrcFactory() { return hsa_rsrc_; }
 
@@ -115,7 +115,7 @@ class TestHsa : public TestAql {
   static uint32_t agent_id_;
 
   // Handle to an Hsa Gpu Agent
-  static AgentInfo* agent_info_;
+  static const AgentInfo* agent_info_;
 
   // Handle to an Hsa Queue
   static hsa_queue_t* hsa_queue_;

test/ctrl/tool.cpp

@@ -371,6 +371,7 @@ CONSTRUCTOR_API void constructor()
     fprintf(stderr, "Input file not found '%s'\n", xml_name);
     exit(1);
   }
+  xml->Print();
 
   // Getting metrics
   auto metrics_list = xml->GetNodes("top.metric");