From ec0e166dfe182b62cdf86ff8567662de2d60cd35 Mon Sep 17 00:00:00 2001
From: Giovanni Baraldi <gbaraldi@amd.com>
Date: Fri, 25 Oct 2024 02:57:38 -0400
Subject: [PATCH] SWDEV-494273: Temporary remove SPI selection

This reverts commit e5e2c6041d2d52a56a39ef9bc9511a09053485bd.

Reason for revert: Requires priv_cp_queues=1

Change-Id: Ia6c78ac25b88d7ef4703654075d54e672a6e320c
(cherry picked from commit a6328a148161fe60752e6cd3708b1443b0715748)
---
 CHANGELOG.md                                 |  8 +-------
 src/core/counters/metrics/basic_counters.xml | 10 ----------
 test/tool/gfx_metrics.xml                    | 10 ----------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fe2dd85..34c0b014 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -340,10 +340,4 @@ Example for file plugin output:
 ### Added
 
 - JSON output plugin for rocprofv2, the JSON file matches Google Trace Format, so it should be easily loaded to perfetto, chrome tracing or speedscope. For Speedscope, `--disable-json-data-flows` option will be needed as speedscope doesn't work with data flows.
-- Added `--no-serialization` flag to disable kernel serialization when rocprofv2 is in counter-collection mode. This change was added to allow rocprofv2 to avoid deadlock when profiling certain programs in counter-collection mode.
-
-## ROCprofiler for rocm 6.3
-
-### Added
-
-- SPI Pipe Selection
\ No newline at end of file
+- Added `--no-serialization` flag to disable kernel serialization when rocprofv2 is in counter-collection mode. This change was added to allow rocprofv2 to avoid deadlock when profiling certain programs in counter-collection mode.
\ No newline at end of file
diff --git a/src/core/counters/metrics/basic_counters.xml b/src/core/counters/metrics/basic_counters.xml
index f53585a6..4e4eec5a 100755
--- a/src/core/counters/metrics/basic_counters.xml
+++ b/src/core/counters/metrics/basic_counters.xml
@@ -363,11 +363,6 @@
   <metric name="TCC_ALL_TC_OP_INV_EVICT" block=TCC event=80 descr="Number of evictions due to all TC_OP invalidate requests."></metric>
   <metric name="TCC_EA_RDREQ_DRAM" block=TCC event=102 descr="Number of TCC/EA read requests (either 32-byte or 64-byte) destined for DRAM (MC)."></metric>
   <metric name="TCC_EA_WRREQ_DRAM" block=TCC event=103 descr="Number of TCC/EA write requests (either 32-byte of 64-byte) destined for DRAM (MC)."></metric>
-
-  <metric name="SPI_PIPE_0" block=SPI event=16777216 descr="Dummy Counter. Used to select SPI Pipe 0"></metric>
-  <metric name="SPI_PIPE_1" block=SPI event=16777217 descr="Dummy Counter. Used to select SPI Pipe 1"></metric>
-  <metric name="SPI_PIPE_2" block=SPI event=16777218 descr="Dummy Counter. Used to select SPI Pipe 2"></metric>
-  <metric name="SPI_PIPE_3" block=SPI event=16777219 descr="Dummy Counter. Used to select SPI Pipe 3"></metric>
 </gfx90a>
 
 <gfx940>
@@ -630,11 +625,6 @@
   <metric name="TCC_PROBE_EVICT" block=TCC event=81 descr="Number of evictions/invalidations due to probes. Not windowable."></metric>
   <metric name="TCC_EA0_RDREQ_DRAM" block=TCC event=102 descr="Number of TCC/EA read requests (either 32-byte or 64-byte) destined for DRAM (MC)."></metric>
   <metric name="TCC_EA0_WRREQ_DRAM" block=TCC event=103 descr="Number of TCC/EA write requests (either 32-byte of 64-byte) destined for DRAM (MC)."></metric>
-
-  <metric name="SPI_PIPE_0" block=SPI event=16777216 descr="Dummy Counter. Used to select SPI Pipe 0"></metric>
-  <metric name="SPI_PIPE_1" block=SPI event=16777217 descr="Dummy Counter. Used to select SPI Pipe 1"></metric>
-  <metric name="SPI_PIPE_2" block=SPI event=16777218 descr="Dummy Counter. Used to select SPI Pipe 2"></metric>
-  <metric name="SPI_PIPE_3" block=SPI event=16777219 descr="Dummy Counter. Used to select SPI Pipe 3"></metric>
 </gfx940>
 
 <gfx941 base="gfx940"></gfx941>
diff --git a/test/tool/gfx_metrics.xml b/test/tool/gfx_metrics.xml
index 8602a725..819afff1 100755
--- a/test/tool/gfx_metrics.xml
+++ b/test/tool/gfx_metrics.xml
@@ -364,11 +364,6 @@
   <metric name="TCC_ALL_TC_OP_INV_EVICT" block=TCC event=80 descr="Number of evictions due to all TC_OP invalidate requests."></metric>
   <metric name="TCC_EA_RDREQ_DRAM" block=TCC event=102 descr="Number of TCC/EA read requests (either 32-byte or 64-byte) destined for DRAM (MC)."></metric>
   <metric name="TCC_EA_WRREQ_DRAM" block=TCC event=103 descr="Number of TCC/EA write requests (either 32-byte of 64-byte) destined for DRAM (MC)."></metric>
-
-  <metric name="SPI_PIPE_0" block=SPI event=16777216 descr="Dummy Counter. Used to select SPI Pipe 0"></metric>
-  <metric name="SPI_PIPE_1" block=SPI event=16777217 descr="Dummy Counter. Used to select SPI Pipe 1"></metric>
-  <metric name="SPI_PIPE_2" block=SPI event=16777218 descr="Dummy Counter. Used to select SPI Pipe 2"></metric>
-  <metric name="SPI_PIPE_3" block=SPI event=16777219 descr="Dummy Counter. Used to select SPI Pipe 3"></metric>
 </gfx90a>
 
 <gfx940>
@@ -629,11 +624,6 @@
   <metric name="TCC_PROBE_EVICT" block=TCC event=81 descr="Number of evictions/invalidations due to probes. Not windowable."></metric>
   <metric name="TCC_EA0_RDREQ_DRAM" block=TCC event=102 descr="Number of TCC/EA read requests (either 32-byte or 64-byte) destined for DRAM (MC)."></metric>
   <metric name="TCC_EA0_WRREQ_DRAM" block=TCC event=103 descr="Number of TCC/EA write requests (either 32-byte of 64-byte) destined for DRAM (MC)."></metric>
-
-  <metric name="SPI_PIPE_0" block=SPI event=16777216 descr="Dummy Counter. Used to select SPI Pipe 0"></metric>
-  <metric name="SPI_PIPE_1" block=SPI event=16777217 descr="Dummy Counter. Used to select SPI Pipe 1"></metric>
-  <metric name="SPI_PIPE_2" block=SPI event=16777218 descr="Dummy Counter. Used to select SPI Pipe 2"></metric>
-  <metric name="SPI_PIPE_3" block=SPI event=16777219 descr="Dummy Counter. Used to select SPI Pipe 3"></metric>
 </gfx940>
 
 <gfx941 base="gfx940"></gfx941>