From 3e75f92cf2ce6ebffc1f51af00ae27cf5aba31d4 Mon Sep 17 00:00:00 2001 From: Graham Sider Date: Mon, 27 Mar 2023 16:18:18 -0400 Subject: [PATCH] Revert "kfdtest: add MES judging API in test utility." See description of previous revert. This reverts commit 8554f0df141d0c5ad5d71d4aa8607e51810eebd7. Signed-off-by: Graham Sider Change-Id: I969dc6469e62b50cd7ba0595918538602afa7516 [ROCm/ROCR-Runtime commit: 287cb29340c3c343c719fb171e6127fdee8fee71] --- .../rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.cpp | 5 ----- .../rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.hpp | 1 - projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp | 5 ----- projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.hpp | 1 - 4 files changed, 12 deletions(-) diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.cpp index a286f21983..bb510e040b 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.cpp @@ -164,11 +164,6 @@ unsigned int KFDBaseComponentTest::GetFamilyIdFromNodeId(unsigned int nodeId) return FamilyIdFromNode(m_NodeInfo.GetNodeProperties(nodeId)); } -bool KFDBaseComponentTest::isMES(unsigned int nodeId) -{ - return CheckMES(m_NodeInfo.GetNodeProperties(nodeId)); -} - int KFDBaseComponentTest::FindDRMRenderNode(int gpuNode) { HsaNodeProperties *nodeProperties; _HSAKMT_STATUS status; diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.hpp index 2f9d8350e2..cc87465ad5 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.hpp @@ -58,7 +58,6 @@ class KFDBaseComponentTest : public testing::Test { // @return DRM Render Node if successful or -1 on failure int FindDRMRenderNode(int gpuNode); unsigned int GetFamilyIdFromNodeId(unsigned int nodeId); - bool isMES(unsigned int nodeId); unsigned int GetFamilyIdFromDefaultNode(){ return m_FamilyId; } // @brief Executed before the first test that uses KFDBaseComponentTest. diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp index afd5e71d99..c45af06aed 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.cpp @@ -238,11 +238,6 @@ bool isTonga(const HsaNodeProperties *props) { return false; } -bool CheckMES(const HsaNodeProperties *props) { - /* MES devices need GART mappings and therefore need non-paged memory */ - return (props->EngineId.ui32.Major >= 11) ? true : false; -} - const uint32_t GetGfxVersion(const HsaNodeProperties *props) { return ((props->EngineId.ui32.Major << 16) | (props->EngineId.ui32.Minor << 8) | diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.hpp index a9f6c9d9be..938ff8bf69 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.hpp @@ -50,7 +50,6 @@ HSAKMT_STATUS CreateQueueTypeEvent(bool ManualReset, bool IsSignaled, unsigned i bool is_dgpu(); bool isTonga(const HsaNodeProperties *props); -bool CheckMES(const HsaNodeProperties *props); bool hasPciAtomicsSupport(int node); unsigned int FamilyIdFromNode(const HsaNodeProperties *props); const uint32_t GetGfxVersion(const HsaNodeProperties *props);