From 39386c03bf51e49c339b9c39bf9850f694a01fd1 Mon Sep 17 00:00:00 2001
From: changzhu <Changfeng.Zhu@amd.com>
Date: Thu, 26 Nov 2020 17:13:14 +0800
Subject: [PATCH] Add distinguish for iommuv2/dgpu_fallback when getting
 gpuName

The memory tests between iommuv2 and dgpu_fallback are different.So it
needs to ditinguish them.

Change-Id: Icc64e9ae0fc1638c3d148795a5f247d9e5e8e503
Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
---
 tests/kfdtest/scripts/kfdtest.exclude | 10 ++++++++--
 tests/kfdtest/scripts/run_kfdtest.sh  |  7 +++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/tests/kfdtest/scripts/kfdtest.exclude b/tests/kfdtest/scripts/kfdtest.exclude
index 40183489ee..6a8d6e9b4f 100644
--- a/tests/kfdtest/scripts/kfdtest.exclude
+++ b/tests/kfdtest/scripts/kfdtest.exclude
@@ -173,10 +173,16 @@ FILTER[vega20]=\
 "KFDEvictTest.BurstyTest:"\
 "KFDQMTest.GPUDoorbellWrite"
 
+FILTER[raven_dgpuFallback]=\
+"$BLACKLIST_ALL_ASICS:"\
+"KFDMemoryTest.MMBench:"\
+"KFDMemoryTest.MemoryRegister:"\
+"KFDQMTest.SdmaConcurrentCopies"
+
 FILTER[raven]=\
 "$BLACKLIST_ALL_ASICS:"\
-"KFDQMTest.QueueLatency:"\
-"KFDQMTest.SdmaEventInterrupt"
+"KFDQMTest.SdmaConcurrentCopies:"\
+"KFDQMTest.MultipleCpQueuesStressDispatch"
 
 FILTER[renoir]=\
 "$BLACKLIST_ALL_ASICS:"\
diff --git a/tests/kfdtest/scripts/run_kfdtest.sh b/tests/kfdtest/scripts/run_kfdtest.sh
index 5aadce3dfd..6311e1b9a5 100755
--- a/tests/kfdtest/scripts/run_kfdtest.sh
+++ b/tests/kfdtest/scripts/run_kfdtest.sh
@@ -144,6 +144,13 @@ getHsaNodes() {
 getNodeName() {
     local nodeId=$1; shift;
     local gpuName=$(cat $TOPOLOGY_SYSFS_DIR/$nodeId/name)
+    if [ "$gpuName" == "raven" ]; then
+      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"
+      fi
+    fi
     echo "$gpuName"
 }