From 8a6743aef4a5b4fe15826ce093811c23cd719787 Mon Sep 17 00:00:00 2001 From: Graham Sider Date: Thu, 30 Sep 2021 18:17:26 -0400 Subject: [PATCH] kfdtest: Remove IsaGen from RDMATest Replace with LLVM-based Assembler. Signed-off-by: Graham Sider Change-Id: I5dff1b9402e294af33cec78a24e2e2decfb5b6d3 --- tests/kfdtest/src/RDMATest.cpp | 8 ++------ tests/kfdtest/src/RDMATest.hpp | 6 +----- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/tests/kfdtest/src/RDMATest.cpp b/tests/kfdtest/src/RDMATest.cpp index 973dbdcdc8..d44d69895e 100644 --- a/tests/kfdtest/src/RDMATest.cpp +++ b/tests/kfdtest/src/RDMATest.cpp @@ -34,16 +34,11 @@ void RDMATest::SetUp() { KFDBaseComponentTest::SetUp(); - m_pIsaGen = IsaGenerator::Create(m_FamilyId); - ROUTINE_END } void RDMATest::TearDown() { ROUTINE_START - if (m_pIsaGen) - delete m_pIsaGen; - m_pIsaGen = NULL; KFDBaseComponentTest::TearDown(); @@ -77,7 +72,8 @@ TEST_F(RDMATest, GPUDirect) { srcSysBuffer.Fill(0xfe); /* Put 'copy dword' command to ISA buffer */ - m_pIsaGen->GetCopyDwordIsa(isaBuffer); + ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(CopyDwordIsa, isaBuffer.As())); + ASSERT_SUCCESS(queue.Create(defaultGPUNode)); Dispatch dispatch(isaBuffer); diff --git a/tests/kfdtest/src/RDMATest.hpp b/tests/kfdtest/src/RDMATest.hpp index 3e4b2331aa..1d16853838 100644 --- a/tests/kfdtest/src/RDMATest.hpp +++ b/tests/kfdtest/src/RDMATest.hpp @@ -26,20 +26,16 @@ #include -#include "IsaGenerator.hpp" #include "KFDBaseComponentTest.hpp" class RDMATest : public KFDBaseComponentTest { public: - RDMATest():m_pIsaGen(NULL) {} + RDMATest() {} ~RDMATest() {} protected: virtual void SetUp(); virtual void TearDown(); - - protected: // Members - IsaGenerator* m_pIsaGen; }; #endif // __RDMA_TEST__H__