From ea4e2a82bb2556feef9acf10cb5e23b128da37bd Mon Sep 17 00:00:00 2001
From: Graham Sider <Graham.Sider@amd.com>
Date: Fri, 6 May 2022 15:03:41 -0400
Subject: [PATCH] libhsakmt: Add Aqua Vanjaram support

Add gfx version for VGPR size per CU calc, add FAMILY_AV to KfdFamilyId,
add blacklist filter to kfdtest.exclude.

Signed-off-by: Graham Sider <Graham.Sider@amd.com>
Change-Id: I9b8072e45f4d497e0a8fd3f8f97f1425238e8b42


[ROCm/ROCR-Runtime commit: 6be4461a0df9ef46cca73361e40a83549fb36d7f]
---
 projects/rocr-runtime/src/libhsakmt.h                      | 1 +
 projects/rocr-runtime/src/queues.c                         | 1 +
 .../rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude     | 7 +++++++
 projects/rocr-runtime/tests/kfdtest/src/KFDTestFlags.hpp   | 1 +
 projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp    | 4 +++-
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/projects/rocr-runtime/src/libhsakmt.h b/projects/rocr-runtime/src/libhsakmt.h
index 55fc5a465d..85e69f6d07 100644
--- a/projects/rocr-runtime/src/libhsakmt.h
+++ b/projects/rocr-runtime/src/libhsakmt.h
@@ -136,6 +136,7 @@ enum full_gfx_versions {
 	GFX_VERSION_VEGA20		= 0x090006,
 	GFX_VERSION_ARCTURUS		= 0x090008,
 	GFX_VERSION_ALDEBARAN		= 0x09000A,
+	GFX_VERSION_AQUA_VANJARAM	= 0x090400,
 	GFX_VERSION_RENOIR		= 0x09000C,
 	GFX_VERSION_NAVI10		= 0x0A0100,
 	GFX_VERSION_NAVI12		= 0x0A0101,
diff --git a/projects/rocr-runtime/src/queues.c b/projects/rocr-runtime/src/queues.c
index f59c3da7bf..6ba1e107c6 100644
--- a/projects/rocr-runtime/src/queues.c
+++ b/projects/rocr-runtime/src/queues.c
@@ -95,6 +95,7 @@ uint32_t get_vgpr_size_per_cu(uint32_t gfxv)
 	{
 		case GFX_VERSION_ARCTURUS:
 		case GFX_VERSION_ALDEBARAN:
+		case GFX_VERSION_AQUA_VANJARAM:
 			vgpr_size = 0x80000;
 			break;
 		case GFX_VERSION_PLUM_BONITO:
diff --git a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
index b2cdd46ad7..672c27ec3a 100644
--- a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
+++ b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
@@ -244,6 +244,13 @@ FILTER[aldebaran]=\
 "KFDMemoryTest.PtraceAccess:"\
 "KFDMemoryTest.DeviceHdpFlush"
 
+FILTER[aqua_vanjaram]=\
+"$BLACKLIST_ALL_ASICS:"\
+"KFDExceptionTest.FaultStorm:"\
+"KFDEvictTest.BurstyTest:"\
+"KFDMemoryTest.PtraceAccess:"\
+"KFDMemoryTest.DeviceHdpFlush"
+
 FILTER[navi10]=\
 "$BLACKLIST_ALL_ASICS:"\
 "$BLACKLIST_GFX10:"\
diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDTestFlags.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDTestFlags.hpp
index 7fd49c7013..00a74fd6c8 100644
--- a/projects/rocr-runtime/tests/kfdtest/src/KFDTestFlags.hpp
+++ b/projects/rocr-runtime/tests/kfdtest/src/KFDTestFlags.hpp
@@ -60,6 +60,7 @@ enum KfdFamilyId {
     FAMILY_RV,    // Raven
     FAMILY_AR,    // Arcturus
     FAMILY_AL,    // Aldebaran
+    FAMILY_AV,    // Aqua Vanjaram
     FAMILY_NV,    // Navi10
     FAMILY_GFX11, // GFX11
 };
diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp
index c45af06aed..b9d9d23d4a 100644
--- a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp
+++ b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp
@@ -188,7 +188,9 @@ unsigned int FamilyIdFromNode(const HsaNodeProperties *props) {
         break;
     case 9:
         familyId = FAMILY_AI;
-        if (props->EngineId.ui32.Stepping == 2)
+        if (props->EngineId.ui32.Minor == 4)
+            familyId = FAMILY_AV;
+        else if (props->EngineId.ui32.Stepping == 2)
             familyId = FAMILY_RV;
         else if (props->EngineId.ui32.Stepping == 8)
             familyId = FAMILY_AR;