Update perf_data_converter to reflect the new perf mem level names in…

… AMD ZEN4. Further slice the L3 hits to local, near, and far L3. PiperOrigin-RevId: 689060853
google · Jan 15, 2025 · df4052a · df4052a
1 parent a85578f
commit df4052a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/perf_data_converter.cc b/src/perf_data_converter.cc
@@ -364,14 +364,15 @@ std::string DataSrcString(uint64_t mem_lvl) {
   if (mem_lvl & quipper::PERF_MEM_LVL_L1) return "L1";
   if (mem_lvl & quipper::PERF_MEM_LVL_LFB) return "LFB";
   if (mem_lvl & quipper::PERF_MEM_LVL_L2) return "L2";
-  if (mem_lvl & quipper::PERF_MEM_LVL_L3) return "L3";
+  if (mem_lvl & quipper::PERF_MEM_LVL_L3) return "Local L3";
   if (mem_lvl & quipper::PERF_MEM_LVL_LOC_RAM) return "Local DRAM";
   if (mem_lvl &
       (quipper::PERF_MEM_LVL_REM_RAM1 | quipper::PERF_MEM_LVL_REM_RAM2))
     return "Remote DRAM";
-  if (mem_lvl &
-      (quipper::PERF_MEM_LVL_REM_CCE1 | quipper::PERF_MEM_LVL_REM_CCE2))
-    return "Remote Cache";
+  // AMD ZEN4+ (Genoa+) supports Near and Far L3 levels. For other AMD platforms
+  // Local and Near L3 both refer to Local L3.
+  if (mem_lvl & quipper::PERF_MEM_LVL_REM_CCE1) return "Near L3";
+  if (mem_lvl & quipper::PERF_MEM_LVL_REM_CCE2) return "Far L3";
   if (mem_lvl & quipper::PERF_MEM_LVL_IO) return "IO Memory";
   if (mem_lvl & quipper::PERF_MEM_LVL_UNC) return "Uncached Memory";
   return "Unknown Level";

diff --git a/src/perf_data_converter_test.cc b/src/perf_data_converter_test.cc
@@ -1073,7 +1073,7 @@ TEST_F(PerfDataConverterTest, ConvertsDataSrc) {
   const std::unordered_map<std::string, uint64_t> expected_counts{
       {"L1", 2},
       {"L2", 1},
-      {"L3", 1},
+      {"Local L3", 1},
   };
   EXPECT_THAT(counts_by_datasrc, UnorderedPointwise(Eq(), expected_counts));
 }