From bc0015fd36c8bc909061d534427f07534fe70700 Mon Sep 17 00:00:00 2001
From: Charis Poag <Charis.Poag@amd.com>
Date: Thu, 5 Dec 2024 20:44:02 -0600
Subject: [PATCH] [SWDEV-488288] Remove GFX_BUSY_ACC from amd-smi metric
 --usage

Output is not helpful to users.

Change-Id: I12a60e28b8eab2fc3ffca4ea88f03018bf0ef3ce
Signed-off-by: Charis Poag <Charis.Poag@amd.com>
---
 CHANGELOG.md                  | 44 +++++++++++++++++++++++++++++++++++
 amdsmi_cli/amdsmi_commands.py |  6 -----
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9198857f1d..a41098f0a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,50 @@ Full documentation for amd_smi_lib is available at [https://rocm.docs.amd.com/pr
 
 ### Removed
 
+- **Removed `GFX_BUSY_ACC` from `amd-smi metric --usage`**.  
+  Displaying `GFX_BUSY_ACC` does not provide helpful outputs for users.  
+
+  Old output:  
+  ```shell
+  $ amd-smi metric --usage
+    GPU: 0
+        USAGE:
+            GFX_ACTIVITY: 0 %
+            UMC_ACTIVITY: 0 %
+            MM_ACTIVITY: N/A
+            VCN_ACTIVITY: [0 %, 0 %, 0 %, 0 %]
+            JPEG_ACTIVITY: [0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %]
+            GFX_BUSY_INST:
+                XCP_0: [0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %]
+            JPEG_BUSY:
+                XCP_0: [0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %]
+            VCN_BUSY:
+                XCP_0: [0 %, 0 %, 0 %, 0 %]
+            GFX_BUSY_ACC:
+                XCP_0: [N/A, N/A, N/A, N/A, N/A, N/A, N/A, N/A]
+  ...
+  ```
+
+  New Output:  
+  ```shell
+  $ amd-smi metric --usage
+  GPU: 0
+      USAGE:
+          GFX_ACTIVITY: 0 %
+          UMC_ACTIVITY: 0 %
+          MM_ACTIVITY: N/A
+          VCN_ACTIVITY: [0 %, 0 %, 0 %, 0 %]
+          JPEG_ACTIVITY: [0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %]
+          GFX_BUSY_INST:
+              XCP_0: [0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %]
+          JPEG_BUSY:
+              XCP_0: [0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %, 0 %]
+          VCN_BUSY:
+              XCP_0: [0 %, 0 %, 0 %, 0 %]
+  ...
+  ```
+
+
 ### Optimized
 
 - **Modified `amd-smi` CLI to allow case insensitive arguments if the argument does not begin with a single dash**.  
diff --git a/amdsmi_cli/amdsmi_commands.py b/amdsmi_cli/amdsmi_commands.py
index aefa176031..fdb2d80408 100644
--- a/amdsmi_cli/amdsmi_commands.py
+++ b/amdsmi_cli/amdsmi_commands.py
@@ -1471,7 +1471,6 @@ class AMDSMICommands():
                     engine_usage['gfx_busy_inst'] = "N/A"
                     engine_usage['jpeg_busy'] = "N/A"
                     engine_usage['vcn_busy'] = "N/A"
-                    engine_usage['gfx_busy_acc'] = "N/A"
 
                     if num_partition != "N/A":
                         # these are one after another, in order to display each in sub-sections
@@ -1490,11 +1489,6 @@ class AMDSMICommands():
                             new_xcp_dict[f"xcp_{current_xcp}"] = gpu_metric['xcp_stats.vcn_busy'][current_xcp]
                         engine_usage['vcn_busy'] = new_xcp_dict
 
-                        new_xcp_dict = {}
-                        for current_xcp in range(num_partition):
-                            new_xcp_dict[f"xcp_{current_xcp}"] = gpu_metric['xcp_stats.gfx_busy_acc'][current_xcp]
-                        engine_usage['gfx_busy_acc'] = new_xcp_dict
-
                     logging.debug(f"After updates to engine_usage dictionary = {engine_usage}")
 
                     for key, value in engine_usage.items():