From f84c2f43866109e2d315c88e9e8425655ea1fa87 Mon Sep 17 00:00:00 2001
From: SrirakshaNag <104580803+SrirakshaNag@users.noreply.github.com>
Date: Tue, 23 Jan 2024 14:39:47 -0600
Subject: [PATCH] Adding SQ_WAVES_sum to derived counters.xml (#394)

* Adding SQ_WAVES_sum to derived counters.xml

* Update test check for derived counters

---------

Co-authored-by: Benjamin Welton <bewelton@amd.com>
---
 source/lib/rocprofiler-sdk/counters/tests/metrics_test.h   | 7 ++++++-
 .../lib/rocprofiler-sdk/counters/xml/derived_counters.xml  | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/source/lib/rocprofiler-sdk/counters/tests/metrics_test.h b/source/lib/rocprofiler-sdk/counters/tests/metrics_test.h
index 1c62bf6c0b..2083cd6d86 100644
--- a/source/lib/rocprofiler-sdk/counters/tests/metrics_test.h
+++ b/source/lib/rocprofiler-sdk/counters/tests/metrics_test.h
@@ -166,7 +166,12 @@ static const std::unordered_map<std::string, std::vector<std::vector<std::string
 
 static const std::unordered_map<std::string, std::vector<std::vector<std::string>>> derived_gfx908 =
     {{"gfx908",
-      {{"TCC_HIT_sum",
+      {{"SQ_WAVES_sum",
+        "",
+        "",
+        "reduce(SQ_WAVES,sum)",
+        "Count number of waves sent to SQs. (per-simd, emulated, global). Sum over SQ instances."},
+       {"TCC_HIT_sum",
         "",
         "",
         "reduce(TCC_HIT,sum)",
diff --git a/source/lib/rocprofiler-sdk/counters/xml/derived_counters.xml b/source/lib/rocprofiler-sdk/counters/xml/derived_counters.xml
index 80dee30ddc..cbd122ad11 100755
--- a/source/lib/rocprofiler-sdk/counters/xml/derived_counters.xml
+++ b/source/lib/rocprofiler-sdk/counters/xml/derived_counters.xml
@@ -1,4 +1,5 @@
 <gfx8>
+  <metric name="SQ_WAVES_sum" expr=reduce(SQ_WAVES,sum) descr="Count number of waves sent to SQs. (per-simd, emulated, global). Sum over SQ instances."></metric>
   <metric name="TA_BUSY_avr" expr=reduce(TA_TA_BUSY,avr) descr="TA block is busy. Average over TA instances."></metric>
   <metric name="TA_BUSY_max" expr=reduce(TA_TA_BUSY,max) descr="TA block is busy. Max over TA instances."></metric>
   <metric name="TA_BUSY_min" expr=reduce(TA_TA_BUSY,min) descr="TA block is busy. Min over TA instances."></metric>
@@ -33,6 +34,7 @@
 </gfx8>
 
 <gfx9>
+  <metric name="SQ_WAVES_sum" expr=reduce(SQ_WAVES,sum) descr="Count number of waves sent to SQs. (per-simd, emulated, global). Sum over SQ instances."></metric>
   <metric name="TA_BUSY_avr" expr=reduce(TA_TA_BUSY,avr) descr="TA block is busy. Average over TA instances."></metric>
   <metric name="TA_BUSY_max" expr=reduce(TA_TA_BUSY,max) descr="TA block is busy. Max over TA instances."></metric>
   <metric name="TA_BUSY_min" expr=reduce(TA_TA_BUSY,min) descr="TA block is busy. Min over TA instances."></metric>
@@ -101,6 +103,7 @@
 </gfx908>
 
 <gfx90a base="gfx9">
+  <metric name="SQ_WAVES_sum" expr=reduce(SQ_WAVES,sum) descr="Count number of waves sent to SQs. (per-simd, emulated, global). Sum over SQ instances."></metric>
   <metric name="MeanOccupancyPerCU" expr=SQ_LEVEL_WAVES*0+SQ_ACCUM_PREV_HIRES/GRBM_GUI_ACTIVE/CU_NUM descr="Mean occupancy per compute unit."></metric>
   <metric name="MeanOccupancyPerActiveCU" expr=SQ_LEVEL_WAVES*0+SQ_ACCUM_PREV_HIRES*4/SQ_BUSY_CYCLES/CU_NUM descr="Mean occupancy per active compute unit."></metric>
   <metric name="TA_BUSY_avr"                                            expr=reduce(TA_TA_BUSY,avr) descr="TA block is busy. Average over TA instances."></metric>
@@ -291,6 +294,7 @@
 </gfx90a>
 
 <gfx940>
+  <metric name="SQ_WAVES_sum" expr=reduce(SQ_WAVES,sum) descr="Count number of waves sent to SQs. (per-simd, emulated, global). Sum over SQ instances."></metric>
   <metric name="TCP_TCP_TA_DATA_STALL_CYCLES_sum" expr=reduce(TCP_TCP_TA_DATA_STALL_CYCLES,sum) descr="Total number of TCP stalls TA data interface."></metric>
   <metric name="TCP_TCP_TA_DATA_STALL_CYCLES_max" expr=reduce(TCP_TCP_TA_DATA_STALL_CYCLES,max) descr="Maximum number of TCP stalls TA data interface."></metric>
 
@@ -424,6 +428,7 @@
 </gfx940>
 
 <gfx10>
+  <metric name="SQ_WAVES_sum" expr=reduce(SQ_WAVES,sum) descr="Count number of waves sent to SQs. (per-simd, emulated, global). Sum over SQ instances."></metric>
   <metric name="MeanOccupancyPerCU" expr=GRBM_COUNT*0+SQ_LEVEL_WAVES*0+SQ_ACCUM_PREV/GRBM_GUI_ACTIVE/CU_NUM descr="Mean occupancy per compute unit."></metric>
   <metric name="MeanOccupancyPerActiveCU" expr=GRBM_COUNT*0+SQ_LEVEL_WAVES*0+SQ_ACCUM_PREV*4/SQ_BUSY_CYCLES/CU_NUM descr="Mean occupancy per active compute unit."></metric>
 
@@ -468,6 +473,7 @@
 </gfx1032>
 
 <gfx11>
+  <metric name="SQ_WAVES_sum" expr=reduce(SQ_WAVES,sum) descr="Count number of waves sent to SQs. (per-simd, emulated, global). Sum over SQ instances."></metric>
   <metric name="GPU_UTIL" expr=100*GRBM_GUI_ACTIVE/GRBM_COUNT descr="Percentage of the time that GUI is active"></metric>
   <metric name="WAVE_DEP_WAIT" expr=100*SQ_WAIT_ANY/SQ_WAVE_CYCLES descr="Percentage of the SQ_WAVE_CYCLE time spent waiting for anything."></metric>
   <metric name="WAVE_ISSUE_WAIT" expr=100*SQ_WAIT_INST_ANY/SQ_WAVE_CYCLES descr="Percentage of the SQ_WAVE_CYCLE time spent waiting for any instruction issue."></metric>