intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-06 02:18:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove usage of TestLegacy from shared tests

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-08-16 12:19:30 +00:00
committed by Compute-Runtime-Automation
parent cb23a38aad
commit bfc0919999
36 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp
View File

@@ -52,11 +52,11 @@ struct AUBHelloWorld
void SetUp() override {
HelloWorldFixture<AUBHelloWorldFixtureFactory>::SetUp();
ClHardwareParse::SetUp();
ClHardwareParse::setUp();
}
void TearDown() override {
ClHardwareParse::TearDown();
ClHardwareParse::tearDown();
HelloWorldFixture<AUBHelloWorldFixtureFactory>::TearDown();
}
};
@@ -213,11 +213,11 @@ struct AUBSimpleArg
void SetUp() override {
SimpleArgFixture<AUBSimpleArgFixtureFactory>::SetUp();
ClHardwareParse::SetUp();
ClHardwareParse::setUp();
}
void TearDown() override {
ClHardwareParse::TearDown();
ClHardwareParse::tearDown();
SimpleArgFixture<AUBSimpleArgFixtureFactory>::TearDown();
}
};

4
opencl/test/unit_test/command_queue/command_enqueue_fixture.h
View File

@@ -40,11 +40,11 @@ struct CommandEnqueueBaseFixture : CommandDeviceFixture,
void SetUp(cl_command_queue_properties cmdQueueProperties = 0) {
CommandDeviceFixture::SetUp(cmdQueueProperties);
IndirectHeapFixture::SetUp(pCmdQ);
ClHardwareParse::SetUp();
ClHardwareParse::setUp();
}
void TearDown() override {
ClHardwareParse::TearDown();
ClHardwareParse::tearDown();
IndirectHeapFixture::TearDown();
CommandDeviceFixture::TearDown();
}

6
opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp
View File

@@ -26,8 +26,8 @@
using namespace NEO;
struct Dg2AndLaterDispatchWalkerBasicFixture : public LinearStreamFixture {
void SetUp() override {
LinearStreamFixture::SetUp();
void setUp() {
LinearStreamFixture::setUp();
memset(globalOffsets, 0, sizeof(globalOffsets));
memset(startWorkGroups, 0, sizeof(startWorkGroups));
memset(&threadPayload, 0, sizeof(threadPayload));
@@ -71,7 +71,7 @@ struct Dg2AndLaterDispatchWalkerBasicFixture : public LinearStreamFixture {
};
using WalkerDispatchTestDg2AndLater = ::testing::Test;
using Dg2AndLaterDispatchWalkerBasicTest = TestLegacy<Dg2AndLaterDispatchWalkerBasicFixture>;
using Dg2AndLaterDispatchWalkerBasicTest = Test<Dg2AndLaterDispatchWalkerBasicFixture>;
using matcherDG2AndLater = IsAtLeastXeHpgCore;
HWTEST2_F(WalkerDispatchTestDg2AndLater, whenProgramComputeWalkerThenApplyL3WAForSpecificPlatformAndRevision, matcherDG2AndLater) {

6
opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp
View File

@@ -42,8 +42,8 @@ using namespace NEO;
using WalkerDispatchTest = ::testing::Test;
struct XeHPAndLaterDispatchWalkerBasicFixture : public LinearStreamFixture {
void SetUp() override {
LinearStreamFixture::SetUp();
void setUp() {
LinearStreamFixture::setUp();
memset(globalOffsets, 0, sizeof(globalOffsets));
memset(startWorkGroups, 0, sizeof(startWorkGroups));
@@ -86,7 +86,7 @@ struct XeHPAndLaterDispatchWalkerBasicFixture : public LinearStreamFixture {
std::unique_ptr<MockKernelWithInternals> kernel;
};
using XeHPAndLaterDispatchWalkerBasicTest = TestLegacy<XeHPAndLaterDispatchWalkerBasicFixture>;
using XeHPAndLaterDispatchWalkerBasicTest = Test<XeHPAndLaterDispatchWalkerBasicFixture>;
HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimOneThenLocalWorkSizeEqualsLocalXDim) {
using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER;

4
opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp
View File

@@ -119,10 +119,10 @@ struct EnqueueKernelTypeTest : public HelloWorldFixture<HelloWorldFixtureFactory
void SetUp() override {
ParentClass::SetUp();
ClHardwareParse::SetUp();
ClHardwareParse::setUp();
}
void TearDown() override {
ClHardwareParse::TearDown();
ClHardwareParse::tearDown();
ParentClass::TearDown();
}
size_t globalWorkSize[3];

4
opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp
View File

@@ -27,12 +27,12 @@ struct TwoIOQsTwoDependentWalkers : public HelloWorldTest<HelloWorldFixtureFacto
void SetUp() override {
Parent::SetUp();
ClHardwareParse::SetUp();
ClHardwareParse::setUp();
}
void TearDown() override {
delete pCmdQ2;
ClHardwareParse::TearDown();
ClHardwareParse::tearDown();
Parent::TearDown();
}

4
opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp
View File

@@ -32,12 +32,12 @@ struct TwoOOQsTwoDependentWalkers : public HelloWorldTest<OOQFixtureFactory>,
void SetUp() override {
Parent::SetUp();
ClHardwareParse::SetUp();
ClHardwareParse::setUp();
}
void TearDown() override {
delete pCmdQ2;
ClHardwareParse::TearDown();
ClHardwareParse::tearDown();
Parent::TearDown();
}

2
opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp
View File

@@ -1436,7 +1436,7 @@ HWTEST_F(EnqueueSvmTestLocalMemory, givenEnabledLocalMemoryWhenMappedSvmRegionIs
hwParse.parseCommands<FamilyType>(stream);
auto walkerCount = hwParse.getCommandCount<WALKER_TYPE>();
EXPECT_EQ(1u, walkerCount);
hwParse.TearDown();
hwParse.tearDown();
cl_event event = nullptr;
retVal = queue.enqueueSVMUnmap(

4
opencl/test/unit_test/command_queue/finish_tests.cpp
View File

@@ -30,11 +30,11 @@ struct FinishFixture : public ClDeviceFixture,
ASSERT_NE(nullptr, pCmdQ);
CommandStreamFixture::SetUp(pCmdQ);
ASSERT_NE(nullptr, pCS);
HardwareParse::SetUp();
HardwareParse::setUp();
}
void TearDown() override {
HardwareParse::TearDown();
HardwareParse::tearDown();
CommandStreamFixture::TearDown();
CommandQueueHwFixture::TearDown();
ClDeviceFixture::TearDown();

4
opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl
View File

@@ -14,11 +14,11 @@ struct CommandStreamReceiverHwTest : public ClDeviceFixture,
void SetUp() override {
ClDeviceFixture::SetUp();
HardwareParse::SetUp();
HardwareParse::setUp();
}
void TearDown() override {
HardwareParse::TearDown();
HardwareParse::tearDown();
ClDeviceFixture::TearDown();
}

4
opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp
View File

@@ -25,11 +25,11 @@ struct CommandStreamReceiverHwTestDg2AndLater : public ClDeviceFixture,
void SetUp() override {
ClDeviceFixture::SetUp();
HardwareParse::SetUp();
HardwareParse::setUp();
}
void TearDown() override {
HardwareParse::TearDown();
HardwareParse::tearDown();
ClDeviceFixture::TearDown();
}
};

4
opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp
View File

@@ -63,11 +63,11 @@ struct CommandStreamReceiverHwTestXeHPAndLater : public ClDeviceFixture,
void SetUp() override {
ClDeviceFixture::SetUp();
HardwareParse::SetUp();
HardwareParse::setUp();
}
void TearDown() override {
HardwareParse::TearDown();
HardwareParse::tearDown();
ClDeviceFixture::TearDown();
}
};

2
opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp
View File

@@ -331,7 +331,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe
EXPECT_NE(oldCmdBufferAddress, newCmdBufferAddress);
EXPECT_NE(oldExCmdBufferGpuAddr, newExCmdBufferGpuAddr);
hwParserCsr.TearDown();
hwParserCsr.tearDown();
hwParserCsr.parseCommands<FamilyType>(commandStreamReceiver.commandStream, csrCmdBufferOffset);
bbList = hwParserCsr.getCommandsList<MI_BATCH_BUFFER_START>();
bbStart = nullptr;

6
opencl/test/unit_test/fixtures/media_kernel_fixture.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
* Copyright (C) 2018-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -66,7 +66,7 @@ struct MediaKernelFixture : public HelloWorldFixture<FactoryType>,
Parent::kernelName = "non_vme_kernel";
Parent::SetUp();
ClHardwareParse::SetUp();
ClHardwareParse::setUp();
ASSERT_NE(nullptr, pKernel);
ASSERT_EQ(false, pKernel->isVmeKernel());
@@ -90,7 +90,7 @@ struct MediaKernelFixture : public HelloWorldFixture<FactoryType>,
}
pMultiDeviceVmeKernel->release();
ClHardwareParse::TearDown();
ClHardwareParse::tearDown();
Parent::TearDown();
}

6
opencl/test/unit_test/fixtures/two_walker_fixture.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
* Copyright (C) 2018-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -54,11 +54,11 @@ struct TwoWalkerTest
void SetUp() override {
Parent::SetUp();
ClHardwareParse::SetUp();
ClHardwareParse::setUp();
}
void TearDown() override {
ClHardwareParse::TearDown();
ClHardwareParse::tearDown();
Parent::TearDown();
}

4
opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h
View File

@@ -29,7 +29,7 @@ struct UltCommandStreamReceiverTest
::testing::Test {
void SetUp() override {
ClDeviceFixture::SetUp();
ClHardwareParse::SetUp();
ClHardwareParse::setUp();
cmdBuffer = alignedMalloc(sizeStream, alignmentStream);
dshBuffer = alignedMalloc(sizeStream, alignmentStream);
@@ -82,7 +82,7 @@ struct UltCommandStreamReceiverTest
alignedFree(iohBuffer);
alignedFree(dshBuffer);
alignedFree(cmdBuffer);
ClHardwareParse::TearDown();
ClHardwareParse::tearDown();
ClDeviceFixture::TearDown();
}

10
opencl/test/unit_test/gen12lp/gpgpu_walker_tests_gen12lp.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2021 Intel Corporation
* Copyright (C) 2020-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -47,7 +47,7 @@ class MockKernelWithApplicableWa : public MockKernel {
struct HardwareInterfaceTests : public ClDeviceFixture, public LinearStreamFixture, public ::testing::Test {
void SetUp() override {
ClDeviceFixture::SetUp();
LinearStreamFixture::SetUp();
LinearStreamFixture::setUp();
pContext = new NEO::MockContext(pClDevice);
pCommandQueue = new MockCommandQueue(pContext, pClDevice, nullptr, false);
@@ -63,7 +63,7 @@ struct HardwareInterfaceTests : public ClDeviceFixture, public LinearStreamFixtu
pCommandQueue->release();
pContext->release();
LinearStreamFixture::TearDown();
LinearStreamFixture::tearDown();
ClDeviceFixture::TearDown();
}
@@ -105,7 +105,7 @@ GEN12LPTEST_F(HardwareInterfaceTests, GivenKernelWithApplicableWaDisableRccRhwoO
size_t expectedUsedForDisableWa = 2 * (sizeof(PIPE_CONTROL) + sizeof(MI_LOAD_REGISTER_IMM));
ASSERT_EQ(expectedUsedForDisableWa, linearStream.getUsed());
hwParse.TearDown();
hwParse.tearDown();
hwParse.parseCommands<FamilyType>(linearStream, expectedUsedForEnableWa);
itorPipeCtrl = find<PIPE_CONTROL *>(hwParse.cmdList.begin(), hwParse.cmdList.end());
ASSERT_NE(hwParse.cmdList.end(), itorPipeCtrl);
@@ -149,4 +149,4 @@ GEN12LPTEST_F(HardwareInterfaceTests, GivenKernelWithoutApplicableWaDisableRccRh
EXPECT_EQ(0u, cmdSize);
}
} // namespace NEO
} // namespace NEO

2
opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
View File

@@ -1852,7 +1852,7 @@ TEST_F(MemoryAllocatorTest, GivenSizeWhenGmmIsCreatedThenNonNullPointerIsReturne
delete gmm;
}
typedef TestLegacy<MemoryManagerWithCsrFixture> MemoryManagerWithCsrTest;
typedef Test<MemoryManagerWithCsrFixture> MemoryManagerWithCsrTest;
TEST_F(MemoryManagerWithCsrTest, GivenAllocationsInHostPtrManagerWhenBiggerOverllapingAllocationIsCreatedAndNothingToCleanThenAbortExecution) {
void *cpuPtr1 = (void *)0x100004;

4
opencl/test/unit_test/xe_hp_core/xehp/test_command_stream_receiver_xehp.inl
View File

@@ -24,10 +24,10 @@ class CommandStreamReceiverHwTestWithLocalMemory : public ClDeviceFixture,
dbgRestore = std::make_unique<DebugManagerStateRestore>();
DebugManager.flags.EnableLocalMemory.set(1);
ClDeviceFixture::SetUp();
HardwareParse::SetUp();
HardwareParse::setUp();
}
void TearDown() override {
HardwareParse::TearDown();
HardwareParse::tearDown();
ClDeviceFixture::TearDown();
}