From bddd5b51dde61a110ff69f8dddb6e7cde8f4e5b2 Mon Sep 17 00:00:00 2001
From: Giovanni  LB <gbaraldi@amd.com>
Date: Mon, 7 Oct 2024 14:10:34 -0300
Subject: [PATCH] SWDEV-487621: Fixing BW measurement in MI300

Change-Id: Ib513009616214a1f3f3568571e58d79259692cfc
---
 src/core/counters/derived/metrics.xml          | 7 ++++++-
 src/core/counters/metrics/derived_counters.xml | 7 ++++++-
 test/tool/metrics.xml                          | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/core/counters/derived/metrics.xml b/src/core/counters/derived/metrics.xml
index db60b778f6..90e643275f 100755
--- a/src/core/counters/derived/metrics.xml
+++ b/src/core/counters/derived/metrics.xml
@@ -263,6 +263,8 @@
     <metric name="FETCH_SIZE" expr="(TCC_EA_RDREQ_32B_sum*32+(TCC_EA_RDREQ_sum-TCC_EA_RDREQ_32B_sum)*64)/1024" descr="The total kilobytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
     <metric name="WRITE_SIZE" expr="((TCC_EA_WRREQ_sum-TCC_EA_WRREQ_64B_sum)*32+TCC_EA_WRREQ_64B_sum*64)/1024" descr="The total kilobytes written to the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
     <metric name="WRITE_REQ_32B" expr="TCC_EA_WRREQ_64B_sum*2+(TCC_EA_WRREQ_sum-TCC_EA_WRREQ_64B_sum)" descr="The total number of 32-byte effective memory writes."></metric>
+    <metric name="BANDWIDTH_EA"  expr="1024*(FETCH_SIZE+WRITE_SIZE)/GRBM_GUI_ACTIVE" descr="Memory Bandwidth measured at the TCC_EA interface. In units of bytes/cycle."></metric>
+    <metric name="OccupancyPercent" expr="400*SQ_WAVE_CYCLES/GRBM_GUI_ACTIVE/CU_NUM/32" descr="GPU occupancy as % of maximum."></metric>
   </gfx90a>
 
   <gfx940>
@@ -388,9 +390,11 @@
     <metric name="TCC_EA0_WRREQ_DRAM_sum" expr="sum(TCC_EA0_WRREQ_DRAM,16)" descr="Number of TCC/EA write requests (either 32-byte of 64-byte) destined for DRAM (MC). Sum over TCC instances."></metric>
     <metric name="TCC_EA_READBW" expr="(128*TCC_BUBBLE_sum)+64*(TCC_EA0_RDREQ_sum-TCC_BUBBLE_sum-TCC_EA0_RDREQ_32B_sum)+32*TCC_EA0_RDREQ_32B_sum" descr="EA read bandwidth."></metric>
     <metric name="TCC_EA_READ_LATENCY" expr="TCC_EA0_RDREQ_LEVEL_sum/(TCC_BUBBLE_sum+TCC_EA0_RDREQ_sum)" descr="Lantency of an EA read."></metric>
-    <metric name="FETCH_SIZE" expr="(TCC_EA0_RDREQ_32B_sum*32+(TCC_EA0_RDREQ_sum-TCC_EA0_RDREQ_32B_sum)*64)/1024" descr="The total kilobytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
+    <metric name="FETCH_SIZE" expr="(TCC_EA0_RDREQ_32B_sum*32+(TCC_EA0_RDREQ_sum-TCC_EA0_RDREQ_32B_sum)*128)/1024" descr="The total kilobytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
     <metric name="WRITE_SIZE" expr="((TCC_EA0_WRREQ_sum-TCC_EA0_WRREQ_64B_sum)*32+TCC_EA0_WRREQ_64B_sum*64)/1024" descr="The total kilobytes written to the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
     <metric name="WRITE_REQ_32B" expr="TCC_EA0_WRREQ_64B_sum*2+(TCC_EA0_WRREQ_sum-TCC_EA0_WRREQ_64B_sum)" descr="The total number of 32-byte effective memory writes."></metric>
+    <metric name="BANDWIDTH_EA"  expr="1024*(FETCH_SIZE+WRITE_SIZE)*XCC_NUM/GRBM_GUI_ACTIVE" descr="Memory Bandwidth measured at the TCC_EA interface. In units of bytes/cycle."></metric>
+    <metric name="OccupancyPercent" expr="400*SQ_WAVE_CYCLES*XCC_NUM/GRBM_GUI_ACTIVE/CU_NUM/32" descr="GPU occupancy as % of maximum."></metric>
   </gfx940>
 
   <gfx941 base="gfx940"></gfx941>
@@ -460,6 +464,7 @@
     <metric name="FETCH_SIZE" expr="(GL2C_EA_RDREQ_32B_sum*32+GL2C_EA_RDREQ_64B_sum*64+GL2C_EA_RDREQ_96B_sum*96+GL2C_EA_RDREQ_128B_sum*128)/1024" descr="The total kilobytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
     <metric name="WriteUnitStalled" expr="100*GL2C_WRREQ_STALL_max/GRBM_GUI_ACTIVE" descr="The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad)."></metric>
     <metric name="LDSBankConflict" expr="100*SQC_LDS_BANK_CONFLICT/SQC_LDS_IDX_ACTIVE" descr="The percentage of GPUTime LDS is stalled by bank conflicts. Value range: 0% (optimal) to 100% (bad)."></metric>
+    <metric name="OccupancyPercent" expr="100*SQ_WAVE_CYCLES/GRBM_GUI_ACTIVE/CU_NUM/32" descr="GPU occupancy as % of maximum."></metric>
   </gfx11>
 
   <gfx12>
diff --git a/src/core/counters/metrics/derived_counters.xml b/src/core/counters/metrics/derived_counters.xml
index 9718ccca65..1bfb9e7f85 100755
--- a/src/core/counters/metrics/derived_counters.xml
+++ b/src/core/counters/metrics/derived_counters.xml
@@ -297,6 +297,8 @@
   <metric name="EaWrDramStallRate"                                      expr=100*TCC_EA_WRREQ_DRAM_CREDIT_STALL_sum/TCC_BUSY_sum              descr="Unit: percent"></metric>
   <metric name="EaWrStarveRate"                                         expr=100*TCC_TOO_MANY_EA_WRREQS_STALL_sum/TCC_BUSY_sum                descr="Unit: percent"></metric>
   <metric name="EaAtomicLatency"                                        expr=TCC_EA_ATOMIC_LEVEL_sum/TCC_EA_ATOMIC_sum                        descr="Unit: cycles"></metric>
+  <metric name="BANDWIDTH_EA"                                           expr=1024*(FETCH_SIZE+WRITE_SIZE)/GRBM_GUI_ACTIVE                     descr="Memory Bandwidth measured at the TCC_EA interface. In units of bytes/cycle."></metric>
+  <metric name="OccupancyPercent"                                       expr=400*SQ_WAVE_CYCLES/GRBM_GUI_ACTIVE/CU_NUM/32                     descr="GPU occupancy as % of maximum."></metric>
 </gfx90a_expr>
 
 <gfx940_expr>
@@ -477,7 +479,7 @@
   <metric name="TCC_EA0_WRREQ_DRAM_sum"                                  expr=sum(TCC_EA0_WRREQ_DRAM,16) descr="Number of TCC/EA write requests (either 32-byte of 64-byte) destined for DRAM (MC). Sum over TCC instances."></metric>
   <metric name="TCC_EA_READBW"                                          expr=(128*TCC_BUBBLE_sum)+64*(TCC_EA0_RDREQ_sum-TCC_BUBBLE_sum-TCC_EA0_RDREQ_32B_sum)+32*TCC_EA0_RDREQ_32B_sum descr="EA read bandwidth."></metric>
   <metric name="TCC_EA_READ_LATENCY"                                    expr=TCC_EA0_RDREQ_LEVEL_sum/(TCC_BUBBLE_sum+TCC_EA0_RDREQ_sum) descr="Lantency of an EA read."></metric>
-  <metric name="FETCH_SIZE"                                             expr=(TCC_EA0_RDREQ_32B_sum*32+(TCC_EA0_RDREQ_sum-TCC_EA0_RDREQ_32B_sum)*64)/1024 descr="The total kilobytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
+  <metric name="FETCH_SIZE"                                             expr=(TCC_EA0_RDREQ_32B_sum*32+(TCC_EA0_RDREQ_sum-TCC_EA0_RDREQ_32B_sum)*128)/1024 descr="The total kilobytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
   <metric name="WRITE_SIZE"                                             expr=((TCC_EA0_WRREQ_sum-TCC_EA0_WRREQ_64B_sum)*32+TCC_EA0_WRREQ_64B_sum*64)/1024 descr="The total kilobytes written to the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
   <metric name="WRITE_REQ_32B"                                          expr=TCC_EA0_WRREQ_64B_sum*2+(TCC_EA0_WRREQ_sum-TCC_EA0_WRREQ_64B_sum) descr="The total number of 32-byte effective memory writes."></metric>
   <metric name="CU_OCCUPANCY"                                           expr=(SQ_CYCLES/(SQ_WAVE_CYCLES*4))/MAX_WAVE_SIZE descr="The ratio of active waves on a CU to the maximum number of active waves supported by the CU"></metric>
@@ -488,6 +490,8 @@
   <metric name="ACTIVE_CYCLES"                                          expr=GRBM_GUI_ACTIVE/XCC_NUM descr="Active Cycles"></metric>
   <metric name="ELAPSED_CYCLES"                                         expr=GRBM_COUNT/XCC_NUM descr="Elapsed Cycles"></metric>
   <metric name="ACTIVE_WAVES"                                           expr=SQ_WAVES descr="Active Waves"></metric>
+  <metric name="BANDWIDTH_EA"                                           expr=1024*(FETCH_SIZE+WRITE_SIZE)*XCC_NUM/GRBM_GUI_ACTIVE descr="Memory Bandwidth measured at the TCC_EA interface. In units of bytes/cycle."></metric>
+  <metric name="OccupancyPercent"                                       expr=400*SQ_WAVE_CYCLES*XCC_NUM/GRBM_GUI_ACTIVE/CU_NUM/32 descr="GPU occupancy as % of maximum."></metric>
 </gfx940_expr>
 
 <gfx10_expr>
@@ -559,6 +563,7 @@
   <metric name="FETCH_SIZE" expr=(GL2C_EA_RDREQ_32B_sum*32+GL2C_EA_RDREQ_64B_sum*64+GL2C_EA_RDREQ_96B_sum*96+GL2C_EA_RDREQ_128B_sum*128)/1024 descr="The total kilobytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
   <metric name="WriteUnitStalled" expr=100*GL2C_WRREQ_STALL_max/GRBM_GUI_ACTIVE descr="The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad)."></metric>
   <metric name="LDSBankConflict" expr=100*SQC_LDS_BANK_CONFLICT/SQC_LDS_IDX_ACTIVE descr="The percentage of GPUTime LDS is stalled by bank conflicts. Value range: 0% (optimal) to 100% (bad)."></metric>
+  <metric name="OccupancyPercent" expr=100*SQ_WAVE_CYCLES/GRBM_GUI_ACTIVE/CU_NUM/32 descr="GPU occupancy as % of maximum."></metric>
 </gfx11_expr>
 
 <gfx12_expr>
diff --git a/test/tool/metrics.xml b/test/tool/metrics.xml
index c5ad7239d4..f5efe5c32c 100755
--- a/test/tool/metrics.xml
+++ b/test/tool/metrics.xml
@@ -222,6 +222,8 @@
   <metric name="ACTIVE_CYCLES"                                          expr=GRBM_GUI_ACTIVE descr="Active Cycles"></metric>
   <metric name="ELAPSED_CYCLES"                                         expr=GRBM_COUNT descr="Elapsed Cycles"></metric>
   <metric name="ACTIVE_WAVES"                                           expr=SQ_WAVES descr="Active Waves"></metric>
+  <metric name="BANDWIDTH_EA"                                           expr=1024*(FETCH_SIZE+WRITE_SIZE)/GRBM_GUI_ACTIVE descr="Memory Bandwidth measured at the TCC_EA interface. In units of bytes/cycle."></metric>
+  <metric name="OccupancyPercent"                                       expr=400*SQ_WAVE_CYCLES/GRBM_GUI_ACTIVE/CU_NUM/32 descr="GPU occupancy as % of maximum."></metric>
 </gfx90a_expr>
 
 <gfx940_expr>
@@ -347,7 +349,7 @@
   <metric name="TCC_EA0_WRREQ_DRAM_sum"                                  expr=sum(TCC_EA0_WRREQ_DRAM,16) descr="Number of TCC/EA write requests (either 32-byte of 64-byte) destined for DRAM (MC). Sum over TCC instances."></metric>
   <metric name="TCC_EA_READBW"                                          expr=(128*TCC_BUBBLE_sum)+64*(TCC_EA0_RDREQ_sum-TCC_BUBBLE_sum-TCC_EA0_RDREQ_32B_sum)+32*TCC_EA0_RDREQ_32B_sum descr="EA read bandwidth."></metric>
   <metric name="TCC_EA_READ_LATENCY"                                    expr=TCC_EA0_RDREQ_LEVEL_sum/(TCC_BUBBLE_sum+TCC_EA0_RDREQ_sum) descr="Lantency of an EA read."></metric>  
-  <metric name="FETCH_SIZE"                                             expr=(TCC_EA0_RDREQ_32B_sum*32+(TCC_EA0_RDREQ_sum-TCC_EA0_RDREQ_32B_sum)*64)/1024 descr="The total kilobytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
+  <metric name="FETCH_SIZE"                                             expr=(TCC_EA0_RDREQ_32B_sum*32+(TCC_EA0_RDREQ_sum-TCC_EA0_RDREQ_32B_sum)*128)/1024 descr="The total kilobytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
   <metric name="WRITE_SIZE"                                             expr=((TCC_EA0_WRREQ_sum-TCC_EA0_WRREQ_64B_sum)*32+TCC_EA0_WRREQ_64B_sum*64)/1024 descr="The total kilobytes written to the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
   <metric name="WRITE_REQ_32B"                                          expr=TCC_EA0_WRREQ_64B_sum*2+(TCC_EA0_WRREQ_sum-TCC_EA0_WRREQ_64B_sum) descr="The total number of 32-byte effective memory writes."></metric>
   <metric name="CU_OCCUPANCY"                                           expr=(SQ_CYCLES/(SQ_WAVE_CYCLES*4))/MAX_WAVE_SIZE descr="The ratio of active waves on a CU to the maximum number of active waves supported by the CU"></metric>
@@ -358,6 +360,8 @@
   <metric name="ACTIVE_CYCLES"                                          expr=GRBM_GUI_ACTIVE/XCC_NUM descr="Active Cycles"></metric>
   <metric name="ELAPSED_CYCLES"                                         expr=GRBM_COUNT/XCC_NUM descr="Elapsed Cycles"></metric>
   <metric name="ACTIVE_WAVES"                                           expr=SQ_WAVES descr="Active Waves"></metric>
+  <metric name="BANDWIDTH_EA"                                           expr=1024*(FETCH_SIZE+WRITE_SIZE)*XCC_NUM/GRBM_GUI_ACTIVE descr="Memory Bandwidth measured at the TCC_EA interface. In units of bytes/cycle."></metric>
+  <metric name="OccupancyPercent"                                       expr=400*SQ_WAVE_CYCLES*XCC_NUM/GRBM_GUI_ACTIVE/CU_NUM/32 descr="GPU occupancy as % of maximum."></metric>
 </gfx940_expr>
 
 <gfx10_expr>
@@ -420,6 +424,7 @@
   <metric name="FETCH_SIZE" expr=(GL2C_EA_RDREQ_32B_sum*32+GL2C_EA_RDREQ_64B_sum*64+GL2C_EA_RDREQ_96B_sum*96+GL2C_EA_RDREQ_128B_sum*128)/1024 descr="The total kilobytes fetched from the video memory. This is measured with all extra fetches and any cache or memory effects taken into account."></metric>
   <metric name="WriteUnitStalled" expr=100*GL2C_WRREQ_STALL_max/GRBM_GUI_ACTIVE descr="The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad)."></metric>
   <metric name="LDSBankConflict" expr=100*SQC_LDS_BANK_CONFLICT/SQC_LDS_IDX_ACTIVE descr="The percentage of GPUTime LDS is stalled by bank conflicts. Value range: 0% (optimal) to 100% (bad)."></metric>
+  <metric name="OccupancyPercent" expr=100*SQ_WAVE_CYCLES/GRBM_GUI_ACTIVE/CU_NUM/32 descr="GPU occupancy as % of maximum."></metric>
 </gfx11_expr>
 
 <gfx12_expr>