From 350eba3a074a214f6ff8888069af7c9ed9d5bfcc Mon Sep 17 00:00:00 2001
From: Graham Sider <Graham.Sider@amd.com>
Date: Thu, 16 Jun 2022 17:16:16 -0400
Subject: [PATCH] kfdtest: Update gpuName logic for ip discovery

Kernel amd-staging-drm-next branch changes GFX11 fish_colour sysfs
naming to "ip discovery". Update run_kfdtest.sh to use sysfs
gfx_target_version for ASICs that have transitioned to IP discovery
topology.

Signed-off-by: Graham Sider <Graham.Sider@amd.com>
Change-Id: If202a0ceeed7324364539a33661f0abcf0973f07
---
 tests/kfdtest/scripts/kfdtest.exclude |  5 +++--
 tests/kfdtest/scripts/run_kfdtest.sh  | 12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/kfdtest/scripts/kfdtest.exclude b/tests/kfdtest/scripts/kfdtest.exclude
index fcd5d0fcbb..2680e7b352 100644
--- a/tests/kfdtest/scripts/kfdtest.exclude
+++ b/tests/kfdtest/scripts/kfdtest.exclude
@@ -290,17 +290,18 @@ FILTER[yellow_carp]=\
 "$BLACKLIST_ALL_ASICS:"\
 "$BLACKLIST_GFX10_NV2X"
 
-FILTER[plum_bonito]=\
+FILTER[gfx1100]=\
 "$BLACKLIST_ALL_ASICS:"\
 "$BLACKLIST_GFX10_NV2X:"\
 "$TEMPORARY_BLACKLIST_GFX11"
 
+# TODO: Update to gfx version when kernel moves to staging-drm-next
 FILTER[wheat_nas]=\
 "$BLACKLIST_ALL_ASICS:"\
 "$BLACKLIST_GFX10_NV2X:"\
 "$TEMPORARY_BLACKLIST_GFX11"
 
-FILTER[hotpink_bonefish]=\
+FILTER[gfx1102]=\
 "$BLACKLIST_ALL_ASICS:"\
 "$BLACKLIST_GFX10_NV2X:"\
 "$TEMPORARY_BLACKLIST_GFX11"
diff --git a/tests/kfdtest/scripts/run_kfdtest.sh b/tests/kfdtest/scripts/run_kfdtest.sh
index f6a5a9b95d..f84ed0e760 100755
--- a/tests/kfdtest/scripts/run_kfdtest.sh
+++ b/tests/kfdtest/scripts/run_kfdtest.sh
@@ -144,7 +144,8 @@ getHsaNodes() {
 }
 
 
-# Prints GPU Name for the given Node ID
+# Prints GPU Name for the given Node ID. If transitioned to IP discovery,
+# use target gfx version
 #   param - Node ID
 getNodeName() {
     local nodeId=$1; shift;
@@ -153,7 +154,14 @@ getNodeName() {
       local CpuCoresCount=$(cat $TOPOLOGY_SYSFS_DIR/$nodeId/properties | grep cpu_cores_count | awk '{print $2}')
       local SimdCount=$(cat $TOPOLOGY_SYSFS_DIR/$nodeId/properties | grep simd_count | awk '{print $2}')
       if [ "$CpuCoresCount" -eq 0 ] && [ "$SimdCount" -gt 0 ]; then
-	gpuName="raven_dgpuFallback"
+        gpuName="raven_dgpuFallback"
+      fi
+    elif [ "$gpuName" == "ip discovery" ]; then
+      if [ -n "$HSA_OVERRIDE_GFX_VERSION" ]; then
+          gpuName="gfx$(echo "$HSA_OVERRIDE_GFX_VERSION" | awk 'BEGIN {FS="."; RS=""} {printf "%d%x%x", $1, $2, $3 }')"
+      else
+          local GfxVersionDec=$(cat $TOPOLOGY_SYSFS_DIR/$nodeId/properties | grep gfx_target_version | awk '{print $2}')
+          gpuName="gfx$(printf "$GfxVersionDec" | fold -w2 | awk 'BEGIN {FS="\n"; RS=""} {printf "%d%x%x", $1, $2, $3}')"
       fi
     fi
     echo "$gpuName"