From 201f8a3de5c2f89c0c7cb8991044ae7e17ee1d2c Mon Sep 17 00:00:00 2001 From: Graham Sider Date: Fri, 23 Sep 2022 16:28:25 -0400 Subject: [PATCH] kfdtest: Add dedicated FamilyId for GFX11 Add FAMILY_GFX11 to KfdFamilyId enum. Signed-off-by: Graham Sider Change-Id: Ib2aa3f8cf31041f7b4cdd9a2f3e36489dde5554c [ROCm/ROCR-Runtime commit: e44952d8a68e22cf96659cc0427701f7de1fe373] --- .../tests/kfdtest/src/KFDTestFlags.hpp | 19 ++++++++++--------- .../tests/kfdtest/src/KFDTestUtil.cpp | 3 ++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDTestFlags.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDTestFlags.hpp index 9087ba23f8..7fd49c7013 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDTestFlags.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDTestFlags.hpp @@ -52,15 +52,16 @@ enum ENVCAPS{ enum KfdFamilyId { FAMILY_UNKNOWN = 0, - FAMILY_CI, // Sea Islands: Hawaii (P), Maui (P), Bonaire (M) - FAMILY_KV, // Fusion Kaveri: Spectre, Spooky; Fusion Kabini: Kalindi - FAMILY_VI, // Volcanic Islands: Iceland (V), Tonga (M) - FAMILY_CZ, // Carrizo, Nolan, Amur - FAMILY_AI, // Arctic Islands - FAMILY_RV, // Raven - FAMILY_AR, // Arcturus - FAMILY_AL, // Aldebaran - FAMILY_NV, // Navi10 + FAMILY_CI, // Sea Islands: Hawaii (P), Maui (P), Bonaire (M) + FAMILY_KV, // Fusion Kaveri: Spectre, Spooky; Fusion Kabini: Kalindi + FAMILY_VI, // Volcanic Islands: Iceland (V), Tonga (M) + FAMILY_CZ, // Carrizo, Nolan, Amur + FAMILY_AI, // Arctic Islands + FAMILY_RV, // Raven + FAMILY_AR, // Arcturus + FAMILY_AL, // Aldebaran + FAMILY_NV, // Navi10 + FAMILY_GFX11, // GFX11 }; #endif // __KFD_TEST_FLAGS__H__ diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp index 103b144b05..feeb6fd19d 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp @@ -192,8 +192,9 @@ unsigned int FamilyIdFromNode(const HsaNodeProperties *props) { familyId = FAMILY_AL; break; case 10: - case 11: familyId = FAMILY_NV; + case 11: + familyId = FAMILY_GFX11; break; }