Merge pull request #13 from RadeonOpenCompute/debugNumaDist

Report Numa distance as N/A when a pool is inaccessible

rocm_bandwidth_test_print.cpp

@@ -201,8 +201,12 @@ void RocmBandwidthTest::PrintLinkMatrix() const {
     for (uint32_t dst_idx = 0; dst_idx < agent_index_; dst_idx++) {
       uint32_t link_weight = link_matrix_[(src_idx * agent_index_) + dst_idx];
       std::cout.width(format);
+      if (link_weight == 0xFFFFFFFF) {
+        std::cout << "N/A";
+      } else {
         std::cout << link_weight;
       }
+    }
     std::cout << std::endl;
     std::cout << std::endl;
   }

rocm_bandwidth_test_topology.cpp

@@ -279,7 +279,6 @@ void RocmBandwidthTest::DiscoverLinkWeight() {
 
   agent_info_t agent_info;
   hsa_agent_t agent1;
-  hsa_agent_t agent2;
   hsa_amd_memory_pool_link_info_t link_info = {0};
   for (uint32_t idx1 = 0; idx1 < agent_index_; idx1++) {
     agent1 = agent_list_[idx1].agent_;
@@ -288,12 +287,18 @@ void RocmBandwidthTest::DiscoverLinkWeight() {
         link_matrix_[(idx1 *agent_index_) + idx2] = 0;
         continue;
       }
+      uint32_t hops = 0;
       if (agent_pool_list_[idx2].pool_list.size() != 0) {
         hsa_amd_memory_pool_t& pool = agent_pool_list_[idx2].pool_list[0].pool_;
-        agent2 = agent_pool_list_[idx2].agent.agent_;
+        err_ = hsa_amd_agent_memory_pool_get_info(agent1, pool,
+                         HSA_AMD_AGENT_MEMORY_POOL_INFO_NUM_LINK_HOPS, &hops);
+        if (hops > 0) {
           err_ = hsa_amd_agent_memory_pool_get_info(agent1, pool,
                          HSA_AMD_AGENT_MEMORY_POOL_INFO_LINK_INFO, &link_info);
           link_matrix_[(idx1 *agent_index_) + idx2] = link_info.numa_distance;
+        } else {
+          link_matrix_[(idx1 *agent_index_) + idx2] = 0xFFFFFFFF;
+        }
       }
     }
   }