From ab76a396916fc51823135a2ceb30243782493107 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Fri, 12 Aug 2022 14:00:54 +0000 Subject: [PATCH] Correct L0 fixture methods name to meet clang-tidy requirements Signed-off-by: Mateusz Jablonski --- .../test/aub_tests/aub_hello_world_test.cpp | 2 +- .../bindless/bindless_kernel_aub_tests.cpp | 6 ++--- .../append_kernel_indirect_aub_tests.cpp | 2 +- .../aub_tests/debugger/debugger_aub_tests.cpp | 6 ++--- .../test/aub_tests/fixtures/aub_fixture.cpp | 8 +++---- .../test/aub_tests/fixtures/aub_fixture.h | 6 ++--- .../fixtures/host_pointer_manager_fixture.h | 20 ++++++++-------- .../linux/test_cache_reservation_impl.cpp | 6 ++--- .../windows/test_cache_reservation_impl.cpp | 6 ++--- .../sources/cmdlist/test_cmdlist_4.cpp | 2 +- .../cmdlist/test_cmdlist_memory_extension.cpp | 8 +++---- .../sources/context/test_context.cpp | 2 +- .../debugger/active_debugger_fixture.h | 4 ++-- .../sources/debugger/l0_debugger_fixture.h | 24 +++++++++---------- .../debugger/linux/test_l0_debugger_linux.cpp | 14 +++++------ .../sources/debugger/test_l0_debugger_1.cpp | 4 ++-- .../test_l0_debugger_sba_tracking.cpp | 10 ++++---- .../debugger/test_module_with_debug.cpp | 8 +++---- .../debugger/test_source_level_debugger.cpp | 10 ++++---- .../windows/test_l0_debugger_windows.cpp | 6 ++--- .../driver/host_pointer_manager_tests.cpp | 6 ++--- .../unit_tests/sources/driver/test_driver.cpp | 10 ++++---- .../sources/tracing/test_api_tracing_common.h | 16 ++++++------- .../test_cmdqueue_debugger_xe_hp_core.cpp | 4 ++-- .../sources/debug/debug_session_tests.cpp | 6 ++--- .../debug/windows/test_debug_api_windows.cpp | 8 +++---- .../sysman/windows/test_sysman_manager.cpp | 4 ++-- 27 files changed, 104 insertions(+), 104 deletions(-) diff --git a/level_zero/core/test/aub_tests/aub_hello_world_test.cpp b/level_zero/core/test/aub_tests/aub_hello_world_test.cpp index 9c8b44a194..2b7b96cdb3 100644 --- a/level_zero/core/test/aub_tests/aub_hello_world_test.cpp +++ b/level_zero/core/test/aub_tests/aub_hello_world_test.cpp @@ -18,7 +18,7 @@ namespace L0 { namespace ult { -using AUBHelloWorldL0 = TestLegacy; +using AUBHelloWorldL0 = Test; TEST_F(AUBHelloWorldL0, whenAppendMemoryCopyIsCalledThenMemoryIsProperlyCopied) { uint8_t size = 8; uint8_t val = 255; diff --git a/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp b/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp index 7f60de4def..00f54b44d4 100644 --- a/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp @@ -22,17 +22,17 @@ namespace L0 { namespace ult { -struct L0BindlessAub : TestLegacy { +struct L0BindlessAub : Test { void SetUp() override { DebugManager.flags.UseBindlessMode.set(1); DebugManager.flags.UseExternalAllocatorForSshAndDsh.set(1); - AUBFixtureL0::SetUp(); + AUBFixtureL0::setUp(); } void TearDown() override { module->destroy(); - AUBFixtureL0::TearDown(); + AUBFixtureL0::tearDown(); } void createModuleFromFile(const std::string &fileName, ze_context_handle_t context, L0::Device *device) { diff --git a/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp b/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp index a3de1ed387..9e4c3f788c 100644 --- a/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp @@ -19,7 +19,7 @@ namespace L0 { namespace ult { -struct AUBAppendKernelIndirectL0 : TestLegacy { +struct AUBAppendKernelIndirectL0 : Test { static ze_module_handle_t createModuleFromFile(const std::string &fileName, ze_context_handle_t context, ze_device_handle_t device) { ze_module_handle_t moduleHandle; diff --git a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp index bde455ce03..0ed3c3cdd3 100644 --- a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp @@ -28,15 +28,15 @@ namespace L0 { namespace ult { -struct DebuggerAub : TestLegacy { +struct DebuggerAub : Test { void SetUp() override { - AUBFixtureL0::SetUp(NEO::defaultHwInfo.get(), true); + AUBFixtureL0::setUp(NEO::defaultHwInfo.get(), true); } void TearDown() override { module->destroy(); - AUBFixtureL0::TearDown(); + AUBFixtureL0::tearDown(); } void createModuleFromFile(const std::string &fileName, ze_context_handle_t context, L0::Device *device) { diff --git a/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp b/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp index fab5567c71..091b8a3e71 100644 --- a/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp +++ b/level_zero/core/test/aub_tests/fixtures/aub_fixture.cpp @@ -33,10 +33,10 @@ void AUBFixtureL0::prepareCopyEngines(NEO::MockDevice &device, const std::string } } -void AUBFixtureL0::SetUp() { - SetUp(NEO::defaultHwInfo.get(), false); +void AUBFixtureL0::setUp() { + setUp(NEO::defaultHwInfo.get(), false); } -void AUBFixtureL0::SetUp(const NEO::HardwareInfo *hardwareInfo, bool debuggingEnabled) { +void AUBFixtureL0::setUp(const NEO::HardwareInfo *hardwareInfo, bool debuggingEnabled) { ASSERT_NE(nullptr, hardwareInfo); const auto &hwInfo = *hardwareInfo; @@ -92,7 +92,7 @@ void AUBFixtureL0::SetUp(const NEO::HardwareInfo *hardwareInfo, bool debuggingEn pCmdq = CommandQueue::create(hwInfo.platform.eProductFamily, device, csr, &queueDesc, false, false, returnValue); EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -void AUBFixtureL0::TearDown() { +void AUBFixtureL0::tearDown() { context->destroy(); pCmdq->destroy(); } diff --git a/level_zero/core/test/aub_tests/fixtures/aub_fixture.h b/level_zero/core/test/aub_tests/fixtures/aub_fixture.h index fa5a6e6f18..2603b946fd 100644 --- a/level_zero/core/test/aub_tests/fixtures/aub_fixture.h +++ b/level_zero/core/test/aub_tests/fixtures/aub_fixture.h @@ -43,9 +43,9 @@ class AUBFixtureL0 { public: AUBFixtureL0(); virtual ~AUBFixtureL0(); - void SetUp(); // NOLINT(readability-identifier-naming) - void SetUp(const NEO::HardwareInfo *hardwareInfo, bool debuggingEnabled); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void setUp(const NEO::HardwareInfo *hardwareInfo, bool debuggingEnabled); + void tearDown(); static void prepareCopyEngines(NEO::MockDevice &device, const std::string &filename); template diff --git a/level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h b/level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h index 0518dcaa6f..2600b03189 100644 --- a/level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h @@ -25,7 +25,7 @@ namespace L0 { namespace ult { struct HostPointerManagerFixure { - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { NEO::MockCompilerEnableGuard mock(true); NEO::DeviceVector devices; neoDevice = NEO::MockDevice::createWithNewExecutionEnvironment(NEO::defaultHwInfo.get()); @@ -51,7 +51,7 @@ struct HostPointerManagerFixure { context = L0::Context::fromHandle(hContext); } - void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { context->destroy(); hostDriverHandle->getMemoryManager()->freeSystemMemory(heapPointer); @@ -72,26 +72,26 @@ struct HostPointerManagerFixure { }; struct ForceDisabledHostPointerManagerFixure : public HostPointerManagerFixure { - void SetUp() { + void setUp() { DebugManager.flags.EnableHostPointerImport.set(0); - HostPointerManagerFixure::SetUp(); + HostPointerManagerFixure::setUp(); } - void TearDown() { - HostPointerManagerFixure::TearDown(); + void tearDown() { + HostPointerManagerFixure::tearDown(); } }; struct ForceEnabledHostPointerManagerFixure : public HostPointerManagerFixure { - void SetUp() { + void setUp() { DebugManager.flags.EnableHostPointerImport.set(1); - HostPointerManagerFixure::SetUp(); + HostPointerManagerFixure::setUp(); } - void TearDown() { - HostPointerManagerFixure::TearDown(); + void tearDown() { + HostPointerManagerFixure::tearDown(); } }; 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 2b4e0ad8ff..3b5728af2b 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,20 +17,20 @@ namespace ult { class CacheReservationFixture : public DeviceFixture { public: - void SetUp() { + void setUp() { DeviceFixture::setUp(); auto deviceImp = static_cast(device); ASSERT_NE(nullptr, deviceImp->cacheReservation.get()); cache = deviceImp->cacheReservation.get(); } - void TearDown() { + void tearDown() { DeviceFixture::tearDown(); } CacheReservation *cache = nullptr; }; -using CacheReservationTest = TestLegacy; +using CacheReservationTest = Test; TEST_F(CacheReservationTest, GivenCacheReservationCreatedWhenCallingReserveCacheThenReturnFalse) { size_t cacheLevel = 3; 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 37740651c7..89b7f77be9 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,19 +17,19 @@ namespace ult { class CacheReservationFixture : public DeviceFixture { public: - void SetUp() { + void setUp() { DeviceFixture::setUp(); auto deviceImp = static_cast(device); ASSERT_NE(nullptr, deviceImp->cacheReservation.get()); cache = deviceImp->cacheReservation.get(); } - void TearDown() { + void tearDown() { DeviceFixture::tearDown(); } CacheReservation *cache = nullptr; }; -using CacheReservationTest = TestLegacy; +using CacheReservationTest = Test; TEST_F(CacheReservationTest, GivenCacheReservationCreatedWhenCallingReserveCacheThenReturnFalse) { size_t cacheLevel = 3; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp index 3154280e7d..2b2ac174ab 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_4.cpp @@ -720,7 +720,7 @@ HWTEST2_F(CommandListCreate, whenCommandListIsCreatedThenFlagsAreCorrectlySet, I } } -using HostPointerManagerCommandListTest = TestLegacy; +using HostPointerManagerCommandListTest = Test; HWTEST2_F(HostPointerManagerCommandListTest, givenImportedHostPointerWhenAppendMemoryFillUsingHostPointerThenAppendFillUsingHostPointerAllocation, IsAtLeastSkl) { diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp index d91eeff1b9..8dfa4e34cc 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp @@ -25,7 +25,7 @@ namespace ult { class CommandListMemoryExtensionFixture : public DeviceFixture { public: - void SetUp() { + void setUp() { DeviceFixture::setUp(); ze_result_t returnValue; commandList.reset(whiteboxCast(CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue))); @@ -52,7 +52,7 @@ class CommandListMemoryExtensionFixture : public DeviceFixture { EXPECT_NE(nullptr, ptr); } - void TearDown() { + void tearDown() { context->freeMem(ptr); event.reset(nullptr); eventPool.reset(nullptr); @@ -67,7 +67,7 @@ class CommandListMemoryExtensionFixture : public DeviceFixture { void *ptr = nullptr; }; -using CommandListAppendWaitOnMemExtension = TestLegacy; +using CommandListAppendWaitOnMemExtension = Test; TEST_F(CommandListAppendWaitOnMemExtension, givenAppendWaitOnMemReturnsUnsupported) { ze_result_t result = ZE_RESULT_SUCCESS; @@ -76,7 +76,7 @@ TEST_F(CommandListAppendWaitOnMemExtension, givenAppendWaitOnMemReturnsUnsupport EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result); } -using CommandListAppendWriteToMemExtension = TestLegacy; +using CommandListAppendWriteToMemExtension = Test; TEST_F(CommandListAppendWriteToMemExtension, givenAppendWriteToMemReturnsUnsupported) { ze_result_t result = ZE_RESULT_SUCCESS; diff --git a/level_zero/core/test/unit_tests/sources/context/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/test_context.cpp index 93e1610fe8..97975f0480 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context.cpp @@ -326,7 +326,7 @@ TEST_F(ContextTest, whenCreatingAndDestroyingContextThenSuccessIsReturned) { EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -using ContextMakeMemoryResidentTests = TestLegacy; +using ContextMakeMemoryResidentTests = Test; TEST_F(ContextMakeMemoryResidentTests, givenUknownPointerPassedToMakeMemoryResidentThenInvalidArgumentIsReturned) { diff --git a/level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h b/level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h index f46358154b..c18aa21704 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h +++ b/level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h @@ -27,7 +27,7 @@ namespace L0 { namespace ult { struct ActiveDebuggerFixture { - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { NEO::MockCompilerEnableGuard mock(true); ze_result_t returnValue; auto executionEnvironment = new NEO::ExecutionEnvironment(); @@ -67,7 +67,7 @@ struct ActiveDebuggerFixture { deviceL0 = L0::Device::fromHandle(hDevice); ASSERT_NE(nullptr, deviceL0); } - void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { L0::GlobalDriver = nullptr; } diff --git a/level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h b/level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h index 39aaa7a961..790ea8cdc4 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h +++ b/level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h @@ -21,7 +21,7 @@ namespace L0 { namespace ult { struct L0DebuggerFixture { - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { NEO::MockCompilerEnableGuard mock(true); auto executionEnvironment = new NEO::ExecutionEnvironment(); auto mockBuiltIns = new NEO::MockBuiltins(); @@ -54,7 +54,7 @@ struct L0DebuggerFixture { device = driverHandle->devices[0]; } - void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { } std::unique_ptr> driverHandle; @@ -68,14 +68,14 @@ struct L0DebuggerFixture { }; struct L0DebuggerHwFixture : public L0DebuggerFixture { - void SetUp() { - L0DebuggerFixture::SetUp(); + void setUp() { + L0DebuggerFixture::setUp(); debuggerHw = static_cast(neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[neoDevice->getRootDeviceIndex()]->debugger.get()); neoDevice->setPreemptionMode(PreemptionMode::Disabled); } - void TearDown() { - L0DebuggerFixture::TearDown(); + void tearDown() { + L0DebuggerFixture::tearDown(); debuggerHw = nullptr; } template @@ -86,12 +86,12 @@ struct L0DebuggerHwFixture : public L0DebuggerFixture { }; struct L0DebuggerPerContextAddressSpaceFixture : public L0DebuggerHwFixture { - void SetUp() { + void setUp() { NEO::DebugManager.flags.DebuggerForceSbaTrackingMode.set(0); - L0DebuggerHwFixture::SetUp(); + L0DebuggerHwFixture::setUp(); } - void TearDown() { - L0DebuggerHwFixture::TearDown(); + void tearDown() { + L0DebuggerHwFixture::tearDown(); } DebugManagerStateRestore restorer; }; @@ -99,10 +99,10 @@ struct L0DebuggerPerContextAddressSpaceFixture : public L0DebuggerHwFixture { struct L0DebuggerHwParameterizedFixture : ::testing::TestWithParam, public L0DebuggerHwFixture { void SetUp() override { NEO::DebugManager.flags.DebuggerForceSbaTrackingMode.set(GetParam()); - L0DebuggerHwFixture::SetUp(); + L0DebuggerHwFixture::setUp(); } void TearDown() override { - L0DebuggerHwFixture::TearDown(); + L0DebuggerHwFixture::tearDown(); } DebugManagerStateRestore restorer; }; diff --git a/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp b/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp index 7bdf8fbdf1..d610aaa275 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp @@ -28,7 +28,7 @@ namespace ult { struct L0DebuggerLinuxFixture { - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { setUp(nullptr); } @@ -56,7 +56,7 @@ struct L0DebuggerLinuxFixture { device = driverHandle->devices[0]; } - void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { drmMock = nullptr; device = nullptr; neoDevice = nullptr; @@ -70,7 +70,7 @@ struct L0DebuggerLinuxFixture { struct L0DebuggerLinuxMultitileFixture : public L0DebuggerLinuxFixture { - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { DebugManager.flags.CreateMultipleRootDevices.set(1); constexpr auto numSubDevices = 2u; @@ -89,8 +89,8 @@ struct L0DebuggerLinuxMultitileFixture : public L0DebuggerLinuxFixture { subDevice1 = neoDevice->getSubDevice(1)->getSpecializedDevice(); } - void TearDown() { // NOLINT(readability-identifier-naming) - L0DebuggerLinuxFixture::TearDown(); + void tearDown() { + L0DebuggerLinuxFixture::tearDown(); } DebugManagerStateRestore restorer; @@ -99,8 +99,8 @@ struct L0DebuggerLinuxMultitileFixture : public L0DebuggerLinuxFixture { L0::Device *subDevice1 = nullptr; }; -using L0DebuggerLinuxTest = TestLegacy; -using L0DebuggerLinuxMultitileTest = TestLegacy; +using L0DebuggerLinuxTest = Test; +using L0DebuggerLinuxMultitileTest = Test; TEST_F(L0DebuggerLinuxTest, givenProgramDebuggingEnabledWhenDriverHandleIsCreatedThenItAllocatesL0Debugger) { EXPECT_NE(nullptr, neoDevice->getDebugger()); diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp index d5449d02b7..ab7ee4d290 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp @@ -21,7 +21,7 @@ namespace L0 { namespace ult { -using L0DebuggerTest = TestLegacy; +using L0DebuggerTest = Test; using L0DebuggerParameterizedTests = L0DebuggerHwParameterizedFixture; TEST_F(L0DebuggerTest, givenL0DebuggerWhenCallingIsLegacyThenFalseIsReturned) { @@ -75,7 +75,7 @@ TEST_F(L0DebuggerTest, givenProgramDebuggingEnabledWhenDebuggerIsCreatedThenComp EXPECT_FALSE(neoDevice->getHardwareInfo().capabilityTable.ftrRenderCompressedImages); } -using L0DebuggerPerContextAddressSpaceTest = TestLegacy; +using L0DebuggerPerContextAddressSpaceTest = Test; HWTEST_F(L0DebuggerPerContextAddressSpaceTest, givenDebuggingEnabledWhenCommandListIsExecutedThenValidKernelDebugCommandsAreAdded) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; using STATE_SIP = typename FamilyType::STATE_SIP; diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp index eebac7a45f..35388466f6 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_sba_tracking.cpp @@ -32,9 +32,9 @@ struct PerContextAddressSpaceFixture : public Test { DebugManagerStateRestore restorer; }; -using L0DebuggerPerContextAddressSpaceTest = TestLegacy; +using L0DebuggerPerContextAddressSpaceTest = Test; -using L0DebuggerTest = TestLegacy; +using L0DebuggerTest = Test; using L0DebuggerParameterizedTests = L0DebuggerHwParameterizedFixture; @@ -332,14 +332,14 @@ HWTEST2_F(L0DebuggerTest, givenDebuggingEnabledWhenCommandListIsExecutedThenSbaB INSTANTIATE_TEST_CASE_P(SBAModesForDebugger, L0DebuggerParameterizedTests, ::testing::Values(0, 1)); -struct L0DebuggerSingleAddressSpace : public TestLegacy { +struct L0DebuggerSingleAddressSpace : public Test { void SetUp() override { NEO::DebugManager.flags.DebuggerForceSbaTrackingMode.set(1); - TestLegacy::SetUp(); + Test::SetUp(); } void TearDown() override { - TestLegacy::TearDown(); + Test::TearDown(); } DebugManagerStateRestore restorer; diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp index 68471858da..2c9194fc3e 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp @@ -25,7 +25,7 @@ namespace L0 { namespace ult { -using DeviceWithDebuggerEnabledTest = TestLegacy; +using DeviceWithDebuggerEnabledTest = Test; TEST_F(DeviceWithDebuggerEnabledTest, givenDebuggingEnabledWhenModuleIsCreatedThenDebugOptionsAreUsed) { NEO::MockCompilerEnableGuard mock(true); auto cip = new NEO::MockCompilerInterfaceCaptureBuildOptions(); @@ -376,7 +376,7 @@ HWTEST_F(KernelDebugSurfaceTest, givenDebuggerAndBindfulKernelWhenAppendingKerne EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_TYPE_SURFTYPE_BUFFER, debugSurfaceState->getSurfaceType()); } -using ModuleWithDebuggerL0Test = TestLegacy; +using ModuleWithDebuggerL0Test = Test; TEST_F(ModuleWithDebuggerL0Test, givenDebuggingEnabledWhenModuleIsCreatedThenDebugOptionsAreNotUsed) { NEO::MockCompilerEnableGuard mock(true); auto cip = new NEO::MockCompilerInterfaceCaptureBuildOptions(); @@ -401,7 +401,7 @@ TEST_F(ModuleWithDebuggerL0Test, givenDebuggingEnabledWhenModuleIsCreatedThenDeb EXPECT_FALSE(CompilerOptions::contains(cip->buildOptions, L0::BuildOptions::optDisable)); } -using KernelInitializeTest = TestLegacy; +using KernelInitializeTest = Test; TEST_F(KernelInitializeTest, givenDebuggingEnabledWhenKernelsAreInitializedThenAllocationsAreNotResidentAndNotCopied) { uint32_t kernelHeap = 0xDEAD; @@ -549,7 +549,7 @@ HWTEST_F(ModuleWithDebuggerL0Test, GivenNoDebugDataWhenInitializingModuleThenDoN EXPECT_EQ(0u, getMockDebuggerL0Hw()->notifyModuleCreateCount); } -using ModuleWithZebinAndL0DebuggerTest = TestLegacy; +using ModuleWithZebinAndL0DebuggerTest = Test; HWTEST_F(ModuleWithZebinAndL0DebuggerTest, GivenZebinDebugDataWhenInitializingModuleThenRegisterElfAndNotifyModuleCreate) { NEO::MockCompilerEnableGuard mock(true); diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp index 4a92c19f50..45bc8a410b 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp @@ -25,7 +25,7 @@ namespace L0 { namespace ult { -using CommandQueueDebugCommandsTest = TestLegacy; +using CommandQueueDebugCommandsTest = Test; HWTEST2_F(CommandQueueDebugCommandsTest, givenDebuggingEnabledWhenCommandListIsExecutedThenKernelDebugCommandsAreAdded, IsAtMostGen12lp) { NEO::MockCompilerEnableGuard mock(true); @@ -158,7 +158,7 @@ HWTEST2_F(CommandQueueDebugCommandsTest, givenDebuggingEnabledWhenCommandListIsE commandQueue->destroy(); } -using SLDebuggerInternalUsageTest = TestLegacy; +using SLDebuggerInternalUsageTest = Test; HWTEST2_F(SLDebuggerInternalUsageTest, givenDebuggingEnabledWhenInternalCmdQIsUsedThenDebuggerPathsAreNotExecuted, IsAtLeastSkl) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; @@ -232,7 +232,7 @@ HWTEST2_F(SLDebuggerInternalUsageTest, givenDebuggingEnabledWhenInternalCmdQIsUs commandList->destroy(); } -using DeviceWithDebuggerEnabledTest = TestLegacy; +using DeviceWithDebuggerEnabledTest = Test; TEST_F(DeviceWithDebuggerEnabledTest, givenDebuggingEnabledWhenDeviceIsCreatedThenItHasDebugSurfaceCreatedWithCorrectAllocationType) { ASSERT_NE(nullptr, deviceL0->getDebugSurface()); @@ -247,10 +247,10 @@ struct TwoSubDevicesDebuggerEnabledTest : public ActiveDebuggerFixture, public : void SetUp() override { DebugManager.flags.CreateMultipleSubDevices.set(2); VariableBackup mockDeviceFlagBackup(&MockDevice::createSingleDevice, false); - ActiveDebuggerFixture::SetUp(); + ActiveDebuggerFixture::setUp(); } void TearDown() override { - ActiveDebuggerFixture::TearDown(); + ActiveDebuggerFixture::tearDown(); } DebugManagerStateRestore restorer; }; diff --git a/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp b/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp index 7d37608d40..3e43d586cf 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp @@ -32,7 +32,7 @@ namespace L0 { namespace ult { struct L0DebuggerWindowsFixture { - void SetUp() { + void setUp() { executionEnvironment = new NEO::ExecutionEnvironment; executionEnvironment->prepareRootDeviceEnvironments(1); executionEnvironment->setDebuggingEnabled(); @@ -62,7 +62,7 @@ struct L0DebuggerWindowsFixture { device = driverHandle->devices[0]; } - void TearDown() { + void tearDown() { } std::unique_ptr> driverHandle; @@ -74,7 +74,7 @@ struct L0DebuggerWindowsFixture { MockGdi *gdi = nullptr; }; -using L0DebuggerWindowsTest = TestLegacy; +using L0DebuggerWindowsTest = Test; TEST_F(L0DebuggerWindowsTest, givenProgramDebuggingEnabledWhenDriverHandleIsCreatedThenItAllocatesL0Debugger) { EXPECT_NE(nullptr, neoDevice->getDebugger()); diff --git a/level_zero/core/test/unit_tests/sources/driver/host_pointer_manager_tests.cpp b/level_zero/core/test/unit_tests/sources/driver/host_pointer_manager_tests.cpp index 967c5ea73a..a427d7f3f3 100644 --- a/level_zero/core/test/unit_tests/sources/driver/host_pointer_manager_tests.cpp +++ b/level_zero/core/test/unit_tests/sources/driver/host_pointer_manager_tests.cpp @@ -15,7 +15,7 @@ namespace L0 { namespace ult { -using HostPointerManagerTest = TestLegacy; +using HostPointerManagerTest = Test; TEST_F(HostPointerManagerTest, givenMultipleGraphicsAllocationWhenCopyingHostPointerDataThenCopyOnlyExistingAllocations) { @@ -437,7 +437,7 @@ TEST_F(HostPointerManagerTest, givenMisalignedPointerRegisteredWhenGettingRelati EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -using ForceDisabledHostPointerManagerTest = TestLegacy; +using ForceDisabledHostPointerManagerTest = Test; TEST_F(ForceDisabledHostPointerManagerTest, givenHostPointerManagerForceDisabledThenReturnFeatureUnsupported) { EXPECT_EQ(nullptr, hostDriverHandle->hostPointerManager.get()); @@ -458,7 +458,7 @@ TEST_F(ForceDisabledHostPointerManagerTest, givenHostPointerManagerForceDisabled EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result); } -using ForceEnabledHostPointerManagerTest = TestLegacy; +using ForceEnabledHostPointerManagerTest = Test; TEST_F(ForceEnabledHostPointerManagerTest, givenHostPointerManagerForceEnabledThenReturnSuccess) { EXPECT_NE(nullptr, hostDriverHandle->hostPointerManager.get()); diff --git a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp index ff0f3bf50a..fd4357f416 100644 --- a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp +++ b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp @@ -640,20 +640,20 @@ TEST(zeDriverGetIpcProperties, whenZeDriverGetIpcPropertiesIsCalledThenGetIPCPro } struct HostImportApiFixture : public HostPointerManagerFixure { - void SetUp() { - HostPointerManagerFixure::SetUp(); + void setUp() { + HostPointerManagerFixure::setUp(); driverHandle = hostDriverHandle->toHandle(); } - void TearDown() { - HostPointerManagerFixure::TearDown(); + void tearDown() { + HostPointerManagerFixure::tearDown(); } ze_driver_handle_t driverHandle; }; -using DriverExperimentalApiTest = TestLegacy; +using DriverExperimentalApiTest = Test; TEST_F(DriverExperimentalApiTest, whenRetrievingApiFunctionThenExpectProperPointer) { decltype(&zexDriverImportExternalPointer) expectedImport = L0::zexDriverImportExternalPointer; diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h b/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h index 6b79575ab3..4fb1140b81 100644 --- a/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h +++ b/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h @@ -38,14 +38,14 @@ class ZeAPITracingCoreTestsFixture { ZeAPITracingCoreTestsFixture(){}; protected: - virtual void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { driver_ddiTable.enableTracing = true; myThreadPrivateTracerData.onList = false; myThreadPrivateTracerData.isInitialized = false; myThreadPrivateTracerData.testAndSetThreadTracerDataInitializedAndOnList(); } - virtual void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { myThreadPrivateTracerData.removeThreadTracerDataFromList(); driver_ddiTable.enableTracing = false; } @@ -55,11 +55,11 @@ class ZeApiTracingCoreTests : public ZeAPITracingCoreTestsFixture, public ::test protected: void SetUp() override { - ZeAPITracingCoreTestsFixture::SetUp(); + ZeAPITracingCoreTestsFixture::setUp(); } void TearDown() override { - ZeAPITracingCoreTestsFixture::TearDown(); + ZeAPITracingCoreTestsFixture::tearDown(); } }; @@ -76,7 +76,7 @@ class ZeApiTracingRuntimeTests : public ZeAPITracingCoreTestsFixture, public ::t void SetUp() override { ze_result_t result; - ZeAPITracingCoreTestsFixture::SetUp(); + ZeAPITracingCoreTestsFixture::setUp(); userData = &defaultUserData; tracerDesc.pUserData = userData; result = zetTracerExpCreate(nullptr, &tracerDesc, &apiTracerHandle); @@ -91,7 +91,7 @@ class ZeApiTracingRuntimeTests : public ZeAPITracingCoreTestsFixture, public ::t EXPECT_EQ(ZE_RESULT_SUCCESS, result); result = zetTracerExpDestroy(apiTracerHandle); EXPECT_EQ(ZE_RESULT_SUCCESS, result); - ZeAPITracingCoreTestsFixture::TearDown(); + ZeAPITracingCoreTestsFixture::tearDown(); } void setTracerCallbacksAndEnableTracer() { @@ -136,7 +136,7 @@ class ZeApiTracingRuntimeMultipleArgumentsTests : public ZeAPITracingCoreTestsFi void SetUp() override { ze_result_t result; - ZeAPITracingCoreTestsFixture::SetUp(); + ZeAPITracingCoreTestsFixture::setUp(); pUserData0 = &defaultUserData0; tracerDesc0.pUserData = pUserData0; @@ -185,7 +185,7 @@ class ZeApiTracingRuntimeMultipleArgumentsTests : public ZeAPITracingCoreTestsFi result = zetTracerExpDestroy(apiTracerHandle3); EXPECT_EQ(ZE_RESULT_SUCCESS, result); - ZeAPITracingCoreTestsFixture::TearDown(); + ZeAPITracingCoreTestsFixture::tearDown(); } void setTracerCallbacksAndEnableTracer() { diff --git a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp index 1409fbb3c9..bb5aa72bac 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp @@ -24,8 +24,8 @@ namespace L0 { namespace ult { -using CommandQueueDebugCommandsForSldXeHP = TestLegacy; -using CommandQueueDebugCommandsDebuggerL0XeHP = TestLegacy; +using CommandQueueDebugCommandsForSldXeHP = Test; +using CommandQueueDebugCommandsDebuggerL0XeHP = Test; XEHPTEST_F(CommandQueueDebugCommandsForSldXeHP, givenSteppingA0OrBWhenGlobalSipIsUsedThenMmioIsRestoredAtTheEndOfCmdBuffer) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; diff --git a/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp b/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp index 0cf13a1438..1a22c2192e 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/debug_session_tests.cpp @@ -1660,7 +1660,7 @@ TEST_F(MultiTileDebugSessionTest, givenAllSlicesInRequestWhenAllInterruptsReturn } struct DebugSessionRegistersAccess { - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { zet_debug_config_t config = {}; config.pid = 0x1234; auto hwInfo = *NEO::defaultHwInfo.get(); @@ -1673,7 +1673,7 @@ struct DebugSessionRegistersAccess { session->allThreads[stoppedThreadId]->stopThread(1u); } - void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { } void dumpRegisterState() { @@ -1701,7 +1701,7 @@ struct DebugSessionRegistersAccess { NEO::MockDevice *neoDevice = nullptr; }; -using DebugSessionRegistersAccessTest = TestLegacy; +using DebugSessionRegistersAccessTest = Test; TEST_F(DebugSessionRegistersAccessTest, givenTypeToRegsetDescCalledThenCorrectRegdescIsReturned) { session->stateSaveAreaHeader = MockSipData::createStateSaveAreaHeader(2); diff --git a/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp b/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp index 7c3ccf689d..69cd550b16 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/windows/test_debug_api_windows.cpp @@ -99,21 +99,21 @@ struct MockDebugSessionWindows : DebugSessionWindows { }; struct DebugApiWindowsFixture : public DeviceFixture { - void SetUp() { + void setUp() { DeviceFixture::setUp(); mockWddm = new WddmEuDebugInterfaceMock(*neoDevice->executionEnvironment->rootDeviceEnvironments[0]); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface->setDriverModel(std::unique_ptr(mockWddm)); } - void TearDown() { + void tearDown() { DeviceFixture::tearDown(); } static constexpr uint8_t bufferSize = 16; WddmEuDebugInterfaceMock *mockWddm = nullptr; }; -using DebugApiWindowsTest = TestLegacy; +using DebugApiWindowsTest = Test; TEST_F(DebugApiWindowsTest, GivenReadOfGpuVaFailDueToEscapeCallFailureWhenTryingToReadSbaThenErrorIsReported) { zet_debug_config_t config = {}; @@ -849,7 +849,7 @@ TEST(DebugSessionWindowsTest, whenTranslateEscapeErrorStatusCalledThenCorrectZeR EXPECT_EQ(ZE_RESULT_ERROR_UNKNOWN, DebugSessionWindows::translateEscapeReturnStatusToZeResult(DBGUMD_RETURN_TYPE_MAX)); } -using DebugApiWindowsAsyncThreadTest = TestLegacy; +using DebugApiWindowsAsyncThreadTest = Test; TEST_F(DebugApiWindowsAsyncThreadTest, GivenDebugSessionWhenStartingAndClosingAsyncThreadThenThreadIsStartedAndFinishes) { auto session = std::make_unique(zet_debug_config_t{0x1234}, device); diff --git a/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman_manager.cpp b/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman_manager.cpp index b6dd1bac2e..94cd2b0961 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman_manager.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -37,7 +37,7 @@ class SysmanKmdManagerFixture : public ::testing::Test { protected: Mock *pKmdSysManager = nullptr; - void SetUp() { + void SetUp() override { if (!sysmanUltsEnable) { GTEST_SKIP(); }