From 8c9e77bb7bedb03401da52f49d7fe3752c2a04fe Mon Sep 17 00:00:00 2001
From: "Castillo, Juan" <Juan.Castillo@amd.com>
Date: Tue, 11 Feb 2025 23:30:07 -0600
Subject: [PATCH] [SWDEV-513189] Updated get_cache_info num_cache_instance
 calculations (#106)

Updated get_cache_info to use level, type, cache_size_kb,
 and num_cu_shared as key to increment num_cache_instance.

Signed-off-by: Juan Castillo <juan.castillo@amd.com>
Change-Id: I54c88263bce5a49713f15e2687ae05212423b186
---
 rocm_smi/src/rocm_smi_kfd.cc | 40 +++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/rocm_smi/src/rocm_smi_kfd.cc b/rocm_smi/src/rocm_smi_kfd.cc
index 18c060337a..24c986e75a 100644
--- a/rocm_smi/src/rocm_smi_kfd.cc
+++ b/rocm_smi/src/rocm_smi_kfd.cc
@@ -922,31 +922,29 @@ int KFDNode::get_cache_info(rsmi_gpu_cache_info_t *info) {
       int cache_type = std::stoi(type);
       if (cache_type <= 0) continue;
 
-      // num_cu_shared – this can be fetched by counting the number of 1’s in the sibling_map.
-      std::string sibling_map =
-              get_properties_from_file(prop_file, "sibling_map ");
-      uint32_t num_cu_shared = static_cast<uint32_t>(std::count(sibling_map.begin(), sibling_map.end(), '1'));
-
-      // known cache type
-      bool is_count_already = false;
-      for (unsigned int i=0; i < info->num_cache_types; i++) {
-        if (info->cache[i].cache_level == static_cast<uint32_t>(cache_level) &&
-            info->cache[i].flags == static_cast<uint32_t>(cache_type)) {
-          is_count_already = true;
-          if (info->cache[i].max_num_cu_shared < num_cu_shared)
-              info->cache[i].max_num_cu_shared = num_cu_shared;
-          info->cache[i].num_cache_instance++;
-          break;
-        }
-      }
-      if (is_count_already) continue;
-
-      // new cache type
-      if (info->num_cache_types >= RSMI_MAX_CACHE_TYPES) return 1;
       std::string size = get_properties_from_file(prop_file, "size ");
       int cache_size = std::stoi(size);
       if (cache_size <= 0) continue;
 
+      std::string sibling_map =
+          get_properties_from_file(prop_file, "sibling_map ");
+      uint32_t num_cu_shared = static_cast<uint32_t>(std::count(sibling_map.begin(), sibling_map.end(), '1'));
+
+      bool is_count_already = false;
+      for (unsigned int i = 0; i < info->num_cache_types; i++) {
+        if (info->cache[i].cache_level == static_cast<uint32_t>(cache_level) &&
+          info->cache[i].flags == static_cast<uint32_t>(cache_type) &&
+          info->cache[i].cache_size_kb == static_cast<uint32_t>(cache_size) &&
+          info->cache[i].max_num_cu_shared == num_cu_shared) {
+          is_count_already = true;
+          info->cache[i].num_cache_instance++;
+          break;
+      }
+      }
+      if (is_count_already) continue;
+
+      if (info->num_cache_types >= RSMI_MAX_CACHE_TYPES) return 1;
+
       info->cache[info->num_cache_types].cache_level = cache_level;
       info->cache[info->num_cache_types].cache_size_kb = cache_size;
       info->cache[info->num_cache_types].max_num_cu_shared = num_cu_shared;