From 1ca1825b84b1761eb9f28208ccd846f191e4a786 Mon Sep 17 00:00:00 2001
From: Kent Russell <kent.russell@amd.com>
Date: Tue, 2 Jul 2019 11:54:28 -0400
Subject: [PATCH] Remove KFDDBGTest.BasicAddressWatch

This functionality doesn't work on GFX9+, and was disabled for gfx802.
Remove the test altogether for now, especially since some kernel changes
broke it on gfx803, and the functionality is deprecated now anyways. Leave
the code for reference, but "#if 0" it to prevent it from compiling or
being in the kfdtest binary

Change-Id: I848b4f23201f18612cbdc122a5b46e4010c4af2a
---
 tests/kfdtest/scripts/kfdtest.exclude | 10 +---------
 tests/kfdtest/src/KFDDBGTest.cpp      |  3 +++
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/kfdtest/scripts/kfdtest.exclude b/tests/kfdtest/scripts/kfdtest.exclude
index 6b21c640e0..9bbb1f926f 100644
--- a/tests/kfdtest/scripts/kfdtest.exclude
+++ b/tests/kfdtest/scripts/kfdtest.exclude
@@ -29,7 +29,6 @@ PERMANENT_BLACKLIST_ALL_ASICS=\
 # KFDPNPTest.DisableAndCreateQueue (KFD-329)
 # KFDQMTest.GPUDoorbellWrite fails intermittently (KFD-318)
 # KFDQMTest.mGPUShareBO (KFD-334)
-# KFDQMTest.PM4EventInterrupt/KFDDBGTest.BasicAddressWatch (KFD-431)
 # KFDHWSTest.* (SWDEV-193035)
 TEMPORARY_BLACKLIST_ALL_ASICS=\
 "KFDGraphicsInterop.RegisterForeignDeviceMem:"\
@@ -39,7 +38,6 @@ TEMPORARY_BLACKLIST_ALL_ASICS=\
 "KFDPNPTest.DisableAndCreateQueue:"\
 "KFDQMTest.GPUDoorbellWrite:"\
 "KFDQMTest.mGPUShareBO:"\
-"KFDDBGTest.BasicAddressWatch*:"\
 "KFDQMTest.PM4EventInterrupt:"\
 "KFDQMTest.SdmaEventInterrupt:"\
 "KFDDBGTest.BasicDebuggerSuspendResume:"\
@@ -114,7 +112,6 @@ TONGA_TESTS_BLACKLIST=\
 "KFDMemoryTest.MemoryRegister*:"\
 "KFDMemoryTest.QueryPointerInfo:"\
 "KFDPerfCountersTest.*:"\
-"KFDDBGTest.BasicAddressWatch:"\
 "KFDQMTest.*"
 
 FIJI_TESTS_BLACKLIST=\
@@ -133,14 +130,12 @@ LEXA_TESTS_BLACKLIST=\
 "$BLACKLIST_ALL_ASICS:"\
 "$SDMA_BLACKLIST"
 
-# KFDDBG.BasicAddressWatch is not supported on GFXv9 and later. FIXME: it should disable itself
 # KFDIPCTest.BasicTest (ROCMOPS-459) .CMABasicTest (ROCMOPS-460) .CrossMemoryAttachTest (ROCMOPS-461)
 # KFDMemoryTest.BigBufferStressTest (ROCMOPS-462)
 # KFDEvictTest.BurstyTest (ROCMOPS-464)
 # KFDQMTest.MultipleSdmaQueues (ROCMOPS-463)
 VEGA10_TESTS_BLACKLIST=\
 "$BLACKLIST_ALL_ASICS:"\
-"KFDDBGTest.BasicAddressWatch:"\
 "KFDIPCTest.BasicTest:"\
 "KFDEvictTest.BurstyTest:"\
 "KFDIPCTest.CMABasicTest:"\
@@ -150,14 +145,12 @@ VEGA10_TESTS_BLACKLIST=\
 
 VEGA12_TESTS_BLACKLIST=\
 "$BLACKLIST_ALL_ASICS:"\
-"$SDMA_BLACKLIST:"\
-"KFDDBGTest.BasicAddressWatch"
+"$SDMA_BLACKLIST"\
 
 # KFDEvictTest.BurstyTest (ROCMOPS-464)
 VEGA20_TESTS_BLACKLIST=\
 "$BLACKLIST_ALL_ASICS:"\
 "$SDMA_BLACKLIST:"\
-"KFDDBGTest.BasicAddressWatch:"\
 "KFDEvictTest.BurstyTest:"\
 "KFDExceptionTest.InvalidBadAddress:"\
 "KFDExceptionTest.InvalidWriteAddress:"\
@@ -165,7 +158,6 @@ VEGA20_TESTS_BLACKLIST=\
 
 RAVEN_TESTS_BLACKLIST=\
 "$BLACKLIST_ALL_ASICS:"\
-"KFDDBGTest.BasicAddressWatch:"\
 "KFDQMTest.QueueLatency:"\
 "KFDQMTest.SdmaEventInterrupt"
 
diff --git a/tests/kfdtest/src/KFDDBGTest.cpp b/tests/kfdtest/src/KFDDBGTest.cpp
index a20db2b15b..e8ab3df780 100644
--- a/tests/kfdtest/src/KFDDBGTest.cpp
+++ b/tests/kfdtest/src/KFDDBGTest.cpp
@@ -114,6 +114,8 @@ void KFDDBGTest::TearDown() {
     ROUTINE_END
 }
 
+#if 0
+// Functionality is deprecated now, keeping code for reference
 TEST_F(KFDDBGTest, BasicAddressWatch) {
     TEST_START(TESTPROFILE_RUNALL)
     if (m_FamilyId >= FAMILY_VI) {
@@ -200,6 +202,7 @@ TEST_F(KFDDBGTest, BasicAddressWatch) {
     }
     TEST_END
 }
+#endif
 
 TEST_F(KFDDBGTest, BasicDebuggerSuspendResume) {
     TEST_START(TESTPROFILE_RUNALL)