AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libhsakmt: Add Aqua Vanjaram support

Browse Source 
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: 6be4461a0d]
This commit is contained in:
Graham Sider
2022-05-06 15:03:41 -04:00
parent c758f24222
commit ea4e2a82bb
5 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocr-runtime/src/libhsakmt.h
+1
View File
@@ -136,6 +136,7 @@ enum full_gfx_versions {
GFX_VERSION_VEGA20 = 0x090006, GFX_VERSION_VEGA20 = 0x090006,
GFX_VERSION_ARCTURUS = 0x090008, GFX_VERSION_ARCTURUS = 0x090008,
GFX_VERSION_ALDEBARAN = 0x09000A, GFX_VERSION_ALDEBARAN = 0x09000A,
GFX_VERSION_AQUA_VANJARAM = 0x090400,
GFX_VERSION_RENOIR = 0x09000C, GFX_VERSION_RENOIR = 0x09000C,
GFX_VERSION_NAVI10 = 0x0A0100, GFX_VERSION_NAVI10 = 0x0A0100,
GFX_VERSION_NAVI12 = 0x0A0101, GFX_VERSION_NAVI12 = 0x0A0101,
projects/rocr-runtime/src/queues.c
+1
View File
@@ -95,6 +95,7 @@ uint32_t get_vgpr_size_per_cu(uint32_t gfxv)
{ {
case GFX_VERSION_ARCTURUS: case GFX_VERSION_ARCTURUS:
case GFX_VERSION_ALDEBARAN: case GFX_VERSION_ALDEBARAN:
case GFX_VERSION_AQUA_VANJARAM:
vgpr_size = 0x80000; vgpr_size = 0x80000;
break; break;
case GFX_VERSION_PLUM_BONITO: case GFX_VERSION_PLUM_BONITO:
projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
+7
View File
@@ -244,6 +244,13 @@ FILTER[aldebaran]=\
"KFDMemoryTest.PtraceAccess:"\ "KFDMemoryTest.PtraceAccess:"\
"KFDMemoryTest.DeviceHdpFlush" "KFDMemoryTest.DeviceHdpFlush"
FILTER[aqua_vanjaram]=\
"$BLACKLIST_ALL_ASICS:"\
"KFDExceptionTest.FaultStorm:"\
"KFDEvictTest.BurstyTest:"\
"KFDMemoryTest.PtraceAccess:"\
"KFDMemoryTest.DeviceHdpFlush"
FILTER[navi10]=\ FILTER[navi10]=\
"$BLACKLIST_ALL_ASICS:"\ "$BLACKLIST_ALL_ASICS:"\
"$BLACKLIST_GFX10:"\ "$BLACKLIST_GFX10:"\
projects/rocr-runtime/tests/kfdtest/src/KFDTestFlags.hpp
+1
View File
@@ -60,6 +60,7 @@ enum KfdFamilyId {
FAMILY_RV, // Raven FAMILY_RV, // Raven
FAMILY_AR, // Arcturus FAMILY_AR, // Arcturus
FAMILY_AL, // Aldebaran FAMILY_AL, // Aldebaran
FAMILY_AV, // Aqua Vanjaram
FAMILY_NV, // Navi10 FAMILY_NV, // Navi10
FAMILY_GFX11, // GFX11 FAMILY_GFX11, // GFX11
}; };
projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp
+3 -1
View File
@@ -188,7 +188,9 @@ unsigned int FamilyIdFromNode(const HsaNodeProperties *props) {
break; break;
case 9: case 9:
familyId = FAMILY_AI; 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; familyId = FAMILY_RV;
else if (props->EngineId.ui32.Stepping == 8) else if (props->EngineId.ui32.Stepping == 8)
familyId = FAMILY_AR; familyId = FAMILY_AR;