From cc050951deadbb10b1c50cdec5fb52ddf4a28aef Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 16 Aug 2019 19:43:35 -0400 Subject: [PATCH] kfdtest: Remove useless test cases Those tests are actually did not function up to its expectation because some underlying functions such as suspend/resume and disable/enable KFD were not implemented. Those interfaces would never be implemented, so delete them. Change-Id: Ib5872ba2f35e307221e43791cda1782c6b6bb4d1 Signed-off-by: Yong Zhao [ROCm/ROCR-Runtime commit: 09d192802ab259123f15e7b1e894b3ad45724fb1] --- .../tests/kfdtest/src/KFDPMTest.cpp | 18 ---- .../tests/kfdtest/src/KFDPMTest.hpp | 6 -- .../tests/kfdtest/src/KFDPNPTest.cpp | 100 ------------------ .../tests/kfdtest/src/KFDPNPTest.hpp | 47 -------- .../tests/kfdtest/src/LinuxOSWrapper.cpp | 12 --- .../tests/kfdtest/src/OSWrapper.hpp | 5 - 6 files changed, 188 deletions(-) delete mode 100644 projects/rocr-runtime/tests/kfdtest/src/KFDPNPTest.cpp delete mode 100644 projects/rocr-runtime/tests/kfdtest/src/KFDPNPTest.hpp diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.cpp index 734b32ba51..79b385cf72 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.cpp @@ -27,24 +27,6 @@ #include "PM4Queue.hpp" #include "hsakmt.h" -bool KFDPMTest::m_SetupSuccess = false; - -void KFDPMTest::SetUpTestCase() { - ROUTINE_START - - m_SetupSuccess = false; - AcquirePrivilege(OS_SUSPEND); - - // If AcquirePrivilege fails, it will throw and we will not reach here. - m_SetupSuccess = true; - - ROUTINE_END -} - -void KFDPMTest::TearDownTestCase() { -} - - void KFDPMTest::SetUp() { ROUTINE_START diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.hpp index 7cc7c85ad6..b8960afefe 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.hpp @@ -33,14 +33,8 @@ class KFDPMTest : public KFDBaseComponentTest { ~KFDPMTest() {} protected: - static void SetUpTestCase(); - static void TearDownTestCase(); - virtual void SetUp(); virtual void TearDown(); - - protected: - static bool m_SetupSuccess; }; #endif // __KFDPMTEST_HPP__ diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDPNPTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDPNPTest.cpp deleted file mode 100644 index fc53f891ab..0000000000 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDPNPTest.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2014-2018 Advanced Micro Devices, Inc. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - */ - -#include "KFDPNPTest.hpp" -#include "KFDTestUtil.hpp" -#include "PM4Queue.hpp" -#include "PM4Packet.hpp" -#include "hsakmt.h" - -bool KFDPNPTest::m_SetupSuccess = false; - -void KFDPNPTest::SetUpTestCase() { - ROUTINE_START - - AcquirePrivilege(OS_DRIVER_OPERATIONS); - - // If AcquirePrivilege fails, it will throw and we will not reach here. - m_SetupSuccess = true; - - ROUTINE_END -} - -void KFDPNPTest::TearDownTestCase() { -} - - -void KFDPNPTest::SetUp() { - ROUTINE_START - - ASSERT_TRUE(m_SetupSuccess); - - KFDBaseComponentTest::SetUp(); - - ROUTINE_END -} - -void KFDPNPTest::TearDown() { - ROUTINE_START - - KFDBaseComponentTest::TearDown(); - - ROUTINE_END -} - -TEST_F(KFDPNPTest, DisableWithActiveProcess) { - TEST_START(TESTPROFILE_RUNALL); - - DisableKfd(); - EnableKfd(); - - TEST_END -} - -TEST_F(KFDPNPTest, DisableAndCreateQueue) { - TEST_START(TESTPROFILE_RUNALL); - - PM4Queue queue; - int defaultGPUNode = m_NodeInfo.HsaDefaultGPUNode(); - ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node"; - - HsaMemoryBuffer destBuffer(PAGE_SIZE, defaultGPUNode); - - ASSERT_SUCCESS(queue.Create(defaultGPUNode)); - - queue.PlaceAndSubmitPacket(PM4WriteDataPacket(destBuffer.As(), 0x1, 0x2)); - queue.Wait4PacketConsumption(); - - WaitOnValue(&(destBuffer.As()[0]), 0x1); - WaitOnValue(&(destBuffer.As()[1]), 0x2); - - EXPECT_SUCCESS(queue.Destroy()); - - DisableKfd(); - EnableKfd(); - - EXPECT_NE(HSAKMT_STATUS_SUCCESS, queue.Create(defaultGPUNode)) - << "Queue creation should fail after a topology change."; - - TEST_END -} diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDPNPTest.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDPNPTest.hpp deleted file mode 100644 index e9ce4d619a..0000000000 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDPNPTest.hpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2014-2018 Advanced Micro Devices, Inc. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - */ - -#ifndef __KFD_PNP_TEST__H__ -#define __KFD_PNP_TEST__H__ - -#include -#include "KFDBaseComponentTest.hpp" - - -class KFDPNPTest : public KFDBaseComponentTest { - public: - KFDPNPTest() {} - ~KFDPNPTest() {} - - protected: - static void SetUpTestCase(); - static void TearDownTestCase(); - - virtual void SetUp(); - virtual void TearDown(); - - protected: - static bool m_SetupSuccess; -}; - -#endif // __KFD_PNP_TEST__H__ diff --git a/projects/rocr-runtime/tests/kfdtest/src/LinuxOSWrapper.cpp b/projects/rocr-runtime/tests/kfdtest/src/LinuxOSWrapper.cpp index a8728944c1..e529c2b6dd 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/LinuxOSWrapper.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/LinuxOSWrapper.cpp @@ -105,18 +105,6 @@ bool SuspendAndWakeUp() { return true; } -void AcquirePrivilege(OS_PRIVILEGE priv) { - // TODO: Implement -} - -void DisableKfd() { - // TODO: Implement -} - -void EnableKfd() { - // TODO: Implement -} - bool ReadDriverConfigValue(CONFIG_VALUE config, unsigned int& rValue) { return false; } diff --git a/projects/rocr-runtime/tests/kfdtest/src/OSWrapper.hpp b/projects/rocr-runtime/tests/kfdtest/src/OSWrapper.hpp index 480b0c91de..99a7ff5829 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/OSWrapper.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/OSWrapper.hpp @@ -102,11 +102,6 @@ HSAuint64 GetSystemTickCountInMicroSec(); */ bool SuspendAndWakeUp(); -void AcquirePrivilege(OS_PRIVILEGE priv); - -void DisableKfd(); -void EnableKfd(); - bool ReadDriverConfigValue(CONFIG_VALUE config, unsigned int& rValue); bool GetCommandLineArguments(int argc, char **argv, CommandLineArguments& rArgs);