intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 06:24:51 +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();
}

4
shared/test/common/cmd_parse/hw_parse.h
View File

@@ -30,10 +30,10 @@ struct HardwareParse {
itorGpgpuCsrBaseAddress = cmdList.end();
}
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
}
void TearDown() { // NOLINT(readability-identifier-naming)
void tearDown() {
cmdList.clear();
lriList.clear();
pipeControlList.clear();

8
shared/test/common/fixtures/linear_stream_fixture.h
View File

@@ -15,19 +15,19 @@
namespace NEO {
struct LinearStreamFixture {
LinearStreamFixture(void)
LinearStreamFixture()
: gfxAllocation(static_cast<void *>(pCmdBuffer), sizeof(pCmdBuffer)), linearStream(&gfxAllocation) {
}
virtual void SetUp(void) { // NOLINT(readability-identifier-naming)
void setUp() {
}
virtual void TearDown(void) { // NOLINT(readability-identifier-naming)
void tearDown() {
}
MockGraphicsAllocation gfxAllocation;
LinearStream linearStream;
uint32_t pCmdBuffer[1024]{};
};
typedef TestLegacy<LinearStreamFixture> LinearStreamTest;
using LinearStreamTest = Test<LinearStreamFixture>;
} // namespace NEO

4
shared/test/common/fixtures/memory_manager_fixture.cpp
View File

@@ -16,7 +16,7 @@
using namespace NEO;
void MemoryManagerWithCsrFixture::SetUp() {
void MemoryManagerWithCsrFixture::setUp() {
executionEnvironment.prepareRootDeviceEnvironments(1);
executionEnvironment.rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
executionEnvironment.rootDeviceEnvironments[0]->initGmm();
@@ -31,5 +31,5 @@ void MemoryManagerWithCsrFixture::SetUp() {
csr->setupContext(*osContext);
}
void MemoryManagerWithCsrFixture::TearDown() {
void MemoryManagerWithCsrFixture::tearDown() {
}

4
shared/test/common/fixtures/memory_manager_fixture.h
View File

@@ -26,6 +26,6 @@ class MemoryManagerWithCsrFixture {
~MemoryManagerWithCsrFixture() = default;
void SetUp(); // NOLINT(readability-identifier-naming)
void TearDown(); // NOLINT(readability-identifier-naming)
void setUp();
void tearDown();
};

8
shared/test/common/os_interface/linux/drm_buffer_object_fixture.h
View File

@@ -65,11 +65,11 @@ template <typename DrmClass>
class DrmBufferObjectFixture {
public:
std::unique_ptr<DrmClass> mock;
TestedBufferObject *bo;
ExecObject execObjectsStorage[256];
TestedBufferObject *bo = nullptr;
ExecObject execObjectsStorage[256]{};
std::unique_ptr<OsContextLinux> osContext;
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
this->mock = std::make_unique<DrmClass>(*executionEnvironment.rootDeviceEnvironments[0]);
ASSERT_NE(nullptr, this->mock);
executionEnvironment.rootDeviceEnvironments[0]->memoryOperationsInterface = DrmMemoryOperationsHandler::create(*mock.get(), 0u);
@@ -79,7 +79,7 @@ class DrmBufferObjectFixture {
ASSERT_NE(nullptr, bo);
}
void TearDown() { // NOLINT(readability-identifier-naming)
void tearDown() {
delete bo;
if (this->mock->ioctl_expected.total >= 0) {
EXPECT_EQ(this->mock->ioctl_expected.total, this->mock->ioctl_cnt.total);

6
shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp
View File

@@ -665,7 +665,7 @@ HWTEST_F(CommandStreamReceiverTest, givenUpdateTaskCountFromWaitInMultiRootDevic
}
struct InitDirectSubmissionFixture {
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
DebugManager.flags.EnableDirectSubmission.set(1);
executionEnvironment = new MockExecutionEnvironment();
DeviceFactory::prepareDeviceEnvironments(*executionEnvironment);
@@ -675,14 +675,14 @@ struct InitDirectSubmissionFixture {
device.reset(new MockDevice(executionEnvironment, 0u));
}
void TearDown() {} // NOLINT(readability-identifier-naming)
void tearDown() {}
DebugManagerStateRestore restore;
MockExecutionEnvironment *executionEnvironment;
std::unique_ptr<MockDevice> device;
};
using InitDirectSubmissionTest = TestLegacy<InitDirectSubmissionFixture>;
using InitDirectSubmissionTest = Test<InitDirectSubmissionFixture>;
HWTEST_F(InitDirectSubmissionTest, givenDirectSubmissionControllerEnabledWhenInitDirectSubmissionThenCsrIsRegistered) {
DebugManagerStateRestore restorer;

6
shared/test/unit_test/fixtures/command_container_fixture.h
View File

@@ -63,7 +63,7 @@ class CommandEncodeStatesFixture : public DeviceFixture {
} // namespace NEO
struct WalkerThreadFixture {
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
startWorkGroup[0] = startWorkGroup[1] = startWorkGroup[2] = 0u;
numWorkGroups[0] = numWorkGroups[1] = numWorkGroups[2] = 1u;
workGroupSizes[0] = 32u;
@@ -72,7 +72,7 @@ struct WalkerThreadFixture {
localIdDimensions = 3u;
requiredWorkGroupOrder = 0u;
}
void TearDown() {} // NOLINT(readability-identifier-naming)
void tearDown() {}
uint32_t startWorkGroup[3];
uint32_t numWorkGroups[3];
@@ -82,4 +82,4 @@ struct WalkerThreadFixture {
uint32_t requiredWorkGroupOrder;
};
using WalkerThreadTest = TestLegacy<WalkerThreadFixture>;
using WalkerThreadTest = Test<WalkerThreadFixture>;

6
shared/test/unit_test/memory_manager/address_mapper_tests.cpp
View File

@@ -17,17 +17,17 @@ using namespace NEO;
class AddressMapperFixture {
public:
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
mapper = new AddressMapper();
}
void TearDown() { // NOLINT(readability-identifier-naming)
void tearDown() {
delete mapper;
}
AddressMapper *mapper;
};
typedef TestLegacy<AddressMapperFixture> AddressMapperTests;
using AddressMapperTests = Test<AddressMapperFixture>;
TEST_F(AddressMapperTests, GivenAlignedPointersWhenMappingThenPointersAreAligned) {
uint32_t m1 = mapper->map((void *)0x1000, MemoryConstants::pageSize);

2
shared/test/unit_test/memory_manager/host_ptr_manager_tests.cpp
View File

@@ -832,7 +832,7 @@ TEST_F(HostPtrManagerTest, GivenHostPtrManagerFilledWithFragmentsWhenAskedForOve
EXPECT_NE(nullptr, fragment3);
}
using HostPtrAllocationTest = TestLegacy<MemoryManagerWithCsrFixture>;
using HostPtrAllocationTest = Test<MemoryManagerWithCsrFixture>;
TEST_F(HostPtrAllocationTest, givenTwoAllocationsThatSharesOneFragmentWhenOneIsDestroyedThenFragmentRemains) {

10
shared/test/unit_test/memory_manager/page_table_tests.cpp
View File

@@ -107,11 +107,11 @@ class PageTableFixture {
uint64_t startAddress = 0x1000;
public:
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
startAddress = 0x1000;
}
void TearDown() { // NOLINT(readability-identifier-naming)
void tearDown() {
}
};
@@ -136,9 +136,9 @@ void PageTableEntryChecker::testEntry<MockPDPE>(MockPDPE *pageTable, uint32_t pt
EXPECT_EQ(reinterpret_cast<void *>(expectedValue), pageTable->entries[0]->entries[0]->entries[pteIndex]);
}
typedef TestLegacy<PageTableFixture> PageTableTests32;
typedef TestLegacy<PageTableFixture> PageTableTests48;
typedef TestLegacy<PageTableFixture> PageTableTestsGPU;
using PageTableTests32 = Test<PageTableFixture>;
using PageTableTests48 = Test<PageTableFixture>;
using PageTableTestsGPU = Test<PageTableFixture>;
TEST_F(PageTableTests48, WhenPageTableIsCreatedThenWalkerIsDummy) {
PageTable<void, 0, 9> pt(&allocator);

2
shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp
View File

@@ -20,7 +20,7 @@
using namespace NEO;
using DrmMockBufferObjectFixture = DrmBufferObjectFixture<DrmMockCustom>;
using DrmBufferObjectTest = TestLegacy<DrmMockBufferObjectFixture>;
using DrmBufferObjectTest = Test<DrmMockBufferObjectFixture>;
TEST_F(DrmBufferObjectTest, WhenCallingExecThenReturnIsCorrect) {
mock->ioctl_expected.total = 1;

2
shared/test/unit_test/os_interface/linux/drm_buffer_object_tests_prelim.cpp
View File

@@ -14,7 +14,7 @@
using namespace NEO;
using DrmBufferObjectPrelimFixture = DrmBufferObjectFixture<DrmMockCustomPrelim>;
using DrmBufferObjectPrelimTest = TestLegacy<DrmBufferObjectPrelimFixture>;
using DrmBufferObjectPrelimTest = Test<DrmBufferObjectPrelimFixture>;
TEST_F(DrmBufferObjectPrelimTest, GivenCompletionAddressWhenCallingExecThenReturnIsCorrect) {
mock->ioctl_expected.total = 1;

6
shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp
View File

@@ -28,7 +28,7 @@
using namespace NEO;
struct DrmCommandStreamMultiTileMemExecFixture {
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
DebugManager.flags.CreateMultipleSubDevices.set(2u);
DebugManager.flags.EnableImplicitScaling.set(1);
DebugManager.flags.EnableForcePin.set(false);
@@ -57,7 +57,7 @@ struct DrmCommandStreamMultiTileMemExecFixture {
device.reset(MockDevice::create<MockDevice>(executionEnvironment, 0));
}
void TearDown() { // NOLINT(readability-identifier-naming)
void tearDown() {
executionEnvironment->decRefInternal();
}
@@ -69,7 +69,7 @@ struct DrmCommandStreamMultiTileMemExecFixture {
DrmMemoryManager *memoryManager = nullptr;
};
using DrmCommandStreamMultiTileMemExecTest = TestLegacy<DrmCommandStreamMultiTileMemExecFixture>;
using DrmCommandStreamMultiTileMemExecTest = Test<DrmCommandStreamMultiTileMemExecFixture>;
HWCMDTEST_F(IGFX_XE_HP_CORE, DrmCommandStreamMultiTileMemExecTest, GivenDrmSupportsCompletionFenceAndVmBindWhenCallingCsrExecThenMultipleTagAllocationIsPassed) {
auto *testCsr = new TestedDrmCommandStreamReceiver<FamilyType>(*executionEnvironment, 0, device->getDeviceBitfield());

6
shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp
View File

@@ -86,7 +86,7 @@ TEST(MemoryInfoPrelim, givenNewMemoryInfoQuerySupportedWhenQueryingMemoryInfoThe
}
struct DrmVmTestFixture {
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
executionEnvironment = std::make_unique<ExecutionEnvironment>();
executionEnvironment->prepareRootDeviceEnvironments(1);
executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(NEO::defaultHwInfo.get());
@@ -104,7 +104,7 @@ struct DrmVmTestFixture {
ASSERT_NE(nullptr, drm);
}
void TearDown() {} // NOLINT(readability-identifier-naming)
void tearDown() {}
DebugManagerStateRestore restorer;
std::unique_ptr<ExecutionEnvironment> executionEnvironment;
@@ -115,7 +115,7 @@ struct DrmVmTestFixture {
static constexpr uint8_t tileCount = 4u;
};
using DrmVmTestTest = TestLegacy<DrmVmTestFixture>;
using DrmVmTestTest = Test<DrmVmTestFixture>;
TEST_F(DrmVmTestTest, givenNewMemoryInfoQuerySupportedWhenCreatingVirtualMemoryThenVmCreatedUsingNewRegion) {
DebugManager.flags.EnableLocalMemory.set(1);

6
shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp
View File

@@ -23,7 +23,7 @@ class DrmMemManagerFixture {
void forceLimitedRangeAllocator(uint32_t rootDeviceIndex, uint64_t range) { getGfxPartition(rootDeviceIndex)->init(range, 0, 0, gfxPartitions.size(), true); }
};
void SetUp() { // NOLINT(readability-identifier-naming)
void setUp() {
DebugManagerStateRestore dbgRestorer;
DebugManager.flags.UseExternalAllocatorForSshAndDsh.set(true);
executionEnvironment = std::make_unique<ExecutionEnvironment>();
@@ -34,13 +34,13 @@ class DrmMemManagerFixture {
executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr<DriverModel>(new DrmMock(*executionEnvironment->rootDeviceEnvironments[0])));
memManager = std::unique_ptr<FrontWindowMemManagerMock>(new FrontWindowMemManagerMock(*executionEnvironment));
}
void TearDown() { // NOLINT(readability-identifier-naming)
void tearDown() {
}
std::unique_ptr<FrontWindowMemManagerMock> memManager;
std::unique_ptr<ExecutionEnvironment> executionEnvironment;
};
using DrmFrontWindowPoolAllocatorTests = TestLegacy<DrmMemManagerFixture>;
using DrmFrontWindowPoolAllocatorTests = Test<DrmMemManagerFixture>;
TEST_F(DrmFrontWindowPoolAllocatorTests, givenAllocateInSpecialPoolFlagWhenDrmAllocate32BitGraphicsMemoryThenAllocateAtHeapBegining) {
AllocationData allocData = {};

14
shared/test/unit_test/preamble/preamble_fixture.h
View File

@@ -19,11 +19,11 @@ struct PreambleFixture : public DeviceFixture,
public ::testing::Test {
void SetUp() override {
DeviceFixture::setUp();
HardwareParse::SetUp();
HardwareParse::setUp();
}
void TearDown() override {
HardwareParse::TearDown();
HardwareParse::tearDown();
DeviceFixture::tearDown();
}
};
@@ -35,17 +35,17 @@ class PreambleVfeState : public DeviceFixture,
public:
void SetUp() override {
::testing::Test::SetUp();
LinearStreamFixture::SetUp();
HardwareParse::SetUp();
LinearStreamFixture::setUp();
HardwareParse::setUp();
DeviceFixture::setUp();
testWaTable = &pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->getMutableHardwareInfo()->workaroundTable;
}
void TearDown() override {
DeviceFixture::tearDown();
HardwareParse::TearDown();
LinearStreamFixture::TearDown();
HardwareParse::tearDown();
LinearStreamFixture::tearDown();
::testing::Test::TearDown();
}
WorkaroundTable *testWaTable;
WorkaroundTable *testWaTable = nullptr;
};

6
shared/test/unit_test/xe_hp_core/xe_hp_sdv/test_preamble_xe_hp_sdv.cpp
View File

@@ -19,11 +19,11 @@ using namespace NEO;
struct XeHPSlm : HardwareParse, ::testing::Test {
void SetUp() override {
HardwareParse::SetUp();
HardwareParse::setUp();
}
void TearDown() override {
HardwareParse::TearDown();
HardwareParse::tearDown();
}
uint32_t cmdBuffer[1024]{};
@@ -137,4 +137,4 @@ XEHPTEST_F(XeHPPipelineSelect, WhenProgramPipelineSelectThenProgramMediaSamplerD
EXPECT_TRUE(cmd.getMediaSamplerDopClockGateEnable());
EXPECT_EQ(expectedSubMask, (cmd.getMaskBits() & expectedSubMask));
}
}