From 3d3881e7ad7210685bfaff2980081b265abe728a Mon Sep 17 00:00:00 2001 From: Zbigniew Zdanowicz Date: Thu, 21 Oct 2021 18:23:30 +0000 Subject: [PATCH] Remove not needed virtual function from tests Signed-off-by: Zbigniew Zdanowicz --- .../unit_tests/fixtures/cmdlist_fixture.h | 4 ++-- .../test/unit_tests/fixtures/device_fixture.h | 24 +++++++++---------- .../test/unit_tests/fixtures/module_fixture.h | 16 ++++++------- .../gen12lp/test_device_gen12lp.cpp | 8 ++++--- .../unit_tests/gen9/test_cmdqueue_gen9.cpp | 8 ++++--- .../builtin/builtin_functions_tests.cpp | 9 ++++--- .../linux/test_cache_reservation_impl.cpp | 4 ++-- .../windows/test_cache_reservation_impl.cpp | 4 ++-- .../sources/cmdlist/test_cmdlist_fill.cpp | 22 +++++++++-------- .../unit_tests/sources/event/test_event.cpp | 17 +++++++------ .../unit_tests/sources/kernel/test_kernel.cpp | 8 ++++--- .../unit_tests/sources/module/test_module.cpp | 20 +++++++++------- .../xe_hp_core/test_device_xe_hp_core.cpp | 8 ++++--- .../test/unit_tests/sources/test_cmdlist.cpp | 4 ++-- .../unit_tests/sources/metrics/mock_metric.h | 8 +++---- 15 files changed, 92 insertions(+), 72 deletions(-) diff --git a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h index 3a21c523c3..797e0f8886 100644 --- a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h @@ -17,7 +17,7 @@ namespace ult { class CommandListFixture : public DeviceFixture { public: - void SetUp() override { + void SetUp() { DeviceFixture::SetUp(); ze_result_t returnValue; commandList.reset(whitebox_cast(CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue))); @@ -35,7 +35,7 @@ class CommandListFixture : public DeviceFixture { event = std::unique_ptr(Event::create(eventPool.get(), &eventDesc, device)); } - void TearDown() override { + void TearDown() { DeviceFixture::TearDown(); } diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.h b/level_zero/core/test/unit_tests/fixtures/device_fixture.h index 8022a83abd..80e36c926c 100644 --- a/level_zero/core/test/unit_tests/fixtures/device_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.h @@ -33,8 +33,8 @@ class MockBuiltins; struct DeviceFixture { NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true); - virtual void SetUp(); // NOLINT(readability-identifier-naming) - virtual void TearDown(); // NOLINT(readability-identifier-naming) + void SetUp(); // NOLINT(readability-identifier-naming) + void TearDown(); // NOLINT(readability-identifier-naming) void setupWithExecutionEnvironment(NEO::ExecutionEnvironment &executionEnvironment); std::unique_ptr> driverHandle; @@ -46,8 +46,8 @@ struct DeviceFixture { struct PageFaultDeviceFixture { NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true); - virtual void SetUp(); // NOLINT(readability-identifier-naming) - virtual void TearDown(); // NOLINT(readability-identifier-naming) + void SetUp(); // NOLINT(readability-identifier-naming) + void TearDown(); // NOLINT(readability-identifier-naming) std::unique_ptr> driverHandle; std::unique_ptr mockMemoryManager; @@ -60,8 +60,8 @@ struct PageFaultDeviceFixture { struct MultiDeviceFixture { NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true); - virtual void SetUp(); // NOLINT(readability-identifier-naming) - virtual void TearDown(); // NOLINT(readability-identifier-naming) + void SetUp(); // NOLINT(readability-identifier-naming) + void TearDown(); // NOLINT(readability-identifier-naming) DebugManagerStateRestore restorer; std::unique_ptr> driverHandle; @@ -72,18 +72,18 @@ struct MultiDeviceFixture { }; struct SingleRootMultiSubDeviceFixture : public MultiDeviceFixture { - void SetUp() override; + void SetUp(); L0::Device *device = nullptr; NEO::Device *neoDevice = nullptr; }; struct ContextFixture : DeviceFixture { - void SetUp() override; - void TearDown() override; + void SetUp(); + void TearDown(); }; -struct AubCsrFixture : ContextFixture { +struct AubCsrFixture : public ContextFixture { template void SetUpT() { auto csrCreateFcn = &commandStreamReceiverFactory[IGFX_MAX_CORE + NEO::defaultHwInfo->platform.eRenderCoreFamily]; @@ -96,8 +96,8 @@ struct AubCsrFixture : ContextFixture { ContextFixture::TearDown(); } - void SetUp() override{}; - void TearDown() override{}; + void SetUp() {} + void TearDown() {} std::unique_ptr> variableBackup; }; diff --git a/level_zero/core/test/unit_tests/fixtures/module_fixture.h b/level_zero/core/test/unit_tests/fixtures/module_fixture.h index 4eedaf1c21..3ef53d42ed 100644 --- a/level_zero/core/test/unit_tests/fixtures/module_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/module_fixture.h @@ -136,7 +136,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture { } }; - void SetUp() override { + void SetUp() { auto executionEnvironment = MockDevice::prepareExecutionEnvironment(NEO::defaultHwInfo.get(), 0u); memoryManager = new MockImmutableMemoryManager(*executionEnvironment); executionEnvironment->memoryManager.reset(memoryManager); @@ -179,7 +179,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture { kernel->initialize(&desc); } - void TearDown() override { + void TearDown() { DeviceFixture::TearDown(); } @@ -191,7 +191,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture { }; struct ModuleFixture : public DeviceFixture { - void SetUp() override { + void SetUp() { NEO::MockCompilerEnableGuard mock(true); DeviceFixture::SetUp(); createModuleFromBinary(); @@ -228,7 +228,7 @@ struct ModuleFixture : public DeviceFixture { kernel->initialize(&desc); } - void TearDown() override { + void TearDown() { DeviceFixture::TearDown(); } @@ -240,7 +240,7 @@ struct ModuleFixture : public DeviceFixture { }; struct MultiDeviceModuleFixture : public MultiDeviceFixture { - void SetUp() override { + void SetUp() { MultiDeviceFixture::SetUp(); modules.resize(numRootDevices); } @@ -277,7 +277,7 @@ struct MultiDeviceModuleFixture : public MultiDeviceFixture { kernel->initialize(&desc); } - void TearDown() override { + void TearDown() { MultiDeviceFixture::TearDown(); } @@ -289,14 +289,14 @@ struct MultiDeviceModuleFixture : public MultiDeviceFixture { }; struct ImportHostPointerModuleFixture : public ModuleFixture { - void SetUp() override { + void SetUp() { DebugManager.flags.EnableHostPointerImport.set(1); ModuleFixture::SetUp(); hostPointer = driverHandle->getMemoryManager()->allocateSystemMemory(MemoryConstants::pageSize, MemoryConstants::pageSize); } - void TearDown() override { + void TearDown() { driverHandle->getMemoryManager()->freeSystemMemory(hostPointer); ModuleFixture::TearDown(); } diff --git a/level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp index 3cb582ed71..5ca0f51c40 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp @@ -65,19 +65,21 @@ HWTEST2_F(DeviceQueueGroupTest, EXPECT_EQ(count, 2u); } -class DeviceCopyQueueGroupTest : public DeviceFixture, public ::testing::Test { +class DeviceCopyQueueGroupFixture : public DeviceFixture { public: - void SetUp() override { + void SetUp() { DebugManager.flags.EnableBlitterOperationsSupport.set(0); DeviceFixture::SetUp(); } - void TearDown() override { + void TearDown() { DeviceFixture::TearDown(); } DebugManagerStateRestore restorer; }; +using DeviceCopyQueueGroupTest = Test; + HWTEST2_F(DeviceCopyQueueGroupTest, givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsGen12LP) { const uint32_t rootDeviceIndex = 0u; diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp index ebcdff414b..ec4b51c576 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp @@ -166,8 +166,8 @@ HWTEST2_F(CommandQueueThreadArbitrationPolicyTests, } } -struct CommandQueueGroupMultiDevice : public MultiDeviceFixture, public ::testing::Test { - void SetUp() override { +struct CommandQueueGroupMultiDeviceFixture : public MultiDeviceFixture { + void SetUp() { NEO::MockCompilerEnableGuard mock(true); MultiDeviceFixture::SetUp(); uint32_t count = 1; @@ -177,12 +177,14 @@ struct CommandQueueGroupMultiDevice : public MultiDeviceFixture, public ::testin device = L0::Device::fromHandle(hDevice); ASSERT_NE(nullptr, device); } - void TearDown() override { + void TearDown() { MultiDeviceFixture::TearDown(); } L0::Device *device = nullptr; }; +using CommandQueueGroupMultiDevice = Test; + HWTEST2_F(CommandQueueGroupMultiDevice, givenCommandQueuePropertiesCallThenCallSucceedsAndCommandListImmediateIsCreated, IsGen9) { uint32_t count = 0; diff --git a/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp b/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp index a1dfbc3b97..611f180532 100644 --- a/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp +++ b/level_zero/core/test/unit_tests/sources/builtin/builtin_functions_tests.cpp @@ -24,7 +24,7 @@ namespace L0 { namespace ult { template -class TestBuiltinFunctionsLibImpl : public DeviceFixture, public testing::Test { +class BuiltinFunctionsLibFixture : public DeviceFixture { public: struct MockBuiltinFunctionsLibImpl : BuiltinFunctionsLibImpl { using BuiltinFunctionsLibImpl::builtins; @@ -68,12 +68,12 @@ class TestBuiltinFunctionsLibImpl : public DeviceFixture, public testing::Test { module.release(); } }; - void SetUp() override { + void SetUp() { DeviceFixture::SetUp(); mockDevicePtr = std::unique_ptr>(new MockDeviceForSpv(device->getNEODevice(), device->getNEODevice()->getExecutionEnvironment(), driverHandle.get())); mockBuiltinFunctionsLibImpl.reset(new MockBuiltinFunctionsLibImpl(mockDevicePtr.get(), neoDevice->getBuiltIns())); } - void TearDown() override { + void TearDown() { mockBuiltinFunctionsLibImpl.reset(); DeviceFixture::TearDown(); } @@ -82,6 +82,9 @@ class TestBuiltinFunctionsLibImpl : public DeviceFixture, public testing::Test { std::unique_ptr> mockDevicePtr; }; +template +using TestBuiltinFunctionsLibImpl = Test>; + class TestBuiltinFunctionsLibImplDefault : public TestBuiltinFunctionsLibImpl {}; class TestBuiltinFunctionsLibImplStateless : public TestBuiltinFunctionsLibImpl {}; class TestBuiltinFunctionsLibImplImages : public TestBuiltinFunctionsLibImpl {}; diff --git a/level_zero/core/test/unit_tests/sources/cache/linux/test_cache_reservation_impl.cpp b/level_zero/core/test/unit_tests/sources/cache/linux/test_cache_reservation_impl.cpp index 5f549c771a..9be36e4b2e 100644 --- a/level_zero/core/test/unit_tests/sources/cache/linux/test_cache_reservation_impl.cpp +++ b/level_zero/core/test/unit_tests/sources/cache/linux/test_cache_reservation_impl.cpp @@ -17,14 +17,14 @@ namespace ult { class CacheReservationFixture : public DeviceFixture { public: - void SetUp() override { + void SetUp() { DeviceFixture::SetUp(); auto deviceImp = static_cast(device); ASSERT_NE(nullptr, deviceImp->cacheReservation.get()); cache = deviceImp->cacheReservation.get(); } - void TearDown() override { + void TearDown() { DeviceFixture::TearDown(); } CacheReservation *cache = nullptr; diff --git a/level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp b/level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp index 5c11bd06dc..b88f6cb3a1 100644 --- a/level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp +++ b/level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp @@ -17,13 +17,13 @@ namespace ult { class CacheReservationFixture : public DeviceFixture { public: - void SetUp() override { + void SetUp() { DeviceFixture::SetUp(); auto deviceImp = static_cast(device); ASSERT_NE(nullptr, deviceImp->cacheReservation.get()); cache = deviceImp->cacheReservation.get(); } - void TearDown() override { + void TearDown() { DeviceFixture::TearDown(); } CacheReservation *cache = nullptr; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp index dbfadc3c81..57f9cf10c8 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp @@ -21,7 +21,7 @@ namespace L0 { namespace ult { -class AppendFillFixture : public DeviceFixture, public ::testing::Test { +class AppendFillFixture : public DeviceFixture { public: class MockDriverFillHandle : public L0::DriverHandleImp { public: @@ -68,7 +68,7 @@ class AppendFillFixture : public DeviceFixture, public ::testing::Test { uint32_t numberOfCallsToAppendLaunchKernelWithParams = 0; }; - void SetUp() override { + void SetUp() { dstPtr = new uint8_t[allocSize]; immediateDstPtr = new uint8_t[allocSize]; @@ -82,7 +82,7 @@ class AppendFillFixture : public DeviceFixture, public ::testing::Test { device = driverHandle->devices[0]; } - void TearDown() override { + void TearDown() { delete[] immediateDstPtr; delete[] dstPtr; } @@ -100,9 +100,11 @@ class AppendFillFixture : public DeviceFixture, public ::testing::Test { uint8_t *immediateDstPtr = nullptr; }; +using AppendFillTest = Test; + using Platforms = IsAtLeastProduct; -HWTEST2_F(AppendFillFixture, +HWTEST2_F(AppendFillTest, givenCallToAppendMemoryFillWithImmediateValueThenSuccessIsReturned, Platforms) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -115,7 +117,7 @@ HWTEST2_F(AppendFillFixture, EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(AppendFillFixture, +HWTEST2_F(AppendFillTest, givenCallToAppendMemoryFillThenSuccessIsReturned, Platforms) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -126,7 +128,7 @@ HWTEST2_F(AppendFillFixture, EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(AppendFillFixture, +HWTEST2_F(AppendFillTest, givenCallToAppendMemoryFillWithAppendLaunchKernelFailureThenSuccessIsNotReturned, Platforms) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -138,7 +140,7 @@ HWTEST2_F(AppendFillFixture, EXPECT_NE(ZE_RESULT_SUCCESS, result); } -HWTEST2_F(AppendFillFixture, +HWTEST2_F(AppendFillTest, givenTwoCallsToAppendMemoryFillWithSamePatternThenAllocationIsCreatedForEachCall, Platforms) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -160,7 +162,7 @@ HWTEST2_F(AppendFillFixture, delete[] newDstPtr; } -HWTEST2_F(AppendFillFixture, +HWTEST2_F(AppendFillTest, givenTwoCallsToAppendMemoryFillWithDifferentPatternsThenAllocationIsCreatedForEachPattern, Platforms) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -180,7 +182,7 @@ HWTEST2_F(AppendFillFixture, EXPECT_EQ(patternAllocationsVectorSize + 1u, newPatternAllocationsVectorSize); } -HWTEST2_F(AppendFillFixture, +HWTEST2_F(AppendFillTest, givenCallToAppendMemoryFillWithSizeNotMultipleOfPatternSizeThenSuccessIsReturned, Platforms) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -195,7 +197,7 @@ HWTEST2_F(AppendFillFixture, delete[] nonMultipleDstPtr; } -HWTEST2_F(AppendFillFixture, +HWTEST2_F(AppendFillTest, givenCallToAppendMemoryFillWithSizeNotMultipleOfPatternSizeAndAppendLaunchKernelFailureOnRemainderThenSuccessIsNotReturned, Platforms) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; diff --git a/level_zero/core/test/unit_tests/sources/event/test_event.cpp b/level_zero/core/test/unit_tests/sources/event/test_event.cpp index 8680da5ae7..af169830f0 100644 --- a/level_zero/core/test/unit_tests/sources/event/test_event.cpp +++ b/level_zero/core/test/unit_tests/sources/event/test_event.cpp @@ -1186,17 +1186,16 @@ TEST_F(EventPoolCreateNegativeTest, whenInitializingEventPoolButMemoryManagerFai delete[] devices; } -class EventTests : public DeviceFixture, - public testing::Test { +class EventFixture : public DeviceFixture { public: - void SetUp() override { + void SetUp() { DeviceFixture::SetUp(); auto hDevice = device->toHandle(); eventPool = whitebox_cast(EventPool::create(device->getDriverHandle(), context, 1, &hDevice, &eventPoolDesc)); } - void TearDown() override { + void TearDown() { eventPool->destroy(); DeviceFixture::TearDown(); @@ -1212,6 +1211,8 @@ class EventTests : public DeviceFixture, EventPool *eventPool; }; +using EventTests = Test; + TEST_F(EventTests, WhenQueryingStatusThenSuccessIsReturned) { auto event = whitebox_cast(Event::create(eventPool, &eventDesc, device)); ASSERT_NE(event, nullptr); @@ -1269,13 +1270,13 @@ TEST_F(EventTests, givenTwoEventsCreatedThenTheyHaveDifferentAddresses) { event1->destroy(); } -struct EventSizeTests : public DeviceFixture, public testing::Test { - void SetUp() override { +struct EventSizeFixture : public DeviceFixture { + void SetUp() { DeviceFixture::SetUp(); hDevice = device->toHandle(); } - void TearDown() override { + void TearDown() { DeviceFixture::TearDown(); } @@ -1311,6 +1312,8 @@ struct EventSizeTests : public DeviceFixture, public testing::Test { std::unique_ptr eventObj1; }; +using EventSizeTests = Test; + HWTEST_F(EventSizeTests, whenCreatingEventPoolThenUseCorrectSizeAndAlignment) { eventPool.reset(static_cast(EventPool::create(device->getDriverHandle(), context, 1, &hDevice, &eventPoolDesc))); diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp index 3541335baa..e9e0e27640 100644 --- a/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp +++ b/level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp @@ -271,17 +271,19 @@ HWTEST2_F(SetKernelArg, givenBufferArgumentWhichHasNotBeenAllocatedByRuntimeThen EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, res); } -class KernelImmutableDataTests : public ModuleImmutableDataFixture, public ::testing::Test { +class KernelImmutableDataFixture : public ModuleImmutableDataFixture { public: - void SetUp() override { + void SetUp() { ModuleImmutableDataFixture::SetUp(); } - void TearDown() override { + void TearDown() { ModuleImmutableDataFixture::TearDown(); } }; +using KernelImmutableDataTests = Test; + TEST_F(KernelImmutableDataTests, givenKernelInitializedWithNoPrivateMemoryThenPrivateMemoryIsNull) { uint32_t perHwThreadPrivateMemorySizeRequested = 0u; bool isInternal = false; diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp index 2f9ae569e9..c40e3ec905 100644 --- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp +++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp @@ -477,10 +477,10 @@ HWTEST_F(ModuleTest, GivenIncorrectNameWhenCreatingKernelThenResultErrorInvalidA EXPECT_EQ(ZE_RESULT_ERROR_INVALID_KERNEL_NAME, res); } + template -struct ModuleSpecConstantsTests : public DeviceFixture, - public ::testing::Test { - void SetUp() override { +struct ModuleSpecConstantsFixture : public DeviceFixture { + void SetUp() { DeviceFixture::SetUp(); mockCompiler = new MockCompilerInterfaceWithSpecConstants(moduleNumSpecConstants); @@ -490,7 +490,7 @@ struct ModuleSpecConstantsTests : public DeviceFixture, mockTranslationUnit = new MockModuleTranslationUnit(device); } - void TearDown() override { + void TearDown() { DeviceFixture::TearDown(); } @@ -600,6 +600,9 @@ struct ModuleSpecConstantsTests : public DeviceFixture, MockModuleTranslationUnit *mockTranslationUnit; }; +template +using ModuleSpecConstantsTests = Test>; + using ModuleSpecConstantsLongTests = ModuleSpecConstantsTests; TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWithLongSizeInDescriptorThenModuleCorrectlyPassesThemToTheCompiler) { runTest(); @@ -763,13 +766,12 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler module->destroy(); } -struct ModuleStaticLinkTests : public DeviceFixture, - public ::testing::Test { - void SetUp() override { +struct ModuleStaticLinkFixture : public DeviceFixture { + void SetUp() { DeviceFixture::SetUp(); } - void TearDown() override { + void TearDown() { DeviceFixture::TearDown(); } @@ -892,6 +894,8 @@ struct ModuleStaticLinkTests : public DeviceFixture, ze_module_program_exp_desc_t staticLinkModuleDesc = {ZE_STRUCTURE_TYPE_MODULE_PROGRAM_EXP_DESC}; }; +using ModuleStaticLinkTests = Test; + TEST_F(ModuleStaticLinkTests, givenMultipleModulesProvidedForSpirVStaticLinkAndCompilerFailsThenFailureIsReturned) { runLinkFailureTest(); } diff --git a/level_zero/core/test/unit_tests/xe_hp_core/test_device_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_device_xe_hp_core.cpp index 58905e00f4..2fec86c462 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_device_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_device_xe_hp_core.cpp @@ -93,19 +93,21 @@ HWTEST2_F(DeviceQueueGroupTest, givenBlitterSupportAndCCSThenThreeQueueGroupsAre } } -class DeviceCopyQueueGroupTest : public DeviceFixture, public ::testing::Test { +class DeviceCopyQueueGroupFixture : public DeviceFixture { public: - void SetUp() override { + void SetUp() { DebugManager.flags.EnableBlitterOperationsSupport.set(0); DeviceFixture::SetUp(); } - void TearDown() override { + void TearDown() { DeviceFixture::TearDown(); } DebugManagerStateRestore restorer; }; +using DeviceCopyQueueGroupTest = Test; + HWTEST2_F(DeviceCopyQueueGroupTest, givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsXeHpCore) { const uint32_t rootDeviceIndex = 0u; diff --git a/level_zero/experimental/test/unit_tests/sources/test_cmdlist.cpp b/level_zero/experimental/test/unit_tests/sources/test_cmdlist.cpp index 4d818e7182..b15ae0065b 100644 --- a/level_zero/experimental/test/unit_tests/sources/test_cmdlist.cpp +++ b/level_zero/experimental/test/unit_tests/sources/test_cmdlist.cpp @@ -29,7 +29,7 @@ using ::testing::Return; class CommandListMemoryExtensionFixture : public DeviceFixture { public: - void SetUp() override { + void SetUp() { DeviceFixture::SetUp(); ze_result_t returnValue; commandList.reset(whitebox_cast(CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue))); @@ -56,7 +56,7 @@ class CommandListMemoryExtensionFixture : public DeviceFixture { EXPECT_NE(nullptr, ptr); } - void TearDown() override { + void TearDown() { context->freeMem(ptr); DeviceFixture::TearDown(); } diff --git a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h index e762bb9bda..65c7cf067c 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h +++ b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric.h @@ -147,8 +147,8 @@ struct Mock : public MetricQuery { class MetricContextFixture : public ContextFixture { protected: - void SetUp() override; - void TearDown() override; + void SetUp(); + void TearDown(); void openMetricsAdapter(); void openMetricsAdapterGroup(); @@ -171,8 +171,8 @@ class MetricContextFixture : public ContextFixture { class MetricMultiDeviceFixture : public MultiDeviceFixture { protected: - void SetUp() override; - void TearDown() override; + void SetUp(); + void TearDown(); void openMetricsAdapter(); void openMetricsAdapterSubDevice(uint32_t subDeviceIndex); void openMetricsAdapterGroup();