From 6a46e8f0ca6674d24bde26bcbd584f8a9478cbcc Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Thu, 11 Aug 2022 14:01:11 +0000 Subject: [PATCH] Correct method names in device and module fixtures correct naming in derived classes Signed-off-by: Mateusz Jablonski --- .../unit_tests/fixtures/aub_csr_fixture.h | 10 +-- .../unit_tests/fixtures/cmdlist_fixture.h | 16 ++--- .../unit_tests/fixtures/device_fixture.cpp | 34 ++++------ .../test/unit_tests/fixtures/device_fixture.h | 35 +++++------ .../test/unit_tests/fixtures/module_fixture.h | 46 +++++++------- .../fixtures/multi_tile_fixture.cpp | 16 ++--- .../unit_tests/fixtures/multi_tile_fixture.h | 8 +-- .../unit_tests/gen11/test_module_gen11.cpp | 2 +- .../unit_tests/gen12lp/test_cache_flush.cpp | 2 +- .../gen12lp/test_cmdlist_gen12lp.cpp | 2 +- .../gen12lp/test_device_gen12lp.cpp | 18 +++--- .../gen12lp/test_events_gen12lp.cpp | 6 +- .../gen12lp/test_module_gen12lp.cpp | 2 +- ...test_cmdlist_append_launch_kernel_gen9.cpp | 2 +- ...test_cmdlist_append_range_barrier_gen9.cpp | 2 +- .../gen9/test_cmdlist_create_gen9.cpp | 4 +- .../unit_tests/gen9/test_cmdlist_gen9.cpp | 2 +- .../test_cmdqueue_enqueuecommandlist_gen9.cpp | 2 +- .../unit_tests/gen9/test_cmdqueue_gen9.cpp | 10 +-- .../test/unit_tests/gen9/test_device_gen9.cpp | 4 +- .../test/unit_tests/gen9/test_module_gen9.cpp | 2 +- .../sources/builtin/built_in_spv_tests_l0.cpp | 2 +- .../builtin/builtin_functions_tests.cpp | 10 +-- .../linux/test_cache_reservation_impl.cpp | 4 +- .../windows/test_cache_reservation_impl.cpp | 4 +- .../sources/cmdlist/test_cmdlist_1.cpp | 6 +- .../sources/cmdlist/test_cmdlist_2.cpp | 6 +- .../sources/cmdlist/test_cmdlist_3.cpp | 2 +- .../sources/cmdlist/test_cmdlist_4.cpp | 6 +- .../sources/cmdlist/test_cmdlist_5.cpp | 2 +- .../sources/cmdlist/test_cmdlist_6.cpp | 10 +-- .../sources/cmdlist/test_cmdlist_7.cpp | 6 +- .../sources/cmdlist/test_cmdlist_api.cpp | 2 +- .../cmdlist/test_cmdlist_append_barrier.cpp | 6 +- .../test_cmdlist_append_event_reset.cpp | 2 +- .../test_cmdlist_append_launch_kernel_1.cpp | 2 +- .../test_cmdlist_append_launch_kernel_2.cpp | 18 +++--- .../test_cmdlist_append_launch_kernel_3.cpp | 4 +- .../cmdlist/test_cmdlist_append_memory.cpp | 2 +- ...cmdlist_append_multipartition_prologue.cpp | 4 +- .../test_cmdlist_append_signal_event.cpp | 2 +- .../test_cmdlist_append_wait_on_events.cpp | 4 +- .../sources/cmdlist/test_cmdlist_blit.cpp | 2 +- .../cmdlist/test_cmdlist_memory_extension.cpp | 4 +- .../cmdlist/test_cmdlist_xehp_and_later.cpp | 12 ++-- .../sources/cmdqueue/test_cmdqueue_1.cpp | 14 ++--- .../sources/cmdqueue/test_cmdqueue_2.cpp | 18 +++--- .../sources/cmdqueue/test_cmdqueue_3.cpp | 6 +- .../test_cmdqueue_enqueue_cmdlist.cpp | 18 +++--- .../test_cmdqueue_enqueue_cmdlist_2.cpp | 2 +- .../context/context_drm/test_context.cpp | 6 +- .../context_drm_or_wddm/test_context.cpp | 4 +- .../context/context_wddm/test_context.cpp | 6 +- .../sources/context/test_context.cpp | 8 +-- .../sources/debugger/test_l0_debugger_1.cpp | 2 +- .../test_l0_debugger_sba_tracking.cpp | 8 +-- .../debugger/test_module_with_debug.cpp | 8 +-- .../unit_tests/sources/device/test_device.cpp | 20 +++--- .../unit_tests/sources/driver/test_driver.cpp | 6 +- .../unit_tests/sources/event/test_event.cpp | 46 +++++++------- .../unit_tests/sources/fence/test_fence.cpp | 6 +- .../sources/helper/heap_assigner_l0_tests.cpp | 2 +- .../unit_tests/sources/image/test_image.cpp | 10 +-- .../sources/kernel/test_function.cpp | 6 +- .../unit_tests/sources/kernel/test_kernel.cpp | 57 +++++++---------- .../unit_tests/sources/memory/test_memory.cpp | 6 +- .../unit_tests/sources/module/test_module.cpp | 62 +++++++++---------- .../sources/module/test_module_2.cpp | 6 +- .../sources/sampler/test_sampler.cpp | 8 +-- .../xe_hp_core/test_cmdlist_xe_hp_core.cpp | 10 +-- ...cmdqueue_enqueuecommandlist_xe_hp_core.cpp | 2 +- .../xe_hp_core/test_device_xe_hp_core.cpp | 18 +++--- .../xe_hp_core/test_module_xe_hp_core.cpp | 2 +- .../built_in_xe_hpc_core_tests_l0.cpp | 4 +- .../xe_hpc_core/pvc/test_cmdlist_pvc.cpp | 6 +- .../xe_hpc_core/pvc/test_device_pvc.cpp | 4 +- .../xe_hpc_core/test_cmdlist_xe_hpc_core.cpp | 12 ++-- .../xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp | 25 +------- .../xe_hpc_core/test_device_xe_hpc_core.cpp | 20 +++--- .../xe_hpc_core/test_module_xe_hpc_core.cpp | 2 +- .../xe_hpg_core/dg2/test_cmdlist_dg2.cpp | 2 +- .../xe_hpg_core/dg2/test_cmdqueue_dg2.cpp | 2 +- .../xe_hpg_core/dg2/test_sampler_dg2.cpp | 2 +- .../xe_hpg_core/test_cmdlist_xe_hpg_core.cpp | 4 +- ...mdqueue_enqueuecommandlist_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/test_device_xe_hpg_core.cpp | 18 +++--- .../xe_hpg_core/test_image_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/test_module_xe_hpg_core.cpp | 2 +- .../sources/debug/debug_session_tests.cpp | 2 +- .../debug/debug_session_thread_tests.cpp | 2 +- .../debug/linux/test_debug_api_linux.cpp | 8 +-- .../sources/debug/test_debug_api.cpp | 4 +- .../debug/windows/test_debug_api_windows.cpp | 4 +- .../linux/test_metric_ip_sampling_linux.cpp | 4 +- ...st_metric_ip_sampling_linux_pvc_prelim.cpp | 4 +- ..._metric_ip_sampling_linux_pvc_upstream.cpp | 4 +- .../linux/test_metric_oa_query_pool_linux.cpp | 8 +-- .../metrics/metric_ip_sampling_fixture.cpp | 4 +- .../metrics/metric_query_pool_fixture.cpp | 8 +-- .../sources/metrics/mock_metric_oa.cpp | 16 ++--- .../sources/metrics/mock_metric_oa.h | 10 +-- .../metrics/test_metric_oa_enumeration_1.cpp | 4 +- .../metrics/test_metric_oa_enumeration_2.cpp | 4 +- .../metrics/test_metric_oa_initialization.cpp | 2 +- .../metrics/test_metric_oa_streamer_1.cpp | 2 +- .../metrics/test_metric_oa_streamer_2.cpp | 2 +- .../metrics/test_metric_oa_streamer_3.cpp | 2 +- .../test_metric_ip_sampling_windows.cpp | 4 +- .../test_metric_oa_enumeration_windows.cpp | 2 +- .../sysman/linux/mock_sysman_fixture.h | 8 +-- .../sources/sysman/linux/test_sysman.cpp | 4 +- .../sysman/windows/mock_sysman_fixture.h | 4 +- .../sources/sysman/windows/test_sysman.cpp | 2 +- .../cl_command_stream_receiver_tests.cpp | 2 +- .../command_stream/cmd_parse_tests.cpp | 2 +- ...nd_stream_receiver_with_aub_dump_tests.cpp | 8 +-- .../unit_test/perf_tests/api/api_tests.cpp | 6 +- .../perf_tests/fixtures/device_fixture.cpp | 6 +- .../built_in_xe_hpc_core_tests_ocl.cpp | 2 +- .../built_ins/built_in_tests_shared.inl | 2 +- .../aub_command_stream_receiver_fixture.h | 4 +- .../test/common/fixtures/device_fixture.cpp | 4 +- shared/test/common/fixtures/device_fixture.h | 4 +- shared/test/common/helpers/hw_helper_tests.h | 2 +- .../os_interface/windows/wddm_fixture.h | 4 +- .../test/unit_test/aub/aub_helper_tests.cpp | 2 +- shared/test/unit_test/built_ins/sip_tests.cpp | 14 ++--- .../command_container_tests.cpp | 8 +-- ...nd_encoder_tests_xe_hpg_core_and_later.cpp | 2 +- .../aub_command_stream_receiver_2_tests.cpp | 2 +- ...d_stream_receiver_tests_xehp_and_later.cpp | 2 +- .../command_stream/aub_subcapture_tests.cpp | 6 +- ...mulated_common_hw_tests_xehp_and_later.cpp | 4 +- .../command_stream_receiver_tests.cpp | 4 +- .../command_stream/linear_stream_tests.cpp | 2 +- ...d_stream_receiver_tests_xehp_and_later.cpp | 2 +- .../tbx_command_stream_tests.cpp | 4 +- .../compiler_interface_tests.cpp | 4 +- .../unit_test/debugger/test_l0_debugger.cpp | 6 +- .../test_l0_debugger_single_address_space.cpp | 8 +-- .../device/linux/neo_device_linux_tests.cpp | 2 +- .../unit_test/device/neo_device_tests.cpp | 4 +- .../windows/neo_device_windows_tests.cpp | 2 +- .../direct_submission_tests_1.cpp | 2 +- .../direct_submission_tests_2.cpp | 4 +- .../direct_submission_tests_xe_hp_core.cpp | 2 +- .../dispatchers/blitter_dispatcher_tests.cpp | 2 +- .../dispatchers/dispatcher_fixture.cpp | 10 +-- .../dispatchers/dispatcher_fixture.h | 4 +- .../dispatchers/dispatcher_tests.cpp | 2 +- .../dispatchers/render_dispatcher_tests.cpp | 2 +- .../encoders/command_encoder_tests_dg2.cpp | 2 +- .../command_encoder_tests_xehp_and_later.cpp | 2 +- .../encoders/test_command_encoder.cpp | 2 +- .../test_encode_3dstate_btd_pvc_and_later.cpp | 2 +- .../unit_test/encoders/test_encode_atomic.cpp | 2 +- .../encoders/test_encode_command_buffer.cpp | 4 +- .../encoders/test_encode_dispatch_kernel.cpp | 10 +-- ...t_encode_dispatch_kernel_dg2_and_later.cpp | 2 +- ...t_encode_dispatch_kernel_pvc_and_later.cpp | 4 +- ..._encode_dispatch_kernel_xehp_and_later.cpp | 22 +++---- .../test_encode_enable_raytracing.cpp | 2 +- .../test_encode_grf_mode_xe_hp_and_later.cpp | 2 +- .../unit_test/encoders/test_encode_math.cpp | 2 +- .../test_encode_math_xehp_and_later.cpp | 2 +- ...test_encode_media_interface_descriptor.cpp | 2 +- ...ia_interface_descriptor_xehp_and_later.cpp | 2 +- ...test_encode_mi_flush_dw_xehp_and_later.cpp | 2 +- .../encoders/test_encode_semaphore.cpp | 2 +- .../encoders/test_encode_set_mmio.cpp | 10 +-- .../unit_test/encoders/test_encode_states.cpp | 4 +- .../fixtures/command_container_fixture.h | 8 +-- .../fixtures/direct_submission_fixture.h | 12 ++-- .../fixtures/front_window_fixture.cpp | 11 ++-- .../unit_test/fixtures/front_window_fixture.h | 4 +- .../fixtures/implicit_scaling_fixture.cpp | 8 +-- .../fixtures/implicit_scaling_fixture.h | 6 +- .../gen11/test_encode_math_gen11.cpp | 2 +- .../gen12lp/adln/test_device_caps_adln.cpp | 2 +- ..._command_stream_receiver_tests_gen12lp.inl | 2 +- ...iver_simulated_common_hw_tests_gen12lp.inl | 2 +- .../gen12lp/test_command_encoder_gen12lp.cpp | 2 +- .../gen12lp/test_encode_math_gen12lp.cpp | 2 +- .../unit_test/gen8/hw_helper_tests_gen8.cpp | 2 +- .../unit_test/gen8/test_device_caps_gen8.cpp | 2 +- .../unit_test/gen8/test_encode_math_gen8.cpp | 2 +- .../gen9/test_command_encoder_gen9.cpp | 2 +- .../unit_test/gen9/test_encode_math_gen9.cpp | 2 +- .../heap_assigner/heap_assigner_tests.cpp | 2 +- .../helpers/bindless_heaps_helper_tests.cpp | 4 +- .../helpers/blit_commands_helper_tests.cpp | 2 +- .../helpers/blit_commands_helper_tests.inl | 4 +- .../blit_commands_helper_tests_gen12lp.cpp | 2 +- .../helpers/compiler_hw_info_config_tests.cpp | 2 +- .../helpers/hw_helper_extended_tests.cpp | 2 +- .../helpers/hw_helper_tests_dg2_and_later.cpp | 2 +- .../helpers/state_base_address_tests.cpp | 2 +- .../helpers/state_base_address_tests.h | 4 +- ...est_blit_commands_helper_pvc_and_later.cpp | 2 +- ...st_blit_commands_helper_xehp_and_later.cpp | 2 +- .../helpers/timestamp_packet_tests.cpp | 4 +- .../image/image_surface_state_fixture.h | 4 +- .../special_heap_pool_tests.cpp | 2 +- .../windows/device_command_stream_tests.cpp | 6 +- .../unit_test/preamble/preamble_fixture.h | 8 +-- .../scratch_space_controler_tests.cpp | 2 +- ...h_space_controler_xehp_and_later_tests.cpp | 2 +- .../utilities/software_tags_manager_tests.cpp | 4 +- .../xe_hp_core/test_encode_xe_hp_core.cpp | 4 +- .../test_hw_info_config_xe_hp_core.cpp | 4 +- .../pvc/test_encode_dispatch_kernel_pvc.cpp | 2 +- .../xe_hpc_core/pvc/test_sample_pvc.cpp | 2 +- .../xe_hpc_core/test_encode_xe_hpc_core.cpp | 2 +- .../xe_hpc_core/test_sample_xe_hpc_core.cpp | 2 +- .../dg2/test_hw_info_config_dg2.cpp | 2 +- 215 files changed, 639 insertions(+), 685 deletions(-) diff --git a/level_zero/core/test/unit_tests/fixtures/aub_csr_fixture.h b/level_zero/core/test/unit_tests/fixtures/aub_csr_fixture.h index dce5bdeb2b..f03e501414 100644 --- a/level_zero/core/test/unit_tests/fixtures/aub_csr_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/aub_csr_fixture.h @@ -18,21 +18,21 @@ extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX namespace L0 { namespace ult { -struct AubCsrFixture : public ContextFixture { +struct AubCsrFixture : public DeviceFixture { template void setUpT() { auto csrCreateFcn = &commandStreamReceiverFactory[IGFX_MAX_CORE + NEO::defaultHwInfo->platform.eRenderCoreFamily]; variableBackup = std::make_unique>(csrCreateFcn); *csrCreateFcn = UltAubCommandStreamReceiver::create; - ContextFixture::SetUp(); + DeviceFixture::setUp(); } template void tearDownT() { - ContextFixture::TearDown(); + DeviceFixture::tearDown(); } - void SetUp() {} - void TearDown() {} + void setUp() {} + void tearDown() {} std::unique_ptr> variableBackup; }; 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 12b7f1597c..fd2b2f314a 100644 --- a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h @@ -21,8 +21,8 @@ namespace ult { class CommandListFixture : public DeviceFixture { public: - void SetUp() { - DeviceFixture::SetUp(); + void setUp() { + DeviceFixture::setUp(); ze_result_t returnValue; commandList.reset(whiteboxCast(CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue))); @@ -39,11 +39,11 @@ class CommandListFixture : public DeviceFixture { event = std::unique_ptr(Event::create(eventPool.get(), &eventDesc, device)); } - void TearDown() { + void tearDown() { event.reset(nullptr); eventPool.reset(nullptr); commandList.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr commandList; @@ -53,12 +53,12 @@ class CommandListFixture : public DeviceFixture { template struct MultiTileCommandListFixture : public SingleRootMultiSubDeviceFixture { - void SetUp() { + void setUp() { DebugManager.flags.EnableImplicitScaling.set(1); osLocalMemoryBackup = std::make_unique>(&NEO::OSInterface::osEnableLocalMemory, true); apiSupportBackup = std::make_unique>(&NEO::ImplicitScaling::apiSupport, true); - SingleRootMultiSubDeviceFixture::SetUp(); + SingleRootMultiSubDeviceFixture::setUp(); ze_result_t returnValue; NEO::EngineGroupType cmdListEngineType = createCopy ? NEO::EngineGroupType::Copy : NEO::EngineGroupType::RenderCompute; @@ -84,8 +84,8 @@ struct MultiTileCommandListFixture : public SingleRootMultiSubDeviceFixture { event = std::unique_ptr(Event::create(eventPool.get(), &eventDesc, device)); } - void TearDown() { - SingleRootMultiSubDeviceFixture::TearDown(); + void tearDown() { + SingleRootMultiSubDeviceFixture::tearDown(); } std::unique_ptr commandList; diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp index 6713e1ae1b..32b13a3f92 100644 --- a/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp +++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp @@ -19,7 +19,7 @@ namespace L0 { namespace ult { -void DeviceFixture::SetUp() { +void DeviceFixture::setUp() { auto executionEnvironment = MockDevice::prepareExecutionEnvironment(NEO::defaultHwInfo.get(), 0u); setupWithExecutionEnvironment(*executionEnvironment); } @@ -42,13 +42,13 @@ void DeviceFixture::setupWithExecutionEnvironment(NEO::ExecutionEnvironment &exe executionEnvironment.incRefInternal(); } -void DeviceFixture::TearDown() { +void DeviceFixture::tearDown() { context->destroy(); driverHandle.reset(nullptr); execEnv->decRefInternal(); } -void PageFaultDeviceFixture::SetUp() { +void PageFaultDeviceFixture::setUp() { neoDevice = NEO::MockDevice::createWithNewExecutionEnvironment(NEO::defaultHwInfo.get()); auto mockBuiltIns = new MockBuiltins(); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->builtins.reset(mockBuiltIns); @@ -70,12 +70,12 @@ void PageFaultDeviceFixture::SetUp() { device->getDriverHandle()->setMemoryManager(mockMemoryManager.get()); } -void PageFaultDeviceFixture::TearDown() { +void PageFaultDeviceFixture::tearDown() { device->getDriverHandle()->setMemoryManager(memoryManager); context->destroy(); } -void MultiDeviceFixture::SetUp() { +void MultiDeviceFixture::setUp() { DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices); DebugManager.flags.CreateMultipleSubDevices.set(numSubDevices); auto executionEnvironment = new NEO::ExecutionEnvironment; @@ -91,19 +91,11 @@ void MultiDeviceFixture::SetUp() { context = static_cast(Context::fromHandle(hContext)); } -void MultiDeviceFixture::TearDown() { +void MultiDeviceFixture::tearDown() { context->destroy(); } -void ContextFixture::SetUp() { - DeviceFixture::SetUp(); -} - -void ContextFixture::TearDown() { - DeviceFixture::TearDown(); -} - -void MultipleDevicesWithCustomHwInfo::SetUp() { +void MultipleDevicesWithCustomHwInfo::setUp() { NEO::MockCompilerEnableGuard mock(true); VariableBackup mockDeviceFlagBackup(&MockDevice::createSingleDevice, false); @@ -147,14 +139,14 @@ void MultipleDevicesWithCustomHwInfo::SetUp() { driverHandle->initialize(std::move(devices)); } -void SingleRootMultiSubDeviceFixture::SetUp() { +void SingleRootMultiSubDeviceFixture::setUp() { MultiDeviceFixture::numRootDevices = 1u; - MultiDeviceFixture::SetUp(); + MultiDeviceFixture::setUp(); device = driverHandle->devices[0]; neoDevice = device->getNEODevice(); } -void SingleRootMultiSubDeviceFixtureWithImplicitScalingImpl::SetUp() { +void SingleRootMultiSubDeviceFixtureWithImplicitScalingImpl::setUp() { DebugManagerStateRestore restorer; DebugManager.flags.EnableImplicitScaling.set(implicitScaling); DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices); @@ -215,11 +207,11 @@ void SingleRootMultiSubDeviceFixtureWithImplicitScalingImpl::SetUp() { } } -void SingleRootMultiSubDeviceFixtureWithImplicitScalingImpl::TearDown() { +void SingleRootMultiSubDeviceFixtureWithImplicitScalingImpl::tearDown() { context->destroy(); } -void GetMemHandlePtrTestFixture::SetUp() { +void GetMemHandlePtrTestFixture::setUp() { NEO::MockCompilerEnableGuard mock(true); neoDevice = NEO::MockDevice::createWithNewExecutionEnvironment(NEO::defaultHwInfo.get()); @@ -242,7 +234,7 @@ void GetMemHandlePtrTestFixture::SetUp() { context->deviceBitfields.insert({neoDevice->getRootDeviceIndex(), neoDevice->getDeviceBitfield()}); } -void GetMemHandlePtrTestFixture::TearDown() { +void GetMemHandlePtrTestFixture::tearDown() { driverHandle->setMemoryManager(prevMemoryManager); delete currMemoryManager; } 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 df4d57151b..6e8ce7f913 100644 --- a/level_zero/core/test/unit_tests/fixtures/device_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.h @@ -32,8 +32,8 @@ class MockBuiltins; struct DeviceFixture { NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true); - void SetUp(); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown(); void setupWithExecutionEnvironment(NEO::ExecutionEnvironment &executionEnvironment); std::unique_ptr> driverHandle; @@ -66,8 +66,8 @@ struct DriverHandleGetMemHandlePtrMock : public L0::DriverHandleImp { struct GetMemHandlePtrTestFixture { NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true); - void SetUp(); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown(); NEO::MemoryManager *prevMemoryManager = nullptr; MemoryManagerMemHandleMock *currMemoryManager = nullptr; std::unique_ptr driverHandle; @@ -80,8 +80,8 @@ struct PageFaultDeviceFixture { PageFaultDeviceFixture(); ~PageFaultDeviceFixture(); NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true); - void SetUp(); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown(); std::unique_ptr> driverHandle; std::unique_ptr mockMemoryManager; @@ -94,8 +94,8 @@ struct PageFaultDeviceFixture { struct MultiDeviceFixture { NEO::MockCompilerEnableGuard compilerMock = NEO::MockCompilerEnableGuard(true); - void SetUp(); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown(); DebugManagerStateRestore restorer; std::unique_ptr> driverHandle; @@ -106,27 +106,22 @@ struct MultiDeviceFixture { }; struct SingleRootMultiSubDeviceFixture : public MultiDeviceFixture { - void SetUp(); + void setUp(); L0::Device *device = nullptr; NEO::Device *neoDevice = nullptr; }; struct ImplicitScalingRootDevice : public SingleRootMultiSubDeviceFixture { - void SetUp() { + void setUp() { DebugManager.flags.EnableImplicitScaling.set(1); - SingleRootMultiSubDeviceFixture::SetUp(); + SingleRootMultiSubDeviceFixture::setUp(); } }; -struct ContextFixture : DeviceFixture { - void SetUp(); - void TearDown(); -}; - struct MultipleDevicesWithCustomHwInfo { - void SetUp(); // NOLINT(readability-identifier-naming) - void TearDown() {} // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown() {} NEO::HardwareInfo hwInfo; const uint32_t numSubslicesPerSlice = 4; const uint32_t numEuPerSubslice = 8; @@ -166,8 +161,8 @@ struct SingleRootMultiSubDeviceFixtureWithImplicitScalingImpl : public MultiDevi uint32_t numEngineGroups = 0; uint32_t subDeviceNumEngineGroups = 0; - void SetUp(); - void TearDown(); + void setUp(); + void tearDown(); }; template struct SingleRootMultiSubDeviceFixtureWithImplicitScaling : public SingleRootMultiSubDeviceFixtureWithImplicitScalingImpl { 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 7bbeccc2cb..b777e40cfa 100644 --- a/level_zero/core/test/unit_tests/fixtures/module_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/module_fixture.h @@ -149,7 +149,7 @@ struct ModuleImmutableDataFixture : public DeviceFixture { } }; - void SetUp() { + void setUp() { auto executionEnvironment = MockDevice::prepareExecutionEnvironment(NEO::defaultHwInfo.get(), 0u); memoryManager = new MockImmutableMemoryManager(*executionEnvironment); executionEnvironment->memoryManager.reset(memoryManager); @@ -192,9 +192,9 @@ struct ModuleImmutableDataFixture : public DeviceFixture { kernel->initialize(&desc); } - void TearDown() { + void tearDown() { module.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } const std::string binaryFilename = "test_kernel"; @@ -205,9 +205,9 @@ struct ModuleImmutableDataFixture : public DeviceFixture { }; struct ModuleFixture : public DeviceFixture { - void SetUp() { + void setUp() { NEO::MockCompilerEnableGuard mock(true); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); createModuleFromBinary(); } @@ -242,10 +242,10 @@ struct ModuleFixture : public DeviceFixture { kernel->initialize(&desc); } - void TearDown() { + void tearDown() { kernel.reset(nullptr); module.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } const std::string binaryFilename = "test_kernel"; @@ -256,8 +256,8 @@ struct ModuleFixture : public DeviceFixture { }; struct MultiDeviceModuleFixture : public MultiDeviceFixture { - void SetUp() { - MultiDeviceFixture::SetUp(); + void setUp() { + MultiDeviceFixture::setUp(); modules.resize(numRootDevices); } @@ -293,12 +293,12 @@ struct MultiDeviceModuleFixture : public MultiDeviceFixture { kernel->initialize(&desc); } - void TearDown() { + void tearDown() { kernel.reset(nullptr); for (auto &module : modules) { module.reset(nullptr); } - MultiDeviceFixture::TearDown(); + MultiDeviceFixture::tearDown(); } const std::string binaryFilename = "test_kernel"; @@ -391,30 +391,30 @@ struct ModuleWithZebinFixture : public DeviceFixture { const char strings[12] = "Hello olleH"; }; - void SetUp() { + void setUp() { NEO::MockCompilerEnableGuard mock(true); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); module = std::make_unique(device); } - void TearDown() { + void tearDown() { module.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr module; }; struct ImportHostPointerModuleFixture : public ModuleFixture { - void SetUp() { + void setUp() { DebugManager.flags.EnableHostPointerImport.set(1); - ModuleFixture::SetUp(); + ModuleFixture::setUp(); hostPointer = driverHandle->getMemoryManager()->allocateSystemMemory(MemoryConstants::pageSize, MemoryConstants::pageSize); } - void TearDown() { + void tearDown() { driverHandle->getMemoryManager()->freeSystemMemory(hostPointer); - ModuleFixture::TearDown(); + ModuleFixture::tearDown(); } DebugManagerStateRestore debugRestore; @@ -422,19 +422,19 @@ struct ImportHostPointerModuleFixture : public ModuleFixture { }; struct MultiTileModuleFixture : public MultiDeviceModuleFixture { - void SetUp() { + void setUp() { DebugManager.flags.EnableImplicitScaling.set(1); MultiDeviceFixture::numRootDevices = 1u; MultiDeviceFixture::numSubDevices = 2u; - MultiDeviceModuleFixture::SetUp(); + MultiDeviceModuleFixture::setUp(); createModuleFromBinary(0); device = driverHandle->devices[0]; } - void TearDown() { - MultiDeviceModuleFixture::TearDown(); + void tearDown() { + MultiDeviceModuleFixture::tearDown(); } DebugManagerStateRestore debugRestore; diff --git a/level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.cpp index 8952304290..9691b90b84 100644 --- a/level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.cpp +++ b/level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.cpp @@ -12,13 +12,13 @@ namespace L0 { namespace ult { -void MultiTileCommandListAppendLaunchFunctionFixture::SetUp() { +void MultiTileCommandListAppendLaunchFunctionFixture::setUp() { DebugManager.flags.EnableImplicitScaling.set(1); MultiDeviceFixture::numRootDevices = 1u; MultiDeviceFixture::numSubDevices = 4u; - MultiDeviceModuleFixture::SetUp(); + MultiDeviceModuleFixture::setUp(); createModuleFromBinary(0u); createKernel(0u); @@ -35,20 +35,20 @@ void MultiTileCommandListAppendLaunchFunctionFixture::SetUp() { EXPECT_EQ(ZE_RESULT_SUCCESS, returnValue); } -void MultiTileCommandListAppendLaunchFunctionFixture::TearDown() { +void MultiTileCommandListAppendLaunchFunctionFixture::tearDown() { commandList->destroy(); contextImp->destroy(); - MultiDeviceModuleFixture::TearDown(); + MultiDeviceModuleFixture::tearDown(); } -void MultiTileImmediateCommandListAppendLaunchFunctionFixture::SetUp() { +void MultiTileImmediateCommandListAppendLaunchFunctionFixture::setUp() { DebugManager.flags.EnableImplicitScaling.set(1); MultiDeviceFixture::numRootDevices = 1u; MultiDeviceFixture::numSubDevices = 2u; - MultiDeviceModuleFixture::SetUp(); + MultiDeviceModuleFixture::setUp(); createModuleFromBinary(0u); createKernel(0u); @@ -61,10 +61,10 @@ void MultiTileImmediateCommandListAppendLaunchFunctionFixture::SetUp() { contextImp = static_cast(Context::fromHandle(hContext)); } -void MultiTileImmediateCommandListAppendLaunchFunctionFixture::TearDown() { +void MultiTileImmediateCommandListAppendLaunchFunctionFixture::tearDown() { contextImp->destroy(); - MultiDeviceModuleFixture::TearDown(); + MultiDeviceModuleFixture::tearDown(); } } // namespace ult diff --git a/level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.h b/level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.h index 28242202e7..ed9aab56a2 100644 --- a/level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.h @@ -19,8 +19,8 @@ struct Device; namespace ult { struct MultiTileCommandListAppendLaunchFunctionFixture : public MultiDeviceModuleFixture { - void SetUp(); - void TearDown(); + void setUp(); + void tearDown(); ContextImp *contextImp = nullptr; WhiteBox<::L0::CommandList> *commandList = nullptr; @@ -29,8 +29,8 @@ struct MultiTileCommandListAppendLaunchFunctionFixture : public MultiDeviceModul }; struct MultiTileImmediateCommandListAppendLaunchFunctionFixture : public MultiDeviceModuleFixture { - void SetUp(); - void TearDown(); + void setUp(); + void tearDown(); ContextImp *contextImp = nullptr; L0::Device *device = nullptr; diff --git a/level_zero/core/test/unit_tests/gen11/test_module_gen11.cpp b/level_zero/core/test/unit_tests/gen11/test_module_gen11.cpp index 1e221ee70e..555567f87e 100644 --- a/level_zero/core/test/unit_tests/gen11/test_module_gen11.cpp +++ b/level_zero/core/test/unit_tests/gen11/test_module_gen11.cpp @@ -12,7 +12,7 @@ namespace L0 { namespace ult { -using KernelPropertyTest = TestLegacy; +using KernelPropertyTest = Test; HWTEST2_F(KernelPropertyTest, givenKernelExtendedPropertiesStructureWhenKernelPropertiesCalledThenPropertiesAreCorrectlySet, IsGen11HP) { ze_device_module_properties_t kernelProperties = {}; diff --git a/level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp b/level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp index 7d7505d1ff..a604e67b41 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp @@ -19,7 +19,7 @@ namespace L0 { namespace ult { -using CacheFlushTests = TestLegacy; +using CacheFlushTests = Test; HWTEST2_F(CacheFlushTests, GivenCommandStreamWithSingleL3RangeAndNonZeroPostSyncAddressWhenFlushGpuCacheIsCalledThenPostSyncOperationIsSetForL3Control, IsDG1) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; diff --git a/level_zero/core/test/unit_tests/gen12lp/test_cmdlist_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_cmdlist_gen12lp.cpp index 9311c26437..41d630cbb5 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_cmdlist_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_cmdlist_gen12lp.cpp @@ -21,7 +21,7 @@ namespace L0 { namespace ult { -using CommandListCreate = TestLegacy; +using CommandListCreate = Test; template struct CommandListAdjustStateComputeMode : public WhiteBox<::L0::CommandListProductFamily> { 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 01b37a5bd3..7f4e42f121 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 @@ -14,7 +14,7 @@ namespace L0 { namespace ult { -using DeviceFixtureGen12LP = TestLegacy; +using DeviceFixtureGen12LP = Test; HWTEST2_F(DeviceFixtureGen12LP, GivenTargetGen12LPaWhenGettingMemoryPropertiesThenMemoryNameComesAsDDR, IsGen12LP) { ze_device_memory_properties_t memProperties = {}; @@ -25,7 +25,7 @@ HWTEST2_F(DeviceFixtureGen12LP, GivenTargetGen12LPaWhenGettingMemoryPropertiesTh EXPECT_EQ(0u, memProperties.maxClockRate); } -using CommandQueueGroupTest = TestLegacy; +using CommandQueueGroupTest = Test; HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsGen12LP) { @@ -61,22 +61,22 @@ HWTEST2_F(CommandQueueGroupTest, EXPECT_EQ(count, 2u); } -class DeviceCopyQueueGroupFixture : public DeviceFixture { +class DeviceCopyQueueGroupGen12LpFixture : public DeviceFixture { public: - void SetUp() { + void setUp() { DebugManager.flags.EnableBlitterOperationsSupport.set(0); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } - void TearDown() { - DeviceFixture::TearDown(); + void tearDown() { + DeviceFixture::tearDown(); } DebugManagerStateRestore restorer; }; -using DeviceCopyQueueGroupTest = TestLegacy; +using DeviceCopyQueueGroupGen12LpTest = Test; -HWTEST2_F(DeviceCopyQueueGroupTest, +HWTEST2_F(DeviceCopyQueueGroupGen12LpTest, givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsGen12LP) { const uint32_t rootDeviceIndex = 0u; NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); diff --git a/level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp index 2706499497..dbcf7cb577 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp @@ -15,9 +15,9 @@ namespace L0 { namespace ult { -struct TimestampEvent : public TestLegacy { +struct TimestampEvent : public Test { void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); ze_event_pool_desc_t eventPoolDesc = {}; eventPoolDesc.count = 1; eventPoolDesc.flags = ZE_EVENT_POOL_FLAG_HOST_VISIBLE | ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP; @@ -38,7 +38,7 @@ struct TimestampEvent : public TestLegacy { void TearDown() override { event.reset(nullptr); eventPool.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr eventPool; diff --git a/level_zero/core/test/unit_tests/gen12lp/test_module_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_module_gen12lp.cpp index f11cd4c367..49c5c89eb0 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_module_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_module_gen12lp.cpp @@ -12,7 +12,7 @@ namespace L0 { namespace ult { -using KernelPropertyTest = TestLegacy; +using KernelPropertyTest = Test; HWTEST2_F(KernelPropertyTest, givenKernelExtendedPropertiesStructureWhenKernelPropertiesCalledThenPropertiesAreCorrectlySet, IsGen12LP) { ze_device_module_properties_t kernelProperties = {}; diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_launch_kernel_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_launch_kernel_gen9.cpp index bb04cf737a..4570ff4338 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_launch_kernel_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_launch_kernel_gen9.cpp @@ -15,7 +15,7 @@ namespace L0 { namespace ult { -using CommandListAppendLaunchKernel = TestLegacy; +using CommandListAppendLaunchKernel = Test; using IsGen9Core = IsWithinProducts; HWTEST2_F(CommandListAppendLaunchKernel, givenKernelWithSLMThenL3IsProgrammedWithSLMValue, IsGen9Core) { diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_range_barrier_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_range_barrier_gen9.cpp index 94d0a7fa69..1879de397e 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_range_barrier_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdlist_append_range_barrier_gen9.cpp @@ -15,7 +15,7 @@ namespace L0 { namespace ult { -using CommandListAppendGen9 = TestLegacy; +using CommandListAppendGen9 = Test; TEST(CommandListAppendMemoryRangesBarrier, WhenAppendingMemoryRangesBarrierThenSuccessIsReturned) { MockCommandList commandList; diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdlist_create_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdlist_create_gen9.cpp index 69468f3d64..8e065449df 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdlist_create_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdlist_create_gen9.cpp @@ -25,7 +25,7 @@ namespace ult { class CommandListCreateGen9 : public DeviceFixture, public testing::Test { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); dispatchFunctionArguments.groupCountX = 1u; dispatchFunctionArguments.groupCountY = 2u; @@ -40,7 +40,7 @@ class CommandListCreateGen9 : public DeviceFixture, public testing::Test { free(ptr); } - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::vector isaBuffers; diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdlist_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdlist_gen9.cpp index 780217e3af..ad0a2dbb1a 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdlist_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdlist_gen9.cpp @@ -16,7 +16,7 @@ namespace L0 { namespace ult { -using CommandListProgramL3 = TestLegacy; +using CommandListProgramL3 = Test; template struct CommandListAdjustStateComputeMode : public WhiteBox<::L0::CommandListProductFamily> { diff --git a/level_zero/core/test/unit_tests/gen9/test_cmdqueue_enqueuecommandlist_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_enqueuecommandlist_gen9.cpp index e98773839a..736a387ea2 100644 --- a/level_zero/core/test/unit_tests/gen9/test_cmdqueue_enqueuecommandlist_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_enqueuecommandlist_gen9.cpp @@ -28,7 +28,7 @@ namespace L0 { namespace ult { -using CommandQueueExecuteCommandListsGen9 = TestLegacy; +using CommandQueueExecuteCommandListsGen9 = Test; GEN9TEST_F(CommandQueueExecuteCommandListsGen9, WhenExecutingCmdListsThenPipelineSelectAndVfeStateAreAddedToCmdBuffer) { const ze_command_queue_desc_t desc = {}; 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 e4f3ed84b6..6fbeaebb2b 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 @@ -168,9 +168,9 @@ HWTEST2_F(CommandQueueThreadArbitrationPolicyTests, } struct CommandQueueGroupMultiDeviceFixture : public MultiDeviceFixture { - void SetUp() { + void setUp() { NEO::MockCompilerEnableGuard mock(true); - MultiDeviceFixture::SetUp(); + MultiDeviceFixture::setUp(); uint32_t count = 1; ze_device_handle_t hDevice; ze_result_t res = driverHandle->getDevice(&count, &hDevice); @@ -178,13 +178,13 @@ struct CommandQueueGroupMultiDeviceFixture : public MultiDeviceFixture { device = L0::Device::fromHandle(hDevice); ASSERT_NE(nullptr, device); } - void TearDown() { - MultiDeviceFixture::TearDown(); + void tearDown() { + MultiDeviceFixture::tearDown(); } L0::Device *device = nullptr; }; -using CommandQueueGroupMultiDevice = TestLegacy; +using CommandQueueGroupMultiDevice = Test; HWTEST2_F(CommandQueueGroupMultiDevice, givenCommandQueuePropertiesCallThenCallSucceedsAndCommandListImmediateIsCreated, IsGen9) { diff --git a/level_zero/core/test/unit_tests/gen9/test_device_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_device_gen9.cpp index 4915084800..980c034bc5 100644 --- a/level_zero/core/test/unit_tests/gen9/test_device_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_device_gen9.cpp @@ -13,7 +13,7 @@ namespace L0 { namespace ult { -using DevicePropertyTest = TestLegacy; +using DevicePropertyTest = Test; HWTEST2_F(DevicePropertyTest, givenReturnedDevicePropertiesThenExpectedPropertiesFlagsSet, IsGen9) { ze_device_properties_t deviceProps = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES}; @@ -25,7 +25,7 @@ HWTEST2_F(DevicePropertyTest, givenReturnedDevicePropertiesThenExpectedPropertie EXPECT_EQ(ZE_DEVICE_PROPERTY_FLAG_INTEGRATED, deviceProps.flags & ZE_DEVICE_PROPERTY_FLAG_INTEGRATED); } -using CommandQueueGroupTest = TestLegacy; +using CommandQueueGroupTest = Test; HWTEST2_F(CommandQueueGroupTest, givenCommandQueuePropertiesCallThenCorrectNumberOfGroupsIsReturned, IsGen9) { uint32_t count = 0; diff --git a/level_zero/core/test/unit_tests/gen9/test_module_gen9.cpp b/level_zero/core/test/unit_tests/gen9/test_module_gen9.cpp index 4b5066b57c..cdeed8fb7e 100644 --- a/level_zero/core/test/unit_tests/gen9/test_module_gen9.cpp +++ b/level_zero/core/test/unit_tests/gen9/test_module_gen9.cpp @@ -12,7 +12,7 @@ namespace L0 { namespace ult { -using KernelPropertyTest = TestLegacy; +using KernelPropertyTest = Test; HWTEST2_F(KernelPropertyTest, givenReturnedKernelPropertiesThenExpectedDp4aSupportReturned, IsGen9) { ze_device_module_properties_t kernelProps = {}; diff --git a/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp b/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp index be2bba6471..381a0fbb21 100644 --- a/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp +++ b/level_zero/core/test/unit_tests/sources/builtin/built_in_spv_tests_l0.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using BuiltInTestL0 = TestLegacy; +using BuiltInTestL0 = Test; TEST_F(BuiltInTestL0, GivenBuiltinTypeIntermediateWhenGettingBuiltinResourceForNotRegisteredRevisionThenResourceSizeIsNonZero) { pDevice->getRootDeviceEnvironment().getMutableHardwareInfo()->platform.usRevId += 0xdead; 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 1deb55d3fa..86416cffea 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 @@ -67,14 +67,14 @@ class BuiltinFunctionsLibFixture : public DeviceFixture { module.release(); } }; - void SetUp() { - DeviceFixture::SetUp(); + 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() { + void tearDown() { mockBuiltinFunctionsLibImpl.reset(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr mockBuiltinFunctionsLibImpl; @@ -82,7 +82,7 @@ class BuiltinFunctionsLibFixture : public DeviceFixture { }; template -using TestBuiltinFunctionsLibImpl = TestLegacy>; +using TestBuiltinFunctionsLibImpl = Test>; class TestBuiltinFunctionsLibImplDefault : public TestBuiltinFunctionsLibImpl {}; class TestBuiltinFunctionsLibImplStateless : 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 32ad7854b9..2b4e0ad8ff 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 @@ -18,14 +18,14 @@ namespace ult { class CacheReservationFixture : public DeviceFixture { public: void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); auto deviceImp = static_cast(device); ASSERT_NE(nullptr, deviceImp->cacheReservation.get()); cache = deviceImp->cacheReservation.get(); } void TearDown() { - DeviceFixture::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 b506fe3aba..37740651c7 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 @@ -18,13 +18,13 @@ namespace ult { class CacheReservationFixture : public DeviceFixture { public: void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); auto deviceImp = static_cast(device); ASSERT_NE(nullptr, deviceImp->cacheReservation.get()); cache = deviceImp->cacheReservation.get(); } void TearDown() { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } CacheReservation *cache = nullptr; }; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp index 0310b5dafd..7cd80b0dc7 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp @@ -23,7 +23,7 @@ namespace L0 { namespace ult { -using ContextCommandListCreate = TestLegacy; +using ContextCommandListCreate = Test; TEST_F(ContextCommandListCreate, whenCreatingCommandListFromContextThenSuccessIsReturned) { ze_command_list_desc_t desc = {}; @@ -61,7 +61,7 @@ HWTEST2_F(ContextCommandListCreate, givenImmediateCmdListWhenGettingLogicalState commandList->destroy(); } -using CommandListCreate = TestLegacy; +using CommandListCreate = Test; TEST_F(CommandListCreate, whenCommandListIsCreatedWithInvalidProductFamilyThenFailureIsReturned) { ze_result_t returnValue; @@ -345,7 +345,7 @@ TEST_F(CommandListCreate, givenValidPtrThenAppendMemAdviseSetAndClearCachingThen ASSERT_EQ(res, ZE_RESULT_SUCCESS); } -using CommandListMemAdvisePageFault = TestLegacy; +using CommandListMemAdvisePageFault = Test; TEST_F(CommandListMemAdvisePageFault, givenValidPtrAndPageFaultHandlerThenAppendMemAdviseWithReadOnlyAndDevicePreferredClearsMigrationBlocked) { size_t size = 10; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp index 0fb3d52fae..933b4667a5 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp @@ -19,8 +19,8 @@ namespace L0 { namespace ult { -using CommandListCreate = TestLegacy; -using CommandListAppend = TestLegacy; +using CommandListCreate = Test; +using CommandListAppend = Test; template class MockCommandListHw : public WhiteBox<::L0::CommandListCoreFamily> { @@ -1199,7 +1199,7 @@ HWTEST2_F(CommandListCreate, givenCommandListThenSshCorrectlyReserved, Supported EXPECT_EQ(commandList.getReserveSshSize(), size); } -using CommandListAppendMemoryCopyBlit = TestLegacy; +using CommandListAppendMemoryCopyBlit = Test; HWTEST2_F(CommandListAppendMemoryCopyBlit, whenAppendMemoryCopyBlitIsAppendedAndNoSpaceIsAvailableThenNextCommandBufferIsCreated, IsAtLeastSkl) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp index 298114e7c3..c635341085 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp @@ -87,7 +87,7 @@ TEST_F(CommandListCreateNegativeTest, whenDeviceAllocationFailsDuringCommandList ASSERT_EQ(nullptr, commandList); } -using CommandListCreate = TestLegacy; +using CommandListCreate = Test; HWTEST2_F(CommandListCreate, givenHostAllocInMapWhenGettingAllocInRangeThenAllocFromMapReturned, IsAtLeastSkl) { auto commandList = std::make_unique>>(); 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 e07d46fa0c..be16fd010c 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 @@ -20,7 +20,7 @@ namespace L0 { namespace ult { -using CommandListCreate = TestLegacy; +using CommandListCreate = Test; HWTEST2_F(CommandListCreate, givenCopyOnlyCommandListWhenAppendWriteGlobalTimestampCalledThenMiFlushDWWithTimestampEncoded, IsAtLeastSkl) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -240,10 +240,10 @@ HWTEST_F(CommandListCreate, givenUseCsrImmediateSubmissionEnabledForCopyImmediat class CommandListImmediateFlushTaskTests : public DeviceFixture { public: void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } void TearDown() { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } DebugManagerStateRestore restorer; }; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp index 7f4e25b8e5..7308b39e33 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_5.cpp @@ -20,7 +20,7 @@ namespace L0 { namespace ult { -using CommandListCreate = TestLegacy; +using CommandListCreate = Test; HWTEST_F(CommandListCreate, givenCommandListWithInvalidWaitEventArgWhenAppendQueryKernelTimestampsThenProperErrorRetruned) { ze_result_t returnValue; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp index 47481d663f..9ff377cbf5 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_6.cpp @@ -17,7 +17,7 @@ namespace L0 { namespace ult { -using MultiTileImmediateCommandListTest = TestLegacy>; +using MultiTileImmediateCommandListTest = Test>; HWTEST2_F(MultiTileImmediateCommandListTest, GivenMultiTileDeviceWhenCreatingImmediateCommandListThenExpectPartitionCountMatchTileCount, IsWithinXeGfxFamily) { EXPECT_EQ(2u, device->getNEODevice()->getDeviceBitfield().count()); @@ -28,7 +28,7 @@ HWTEST2_F(MultiTileImmediateCommandListTest, GivenMultiTileDeviceWhenCreatingImm EXPECT_EQ(2u, commandList->partitionCount); } -using MultiTileImmediateInternalCommandListTest = TestLegacy>; +using MultiTileImmediateInternalCommandListTest = Test>; HWTEST2_F(MultiTileImmediateInternalCommandListTest, GivenMultiTileDeviceWhenCreatingInternalImmediateCommandListThenExpectPartitionCountEqualOne, IsWithinXeGfxFamily) { EXPECT_EQ(2u, device->getNEODevice()->getDeviceBitfield().count()); @@ -39,7 +39,7 @@ HWTEST2_F(MultiTileImmediateInternalCommandListTest, GivenMultiTileDeviceWhenCre EXPECT_EQ(1u, commandList->partitionCount); } -using MultiTileCopyEngineCommandListTest = TestLegacy>; +using MultiTileCopyEngineCommandListTest = Test>; HWTEST2_F(MultiTileCopyEngineCommandListTest, GivenMultiTileDeviceWhenCreatingCopyEngineCommandListThenExpectPartitionCountEqualOne, IsWithinXeGfxFamily) { EXPECT_EQ(2u, device->getNEODevice()->getDeviceBitfield().count()); @@ -50,7 +50,7 @@ HWTEST2_F(MultiTileCopyEngineCommandListTest, GivenMultiTileDeviceWhenCreatingCo EXPECT_EQ(1u, commandList->partitionCount); } -using CommandListExecuteImmediate = TestLegacy; +using CommandListExecuteImmediate = Test; HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlushTaskThenRequiredStreamStateIsCorrectlyReported, IsAtLeastSkl) { auto &hwHelper = NEO::HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily); auto &hwInfoConfig = *NEO::HwInfoConfig::get(defaultHwInfo->platform.eProductFamily); @@ -111,7 +111,7 @@ HWTEST2_F(CommandListExecuteImmediate, whenExecutingCommandListImmediateWithFlus EXPECT_FALSE(commandListImmediate.containsAnyKernel); } -using CommandListTest = TestLegacy; +using CommandListTest = Test; using IsDcFlushSupportedPlatform = IsWithinGfxCore; HWTEST2_F(CommandListTest, givenCopyCommandListWhenRequiredFlushOperationThenExpectNoPipeControl, IsDcFlushSupportedPlatform) { diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp index c59199639a..8ebee4eccb 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_7.cpp @@ -23,7 +23,7 @@ namespace L0 { namespace ult { -using CommandListCreate = TestLegacy; +using CommandListCreate = Test; HWTEST2_F(CommandListCreate, givenIndirectAccessFlagsAreChangedWhenResetingCommandListThenExpectAllFlagsSetToDefault, IsAtLeastSkl) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -213,7 +213,7 @@ HWTEST2_F(CommandListCreate, givenSingleTileOnlyPlatformsWhenProgrammingMultiTil EXPECT_EQ(usedBefore, usedAfter); } -using CommandListAppendLaunchKernel = TestLegacy; +using CommandListAppendLaunchKernel = Test; HWTEST2_F(CommandListAppendLaunchKernel, givenSignalEventWhenAppendLaunchCooperativeKernelIsCalledThenSuccessIsReturned, IsAtLeastSkl) { createKernel(); @@ -464,7 +464,7 @@ HWTEST2_F(CommandListCreate, givenCommandListAndHostPointersWhenMemoryCopyCalled } } -using CmdlistAppendLaunchKernelTests = TestLegacy; +using CmdlistAppendLaunchKernelTests = Test; using IsBetweenGen9AndGen12lp = IsWithinGfxCore; HWTEST2_F(CmdlistAppendLaunchKernelTests, diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_api.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_api.cpp index 98e2a29089..09a92ae2cd 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_api.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_api.cpp @@ -29,7 +29,7 @@ TEST(zeCommandListAppendMemoryPrefetch, whenCalledThenRedirectedToObject) { ASSERT_EQ(ZE_RESULT_SUCCESS, res); } -using zeCommandListAppendMemAdviseTest = TestLegacy; +using zeCommandListAppendMemAdviseTest = Test; TEST_F(zeCommandListAppendMemAdviseTest, whenCalledThenRedirectedToObject) { MockCommandList commandList; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_barrier.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_barrier.cpp index 027c58c306..c172dca78f 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_barrier.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_barrier.cpp @@ -18,7 +18,7 @@ namespace L0 { namespace ult { -using CommandListAppendBarrier = TestLegacy; +using CommandListAppendBarrier = Test; HWTEST_F(CommandListAppendBarrier, WhenAppendingBarrierThenPipeControlIsGenerated) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; @@ -191,7 +191,7 @@ void validateMultiTileBarrier(void *cmdBuffer, size_t &parsedOffset, } } -using MultiTileCommandListAppendBarrier = TestLegacy>; +using MultiTileCommandListAppendBarrier = Test>; HWTEST2_F(MultiTileCommandListAppendBarrier, WhenAppendingBarrierThenPipeControlIsGenerated, IsWithinXeGfxFamily) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; @@ -505,7 +505,7 @@ HWTEST2_F(MultiTileCommandListAppendBarrier, true); } -using MultiTileImmediateCommandListAppendBarrier = TestLegacy>; +using MultiTileImmediateCommandListAppendBarrier = Test>; HWTEST2_F(MultiTileImmediateCommandListAppendBarrier, givenMultiTileImmediateCommandListWhenAppendingBarrierThenExpectCrossTileSyncAndNoCleanupSection, IsWithinXeGfxFamily) { diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp index 7b88e35f55..b67efed19b 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_event_reset.cpp @@ -19,7 +19,7 @@ namespace L0 { namespace ult { -using CommandListAppendEventReset = TestLegacy; +using CommandListAppendEventReset = Test; HWTEST_F(CommandListAppendEventReset, givenCmdlistWhenResetEventAppendedThenStoreDataImmIsGenerated) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp index 50bb84fdd0..e2af585b98 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_1.cpp @@ -25,7 +25,7 @@ namespace L0 { namespace ult { -using CommandListAppendLaunchKernel = TestLegacy; +using CommandListAppendLaunchKernel = Test; HWTEST_F(CommandListAppendLaunchKernel, givenKernelWithIndirectAllocationsAllowedThenCommandListReturnsExpectedIndirectAllocationsAllowed) { createKernel(); diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp index 8ad39dbc17..822eef3543 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_2.cpp @@ -23,25 +23,25 @@ namespace L0 { namespace ult { -struct CommandListAppendLaunchKernelSWTags : public TestLegacy { +struct CommandListAppendLaunchKernelSWTags : public Test { void SetUp() override { NEO::MockCompilerEnableGuard mock(true); NEO::DebugManager.flags.EnableSWTags.set(true); - ModuleFixture::SetUp(); + ModuleFixture::setUp(); } DebugManagerStateRestore dbgRestorer; }; -struct CommandListDualStorage : public TestLegacy { +struct CommandListDualStorage : public Test { void SetUp() override { NEO::MockCompilerEnableGuard mock(true); DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.AllocateSharedAllocationsWithCpuAndGpuStorage.set(1); - ModuleFixture::SetUp(); + ModuleFixture::setUp(); } void TearDown() override { - ModuleFixture::TearDown(); + ModuleFixture::tearDown(); } DebugManagerStateRestore restorer; }; @@ -799,7 +799,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendMemoryC EXPECT_TRUE(tagFound); } -using CommandListArbitrationPolicyTest = TestLegacy; +using CommandListArbitrationPolicyTest = Test; HWTEST_F(CommandListArbitrationPolicyTest, whenCreatingCommandListThenDefaultThreadArbitrationPolicyIsUsed) { using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; @@ -921,7 +921,7 @@ HWTEST_F(CommandListArbitrationPolicyTest, whenCommandListIsResetThenOriginalThr } } -using CmdlistAppendLaunchKernelTests = TestLegacy; +using CmdlistAppendLaunchKernelTests = Test; struct CmdlistAppendLaunchKernelWithImplicitArgsTests : CmdlistAppendLaunchKernelTests { void SetUp() override { @@ -1215,7 +1215,7 @@ HWTEST_F(CmdlistAppendLaunchKernelTests, whenEncodingWorkDimForIndirectDispatchT } } -using CommandListAppendLaunchKernel = TestLegacy; +using CommandListAppendLaunchKernel = Test; HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeAndNonCooperativeKernelsWhenAppendLaunchCooperativeKernelIsCalledThenReturnError, IsAtLeastSkl) { Mock<::L0::Kernel> kernel; auto pMockModule = std::unique_ptr(new Mock(device, nullptr)); @@ -1276,7 +1276,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, GivenDebugToggleSetWhenUpdateStreamProp EXPECT_EQ(defaultThreadArbitrationPolicy, pCommandList->finalStreamState.stateComputeMode.threadArbitrationPolicy.value); } -using MultiTileCommandListAppendLaunchFunctionXeHpCoreTest = TestLegacy; +using MultiTileCommandListAppendLaunchFunctionXeHpCoreTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, MultiTileCommandListAppendLaunchFunctionXeHpCoreTest, givenImplicitScalingEnabledWhenAppendingKernelWithEventThenAllEventPacketsAreUsed) { ze_event_pool_desc_t eventPoolDesc = {}; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp index 7c0c418011..d6d31055a8 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp @@ -26,7 +26,7 @@ namespace L0 { namespace ult { -using CommandListAppendLaunchKernel = TestLegacy; +using CommandListAppendLaunchKernel = Test; HWCMDTEST_F(IGFX_GEN8_CORE, CommandListAppendLaunchKernel, givenFunctionWhenBindingTablePrefetchAllowedThenProgramBindingTableEntryCount) { using MEDIA_INTERFACE_DESCRIPTOR_LOAD = typename FamilyType::MEDIA_INTERFACE_DESCRIPTOR_LOAD; @@ -695,7 +695,7 @@ HWTEST_F(CommandListAppendLaunchKernelWithImplicitArgs, givenIndirectDispatchWit context->freeMem(alloc); } -using MultiTileImmediateCommandListAppendLaunchFunctionXeHpCoreTest = TestLegacy; +using MultiTileImmediateCommandListAppendLaunchFunctionXeHpCoreTest = Test; HWTEST2_F(MultiTileImmediateCommandListAppendLaunchFunctionXeHpCoreTest, givenImplicitScalingWhenUsingImmediateCommandListThenDoNotAddSelfCleanup, IsAtLeastXeHpCore) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp index c152a6fe8c..999b60eef0 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_memory.cpp @@ -16,7 +16,7 @@ namespace L0 { namespace ult { -using AppendMemoryCopy = TestLegacy; +using AppendMemoryCopy = Test; HWTEST2_F(AppendMemoryCopy, givenCommandListAndHostPointersWhenMemoryCopyRegionCalledThenTwoNewAllocationAreAddedToHostMapPtr, IsAtLeastSkl) { MockAppendMemoryCopy cmdList; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_multipartition_prologue.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_multipartition_prologue.cpp index b4e4a66285..09e664a6ce 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_multipartition_prologue.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_multipartition_prologue.cpp @@ -16,7 +16,7 @@ namespace L0 { namespace ult { -using MultiPartitionPrologueTest = TestLegacy; +using MultiPartitionPrologueTest = Test; HWTEST2_F(MultiPartitionPrologueTest, whenAppendMultiPartitionPrologueIsCalledThenCommandListIsUpdated, IsAtLeastXeHpCore) { using MI_LOAD_REGISTER_MEM = typename FamilyType::MI_LOAD_REGISTER_MEM; using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; @@ -72,7 +72,7 @@ HWTEST2_F(MultiPartitionPrologueTest, whenAppendMultiPartitionPrologueIsCalledTh auto result = commandList->close(); ASSERT_EQ(ZE_RESULT_SUCCESS, result); } -using MultiPartitionEpilogueTest = TestLegacy; +using MultiPartitionEpilogueTest = Test; HWTEST2_F(MultiPartitionEpilogueTest, whenAppendMultiPartitionEpilogueIsCalledThenCommandListIsUpdated, IsAtLeastXeHpCore) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp index 484b7a1ad1..25cf6d1bab 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_signal_event.cpp @@ -19,7 +19,7 @@ namespace L0 { namespace ult { -using CommandListAppendSignalEvent = TestLegacy; +using CommandListAppendSignalEvent = Test; HWTEST_F(CommandListAppendSignalEvent, WhenAppendingSignalEventWithoutScopeThenMiStoreImmIsGenerated) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp index 0141bf45d8..bcda2f4096 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_wait_on_events.cpp @@ -19,7 +19,7 @@ namespace L0 { namespace ult { -using CommandListAppendWaitOnEvent = TestLegacy; +using CommandListAppendWaitOnEvent = Test; HWTEST_F(CommandListAppendWaitOnEvent, WhenAppendingWaitOnEventThenSemaphoreWaitCmdIsGenerated) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; @@ -386,7 +386,7 @@ HWTEST_F(CommandListAppendWaitOnEvent, givenCommandBufferIsEmptyWhenAppendingWai EXPECT_EQ(1u, semaphoreWaitsFound); } -using MultTileCommandListAppendWaitOnEvent = TestLegacy>; +using MultTileCommandListAppendWaitOnEvent = Test>; HWTEST2_F(MultTileCommandListAppendWaitOnEvent, GivenMultiTileCmdListWhenPartitionedEventUsedToWaitThenExpectProperGpuAddressAndSemaphoreCount, IsAtLeastXeHpCore) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp index 1860c18eed..5273d58728 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp @@ -58,7 +58,7 @@ class MockDriverHandle : public L0::DriverHandleImp { NEO::SvmAllocationData data{rootDeviceIndex}; }; -using AppendMemoryCopy = TestLegacy; +using AppendMemoryCopy = Test; HWTEST2_F(AppendMemoryCopy, givenCopyOnlyCommandListWhenAppenBlitFillCalledWithLargePatternSizeThenMemCopyWasCalled, IsAtLeastSkl) { MockCommandListForMemFill cmdList; 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 aff1d8863c..d91eeff1b9 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 @@ -26,7 +26,7 @@ namespace ult { class CommandListMemoryExtensionFixture : public DeviceFixture { public: void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); ze_result_t returnValue; commandList.reset(whiteboxCast(CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue))); @@ -57,7 +57,7 @@ class CommandListMemoryExtensionFixture : public DeviceFixture { event.reset(nullptr); eventPool.reset(nullptr); commandList.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr commandList; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp index af431ce7b7..a1a3aac836 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp @@ -24,7 +24,7 @@ namespace L0 { namespace ult { -using CommandListTests = TestLegacy; +using CommandListTests = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, CommandListTests, whenCommandListIsCreatedThenPCAndStateBaseAddressCmdsAreAddedAndCorrectlyProgrammed) { using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; @@ -149,7 +149,7 @@ HWTEST2_F(CommandListTests, whenCommandListIsCreatedAndProgramExtendedPipeContro EXPECT_TRUE(cmdSba->getDisableSupportForMultiGpuAtomicsForStatelessAccesses()); } -using MultiTileCommandListTests = TestLegacy>; +using MultiTileCommandListTests = Test>; HWCMDTEST_F(IGFX_XE_HP_CORE, MultiTileCommandListTests, givenPartitionedCommandListWhenCommandListIsCreatedThenStateBaseAddressCmdWithMultiPartialAndAtomicsCorrectlyProgrammed) { using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; @@ -180,14 +180,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MultiTileCommandListTests, givenPartitionedCommandL EXPECT_TRUE(cmdSba->getDisableSupportForMultiGpuAtomicsForStatelessAccesses()); } -using CommandListTestsReserveSize = TestLegacy; +using CommandListTestsReserveSize = Test; HWTEST2_F(CommandListTestsReserveSize, givenCommandListWhenGetReserveSshSizeThen4PagesReturned, IsAtLeastXeHpCore) { L0::CommandListCoreFamily commandList(1u); EXPECT_EQ(commandList.getReserveSshSize(), 4 * MemoryConstants::pageSize); } -using CommandListAppendLaunchKernel = TestLegacy; +using CommandListAppendLaunchKernel = Test; HWTEST2_F(CommandListAppendLaunchKernel, givenVariousKernelsWhenUpdateStreamPropertiesIsCalledThenRequiredStateFinalStateAndCommandsToPatchAreCorrectlySet, IsAtLeastXeHpCore) { DebugManagerStateRestore restorer; DebugManager.flags.AllowMixingRegularAndCooperativeKernels.set(1); @@ -279,8 +279,8 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenVariousKernelsAndPatchingDisallowe pCommandList->reset(); } -using AppendMemoryCopyXeHpAndLater = TestLegacy; -using MultiTileAppendMemoryCopyXeHpAndLater = TestLegacy; +using AppendMemoryCopyXeHpAndLater = Test; +using MultiTileAppendMemoryCopyXeHpAndLater = Test; HWTEST2_F(AppendMemoryCopyXeHpAndLater, givenCommandListWhenTimestampProvidedByComputeWalkerPostSyncPassedToMemoryCopyThenAppendProfilingCalledForThreeSeparateKernels, diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp index 47d8c9990f..c2ddf38b74 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_1.cpp @@ -24,7 +24,7 @@ namespace L0 { namespace ult { -using CommandQueueCreate = TestLegacy; +using CommandQueueCreate = Test; TEST_F(CommandQueueCreate, whenCreatingCommandQueueThenItIsInitialized) { auto csr = std::unique_ptr(neoDevice->createCommandStreamReceiver()); @@ -640,7 +640,7 @@ TEST_F(CommandQueueCreate, givenCmdQueueWithBlitCopyWhenExecutingCopyBlitCommand commandQueue->destroy(); } -using DeviceCreateCommandQueueTest = TestLegacy; +using DeviceCreateCommandQueueTest = Test; TEST_F(DeviceCreateCommandQueueTest, givenLowPriorityDescWhenCreateCommandQueueIsCalledThenLowPriorityCsrIsAssigned) { ze_command_queue_desc_t desc{}; desc.ordinal = 0u; @@ -833,13 +833,13 @@ TEST_F(DeviceCreateCommandQueueTest, givenLowPriorityDescAndWithoutLowPriorityCs } struct MultiDeviceCreateCommandQueueFixture : MultiDeviceFixture { - void SetUp() { + void setUp() { DebugManager.flags.EnableImplicitScaling = false; - MultiDeviceFixture::SetUp(); + MultiDeviceFixture::setUp(); } }; -using MultiDeviceCreateCommandQueueTest = TestLegacy; +using MultiDeviceCreateCommandQueueTest = Test; TEST_F(MultiDeviceCreateCommandQueueTest, givenLowPriorityDescWhenCreateCommandQueueIsCalledThenLowPriorityCsrIsAssigned) { auto device = driverHandle->devices[0]; @@ -887,7 +887,7 @@ class MockCommandQueue : public L0::CommandQueueHw { } }; -using ExecuteCommandListTests = TestLegacy; +using ExecuteCommandListTests = Test; HWTEST2_F(ExecuteCommandListTests, givenExecuteCommandListWhenItReturnsThenContainersAreEmpty, IsAtLeastSkl) { ze_command_queue_desc_t desc = {}; NEO::CommandStreamReceiver *csr; @@ -945,7 +945,7 @@ HWTEST2_F(ExecuteCommandListTests, givenOutOfMemorySubmitBatchBufferThenExecuteC commandList->destroy(); } -using CommandQueueDestroy = TestLegacy; +using CommandQueueDestroy = Test; HWTEST2_F(CommandQueueDestroy, givenCommandQueueAndCommandListWithSshAndScratchWhenExecuteThenSshWasUsed, IsAtLeastSkl) { ze_command_queue_desc_t desc = {}; NEO::CommandStreamReceiver *csr; diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp index b40bf0822f..e3ce9173c3 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp @@ -29,7 +29,7 @@ namespace L0 { namespace ult { -using ContextCreateCommandQueueTest = TestLegacy; +using ContextCreateCommandQueueTest = Test; TEST_F(ContextCreateCommandQueueTest, givenCallToContextCreateCommandQueueThenCallSucceeds) { ze_command_queue_desc_t desc = {}; @@ -109,7 +109,7 @@ HWTEST_F(ContextCreateCommandQueueTest, givenRootDeviceAndImplicitScalingDisable L0::CommandQueue::fromHandle(commandQueue)->destroy(); } -using AubCsrTest = TestLegacy; +using AubCsrTest = Test; HWTEST_TEMPLATED_F(AubCsrTest, givenAubCsrWhenCallingExecuteCommandListsThenPollForCompletionIsCalled) { auto csr = neoDevice->getDefaultEngine().commandStreamReceiver; @@ -134,8 +134,8 @@ HWTEST_TEMPLATED_F(AubCsrTest, givenAubCsrWhenCallingExecuteCommandListsThenPoll L0::CommandQueue::fromHandle(commandQueue)->destroy(); } -using CommandQueueSynchronizeTest = TestLegacy; -using MultiTileCommandQueueSynchronizeTest = TestLegacy; +using CommandQueueSynchronizeTest = Test; +using MultiTileCommandQueueSynchronizeTest = Test; template struct SynchronizeCsr : public NEO::UltCommandStreamReceiver { @@ -503,7 +503,7 @@ HWTEST_F(CommandQueueSynchronizeTest, givenSynchronousCommandQueueWhenTagUpdateF L0::CommandQueue::fromHandle(commandQueue)->destroy(); } -using CommandQueuePowerHintTest = TestLegacy; +using CommandQueuePowerHintTest = Test; HWTEST_F(CommandQueuePowerHintTest, givenDriverHandleWithPowerHintAndOsContextPowerHintUnsetThenSuccessIsReturned) { auto csr = std::unique_ptr>(new TestCmdQueueCsr(*device->getNEODevice()->getExecutionEnvironment(), @@ -698,15 +698,15 @@ TEST_F(CommandQueueInitTests, whenDestroyCommandQueueThenStoreCommandBuffersAsRe EXPECT_FALSE(deviceImp->allocationsForReuse->peekIsEmpty()); } -struct DeviceWithDualStorage : TestLegacy { +struct DeviceWithDualStorage : Test { void SetUp() override { NEO::MockCompilerEnableGuard mock(true); DebugManager.flags.EnableLocalMemory.set(1); DebugManager.flags.AllocateSharedAllocationsWithCpuAndGpuStorage.set(1); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } DebugManagerStateRestore restorer; }; @@ -775,7 +775,7 @@ HWTEST2_F(DeviceWithDualStorage, givenCmdListWithAppendedKernelAndUsmTransferAnd ASSERT_EQ(ZE_RESULT_SUCCESS, res); commandQueue->destroy(); } -using CommandQueueScratchTests = TestLegacy; +using CommandQueueScratchTests = Test; using Platforms = IsAtLeastProduct; diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp index e825c7a914..6a55a68cce 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp @@ -225,11 +225,11 @@ struct CommandQueueCommands : DeviceFixture, ::testing::Test { void SetUp() override { DebugManager.flags.ForcePreemptionMode.set(static_cast(NEO::PreemptionMode::Disabled)); DebugManager.flags.CreateMultipleSubDevices.set(multiTile ? 2 : 1); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } template @@ -376,7 +376,7 @@ HWTEST2_F(CommandQueueCommandsMultiTile, givenCommandQueueOnMultiTileWhenWalkerP EXPECT_EQ(nullptr, workPartitionAllocation); } -using CommandQueueIndirectAllocations = TestLegacy; +using CommandQueueIndirectAllocations = Test; HWTEST_F(CommandQueueIndirectAllocations, givenCommandQueueWhenExecutingCommandListsThenExpectedIndirectAllocationsAddedToResidencyContainer) { const ze_command_queue_desc_t desc = {}; diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp index 8a15adee27..bb2a5512e8 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp @@ -28,9 +28,9 @@ namespace L0 { namespace ult { -struct CommandQueueExecuteCommandLists : public TestLegacy { +struct CommandQueueExecuteCommandLists : public Test { void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); ze_result_t returnValue; commandLists[0] = CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue)->toHandle(); @@ -48,7 +48,7 @@ struct CommandQueueExecuteCommandLists : public TestLegacy { commandList->destroy(); } - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } template @@ -58,11 +58,11 @@ struct CommandQueueExecuteCommandLists : public TestLegacy { ze_command_list_handle_t commandLists[numCommandLists]; }; -struct MultiDeviceCommandQueueExecuteCommandLists : public TestLegacy { +struct MultiDeviceCommandQueueExecuteCommandLists : public Test { void SetUp() override { DebugManager.flags.EnableWalkerPartition.set(1); numRootDevices = 1u; - MultiDeviceFixture::SetUp(); + MultiDeviceFixture::setUp(); uint32_t deviceCount = 1; ze_device_handle_t deviceHandle; @@ -88,7 +88,7 @@ struct MultiDeviceCommandQueueExecuteCommandLists : public TestLegacydestroy(); } - MultiDeviceFixture::TearDown(); + MultiDeviceFixture::tearDown(); } L0::Device *device = nullptr; @@ -976,10 +976,10 @@ HWTEST_F(CommandQueueExecuteCommandLists, GivenCopyCommandQueueWhenExecutingCopy commandQueue->destroy(); } -struct CommandQueueExecuteCommandListSWTagsTests : public TestLegacy { +struct CommandQueueExecuteCommandListSWTagsTests : public Test { void SetUp() override { DebugManager.flags.EnableSWTags.set(true); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); ze_result_t returnValue; commandLists[0] = CommandList::create(productFamily, device, NEO::EngineGroupType::RenderCompute, 0u, returnValue)->toHandle(); @@ -1006,7 +1006,7 @@ struct CommandQueueExecuteCommandListSWTagsTests : public TestLegacydestroy(); } - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } DebugManagerStateRestore dbgRestorer; diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp index 7a205e665a..8398973c61 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist_2.cpp @@ -18,7 +18,7 @@ namespace L0 { namespace ult { -using CommandQueueExecuteCommandListsSimpleTest = TestLegacy; +using CommandQueueExecuteCommandListsSimpleTest = Test; HWTEST2_F(CommandQueueExecuteCommandListsSimpleTest, GivenSynchronousModeWhenExecutingCommandListThenSynchronizeIsCalled, IsAtLeastSkl) { ze_command_queue_desc_t desc; diff --git a/level_zero/core/test/unit_tests/sources/context/context_drm/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/context_drm/test_context.cpp index e5df1bc905..cbd2e3aa52 100644 --- a/level_zero/core/test/unit_tests/sources/context/context_drm/test_context.cpp +++ b/level_zero/core/test/unit_tests/sources/context/context_drm/test_context.cpp @@ -25,7 +25,7 @@ namespace L0 { namespace ult { -using ContextIsShareable = TestLegacy; +using ContextIsShareable = Test; TEST_F(ContextIsShareable, whenCallingisSharedMemoryThenCorrectResultIsReturned) { ze_context_handle_t hContext; ze_context_desc_t desc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr, 0}; @@ -44,7 +44,7 @@ TEST_F(ContextIsShareable, whenCallingisSharedMemoryThenCorrectResultIsReturned) EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -using GetMemHandlePtrTest = TestLegacy; +using GetMemHandlePtrTest = Test; TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithValidHandleThenSuccessIsReturned) { MemoryManagerMemHandleMock *fixtureMemoryManager = static_cast(currMemoryManager); @@ -68,4 +68,4 @@ TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithInvalidHandleThenNullp } } // namespace ult -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/test/unit_tests/sources/context/context_drm_or_wddm/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/context_drm_or_wddm/test_context.cpp index ae08bae6b9..8ed9f32004 100644 --- a/level_zero/core/test/unit_tests/sources/context/context_drm_or_wddm/test_context.cpp +++ b/level_zero/core/test/unit_tests/sources/context/context_drm_or_wddm/test_context.cpp @@ -26,7 +26,7 @@ namespace L0 { namespace ult { -using ContextIsShareable = TestLegacy; +using ContextIsShareable = Test; TEST_F(ContextIsShareable, whenCallingisSharedMemoryThenCorrectResultIsReturned) { ze_context_handle_t hContext; ze_context_desc_t desc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr, 0}; @@ -57,7 +57,7 @@ TEST_F(ContextIsShareable, whenCallingisSharedMemoryThenCorrectResultIsReturned) EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -using GetMemHandlePtrTest = TestLegacy; +using GetMemHandlePtrTest = Test; TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithValidNTHandleThenSuccessIsReturned) { MemoryManagerMemHandleMock *fixtureMemoryManager = static_cast(currMemoryManager); diff --git a/level_zero/core/test/unit_tests/sources/context/context_wddm/test_context.cpp b/level_zero/core/test/unit_tests/sources/context/context_wddm/test_context.cpp index 7c7d1ab683..00c8ecd8f3 100644 --- a/level_zero/core/test/unit_tests/sources/context/context_wddm/test_context.cpp +++ b/level_zero/core/test/unit_tests/sources/context/context_wddm/test_context.cpp @@ -25,7 +25,7 @@ namespace L0 { namespace ult { -using ContextIsShareable = TestLegacy; +using ContextIsShareable = Test; TEST_F(ContextIsShareable, whenCallingisSharedMemoryThenCorrectResultIsReturned) { ze_context_handle_t hContext; ze_context_desc_t desc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr, 0}; @@ -44,7 +44,7 @@ TEST_F(ContextIsShareable, whenCallingisSharedMemoryThenCorrectResultIsReturned) EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -using GetMemHandlePtrTest = TestLegacy; +using GetMemHandlePtrTest = Test; TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithValidHandleThenSuccessIsReturned) { MemoryManagerMemHandleMock *fixtureMemoryManager = static_cast(currMemoryManager); @@ -68,4 +68,4 @@ TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithInvalidHandleThenNullp } } // namespace ult -} // namespace L0 \ No newline at end of file +} // namespace L0 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 cf0805a228..93e1610fe8 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 @@ -27,7 +27,7 @@ namespace L0 { namespace ult { -using MultiDeviceContextTests = TestLegacy; +using MultiDeviceContextTests = Test; TEST_F(MultiDeviceContextTests, whenCreatingContextWithZeroNumDevicesThenAllDevicesAreAssociatedWithTheContext) { @@ -224,7 +224,7 @@ TEST_F(ContextHostAllocTests, context->destroy(); } -using ContextGetStatusTest = TestLegacy; +using ContextGetStatusTest = Test; TEST_F(ContextGetStatusTest, givenCallToContextGetStatusThenCorrectErrorCodeIsReturnedWhenResourcesHaveBeenReleased) { ze_context_handle_t hContext; ze_context_desc_t desc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC, nullptr, 0}; @@ -246,7 +246,7 @@ TEST_F(ContextGetStatusTest, givenCallToContextGetStatusThenCorrectErrorCodeIsRe context->destroy(); } -using ContextPowerSavingHintTest = TestLegacy; +using ContextPowerSavingHintTest = Test; TEST_F(ContextPowerSavingHintTest, givenCallToContextCreateWithPowerHintDescThenPowerHintSetInDriverHandle) { ze_context_handle_t hContext; ze_context_desc_t ctxtDesc = {ZE_STRUCTURE_TYPE_CONTEXT_DESC}; @@ -313,7 +313,7 @@ TEST_F(ContextPowerSavingHintTest, givenCallToContextCreateWithoutPowerHintDescT context->destroy(); } -using ContextTest = TestLegacy; +using ContextTest = Test; TEST_F(ContextTest, whenCreatingAndDestroyingContextThenSuccessIsReturned) { ze_context_handle_t hContext; 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 f23b5ead5e..d5449d02b7 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 @@ -219,7 +219,7 @@ HWTEST_P(L0DebuggerParameterizedTests, givenEnabledDebuggingWhenIsaTypeAllocated } } -using L0DebuggerSimpleTest = TestLegacy; +using L0DebuggerSimpleTest = Test; HWTEST_F(L0DebuggerSimpleTest, givenUseCsrImmediateSubmissionEnabledWithImmediateCommandListToInvokeNonKernelOperationsThenSuccessIsReturned) { DebugManagerStateRestore restorer; 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 a54f153b4a..eebac7a45f 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 @@ -19,14 +19,14 @@ namespace L0 { namespace ult { -struct PerContextAddressSpaceFixture : public TestLegacy { +struct PerContextAddressSpaceFixture : public Test { void SetUp() override { NEO::DebugManager.flags.DebuggerForceSbaTrackingMode.set(0); - TestLegacy::SetUp(); + Test::SetUp(); } void TearDown() override { - TestLegacy::TearDown(); + Test::TearDown(); } DebugManagerStateRestore restorer; @@ -208,7 +208,7 @@ HWTEST2_F(L0DebuggerTest, givenDebuggingEnabledAndDebuggerLogsWhenCommandQueueIs commandQueue->destroy(); } -using L0DebuggerSimpleTest = TestLegacy; +using L0DebuggerSimpleTest = Test; HWTEST2_F(L0DebuggerSimpleTest, givenNullL0DebuggerAndDebuggerLogsWhenCommandQueueIsSynchronizedThenSbaAddressesAreNotPrinted, Gen12Plus) { 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 48f63c55ec..68471858da 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 @@ -160,7 +160,7 @@ TEST_F(DeviceWithDebuggerEnabledTest, GivenNonDebuggeableKernelWhenModuleIsIniti EXPECT_FALSE(module->isDebugEnabled()); } -using ModuleWithSLDTest = TestLegacy; +using ModuleWithSLDTest = Test; TEST_F(ModuleWithSLDTest, GivenNoDebugDataWhenInitializingModuleThenRelocatedDebugDataIsNotCreated) { NEO::MockCompilerEnableGuard mock(true); @@ -298,7 +298,7 @@ TEST_F(ModuleWithSLDTest, GivenDebugDataWithMultipleRelocationsWhenInitializingM EXPECT_NE(nullptr, kernelInfo->kernelDescriptor.external.relocatedDebugData); } -using ModuleWithZebinAndSLDTest = TestLegacy; +using ModuleWithZebinAndSLDTest = Test; TEST_F(ModuleWithZebinAndSLDTest, GivenZebinThenCreateDebugZebinAndPassToSLD) { module->addEmptyZebin(); module->addSegments(); @@ -310,7 +310,7 @@ TEST_F(ModuleWithZebinAndSLDTest, GivenZebinThenCreateDebugZebinAndPassToSLD) { EXPECT_TRUE(module->translationUnit->debugData); } -using KernelDebugSurfaceTest = TestLegacy; +using KernelDebugSurfaceTest = Test; HWTEST_F(KernelDebugSurfaceTest, givenDebuggerAndBindfulKernelWhenAppendingKernelToCommandListThenBindfulSurfaceStateForDebugSurfaceIsProgrammed) { NEO::MockCompilerEnableGuard mock(true); @@ -780,7 +780,7 @@ HWTEST_F(ModuleWithZebinAndL0DebuggerTest, GivenModuleDebugHandleZeroWhenInitial EXPECT_EQ(std::numeric_limits::max(), getMockDebuggerL0Hw()->removedZebinModuleHandle); } -using NotifyModuleLoadTest = TestLegacy; +using NotifyModuleLoadTest = Test; HWTEST_F(NotifyModuleLoadTest, givenDebuggingEnabledWhenModuleIsCreatedAndFullyLinkedThenIsaAllocationsAreCopiedAndResidentOnlyForUserModules) { NEO::MockCompilerEnableGuard mock(true); diff --git a/level_zero/core/test/unit_tests/sources/device/test_device.cpp b/level_zero/core/test/unit_tests/sources/device/test_device.cpp index 03dbeae928..1875f56f2c 100644 --- a/level_zero/core/test/unit_tests/sources/device/test_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/test_device.cpp @@ -2026,7 +2026,7 @@ HWTEST_F(MultipleDevicesDisabledImplicitScalingTest, givenTwoRootDevicesFromSame EXPECT_EQ(ZE_RESULT_ERROR_DEVICE_LOST, res); } -using DeviceTests = TestLegacy; +using DeviceTests = Test; TEST_F(DeviceTests, WhenGettingMemoryAccessPropertiesThenSuccessIsReturned) { ze_device_memory_access_properties_t properties; @@ -2663,7 +2663,7 @@ TEST_F(MultipleDevicesTest, givenTopologyMapForSubdeviceZeroWhenGettingPhysicalS EXPECT_FALSE(ret); } -using MultipleDevicesWithCustomHwInfoTest = TestLegacy; +using MultipleDevicesWithCustomHwInfoTest = Test; TEST_F(MultipleDevicesWithCustomHwInfoTest, givenTopologyWhenMappingToAndFromApiAndPhysicalSliceIdThenIdsAreMatching) { L0::Device *device0 = driverHandle->devices[0]; @@ -3227,14 +3227,14 @@ TEST_F(zeDeviceSystemBarrierTest, whenCallingSystemBarrierThenReturnErrorUnsuppo template struct MultiSubDeviceFixture : public DeviceFixture { - void SetUp() { + void setUp() { DebugManager.flags.CreateMultipleSubDevices.set(2); DebugManager.flags.EnableWalkerPartition.set(enablePartitionWalker); DebugManager.flags.EnableImplicitScaling.set(enableImplicitScaling); osLocalMemoryBackup = std::make_unique>(&NEO::OSInterface::osEnableLocalMemory, osLocalMemory); apiSupportBackup = std::make_unique>(&NEO::ImplicitScaling::apiSupport, apiSupport); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); deviceImp = reinterpret_cast(device); subDevice = neoDevice->getSubDevice(0); @@ -3247,7 +3247,7 @@ struct MultiSubDeviceFixture : public DeviceFixture { std::unique_ptr> apiSupportBackup; }; -using MultiSubDeviceTest = TestLegacy>; +using MultiSubDeviceTest = Test>; TEST_F(MultiSubDeviceTest, GivenApiSupportAndLocalMemoryEnabledWhenDeviceContainsSubDevicesThenItIsImplicitScalingCapable) { if (NEO::HwHelper::get(neoDevice->getHardwareInfo().platform.eRenderCoreFamily).platformSupportsImplicitScaling(neoDevice->getHardwareInfo())) { EXPECT_TRUE(device->isImplicitScalingCapable()); @@ -3258,25 +3258,25 @@ TEST_F(MultiSubDeviceTest, GivenApiSupportAndLocalMemoryEnabledWhenDeviceContain } } -using MultiSubDeviceTestNoApi = TestLegacy>; +using MultiSubDeviceTestNoApi = Test>; TEST_F(MultiSubDeviceTestNoApi, GivenNoApiSupportAndLocalMemoryEnabledWhenDeviceContainsSubDevicesThenItIsNotImplicitScalingCapable) { EXPECT_FALSE(device->isImplicitScalingCapable()); EXPECT_EQ(subDevice, deviceImp->getActiveDevice()); } -using MultiSubDeviceTestNoLocalMemory = TestLegacy>; +using MultiSubDeviceTestNoLocalMemory = Test>; TEST_F(MultiSubDeviceTestNoLocalMemory, GivenApiSupportAndLocalMemoryDisabledWhenDeviceContainsSubDevicesThenItIsNotImplicitScalingCapable) { EXPECT_FALSE(device->isImplicitScalingCapable()); EXPECT_EQ(subDevice, deviceImp->getActiveDevice()); } -using MultiSubDeviceTestNoApiForceOn = TestLegacy>; +using MultiSubDeviceTestNoApiForceOn = Test>; TEST_F(MultiSubDeviceTestNoApiForceOn, GivenNoApiSupportAndLocalMemoryEnabledWhenForcedImplicitScalingThenItIsImplicitScalingCapable) { EXPECT_TRUE(device->isImplicitScalingCapable()); EXPECT_EQ(neoDevice, deviceImp->getActiveDevice()); } -using MultiSubDeviceEnabledImplicitScalingTest = TestLegacy>; +using MultiSubDeviceEnabledImplicitScalingTest = Test>; TEST_F(MultiSubDeviceEnabledImplicitScalingTest, GivenApiSupportAndLocalMemoryEnabledWhenDeviceContainsSubDevicesAndSupportsImplicitScalingThenItIsImplicitScalingCapable) { EXPECT_TRUE(device->isImplicitScalingCapable()); EXPECT_EQ(neoDevice, deviceImp->getActiveDevice()); @@ -3291,7 +3291,7 @@ TEST_F(MultiSubDeviceEnabledImplicitScalingTest, GivenEnabledImplicitScalingWhen EXPECT_EQ(defaultEngine.commandStreamReceiver, csr); } -using DeviceSimpleTests = TestLegacy; +using DeviceSimpleTests = Test; static_assert(ZE_MEMORY_ACCESS_CAP_FLAG_RW == UNIFIED_SHARED_MEMORY_ACCESS, "Flags value difference"); static_assert(ZE_MEMORY_ACCESS_CAP_FLAG_ATOMIC == UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS, "Flags value difference"); 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 bc882257fa..ff0f3bf50a 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 @@ -54,7 +54,7 @@ TEST(zeInit, whenCallingZeInitWithoutGpuOnlyFlagThenInitializeOnDriverIsNotCalle EXPECT_EQ(0u, driver.initCalledCount); } -using DriverHandleImpTest = TestLegacy; +using DriverHandleImpTest = Test; TEST_F(DriverHandleImpTest, givenDriverImpWhenCallingupdateRootDeviceBitFieldsThendeviceBitfieldsAreUpdatedInAccordanceWithNeoDevice) { auto hwInfo = *NEO::defaultHwInfo; auto newNeoDevice = std::unique_ptr(NEO::MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); @@ -64,7 +64,7 @@ TEST_F(DriverHandleImpTest, givenDriverImpWhenCallingupdateRootDeviceBitFieldsTh EXPECT_EQ(newNeoDevice->getDeviceBitfield(), entry->second); } -using DriverVersionTest = TestLegacy; +using DriverVersionTest = Test; TEST_F(DriverVersionTest, givenCallToGetExtensionPropertiesThenSupportedExtensionsAreReturned) { uint32_t count = 0; @@ -150,7 +150,7 @@ TEST_F(DriverVersionTest, whenCallingGetDriverPropertiesRepeatedlyThenTheSameUui } } -using ImportNTHandle = TestLegacy; +using ImportNTHandle = Test; class MemoryManagerNTHandleMock : public NEO::OsAgnosticMemoryManager { public: 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 f6840429af..96c6a9d070 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 @@ -41,8 +41,8 @@ extern std::function setupPauseAddress; namespace L0 { namespace ult { -using EventPoolCreate = TestLegacy; -using EventCreate = TestLegacy; +using EventPoolCreate = Test; +using EventCreate = Test; class MemoryManagerEventPoolFailMock : public NEO::MemoryManager { public: @@ -294,7 +294,7 @@ class MemoryManagerEventPoolIPCMock : public NEO::MockMemoryManager { NEO::MockGraphicsAllocation *alloc; }; -using EventPoolIPCHandleTests = TestLegacy; +using EventPoolIPCHandleTests = Test; TEST_F(EventPoolIPCHandleTests, whenGettingIpcHandleForEventPoolThenHandleAndNumberOfEventsAreReturnedInHandle) { uint32_t numEvents = 4; @@ -428,7 +428,7 @@ TEST_F(EventPoolIPCHandleTests, GivenEventPoolWithIPCEventFlagAndHostMemoryThenS EXPECT_FALSE(allocation->getGraphicsAllocation(device->getNEODevice()->getRootDeviceIndex())->isShareableHostMemory); } -using EventPoolOpenIPCHandleFailTests = TestLegacy; +using EventPoolOpenIPCHandleFailTests = Test; TEST_F(EventPoolOpenIPCHandleFailTests, givenFailureToAllocateMemoryWhenOpeningIpcHandleForEventPoolThenInvalidArgumentIsReturned) { uint32_t numEvents = 4; @@ -497,7 +497,7 @@ class MultiDeviceEventPoolOpenIPCHandleFailTestsMemoryManager : public FailMemor uint32_t calls = 0; }; -using MultiDeviceEventPoolOpenIPCHandleFailTests = TestLegacy; +using MultiDeviceEventPoolOpenIPCHandleFailTests = Test; TEST_F(MultiDeviceEventPoolOpenIPCHandleFailTests, givenFailureToAllocateMemoryWhenOpeningIpcHandleForEventPoolWithMultipleDevicesThenOutOfHostMemoryIsReturned) { @@ -788,10 +788,10 @@ HWTEST2_F(EventCreate, givenPlatformNotSupportsMultTileWhenDebugKeyIsSetToUseCon event->destroy(); } -class EventSynchronizeTest : public TestLegacy { +class EventSynchronizeTest : public Test { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); ze_event_pool_desc_t eventPoolDesc = {}; eventPoolDesc.count = 1; eventPoolDesc.flags = ZE_EVENT_POOL_FLAG_HOST_VISIBLE; @@ -812,7 +812,7 @@ class EventSynchronizeTest : public TestLegacy { void TearDown() override { event.reset(nullptr); eventPool.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr eventPool = nullptr; @@ -1002,7 +1002,7 @@ TEST_F(EventSynchronizeTest, givenInfiniteTimeoutWhenWaitingForTimestampEventCom EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -using EventPoolIPCEventResetTests = TestLegacy; +using EventPoolIPCEventResetTests = Test; TEST_F(EventPoolIPCEventResetTests, whenOpeningIpcHandleForEventPoolCreateWithIpcFlagThenEventsInNewPoolAreNotReset) { std::unique_ptr eventPool = nullptr; @@ -1068,7 +1068,7 @@ TEST_F(EventPoolIPCEventResetTests, whenOpeningIpcHandleForEventPoolCreateWithIp EXPECT_EQ(*hostAddr2, Event::STATE_INITIAL); } -using EventAubCsrTest = TestLegacy; +using EventAubCsrTest = Test; HWTEST_F(EventAubCsrTest, givenCallToEventHostSynchronizeWithAubModeCsrReturnsSuccess) { std::unique_ptr> driverHandle; @@ -1132,10 +1132,10 @@ struct EventCreateAllocationResidencyTest : public ::testing::Test { L0::Device *device = nullptr; }; -class TimestampEventCreate : public TestLegacy { +class TimestampEventCreate : public Test { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); ze_event_pool_desc_t eventPoolDesc = {}; eventPoolDesc.count = 1; eventPoolDesc.flags = ZE_EVENT_POOL_FLAG_HOST_VISIBLE | ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP; @@ -1156,7 +1156,7 @@ class TimestampEventCreate : public TestLegacy { void TearDown() override { event.reset(nullptr); eventPool.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr eventPool; @@ -1267,10 +1267,10 @@ TEST_F(TimestampEventCreate, givenEventWithStaticPartitionOffThenQueryTimestampE EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result); } -class TimestampDeviceEventCreate : public TestLegacy { +class TimestampDeviceEventCreate : public Test { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); ze_event_pool_desc_t eventPoolDesc = {}; eventPoolDesc.count = 1; eventPoolDesc.flags = ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP; @@ -1291,7 +1291,7 @@ class TimestampDeviceEventCreate : public TestLegacy { void TearDown() override { event.reset(nullptr); eventPool.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr eventPool; @@ -1305,7 +1305,7 @@ TEST_F(TimestampDeviceEventCreate, givenTimestampDeviceEventThenAllocationsIsOfG EXPECT_EQ(NEO::AllocationType::GPU_TIMESTAMP_DEVICE_BUFFER, allocation->getAllocationType()); } -using EventQueryTimestampExpWithSubDevice = TestLegacy; +using EventQueryTimestampExpWithSubDevice = Test; TEST_F(EventQueryTimestampExpWithSubDevice, givenEventWhenQuerytimestampExpWithSubDeviceThenReturnsCorrectValueReturned) { std::unique_ptr eventPool; @@ -1542,7 +1542,7 @@ TEST_F(TimestampEventCreate, givenEventWhenQueryKernelTimestampThenNotReadyRetur EXPECT_EQ(0u, resultTimestamp.global.kernelEnd); } -using EventPoolCreateMultiDevice = TestLegacy; +using EventPoolCreateMultiDevice = Test; TEST_F(EventPoolCreateMultiDevice, givenReturnSubDevicesAsApiDevicesWhenCallZeGetDevicesThenSubDevicesAreReturnedAsSeparateDevices) { DebugManagerStateRestore restorer; @@ -1683,7 +1683,7 @@ TEST_F(EventPoolCreateMultiDevice, whenCreatingEventPoolWithNoDevicesThenEventPo EXPECT_EQ(allocation->getGraphicsAllocations().size(), numRootDevices); } -using EventPoolCreateSingleDevice = TestLegacy; +using EventPoolCreateSingleDevice = Test; TEST_F(EventPoolCreateSingleDevice, whenCreatingEventPoolWithNoDevicesThenEventPoolCreateSucceedsAndSingleDeviceIsUsed) { ze_event_pool_desc_t eventPoolDesc = {}; @@ -1800,7 +1800,7 @@ TEST_F(EventPoolCreateNegativeTest, whenInitializingEventPoolButMemoryManagerFai class EventFixture : public DeviceFixture { public: void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); auto hDevice = device->toHandle(); ze_result_t result = ZE_RESULT_SUCCESS; @@ -1810,7 +1810,7 @@ class EventFixture : public DeviceFixture { void TearDown() { eventPool->destroy(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } ze_event_pool_desc_t eventPoolDesc = { @@ -1968,7 +1968,7 @@ TEST_F(EventTests, WhenSettingL3FlushOnEventThenSetOnParticularKernel) { struct EventSizeFixture : public DeviceFixture { void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); hDevice = device->toHandle(); } @@ -1976,7 +1976,7 @@ struct EventSizeFixture : public DeviceFixture { eventObj0.reset(nullptr); eventObj1.reset(nullptr); eventPool.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } void createEvents() { diff --git a/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp b/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp index 27e4840626..73e3fbc4f7 100644 --- a/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp +++ b/level_zero/core/test/unit_tests/sources/fence/test_fence.cpp @@ -33,7 +33,7 @@ extern std::function setupPauseAddress; namespace L0 { namespace ult { -using FenceTest = TestLegacy; +using FenceTest = Test; TEST_F(FenceTest, whenQueryingStatusThenCsrAllocationsAreDownloaded) { auto csr = std::make_unique(*neoDevice->getExecutionEnvironment(), 0, neoDevice->getDeviceBitfield()); *csr->tagAddress = 0; @@ -169,7 +169,7 @@ TEST_F(FenceTest, GivenSuccessfulQueryResultAndNoTimeoutWhenHostSynchronizeIsCal EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -using FenceSynchronizeTest = TestLegacy; +using FenceSynchronizeTest = Test; TEST_F(FenceSynchronizeTest, givenCallToFenceHostSynchronizeWithTimeoutZeroAndStateInitialThenHostSynchronizeReturnsNotReady) { std::unique_ptr csr = nullptr; @@ -275,7 +275,7 @@ TEST_F(FenceSynchronizeTest, givenInfiniteTimeoutWhenWaitingForFenceCompletionTh EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -using FenceAubCsrTest = TestLegacy; +using FenceAubCsrTest = Test; HWTEST_F(FenceAubCsrTest, givenCallToFenceHostSynchronizeWithAubModeCsrReturnsSuccess) { std::unique_ptr> driverHandle; diff --git a/level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp b/level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp index 54d2f858e0..b69a590ffb 100644 --- a/level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp +++ b/level_zero/core/test/unit_tests/sources/helper/heap_assigner_l0_tests.cpp @@ -16,7 +16,7 @@ namespace L0 { namespace ult { -using AlocationHelperTests = TestLegacy; +using AlocationHelperTests = Test; using Platforms = IsAtMostProduct; diff --git a/level_zero/core/test/unit_tests/sources/image/test_image.cpp b/level_zero/core/test/unit_tests/sources/image/test_image.cpp index 6416040c8b..619aa8c8e7 100644 --- a/level_zero/core/test/unit_tests/sources/image/test_image.cpp +++ b/level_zero/core/test/unit_tests/sources/image/test_image.cpp @@ -27,8 +27,8 @@ namespace L0 { namespace ult { -using ImageCreate = TestLegacy; -using ImageView = TestLegacy; +using ImageCreate = Test; +using ImageView = Test; HWTEST2_F(ImageCreate, givenValidImageDescriptionWhenImageCreateThenImageIsCreatedCorrectly, IsAtLeastSkl) { ze_image_desc_t zeDesc = {}; @@ -95,11 +95,11 @@ HWTEST2_F(ImageCreate, givenValidImageDescriptionWhenImageCreateWithUnsupportedI class TestImageFormats : public DeviceFixture, public testing::TestWithParam> { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; @@ -813,7 +813,7 @@ TEST(ImageFormatDescHelperTest, givenSupportedSwizzlesThenProperClEnumIsReturned EXPECT_EQ(getClChannelOrder(format), static_cast(CL_BGRA)); } -using ImageGetMemoryProperties = TestLegacy; +using ImageGetMemoryProperties = Test; HWTEST2_F(ImageGetMemoryProperties, givenImageMemoryPropertiesExpStructureWhenGetMemroyPropertiesThenProperDataAreSet, IsAtLeastSkl) { ze_image_desc_t zeDesc = {}; diff --git a/level_zero/core/test/unit_tests/sources/kernel/test_function.cpp b/level_zero/core/test/unit_tests/sources/kernel/test_function.cpp index 50bf01d983..f7ac357ffd 100644 --- a/level_zero/core/test/unit_tests/sources/kernel/test_function.cpp +++ b/level_zero/core/test/unit_tests/sources/kernel/test_function.cpp @@ -14,7 +14,7 @@ namespace L0 { namespace ult { -using KernelImp = TestLegacy; +using KernelImp = Test; TEST_F(KernelImp, GivenCrossThreadDataThenIsCorrectlyPatchedWithGlobalWorkSizeAndGroupCount) { uint32_t *crossThreadData = @@ -104,11 +104,11 @@ TEST_F(KernelImp, WhenSuggestingGroupSizeThenClampToMaxGroupSize) { class KernelImpSuggestGroupSize : public DeviceFixture, public ::testing::TestWithParam { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; 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 d86ad4041f..749e5178c3 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 @@ -43,7 +43,7 @@ void populatePointerKernelArg(ArgDescPointer &dst, namespace L0 { namespace ult { -using KernelInitTest = TestLegacy; +using KernelInitTest = Test; TEST_F(KernelInitTest, givenKernelToInitWhenItHasUnknownArgThenUnknowKernelArgHandlerAssigned) { uint32_t perHwThreadPrivateMemorySizeRequested = 32u; @@ -62,7 +62,7 @@ TEST_F(KernelInitTest, givenKernelToInitWhenItHasUnknownArgThenUnknowKernelArgHa EXPECT_EQ(mockKernelImmData->getDescriptor().payloadMappings.explicitArgs[0].type, NEO::ArgDescriptor::ArgTUnknown); } -using KernelBaseAddressTests = TestLegacy; +using KernelBaseAddressTests = Test; TEST_F(KernelBaseAddressTests, whenQueryingKernelBaseAddressThenCorrectAddressIsReturned) { uint32_t perHwThreadPrivateMemorySizeRequested = 32u; @@ -102,7 +102,7 @@ struct MockKernelWithCallTracking : Mock<::L0::Kernel> { size_t setArgBufferWithAllocCalled = 0u; }; -using SetKernelArgCacheTest = TestLegacy; +using SetKernelArgCacheTest = Test; TEST_F(SetKernelArgCacheTest, givenValidBufferArgumentWhenSetMultipleTimesThenSetArgBufferWithAllocOnlyCalledIfNeeded) { MockKernelWithCallTracking mockKernel; @@ -172,7 +172,7 @@ TEST_F(SetKernelArgCacheTest, givenValidBufferArgumentWhenSetMultipleTimesThenSe svmAllocsManager->freeSVMAlloc(svmAllocation); } -using KernelImpSetGroupSizeTest = TestLegacy; +using KernelImpSetGroupSizeTest = Test; TEST_F(KernelImpSetGroupSizeTest, WhenCalculatingLocalIdsThenGrfSizeIsTakenFromCapabilityTable) { Mock mockKernel; @@ -246,7 +246,7 @@ TEST_F(KernelImpSetGroupSizeTest, givenZeroGroupSizeWhenSettingGroupSizeThenInva EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, ret); } -using SetKernelArg = TestLegacy; +using SetKernelArg = Test; using ImageSupport = IsWithinProducts; HWTEST2_F(SetKernelArg, givenImageAndKernelWhenSetArgImageThenCrossThreadDataIsSet, ImageSupport) { @@ -379,18 +379,7 @@ HWTEST2_F(SetKernelArg, givenBufferArgumentWhichHasNotBeenAllocatedByRuntimeThen EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, res); } -class KernelImmutableDataFixture : public ModuleImmutableDataFixture { - public: - void SetUp() { - ModuleImmutableDataFixture::SetUp(); - } - - void TearDown() { - ModuleImmutableDataFixture::TearDown(); - } -}; - -using KernelImmutableDataTests = TestLegacy; +using KernelImmutableDataTests = Test; TEST_F(KernelImmutableDataTests, givenKernelInitializedWithNoPrivateMemoryThenPrivateMemoryIsNull) { uint32_t perHwThreadPrivateMemorySizeRequested = 0u; @@ -1084,7 +1073,7 @@ class KernelPropertiesTests : public ModuleFixture, public ::testing::Test { using KernelImp::kernelHasIndirectAccess; }; void SetUp() override { - ModuleFixture::SetUp(); + ModuleFixture::setUp(); ze_kernel_desc_t kernelDesc = {}; kernelDesc.pKernelName = kernelName.c_str(); @@ -1098,7 +1087,7 @@ class KernelPropertiesTests : public ModuleFixture, public ::testing::Test { void TearDown() override { Kernel::fromHandle(kernelHandle)->destroy(); - ModuleFixture::TearDown(); + ModuleFixture::tearDown(); } ze_kernel_handle_t kernelHandle; @@ -1490,7 +1479,7 @@ TEST_F(KernelPropertiesTests, WhenGetExtensionIsCalledWithUnknownExtensionTypeTh EXPECT_EQ(nullptr, kernel->getExtension(0U)); } -using KernelLocalIdsTest = TestLegacy; +using KernelLocalIdsTest = Test; TEST_F(KernelLocalIdsTest, WhenKernelIsCreatedThenDefaultLocalIdGenerationbyRuntimeIsTrue) { createKernel(); @@ -1498,9 +1487,9 @@ TEST_F(KernelLocalIdsTest, WhenKernelIsCreatedThenDefaultLocalIdGenerationbyRunt EXPECT_TRUE(kernel->requiresGenerationOfLocalIdsByRuntime()); } -struct KernelIsaTests : TestLegacy { +struct KernelIsaTests : Test { void SetUp() override { - TestLegacy::SetUp(); + Test::SetUp(); auto &capabilityTable = device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable; bool createBcsEngine = !capabilityTable.blitterOperationsSupported; @@ -1649,7 +1638,7 @@ TEST_F(KernelIsaTests, givenGlobalBuffersWhenCreatingKernelImmutableDataThenBuff EXPECT_EQ(1, std::count(resCont.begin(), resCont.end(), &globalConstBuffer)); } -using KernelImpPatchBindlessTest = TestLegacy; +using KernelImpPatchBindlessTest = Test; TEST_F(KernelImpPatchBindlessTest, GivenKernelImpWhenPatchBindlessOffsetCalledThenOffsetPatchedCorrectly) { Mock kernel; @@ -1746,7 +1735,7 @@ HWTEST2_F(KernelImpPatchBindlessTest, GivenKernelImpWhenSetSurfaceStateBindfulTh EXPECT_TRUE(memcmp(&surfaceStateAfter, &surfaceStateBefore, size) == 0); } -using KernelImpL3CachingTests = TestLegacy; +using KernelImpL3CachingTests = Test; HWTEST2_F(KernelImpL3CachingTests, GivenKernelImpWhenSetSurfaceStateWithUnalignedMemoryThenL3CachingIsDisabled, MatchAny) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; @@ -1845,7 +1834,7 @@ TEST_F(KernelImpPatchBindlessTest, GivenUndefiedBidfulAndBindlesstOffsetWhenSetA EXPECT_FALSE(mockKernel.setSurfaceStateCalled); } -using KernelBindlessUncachedMemoryTests = TestLegacy; +using KernelBindlessUncachedMemoryTests = Test; TEST_F(KernelBindlessUncachedMemoryTests, givenBindlessKernelAndAllocDataNoTfoundThenKernelRequiresUncachedMocsIsSet) { ze_kernel_desc_t desc = {}; @@ -2173,7 +2162,7 @@ HWTEST2_F(SetKernelArg, givenSupportsMediaBlockAndIsMediaBlockImageWhenSetArgIma } } -using ImportHostPointerSetKernelArg = TestLegacy; +using ImportHostPointerSetKernelArg = Test; TEST_F(ImportHostPointerSetKernelArg, givenHostPointerImportedWhenSettingKernelArgThenUseHostPointerAllocation) { createKernel(); @@ -2190,7 +2179,7 @@ TEST_F(ImportHostPointerSetKernelArg, givenHostPointerImportedWhenSettingKernelA class KernelGlobalWorkOffsetTests : public ModuleFixture, public ::testing::Test { public: void SetUp() override { - ModuleFixture::SetUp(); + ModuleFixture::setUp(); ze_kernel_desc_t kernelDesc = {}; kernelDesc.pKernelName = kernelName.c_str(); @@ -2203,7 +2192,7 @@ class KernelGlobalWorkOffsetTests : public ModuleFixture, public ::testing::Test void TearDown() override { Kernel::fromHandle(kernelHandle)->destroy(); - ModuleFixture::TearDown(); + ModuleFixture::tearDown(); } ze_kernel_handle_t kernelHandle; @@ -2242,7 +2231,7 @@ TEST_F(KernelGlobalWorkOffsetTests, whenSettingGlobalOffsetThenCrossThreadDataIs EXPECT_EQ(*(dst.begin() + desc.payloadMappings.dispatchTraits.globalWorkOffset[2]), globalOffsetz); } -using KernelWorkDimTests = TestLegacy; +using KernelWorkDimTests = Test; TEST_F(KernelWorkDimTests, givenGroupCountsWhenPatchingWorkDimThenCrossThreadDataIsPatched) { uint32_t perHwThreadPrivateMemorySizeRequested = 32u; @@ -2279,7 +2268,7 @@ TEST_F(KernelWorkDimTests, givenGroupCountsWhenPatchingWorkDimThenCrossThreadDat } } -using KernelPrintHandlerTest = TestLegacy; +using KernelPrintHandlerTest = Test; struct MyPrintfHandler : public PrintfHandler { static uint32_t getPrintfSurfaceInitialDataSize() { return PrintfHandler::printfSurfaceInitialDataSize; @@ -2300,7 +2289,7 @@ TEST_F(KernelPrintHandlerTest, whenPrintPrintfOutputIsCalledThenPrintfBufferIsUs EXPECT_EQ(buffer, MyPrintfHandler::getPrintfSurfaceInitialDataSize()); } -using PrintfTest = TestLegacy; +using PrintfTest = Test; TEST_F(PrintfTest, givenKernelWithPrintfThenPrintfBufferIsCreated) { Mock mockModule(this->device, nullptr); @@ -2373,7 +2362,7 @@ TEST_F(PrintfTest, WhenCreatingPrintfBufferThenCrossThreadDataIsPatched) { mockKernel.crossThreadData.release(); } -using KernelPatchtokensPrintfStringMapTests = TestLegacy; +using KernelPatchtokensPrintfStringMapTests = Test; TEST_F(KernelPatchtokensPrintfStringMapTests, givenKernelWithPrintfStringsMapUsageEnabledWhenPrintOutputThenProperStringIsPrinted) { std::unique_ptr mockKernelImmData = std::make_unique(0u); @@ -2458,7 +2447,7 @@ TEST_F(KernelPatchtokensPrintfStringMapTests, givenKernelWithPrintfStringsMapUsa EXPECT_STREQ(expectedString.c_str(), output.c_str()); } -using KernelImplicitArgTests = TestLegacy; +using KernelImplicitArgTests = Test; TEST_F(KernelImplicitArgTests, givenKernelWithImplicitArgsWhenInitializeThenPrintfSurfaceIsCreatedAndProperlyPatchedInImplicitArgs) { std::unique_ptr mockKernelImmData = std::make_unique(0u); @@ -2543,7 +2532,7 @@ TEST_F(KernelImplicitArgTests, givenKernelWithImplicitArgsWhenSettingKernelParam EXPECT_EQ(0, memcmp(pImplicitArgs, &expectedImplicitArgs, sizeof(ImplicitArgs))); } -using MultiTileModuleTest = TestLegacy; +using MultiTileModuleTest = Test; HWTEST2_F(MultiTileModuleTest, GivenMultiTileDeviceWhenSettingKernelArgAndSurfaceStateThenMultiTileFlagsAreSetCorrectly, IsXeHpCore) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; diff --git a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp index e50b955b2b..28986bc1d4 100644 --- a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp +++ b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp @@ -276,7 +276,7 @@ TEST_F(MemoryExportImportImplicitScalingTest, EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -using MemoryTest = TestLegacy; +using MemoryTest = Test; struct CompressionMemoryTest : public MemoryTest { GraphicsAllocation *allocDeviceMem(size_t size) { @@ -3046,7 +3046,7 @@ TEST_F(MemoryFailedOpenIpcHandleImplicitScalingTest, EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -using DeviceMemorySizeTest = TestLegacy; +using DeviceMemorySizeTest = Test; TEST_F(DeviceMemorySizeTest, givenSizeGreaterThanLimitThenDeviceAllocationFails) { size_t size = neoDevice->getDeviceInfo().maxMemAllocSize + 1; @@ -3438,7 +3438,7 @@ TEST_F(AllocHostMemoryTest, EXPECT_EQ(nullptr, ptr); } -using ContextMemoryTest = TestLegacy; +using ContextMemoryTest = Test; TEST_F(ContextMemoryTest, whenAllocatingSharedAllocationFromContextThenAllocationSucceeds) { size_t size = 10u; 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 ab76d607c8..e8a50b587d 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 @@ -36,7 +36,7 @@ namespace L0 { namespace ult { -using ModuleTest = TestLegacy; +using ModuleTest = Test; HWTEST_F(ModuleTest, givenBinaryWithDebugDataWhenModuleCreatedFromNativeBinaryThenDebugDataIsStored) { size_t size = 0; @@ -372,7 +372,7 @@ HWTEST_F(ModuleTest, givenUnalignedHostBufferWhenSurfaceStateProgrammedThenUnali Kernel::fromHandle(kernelHandle)->destroy(); } -using ModuleUncachedBufferTest = TestLegacy; +using ModuleUncachedBufferTest = Test; struct KernelImpUncachedTest : public KernelImp { using KernelImp::kernelRequiresUncachedMocsCount; @@ -544,8 +544,8 @@ HWTEST_F(ModuleTest, GivenIncorrectNameWhenCreatingKernelThenResultErrorInvalidA template struct ModuleSpecConstantsFixture : public DeviceFixture { - void SetUp() { - DeviceFixture::SetUp(); + void setUp() { + DeviceFixture::setUp(); mockCompiler = new MockCompilerInterfaceWithSpecConstants(moduleNumSpecConstants); auto rootDeviceEnvironment = neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[0].get(); @@ -554,8 +554,8 @@ struct ModuleSpecConstantsFixture : public DeviceFixture { mockTranslationUnit = new MockModuleTranslationUnit(device); } - void TearDown() { - DeviceFixture::TearDown(); + void tearDown() { + DeviceFixture::tearDown(); } void runTest() { @@ -665,7 +665,7 @@ struct ModuleSpecConstantsFixture : public DeviceFixture { }; template -using ModuleSpecConstantsTests = TestLegacy>; +using ModuleSpecConstantsTests = Test>; using ModuleSpecConstantsLongTests = ModuleSpecConstantsTests; TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWithLongSizeInDescriptorThenModuleCorrectlyPassesThemToTheCompiler) { @@ -832,11 +832,11 @@ TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWhenCompiler struct ModuleStaticLinkFixture : public DeviceFixture { void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } void TearDown() { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } void loadModules(bool multiple) { @@ -990,7 +990,7 @@ struct ModuleStaticLinkFixture : public DeviceFixture { bool testSingle = false; }; -using ModuleStaticLinkTests = TestLegacy; +using ModuleStaticLinkTests = Test; TEST_F(ModuleStaticLinkTests, givenMultipleModulesProvidedForSpirVStaticLinkAndCompilerFailsThenFailureIsReturned) { runLinkFailureTest(); @@ -1012,7 +1012,7 @@ TEST_F(ModuleStaticLinkTests, givenSingleModuleProvidedForSpirVStaticLinkAndBuil runSprivLinkBuildWithOneModule(); } -using ModuleLinkingTest = TestLegacy; +using ModuleLinkingTest = Test; HWTEST_F(ModuleLinkingTest, whenExternFunctionsAllocationIsPresentThenItsBeingAddedToResidencyContainer) { Mock module(device, nullptr); @@ -1097,7 +1097,7 @@ HWTEST_F(ModuleLinkingTest, givenNotFullyLinkedModuleWhenCreatingKernelThenError EXPECT_EQ(ZE_RESULT_ERROR_INVALID_MODULE_UNLINKED, retVal); } -using ModulePropertyTest = TestLegacy; +using ModulePropertyTest = Test; TEST_F(ModulePropertyTest, whenZeModuleGetPropertiesIsCalledThenGetPropertiesIsCalled) { Mock module(device, nullptr); @@ -1144,21 +1144,21 @@ TEST_F(ModulePropertyTest, givenCallToGetPropertiesWithUnresolvedSymbolsThenFlag EXPECT_EQ(expectedFlags, moduleProperties.flags); } -struct ModuleFunctionPointerTests : public TestLegacy { +struct ModuleFunctionPointerTests : public Test { void SetUp() override { - TestLegacy::SetUp(); + Test::SetUp(); module0 = std::make_unique>(device, nullptr, ModuleType::User); } void TearDown() override { module0.reset(nullptr); - TestLegacy::TearDown(); + Test::TearDown(); } std::unique_ptr> module0; }; -struct ModuleDynamicLinkTests : public TestLegacy { +struct ModuleDynamicLinkTests : public Test { void SetUp() override { - TestLegacy::SetUp(); + Test::SetUp(); module0 = std::make_unique>(device, nullptr, ModuleType::User); module1 = std::make_unique>(device, nullptr, ModuleType::User); module2 = std::make_unique>(device, nullptr, ModuleType::User); @@ -1167,7 +1167,7 @@ struct ModuleDynamicLinkTests : public TestLegacy { module0.reset(nullptr); module1.reset(nullptr); module2.reset(nullptr); - TestLegacy::TearDown(); + Test::TearDown(); } std::unique_ptr> module0; std::unique_ptr> module1; @@ -1657,7 +1657,7 @@ TEST_F(ModuleDynamicLinkTests, givenModuleWithUnresolvedSymbolsNotPresentInAnoth zeModuleBuildLogDestroy(dynLinkLog); } -using ModuleDynamicLinkTest = TestLegacy; +using ModuleDynamicLinkTest = Test; TEST_F(ModuleDynamicLinkTest, givenUnresolvedSymbolsWhenModuleIsCreatedThenIsaAllocationsAreNotCopied) { NEO::MockCompilerEnableGuard mock(true); auto cip = new NEO::MockCompilerInterfaceCaptureBuildOptions(); @@ -1839,11 +1839,11 @@ TEST_F(ModuleFunctionPointerTests, givenModuleWithExportedSymbolThenGetFunctionP class DeviceModuleSetArgBufferTest : public ModuleFixture, public ::testing::Test { public: void SetUp() override { - ModuleFixture::SetUp(); + ModuleFixture::setUp(); } void TearDown() override { - ModuleFixture::TearDown(); + ModuleFixture::tearDown(); } void createKernelAndAllocMemory(uint32_t rootDeviceIndex, void **ptr, ze_kernel_handle_t *kernelHandle) { @@ -1901,11 +1901,11 @@ HWTEST_F(DeviceModuleSetArgBufferTest, class MultiDeviceModuleSetArgBufferTest : public MultiDeviceModuleFixture, public ::testing::Test { public: void SetUp() override { - MultiDeviceModuleFixture::SetUp(); + MultiDeviceModuleFixture::setUp(); } void TearDown() override { - MultiDeviceModuleFixture::TearDown(); + MultiDeviceModuleFixture::tearDown(); } void createKernelAndAllocMemory(uint32_t rootDeviceIndex, void **ptr, ze_kernel_handle_t *kernelHandle) { @@ -1944,7 +1944,7 @@ HWTEST_F(MultiDeviceModuleSetArgBufferTest, } } -using ContextModuleCreateTest = TestLegacy; +using ContextModuleCreateTest = Test; HWTEST_F(ContextModuleCreateTest, givenCallToCreateModuleThenModuleIsReturned) { std::string testFile; @@ -1971,7 +1971,7 @@ HWTEST_F(ContextModuleCreateTest, givenCallToCreateModuleThenModuleIsReturned) { EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -using ModuleTranslationUnitTest = TestLegacy; +using ModuleTranslationUnitTest = Test; struct MockModuleTU : public L0::ModuleTranslationUnit { MockModuleTU(L0::Device *device) : L0::ModuleTranslationUnit(device) {} @@ -2386,7 +2386,7 @@ TEST(ModuleBuildLog, WhenTooSmallBufferIsPassedToGetStringThenErrorIsReturned) { EXPECT_EQ(ZE_RESULT_SUCCESS, destroyResult); } -using PrintfModuleTest = TestLegacy; +using PrintfModuleTest = Test; HWTEST_F(PrintfModuleTest, GivenModuleWithPrintfWhenKernelIsCreatedThenPrintfAllocationIsPlacedInResidencyContainer) { std::string testFile; @@ -2618,7 +2618,7 @@ TEST_F(ModuleTest, whenContainsStatefulAccessIsCalledThenResultIsCorrect) { } } -using ModuleInitializeTest = TestLegacy; +using ModuleInitializeTest = Test; TEST_F(ModuleInitializeTest, whenModuleInitializeIsCalledThenCorrectResultIsReturned) { class MockModuleImp : public ModuleImp { @@ -2691,7 +2691,7 @@ TEST_F(ModuleInitializeTest, whenModuleInitializeIsCalledThenCorrectResultIsRetu } } -using ModuleDebugDataTest = TestLegacy; +using ModuleDebugDataTest = Test; TEST_F(ModuleDebugDataTest, GivenDebugDataWithRelocationsWhenCreatingRelocatedDebugDataThenRelocationsAreApplied) { auto cip = new NEO::MockCompilerInterfaceCaptureBuildOptions(); neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()]->compilerInterface.reset(cip); @@ -2843,7 +2843,7 @@ TEST_F(ModuleTest, givenModuleWithGlobalSymbolsMapWhenPopulatingMapWithSymbolFro EXPECT_STREQ(expectedErrorOutput.c_str(), module0->getTranslationUnit()->buildLog.c_str()); } -using ModuleTests = TestLegacy; +using ModuleTests = Test; TEST_F(ModuleTests, whenCopyingPatchedSegmentsThenAllocationsAreSetWritableForTbxAndAub) { auto pModule = std::make_unique(device, nullptr, ModuleType::User); @@ -3036,7 +3036,7 @@ TEST_F(ModuleTests, givenModuleWithGlobalAndConstAllocationsWhenGettingModuleAll EXPECT_NE(allocs.end(), iter); } -using ModuleIsaCopyTest = TestLegacy; +using ModuleIsaCopyTest = Test; TEST_F(ModuleIsaCopyTest, whenModuleIsInitializedThenIsaIsCopied) { MockImmutableMemoryManager *mockMemoryManager = static_cast(device->getNEODevice()->getMemoryManager()); @@ -3060,7 +3060,7 @@ TEST_F(ModuleIsaCopyTest, whenModuleIsInitializedThenIsaIsCopied) { } } -using ModuleWithZebinTest = TestLegacy; +using ModuleWithZebinTest = Test; TEST_F(ModuleWithZebinTest, givenNoZebinThenSegmentsAreEmpty) { auto segments = module->getZebinSegments(); diff --git a/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp b/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp index 10a57d141b..beaf2e9db9 100644 --- a/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp +++ b/level_zero/core/test/unit_tests/sources/module/test_module_2.cpp @@ -21,7 +21,7 @@ namespace ult { class ModuleOnlineCompiled : public DeviceFixture, public testing::Test { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); std::string kernelFilename; size_t spvModuleSize = 0; @@ -42,12 +42,12 @@ class ModuleOnlineCompiled : public DeviceFixture, public testing::Test { void TearDown() override { module.reset(nullptr); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr> module; }; -using ModuleTests = TestLegacy; +using ModuleTests = Test; TEST_F(ModuleTests, WhenCreatingBuildOptionsThenOptionsParsedCorrectly) { auto module = new ModuleImp(device, nullptr, ModuleType::User); diff --git a/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp b/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp index e6268db1dc..3bfb14c1fc 100644 --- a/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp +++ b/level_zero/core/test/unit_tests/sources/sampler/test_sampler.cpp @@ -33,16 +33,16 @@ const auto samplerIsNormalized = ::testing::Values( using SamplerCreateSupport = IsWithinProducts; class SamplerCreateTest - : public TestLegacy, + : public Test, public ::testing::WithParamInterface> { public: void SetUp() override { - TestLegacy::SetUp(); + Test::SetUp(); } void TearDown() override { - TestLegacy::TearDown(); + Test::TearDown(); } }; @@ -151,7 +151,7 @@ INSTANTIATE_TEST_CASE_P(SamplerDescCombinations, SamplerCreateTest, samplerFilterMode, samplerIsNormalized)); -using ContextCreateSamplerTest = TestLegacy; +using ContextCreateSamplerTest = Test; HWTEST2_F(ContextCreateSamplerTest, givenDifferentDescriptorValuesThenSamplerIsCorrectlyCreated, SamplerCreateSupport) { ze_sampler_address_mode_t addressMode = ZE_SAMPLER_ADDRESS_MODE_NONE; diff --git a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdlist_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdlist_xe_hp_core.cpp index e88f4b8bb4..073a0fc190 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdlist_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdlist_xe_hp_core.cpp @@ -25,10 +25,10 @@ namespace L0 { namespace ult { -using CommandListCreate = TestLegacy; -using CommandListAppendLaunchKernel = TestLegacy; +using CommandListCreate = Test; +using CommandListAppendLaunchKernel = Test; -using CommandListAppendLaunchKernelWithAtomics = TestLegacy; +using CommandListAppendLaunchKernelWithAtomics = Test; HWTEST2_F(CommandListAppendLaunchKernelWithAtomics, givenKernelWithNoGlobalAtomicsThenLastSentGlobalAtomicsInContainerStaysFalse, IsXeHpCore) { Mock<::L0::Kernel> kernel; @@ -144,7 +144,7 @@ HWTEST2_F(CommandListAppendLaunchKernelWithAtomics, givenKernelWithGlobalAtomics EXPECT_FALSE(pCommandList->commandContainer.lastSentUseGlobalAtomics); } -using MultTileCommandListAppendLaunchKernelL3Flush = TestLegacy>; +using MultTileCommandListAppendLaunchKernelL3Flush = Test>; HWTEST2_F(MultTileCommandListAppendLaunchKernelL3Flush, givenKernelWithRegularEventAndWithWalkerPartitionThenProperCommandsEncoded, IsXeHpCore) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; @@ -262,7 +262,7 @@ HWTEST2_F(MultTileCommandListAppendLaunchKernelL3Flush, givenKernelWithTimestamp ASSERT_LE(1u, postSyncCount); } -using CommandListAppendLaunchKernelL3Flush = TestLegacy; +using CommandListAppendLaunchKernelL3Flush = Test; HWTEST2_F(CommandListAppendLaunchKernelL3Flush, givenKernelWithEventAndWithoutWalkerPartitionThenProperCommandsEncoded, IsXeHpCore) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; diff --git a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_enqueuecommandlist_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_enqueuecommandlist_xe_hp_core.cpp index 93df61f828..aabfa73772 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_enqueuecommandlist_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_enqueuecommandlist_xe_hp_core.cpp @@ -22,7 +22,7 @@ namespace L0 { namespace ult { -using CommandQueueExecuteCommandListsXE_HP_CORE = TestLegacy; +using CommandQueueExecuteCommandListsXE_HP_CORE = Test; XE_HP_CORE_TEST_F(CommandQueueExecuteCommandListsXE_HP_CORE, WhenExecutingCmdListsThenPipelineSelectAndCfeStateAreAddedToCmdBuffer) { const ze_command_queue_desc_t desc = {}; 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 075988f19c..ca9d2dfa26 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 @@ -12,7 +12,7 @@ namespace L0 { namespace ult { -using DeviceFixtureXeHpCore = TestLegacy; +using DeviceFixtureXeHpCore = Test; HWTEST2_F(DeviceFixtureXeHpCore, GivenTargetXeHpCoreaWhenGettingMemoryPropertiesThenMemoryNameComesAsHBM, IsXeHpCore) { ze_device_memory_properties_t memProperties = {}; @@ -32,7 +32,7 @@ HWTEST2_F(DeviceFixtureXeHpCore, givenReturnedDevicePropertiesThenExpectedProper EXPECT_EQ(0u, deviceProps.flags & ZE_DEVICE_PROPERTY_FLAG_INTEGRATED); } -using CommandQueueGroupTest = TestLegacy; +using CommandQueueGroupTest = Test; HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpCore) { const uint32_t rootDeviceIndex = 0u; @@ -104,22 +104,22 @@ HWTEST2_F(CommandQueueGroupTest, givenBlitterSupportAndCCSThenThreeQueueGroupsAr } } -class DeviceCopyQueueGroupFixture : public DeviceFixture { +class DeviceCopyQueueGroupXeHpCoreFixture : public DeviceFixture { public: - void SetUp() { + void setUp() { DebugManager.flags.EnableBlitterOperationsSupport.set(0); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } - void TearDown() { - DeviceFixture::TearDown(); + void tearDown() { + DeviceFixture::tearDown(); } DebugManagerStateRestore restorer; }; -using DeviceCopyQueueGroupTest = TestLegacy; +using DeviceCopyQueueGroupXeHpCoreTest = Test; -HWTEST2_F(DeviceCopyQueueGroupTest, +HWTEST2_F(DeviceCopyQueueGroupXeHpCoreTest, givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsXeHpCore) { const uint32_t rootDeviceIndex = 0u; NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); diff --git a/level_zero/core/test/unit_tests/xe_hp_core/test_module_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_module_xe_hp_core.cpp index 6fb8cdd77f..a548cc729a 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_module_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_module_xe_hp_core.cpp @@ -13,7 +13,7 @@ namespace L0 { namespace ult { -using KernelPropertyTest = TestLegacy; +using KernelPropertyTest = Test; HWTEST2_F(KernelPropertyTest, givenKernelExtendedPropertiesStructureWhenKernelPropertiesCalledThenPropertiesAreCorrectlySet, IsXeHpCore) { ze_device_module_properties_t kernelProperties = {}; diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/built_in_xe_hpc_core_tests_l0.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/built_in_xe_hpc_core_tests_l0.cpp index 41b2231e7a..47cd0f7ae4 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/built_in_xe_hpc_core_tests_l0.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/built_in_xe_hpc_core_tests_l0.cpp @@ -16,7 +16,7 @@ namespace L0 { namespace ult { -using XeHpcCoreBuiltInTestL0 = TestLegacy; +using XeHpcCoreBuiltInTestL0 = Test; HWTEST_EXCLUDE_PRODUCT(BuiltInSharedTest, GivenBuiltinTypeBinaryWhenGettingBuiltinResourceForNotRegisteredRevisionThenBuiltinFromDefaultRevisionIsTaken, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(BuiltInTestL0, givenDeviceWithUnregisteredBinaryBuiltinWhenGettingBuiltinKernelThenTakeBinaryBuiltinFromDefaultRevision, IGFX_XE_HPC_CORE); @@ -51,4 +51,4 @@ HWTEST2_F(XeHpcCoreBuiltInTestL0, GivenBuiltinTypeBinaryWhenGettingBuiltinResour EXPECT_EQ(0u, mockBuiltinsLib->getBuiltinResource(EBuiltInOps::COUNT, BuiltinCode::ECodeType::Binary, *pDevice).size()); } } // namespace ult -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_cmdlist_pvc.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_cmdlist_pvc.cpp index 3be96f6f6b..9b3db656cb 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_cmdlist_pvc.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_cmdlist_pvc.cpp @@ -17,7 +17,7 @@ namespace L0 { namespace ult { -using CommandListStatePrefetchPvcXt = TestLegacy; +using CommandListStatePrefetchPvcXt = Test; PVCTEST_F(CommandListStatePrefetchPvcXt, givenCommandBufferIsExhaustedWhenPrefetchApiCalledAndIsPvcXtNotBaseDieA0ThenProgramStatePrefetch) { auto hwInfo = device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo(); @@ -36,7 +36,7 @@ PVCTEST_F(CommandListStatePrefetchPvcXt, givenDebugFlagSetWhenPrefetchApiCalledA checkIfDebugFlagSetWhenPrefetchApiCalledAThenStatePrefetchProgrammed(hwInfo); } -using CommandListEventFenceTestsPvc = TestLegacy; +using CommandListEventFenceTestsPvc = Test; PVCTEST_F(CommandListEventFenceTestsPvc, givenCommandListWithProfilingEventAfterCommandOnPvcRev00ThenMiFenceIsNotAdded) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -69,7 +69,7 @@ PVCTEST_F(CommandListEventFenceTestsPvc, givenCommandListWithProfilingEventAfter EXPECT_EQ(cmdList.end(), itor); } -using CommandListAppendBarrierXeHpcCore = TestLegacy; +using CommandListAppendBarrierXeHpcCore = Test; PVCTEST_F(CommandListAppendBarrierXeHpcCore, givenCommandListWhenAppendingBarrierThenPipeControlIsProgrammedAndHdcAndUnTypedFlushesAreSet) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp index 0171d99c16..39f8f65a93 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp @@ -19,7 +19,7 @@ namespace L0 { namespace ult { -using DeviceTestPvcXt = TestLegacy; +using DeviceTestPvcXt = Test; PVCTEST_F(DeviceTestPvcXt, whenCallingGetMemoryPropertiesWithNonNullPtrAndRevisionIsNotBaseDieA0OnPvcXtThenMaxClockRateReturnedIsZero) { auto &device = driverHandle->devices[0]; @@ -31,7 +31,7 @@ PVCTEST_F(DeviceTestPvcXt, whenCallingGetMemoryPropertiesWithNonNullPtrAndRevisi checkIfCallingGetMemoryPropertiesWithNonNullPtrThenMaxClockRateReturnZero(hwInfo); } -using DeviceTestPvc = TestLegacy; +using DeviceTestPvc = Test; PVCTEST_F(DeviceTestPvc, givenPvcAStepWhenCreatingMultiTileDeviceThenExpectImplicitScalingDisabled) { auto hwInfo = *NEO::defaultHwInfo; const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp index 95504eaa47..704eb9808c 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdlist_xe_hpc_core.cpp @@ -21,14 +21,14 @@ namespace L0 { namespace ult { struct LocalMemoryModuleFixture : public ModuleFixture { - void SetUp() { + void setUp() { DebugManager.flags.EnableLocalMemory.set(1); - ModuleFixture::SetUp(); + ModuleFixture::setUp(); } DebugManagerStateRestore restore; }; -using CommandListAppendLaunchKernelXeHpcCore = TestLegacy; +using CommandListAppendLaunchKernelXeHpcCore = Test; HWTEST2_F(CommandListAppendLaunchKernelXeHpcCore, givenKernelUsingSyncBufferWhenAppendLaunchCooperativeKernelIsCalledThenCorrectValueIsReturned, IsXeHpcCore) { auto &hwInfo = *device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo(); auto &hwConfig = *NEO::HwInfoConfig::get(hwInfo.platform.eProductFamily); @@ -64,7 +64,7 @@ HWTEST2_F(CommandListAppendLaunchKernelXeHpcCore, givenKernelUsingSyncBufferWhen } } -using CommandListStatePrefetchXeHpcCore = TestLegacy; +using CommandListStatePrefetchXeHpcCore = Test; HWTEST2_F(CommandListStatePrefetchXeHpcCore, givenUnifiedSharedMemoryWhenPrefetchApiIsCalledThenDontRequestMemoryPrefetchByDefault, IsXeHpcCore) { auto pCommandList = std::make_unique>>(); @@ -386,7 +386,7 @@ HWTEST2_F(CommandListStatePrefetchXeHpcCore, givenAppendMemoryPrefetchForKmdMigr commandQueue->destroy(); } -using CommandListEventFenceTestsXeHpcCore = TestLegacy; +using CommandListEventFenceTestsXeHpcCore = Test; HWTEST2_F(CommandListEventFenceTestsXeHpcCore, givenCommandListWithProfilingEventAfterCommandWhenRevId03ThenMiFenceIsAdded, IsXeHpcCore) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -449,7 +449,7 @@ HWTEST2_F(CommandListEventFenceTestsXeHpcCore, givenCommandListWithRegularEventA EXPECT_NE(cmdList.end(), itor); } -using CommandListAppendRangesBarrierXeHpcCore = TestLegacy; +using CommandListAppendRangesBarrierXeHpcCore = Test; HWTEST2_F(CommandListAppendRangesBarrierXeHpcCore, givenCallToAppendRangesBarrierThenPipeControlProgrammed, IsXeHpcCore) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp index 1a15e55728..d0c6fcf328 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp @@ -22,30 +22,7 @@ namespace L0 { namespace ult { -struct CommandQueueCreateMultiOrdinalFixture : public DeviceFixture { - void SetUp() { - NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo; - hwInfo.featureTable.flags.ftrCCSNode = true; - hwInfo.featureTable.ftrBcsInfo = 0; - hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 4; - - neoDevice = NEO::MockDevice::createWithNewExecutionEnvironment(&hwInfo); - NEO::DeviceVector devices; - devices.push_back(std::unique_ptr(neoDevice)); - driverHandle = std::make_unique>(); - driverHandle->initialize(std::move(devices)); - device = driverHandle->devices[0]; - } - - void TearDown() { - } - - std::unique_ptr> driverHandle; - NEO::MockDevice *neoDevice = nullptr; - L0::Device *device = nullptr; -}; - -using CommandQueueCommandsXeHpc = TestLegacy; +using CommandQueueCommandsXeHpc = Test; HWTEST2_F(CommandQueueCommandsXeHpc, givenCommandQueueWhenExecutingCommandListsThenGlobalFenceAllocationIsResident, IsXeHpcCore) { using STATE_SYSTEM_MEM_FENCE_ADDRESS = typename FamilyType::STATE_SYSTEM_MEM_FENCE_ADDRESS; diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp index 4a23d111c0..c3881c2018 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp @@ -20,7 +20,7 @@ namespace ult { HWTEST_EXCLUDE_PRODUCT(AppendMemoryCopy, givenCopyOnlyCommandListAndHostPointersWhenMemoryCopyCalledThenPipeControlWithDcFlushAddedIsNotAddedAfterBlitCopy, IGFX_XE_HPC_CORE); -using DeviceTestXeHpc = TestLegacy; +using DeviceTestXeHpc = Test; HWTEST2_F(DeviceTestXeHpc, WhenGettingImagePropertiesThenPropertiesAreNotSet, IsXeHpcCore) { ze_image_properties_t properties{}; @@ -85,7 +85,7 @@ HWTEST2_F(DeviceTestXeHpc, givenXeHpcBStepWhenCreatingMultiTileDeviceThenExpectI delete device; } -using MultiDeviceCommandQueueGroupWithNineCopyEnginesTest = TestLegacy>; +using MultiDeviceCommandQueueGroupWithNineCopyEnginesTest = Test>; HWTEST2_F(MultiDeviceCommandQueueGroupWithNineCopyEnginesTest, givenMainAndLinkCopyEngineSupportAndCCSAndImplicitScalingThenExpectedQueueGroupsAreReturned, IsXeHpcCore) { uint32_t count = 0; @@ -279,7 +279,7 @@ HWTEST2_F(MultiDeviceCommandQueueGroupWithNineCopyEnginesTest, givenMainAndLinkC } } -using MultiDeviceCommandQueueGroupWithNoCopyEnginesTest = TestLegacy>; +using MultiDeviceCommandQueueGroupWithNoCopyEnginesTest = Test>; HWTEST2_F(MultiDeviceCommandQueueGroupWithNoCopyEnginesTest, givenNoCopyEngineSupportAndCCSAndImplicitScalingThenExpectedQueueGroupsAreReturned, IsXeHpcCore) { uint32_t count = 0; @@ -298,7 +298,7 @@ HWTEST2_F(MultiDeviceCommandQueueGroupWithNoCopyEnginesTest, } } -using MultiDeviceCommandQueueGroupWithNoCopyEnginesAndNoImplicitScalingTest = TestLegacy>; +using MultiDeviceCommandQueueGroupWithNoCopyEnginesAndNoImplicitScalingTest = Test>; HWTEST2_F(MultiDeviceCommandQueueGroupWithNoCopyEnginesAndNoImplicitScalingTest, givenNoCopyEngineSupportAndCCSAndNoImplicitScalingThenOnlyTheQueueGroupsFromSubDeviceAreReturned, IsXeHpcCore) { uint32_t count = 0; @@ -317,7 +317,7 @@ HWTEST2_F(MultiDeviceCommandQueueGroupWithNoCopyEnginesAndNoImplicitScalingTest, } } -using CommandQueueGroupTest = TestLegacy; +using CommandQueueGroupTest = Test; HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpcCore) { const uint32_t rootDeviceIndex = 0u; @@ -365,16 +365,16 @@ HWTEST2_F(CommandQueueGroupTest, givenBlitterDisabledAndAllBcsSetThenTwoQueueGro class DeviceCopyQueueGroupXeHpcFixture : public DeviceFixture { public: - void SetUp() { + void setUp() { DebugManager.flags.EnableBlitterOperationsSupport.set(0); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } - void TearDown() { - DeviceFixture::TearDown(); + void tearDown() { + DeviceFixture::tearDown(); } DebugManagerStateRestore restorer; }; -using DeviceCopyQueueGroupXeHpcTest = TestLegacy; +using DeviceCopyQueueGroupXeHpcTest = Test; HWTEST2_F(DeviceCopyQueueGroupXeHpcTest, givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsXeHpcCore) { diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_module_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_module_xe_hpc_core.cpp index 38989f2603..877315e237 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_module_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_module_xe_hpc_core.cpp @@ -13,7 +13,7 @@ namespace L0 { namespace ult { -using KernelPropertyTest = TestLegacy; +using KernelPropertyTest = Test; HWTEST2_F(KernelPropertyTest, givenKernelExtendedPropertiesStructureWhenKernelPropertiesCalledThenPropertiesAreCorrectlySet, IsXeHpcCore) { ze_device_module_properties_t kernelProperties = {}; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdlist_dg2.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdlist_dg2.cpp index 2e8f900ad1..3e921f4079 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdlist_dg2.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdlist_dg2.cpp @@ -17,7 +17,7 @@ namespace L0 { namespace ult { -using CommandListTests = TestLegacy; +using CommandListTests = Test; HWTEST2_F(CommandListTests, givenDG2WithBSteppingWhenCreatingCommandListThenAdditionalStateBaseAddressCmdIsAdded, IsDG2) { using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdqueue_dg2.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdqueue_dg2.cpp index acf10f3a09..701c4f146d 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdqueue_dg2.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_cmdqueue_dg2.cpp @@ -13,7 +13,7 @@ namespace L0 { namespace ult { -using CommandQueueTestDG2 = TestLegacy; +using CommandQueueTestDG2 = Test; HWTEST2_F(CommandQueueTestDG2, givenBindlessEnabledWhenEstimateStateBaseAddressCmdSizeCalledOnDG2ThenReturnedSizeOf2SBAAndPCAnd3DBindingTablePoolPool, IsDG2) { DebugManagerStateRestore restorer; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp index 9a592fb527..ae5dba22e1 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_sampler_dg2.cpp @@ -15,7 +15,7 @@ namespace L0 { namespace ult { -using SamplerCreateTest = TestLegacy; +using SamplerCreateTest = Test; HWTEST2_F(SamplerCreateTest, givenDg2WhenInitializeSamplerAndForceSamplerLowFilteringPrecisionIsFalseThenLowQualityFilterIsDisabled, IsDG2) { using SAMPLER_STATE = typename NEO::XeHpgCoreFamily::SAMPLER_STATE; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdlist_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdlist_xe_hpg_core.cpp index 4130d43ec3..94ca378bbf 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdlist_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdlist_xe_hpg_core.cpp @@ -27,7 +27,7 @@ namespace L0 { namespace ult { -using CommandListCreate = TestLegacy; +using CommandListCreate = Test; HWTEST2_F(CommandListCreate, WhenCreatingCommandListThenBindingTablePoolAllocAddedToBatchBuffer, IsXeHpgCore) { using _3DSTATE_BINDING_TABLE_POOL_ALLOC = typename FamilyType::_3DSTATE_BINDING_TABLE_POOL_ALLOC; @@ -381,7 +381,7 @@ HWTEST2_F(CommandListCreate, GivenComputeModePropertiesWhenUpdateStreamPropertie EXPECT_FALSE(pCommandList->finalStreamState.stateComputeMode.isCoherencyRequired.isDirty); } -using CommandListAppendLaunchKernelXeHpgCore = TestLegacy; +using CommandListAppendLaunchKernelXeHpgCore = Test; HWTEST2_F(CommandListAppendLaunchKernelXeHpgCore, givenEventWhenAppendKernelIsCalledThenImmediateDataPostSyncIsAdded, IsXeHpgCore) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; using POSTSYNC_DATA = typename FamilyType::POSTSYNC_DATA; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp index b357f1649b..39d63f2142 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_cmdqueue_enqueuecommandlist_xe_hpg_core.cpp @@ -24,7 +24,7 @@ namespace L0 { namespace ult { -using CommandQueueExecuteCommandListsXeHpgCore = TestLegacy; +using CommandQueueExecuteCommandListsXeHpgCore = Test; XE_HPG_CORETEST_F(CommandQueueExecuteCommandListsXeHpgCore, WhenExecutingCmdListsThenPipelineSelectAndCfeStateAreAddedToCmdBuffer) { const ze_command_queue_desc_t desc = {}; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_device_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_device_xe_hpg_core.cpp index 32f6ef7cfc..ceee3e5fa5 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_device_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_device_xe_hpg_core.cpp @@ -12,7 +12,7 @@ namespace L0 { namespace ult { -using CommandQueueGroupTest = TestLegacy; +using CommandQueueGroupTest = Test; HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpgCore) { const uint32_t rootDeviceIndex = 0u; @@ -84,22 +84,22 @@ HWTEST2_F(CommandQueueGroupTest, givenBlitterSupportAndCCSThenThreeQueueGroupsAr } } -class DeviceCopyQueueGroupFixture : public DeviceFixture { +class DeviceCopyQueueGroupXeHpgCoreFixture : public DeviceFixture { public: - void SetUp() { + void setUp() { DebugManager.flags.EnableBlitterOperationsSupport.set(0); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } - void TearDown() { - DeviceFixture::TearDown(); + void tearDown() { + DeviceFixture::tearDown(); } DebugManagerStateRestore restorer; }; -using DeviceCopyQueueGroupTest = TestLegacy; +using DeviceCopyQueueGroupXeHpgCoreTest = Test; -HWTEST2_F(DeviceCopyQueueGroupTest, +HWTEST2_F(DeviceCopyQueueGroupXeHpgCoreTest, givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsXeHpgCore) { const uint32_t rootDeviceIndex = 0u; NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get(); @@ -123,7 +123,7 @@ HWTEST2_F(DeviceCopyQueueGroupTest, } } -using TestDeviceXeHpgCore = TestLegacy; +using TestDeviceXeHpgCore = Test; HWTEST2_F(TestDeviceXeHpgCore, givenReturnedDevicePropertiesThenExpectedPropertyFlagsSet, IsXeHpgCore) { ze_device_properties_t deviceProps = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES}; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_image_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_image_xe_hpg_core.cpp index 400a754b5e..d670c34e2f 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_image_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_image_xe_hpg_core.cpp @@ -19,7 +19,7 @@ namespace L0 { namespace ult { -using ImageCreate = TestLegacy; +using ImageCreate = Test; HWTEST2_F(ImageCreate, WhenGettingImagePropertiesThenPropertiesSetCorrectly, IsXeHpgCore) { ze_image_properties_t properties; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_module_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_module_xe_hpg_core.cpp index 3d3f64363b..57417fa9fa 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_module_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_module_xe_hpg_core.cpp @@ -14,7 +14,7 @@ namespace L0 { namespace ult { -using KernelPropertyTest = TestLegacy; +using KernelPropertyTest = Test; HWTEST2_F(KernelPropertyTest, givenKernelExtendedPropertiesStructureWhenKernelPropertiesCalledThenPropertiesAreCorrectlySet, IsXeHpgCore) { ze_device_module_properties_t kernelProperties = {}; 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 5213ff402a..0cf13a1438 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 @@ -1342,7 +1342,7 @@ TEST(DebugSessionTest, GivenBindlessSipVersion2WhenResumingThreadThenCheckIfThre EXPECT_EQ(1u, sessionMock->checkThreadIsResumedCalled); } -using MultiTileDebugSessionTest = TestLegacy; +using MultiTileDebugSessionTest = Test; TEST_F(MultiTileDebugSessionTest, givenThreadsFromMultipleTilesWhenResumeCalledThenThreadsResumedInAllTiles) { zet_debug_config_t config = {}; diff --git a/level_zero/tools/test/unit_tests/sources/debug/debug_session_thread_tests.cpp b/level_zero/tools/test/unit_tests/sources/debug/debug_session_thread_tests.cpp index 7a2a8c1e34..89fb1fefd8 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/debug_session_thread_tests.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/debug_session_thread_tests.cpp @@ -500,7 +500,7 @@ TEST(DebugSession, GivenLogsDisabledWhenPrintBitmaskCalledThenBitmaskIsNotPrinte EXPECT_EQ(0u, output.size()); } -using DebugSessionMultiTile = TestLegacy; +using DebugSessionMultiTile = Test; TEST_F(DebugSessionMultiTile, givenApiThreadAndMultipleTilesWhenConvertingToPhysicalThenCorrectValueReturned) { L0::Device *device = driverHandle->devices[0]; diff --git a/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp b/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp index 9b535bf531..a8f7ceb3fc 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/linux/test_debug_api_linux.cpp @@ -482,7 +482,7 @@ struct DebugApiLinuxFixture : public DeviceFixture { auto executionEnvironment = MockDevice::prepareExecutionEnvironment(hwInfo, 0u); DeviceFixture::setupWithExecutionEnvironment(*executionEnvironment); } else { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } mockDrm = new DrmQueryMock(*neoDevice->executionEnvironment->rootDeviceEnvironments[0]); @@ -503,7 +503,7 @@ struct DebugApiLinuxFixture : public DeviceFixture { } void TearDown() { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } DrmQueryMock *mockDrm = nullptr; static constexpr uint8_t bufferSize = 16; @@ -511,7 +511,7 @@ struct DebugApiLinuxFixture : public DeviceFixture { struct DebugApiLinuxMultiDeviceFixture : public MultipleDevicesWithCustomHwInfo { void SetUp() { - MultipleDevicesWithCustomHwInfo::SetUp(); + MultipleDevicesWithCustomHwInfo::setUp(); neoDevice = driverHandle->devices[0]->getNEODevice(); L0::Device *device = driverHandle->devices[0]; @@ -537,7 +537,7 @@ struct DebugApiLinuxMultiDeviceFixture : public MultipleDevicesWithCustomHwInfo } void TearDown() { - MultipleDevicesWithCustomHwInfo::TearDown(); + MultipleDevicesWithCustomHwInfo::tearDown(); } NEO::Device *neoDevice = nullptr; L0::DeviceImp *deviceImp = nullptr; diff --git a/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp b/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp index 561318bb5b..e3449645d7 100644 --- a/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp +++ b/level_zero/tools/test/unit_tests/sources/debug/test_debug_api.cpp @@ -20,7 +20,7 @@ namespace ult { struct DebugApiFixture : public DeviceFixture { void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); neoDevice->executionEnvironment->rootDeviceEnvironments[0]->osInterface.reset(new NEO::OSInterface); mockBuiltins = new MockBuiltins(); mockBuiltins->stateSaveAreaHeader = MockSipData::createStateSaveAreaHeader(2); @@ -28,7 +28,7 @@ struct DebugApiFixture : public DeviceFixture { } void TearDown() { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } MockBuiltins *mockBuiltins = nullptr; 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 ac12fdf526..7c3ccf689d 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 @@ -100,14 +100,14 @@ struct MockDebugSessionWindows : DebugSessionWindows { struct DebugApiWindowsFixture : public DeviceFixture { void SetUp() { - DeviceFixture::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() { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } static constexpr uint8_t bufferSize = 16; WddmEuDebugInterfaceMock *mockWddm = nullptr; diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux.cpp index c26204afab..ce05505eaf 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux.cpp @@ -17,12 +17,12 @@ class MetricIpSamplingLinuxTest : public DeviceFixture, public ::testing::Test { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); metricIpSamplingOsInterface = MetricIpSamplingOsInterface::create(static_cast(*device)); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr metricIpSamplingOsInterface = nullptr; }; diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp index 9c4b4c6188..b5bab33312 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp @@ -118,7 +118,7 @@ class MetricIpSamplingLinuxTestPrelim : public DeviceFixture, public ::testing::Test { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()]->osInterface = std::make_unique(); auto &osInterface = device->getOsInterface(); osInterface.setDriverModel(std::make_unique(const_cast(neoDevice->getRootDeviceEnvironment()))); @@ -127,7 +127,7 @@ class MetricIpSamplingLinuxTestPrelim : public DeviceFixture, } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr metricIpSamplingOsInterface = nullptr; }; diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp index 9a2dec7e75..68c6c3444c 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp @@ -31,7 +31,7 @@ class MetricIpSamplingLinuxTestUpstream : public MetricContextFixture, public ::testing::Test { public: void SetUp() override { - MetricContextFixture::SetUp(); + MetricContextFixture::setUp(); neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()]->osInterface = std::make_unique(); auto &osInterface = device->getOsInterface(); osInterface.setDriverModel(std::make_unique(const_cast(neoDevice->getRootDeviceEnvironment()))); @@ -39,7 +39,7 @@ class MetricIpSamplingLinuxTestUpstream : public MetricContextFixture, } void TearDown() override { - MetricContextFixture::TearDown(); + MetricContextFixture::tearDown(); } std::unique_ptr metricIpSamplingOsInterface = nullptr; }; diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_oa_query_pool_linux.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_oa_query_pool_linux.cpp index 1002ee1226..62c751af6b 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_oa_query_pool_linux.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_oa_query_pool_linux.cpp @@ -33,14 +33,14 @@ class MetricQueryPoolLinuxTest : public MetricContextFixture, public ::testing::Test { public: void SetUp() override { - MetricContextFixture::SetUp(); + MetricContextFixture::setUp(); neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()]->osInterface = std::make_unique(); auto &osInterface = device->getOsInterface(); osInterface.setDriverModel(std::make_unique(const_cast(neoDevice->getRootDeviceEnvironment()))); } void TearDown() override { - MetricContextFixture::TearDown(); + MetricContextFixture::tearDown(); } }; @@ -211,14 +211,14 @@ class MetricEnumerationTestLinux : public MetricContextFixture, public ::testing::Test { public: void SetUp() override { - MetricContextFixture::SetUp(); + MetricContextFixture::setUp(); neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()]->osInterface = std::make_unique(); auto &osInterface = device->getOsInterface(); osInterface.setDriverModel(std::make_unique(const_cast(neoDevice->getRootDeviceEnvironment()))); } void TearDown() override { - MetricContextFixture::TearDown(); + MetricContextFixture::tearDown(); } }; diff --git a/level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.cpp b/level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.cpp index ecd15ca5b9..ec305bbb8d 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.cpp @@ -24,7 +24,7 @@ void MetricIpSamplingFixture::SetUp() { MultiDeviceFixture::numRootDevices = 1; MultiDeviceFixture::numSubDevices = 2; - MultiDeviceFixture::SetUp(); + MultiDeviceFixture::setUp(); testDevices.reserve(MultiDeviceFixture::numRootDevices + (MultiDeviceFixture::numRootDevices * MultiDeviceFixture::numSubDevices)); @@ -52,7 +52,7 @@ void MetricIpSamplingFixture::SetUp() { } void MetricIpSamplingFixture::TearDown() { - MultiDeviceFixture::TearDown(); + MultiDeviceFixture::tearDown(); } } // namespace ult diff --git a/level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.cpp b/level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.cpp index 5050b115e3..1e54a14b0d 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.cpp @@ -13,26 +13,26 @@ namespace L0 { namespace ult { void MetricQueryPoolTest::SetUp() { ze_result_t returnValue = ZE_RESULT_SUCCESS; - MetricContextFixture::SetUp(); + MetricContextFixture::setUp(); auto executionEnvironment = new NEO::ExecutionEnvironment(); driverHandle.reset(DriverHandle::create(NEO::DeviceFactory::createDevices(*executionEnvironment), L0EnvVariables{}, &returnValue)); } void MetricQueryPoolTest::TearDown() { - MetricContextFixture::TearDown(); + MetricContextFixture::tearDown(); driverHandle.reset(); GlobalDriver = nullptr; } void MultiDeviceMetricQueryPoolTest::SetUp() { ze_result_t returnValue = ZE_RESULT_SUCCESS; - MetricMultiDeviceFixture::SetUp(); + MetricMultiDeviceFixture::setUp(); auto executionEnvironment = new NEO::ExecutionEnvironment(); driverHandle.reset(DriverHandle::create(NEO::DeviceFactory::createDevices(*executionEnvironment), L0EnvVariables{}, &returnValue)); } void MultiDeviceMetricQueryPoolTest::TearDown() { - MetricMultiDeviceFixture::TearDown(); + MetricMultiDeviceFixture::tearDown(); driverHandle.reset(); GlobalDriver = nullptr; } diff --git a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp index 4ce4e9b06d..b20faa56a7 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp @@ -38,10 +38,10 @@ class MockIpSamplingOsInterface : public MetricIpSamplingOsInterface { bool isDependencyAvailable() override { return false; } }; -void MetricContextFixture::SetUp() { +void MetricContextFixture::setUp() { // Call base class. - ContextFixture::SetUp(); + DeviceFixture::setUp(); // Initialize metric api. auto &metricSource = device->getMetricDeviceContext().getMetricSource(); @@ -67,7 +67,7 @@ void MetricContextFixture::SetUp() { metricsDeviceParams.Version.MinorNumber = MetricEnumeration::requiredMetricsDiscoveryMinorVersion; } -void MetricContextFixture::TearDown() { +void MetricContextFixture::tearDown() { // Restore original metrics library delete mockMetricsLibrary->handle; @@ -79,7 +79,7 @@ void MetricContextFixture::TearDown() { mockMetricEnumeration.reset(); // Call base class. - ContextFixture::TearDown(); + DeviceFixture::tearDown(); } void MetricContextFixture::openMetricsAdapter() { @@ -133,10 +133,10 @@ void MetricContextFixture::openMetricsAdapterGroup() { .WillOnce(Return(TCompletionCode::CC_OK)); } -void MetricMultiDeviceFixture::SetUp() { +void MetricMultiDeviceFixture::setUp() { DebugManager.flags.EnableImplicitScaling.set(1); - MultiDeviceFixture::SetUp(); + MultiDeviceFixture::setUp(); devices.resize(driverHandle->devices.size()); @@ -180,7 +180,7 @@ void MetricMultiDeviceFixture::SetUp() { metricsDeviceParams.Version.MinorNumber = MetricEnumeration::requiredMetricsDiscoveryMinorVersion; } -void MetricMultiDeviceFixture::TearDown() { +void MetricMultiDeviceFixture::tearDown() { auto &deviceImp = *static_cast(devices[0]); const uint32_t subDeviceCount = static_cast(deviceImp.subDevices.size()); @@ -207,7 +207,7 @@ void MetricMultiDeviceFixture::TearDown() { mockMetricEnumeration->setMockedApi(nullptr); mockMetricEnumeration.reset(); - MultiDeviceFixture::TearDown(); + MultiDeviceFixture::tearDown(); } void MetricMultiDeviceFixture::openMetricsAdapter() { diff --git a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h index 140011f85d..1487ac7e27 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h +++ b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h @@ -143,11 +143,11 @@ struct Mock : public MetricQuery { MOCK_METHOD(ze_result_t, destroy, (), (override)); }; -class MetricContextFixture : public ContextFixture { +class MetricContextFixture : public DeviceFixture { protected: - void SetUp(); - void TearDown(); + void setUp(); + void tearDown(); void openMetricsAdapter(); void openMetricsAdapterGroup(); @@ -170,8 +170,8 @@ class MetricContextFixture : public ContextFixture { class MetricMultiDeviceFixture : public MultiDeviceFixture { protected: - void SetUp(); - void TearDown(); + void setUp(); + void tearDown(); void openMetricsAdapter(); void openMetricsAdapterSubDevice(uint32_t subDeviceIndex); void openMetricsAdapterDeviceAndSubDeviceNoCountVerify(uint32_t subDeviceIndex); diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp index f69b3fe678..4c0a9d6640 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp @@ -22,7 +22,7 @@ using ::testing::Return; namespace L0 { namespace ult { -using MetricEnumerationTest = TestLegacy; +using MetricEnumerationTest = Test; TEST_F(MetricEnumerationTest, givenIncorrectMetricsDiscoveryDeviceWhenZetGetMetricGroupIsCalledThenNoMetricGroupsAreReturned) { EXPECT_CALL(*mockMetricEnumeration, loadMetricsDiscovery()) @@ -887,7 +887,7 @@ TEST_F(MetricEnumerationTest, givenValidEventBasedMetricGroupWhenzetContextActiv EXPECT_EQ(zetContextActivateMetricGroups(context->toHandle(), device->toHandle(), 1, &metricGroupHandle), ZE_RESULT_SUCCESS); } -using MultiDeviceMetricEnumerationTest = TestLegacy; +using MultiDeviceMetricEnumerationTest = Test; TEST_F(MultiDeviceMetricEnumerationTest, givenMultipleDevicesAndValidEventBasedMetricGroupWhenzetContextActivateMetricGroupsIsCalledThenReturnsSuccess) { diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_2.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_2.cpp index 6df48599a6..f703e92959 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_2.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_2.cpp @@ -20,7 +20,7 @@ using ::testing::Return; namespace L0 { namespace ult { -using MetricEnumerationTest = TestLegacy; +using MetricEnumerationTest = Test; TEST_F(MetricEnumerationTest, givenTimeAndBufferSizeWhenOpenIoStreamReturnsErrorThenTheMetricGroupOpenIoStreamReturnsErrorUnknown) { @@ -138,7 +138,7 @@ TEST_F(MetricEnumerationTest, givenTTypedValueWhenCopyValueIsCalledReturnsFilled } } -using MetricEnumerationMultiDeviceTest = TestLegacy; +using MetricEnumerationMultiDeviceTest = Test; TEST_F(MetricEnumerationMultiDeviceTest, givenRootDeviceWhenLoadDependenciesIsCalledThenOpenMetricsSubDeviceWillBeCalled) { diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_initialization.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_initialization.cpp index 762eb46ddd..2e0d606039 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_initialization.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_initialization.cpp @@ -43,7 +43,7 @@ class MockOsLibrary : public NEO::OsLibrary { } }; -using MetricInitializationTest = TestLegacy; +using MetricInitializationTest = Test; TEST_F(MetricInitializationTest, GivenOaDependenciesAreAvailableThenMetricInitializationIsSuccess) { diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp index 8e2e8f98e4..6cf44f871d 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_1.cpp @@ -22,7 +22,7 @@ using ::testing::Return; namespace L0 { namespace ult { -using MetricStreamerTest = TestLegacy; +using MetricStreamerTest = Test; TEST_F(MetricStreamerTest, givenInvalidMetricGroupTypeWhenZetMetricStreamerOpenIsCalledThenReturnsFail) { diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp index 12cda7b7cc..2640f8a3e5 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_2.cpp @@ -18,7 +18,7 @@ using ::testing::Return; namespace L0 { namespace ult { -using MetricStreamerMultiDeviceTest = TestLegacy; +using MetricStreamerMultiDeviceTest = Test; TEST_F(MetricStreamerMultiDeviceTest, givenInvalidMetricGroupTypeWhenZetMetricStreamerOpenIsCalledThenReturnsFail) { diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp index 0c71969e6c..47323aa4db 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_streamer_3.cpp @@ -17,7 +17,7 @@ using ::testing::Return; namespace L0 { namespace ult { -using MetricStreamerMultiDeviceTest = TestLegacy; +using MetricStreamerMultiDeviceTest = Test; TEST_F(MetricStreamerMultiDeviceTest, givenEnableWalkerPartitionIsOnWhenZetCommandListAppendMetricStreamerMarkerIsCalledForSubDeviceThenReturnsSuccess) { diff --git a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling_windows.cpp b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling_windows.cpp index 9115d5c3c1..3bab52cf0a 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling_windows.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling_windows.cpp @@ -20,12 +20,12 @@ class MetricIpSamplingWindowsTest : public DeviceFixture, public ::testing::Test { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); metricIpSamplingOsInterface = MetricIpSamplingOsInterface::create(static_cast(*device)); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr metricIpSamplingOsInterface = nullptr; }; diff --git a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp index 1c5ba3f75a..cc8ca9a958 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_oa_enumeration_windows.cpp @@ -20,7 +20,7 @@ using ::testing::Return; namespace L0 { namespace ult { -using MetricEnumerationTestWindows = TestLegacy; +using MetricEnumerationTestWindows = Test; TEST_F(MetricEnumerationTestWindows, givenCorrectWindowsAdapterWhenGetMetricsAdapterThenReturnSuccess) { diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h index 8e80d3dcf7..e36b37be6b 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h @@ -57,7 +57,7 @@ class SysmanDeviceFixture : public DeviceFixture, public ::testing::Test { if (!sysmanUltsEnable) { GTEST_SKIP(); } - DeviceFixture::SetUp(); + DeviceFixture::setUp(); neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()]->osInterface = std::make_unique(); auto &osInterface = device->getOsInterface(); osInterface.setDriverModel(std::make_unique(const_cast(neoDevice->getRootDeviceEnvironment()))); @@ -87,7 +87,7 @@ class SysmanDeviceFixture : public DeviceFixture, public ::testing::Test { GTEST_SKIP(); } - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); unsetenv("ZES_ENABLE_SYSMAN"); } @@ -106,7 +106,7 @@ class SysmanMultiDeviceFixture : public MultiDeviceFixture, public ::testing::Te if (!sysmanUltsEnable) { GTEST_SKIP(); } - MultiDeviceFixture::SetUp(); + MultiDeviceFixture::setUp(); device = driverHandle->devices[0]; neoDevice = device->getNEODevice(); neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()]->osInterface = std::make_unique(); @@ -143,7 +143,7 @@ class SysmanMultiDeviceFixture : public MultiDeviceFixture, public ::testing::Te GTEST_SKIP(); } unsetenv("ZES_ENABLE_SYSMAN"); - MultiDeviceFixture::TearDown(); + MultiDeviceFixture::tearDown(); } SysmanDevice *pSysmanDevice = nullptr; diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/test_sysman.cpp b/level_zero/tools/test/unit_tests/sources/sysman/linux/test_sysman.cpp index 79ff5c7b30..6a4e41114f 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/test_sysman.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/test_sysman.cpp @@ -141,7 +141,7 @@ TEST_F(SysmanDeviceFixture, GivenValidDeviceHandleAndIfSysmanDeviceInitFailsThen static_cast(device)->setSysmanHandle(pSysmanDeviceOriginal); } -using MockDeviceSysmanGetTest = TestLegacy; +using MockDeviceSysmanGetTest = Test; TEST_F(MockDeviceSysmanGetTest, GivenValidSysmanHandleSetInDeviceStructWhenGetThisSysmanHandleThenHandlesShouldBeSimilar) { SysmanDeviceImp *sysman = new SysmanDeviceImp(device->toHandle()); device->setSysmanHandle(sysman); @@ -397,7 +397,7 @@ class UnknownDriverModel : public DriverModel { } }; -using SysmanUnknownDriverModelTest = TestLegacy; +using SysmanUnknownDriverModelTest = Test; TEST_F(SysmanUnknownDriverModelTest, GivenDriverModelTypeIsNotDrmWhenExecutingSysmanOnLinuxThenErrorIsReturned) { neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()]->osInterface = std::make_unique(); auto &osInterface = device->getOsInterface(); diff --git a/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h index e495424587..81cf00b643 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h @@ -39,7 +39,7 @@ class SysmanDeviceFixture : public DeviceFixture, public SysmanEnabledFixture { if (!sysmanUltsEnable) { GTEST_SKIP(); } - DeviceFixture::SetUp(); + DeviceFixture::setUp(); neoDevice->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()]->osInterface = std::make_unique(); SysmanEnabledFixture::SetUp(); @@ -55,7 +55,7 @@ class SysmanDeviceFixture : public DeviceFixture, public SysmanEnabledFixture { GTEST_SKIP(); } SysmanEnabledFixture::TearDown(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } SysmanDevice *pSysmanDevice = nullptr; diff --git a/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman.cpp b/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman.cpp index 814dcbdc2e..40d9a1bd32 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman.cpp @@ -15,7 +15,7 @@ namespace L0 { namespace ult { -using MockDeviceSysmanGetTest = TestLegacy; +using MockDeviceSysmanGetTest = Test; TEST_F(MockDeviceSysmanGetTest, GivenValidSysmanHandleSetInDeviceStructWhenGetThisSysmanHandleThenHandlesShouldBeSimilar) { SysmanDeviceImp *sysman = new SysmanDeviceImp(device->toHandle()); device->setSysmanHandle(sysman); diff --git a/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp index 8d043c219b..c5ae8f9ddb 100644 --- a/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp @@ -44,7 +44,7 @@ TEST(ClCommandStreamReceiverTest, WhenMakingResidentThenBufferResidencyFlagIsSet delete buffer; } -using ClCommandStreamReceiverTests = TestLegacy; +using ClCommandStreamReceiverTests = Test; HWTEST_F(ClCommandStreamReceiverTests, givenCommandStreamReceiverWhenFenceAllocationIsRequiredAndCreateGlobalFenceAllocationIsCalledThenFenceAllocationIsAllocated) { RAIIHwHelperFactory> hwHelperBackup{pDevice->getHardwareInfo().platform.eRenderCoreFamily}; diff --git a/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp index a639a03c76..79d1707483 100644 --- a/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp +++ b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp @@ -11,7 +11,7 @@ using namespace NEO; -using CommandParse = TestLegacy; +using CommandParse = Test; HWTEST_F(CommandParse, WhenGeneratingCommandBufferThenIsNotNull) { typedef typename FamilyType::PARSE PARSE; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index 9fc2e51c8a..f0ab78ad1d 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -140,7 +140,7 @@ struct MyMockCsrWithAubDump : CommandStreamReceiverWithAUBDump { struct CommandStreamReceiverWithAubDumpTest : public ::testing::TestWithParam, MockAubCenterFixture, DeviceFixture { void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); MockAubCenterFixture::SetUp(); setMockAubCenter(pDevice->getRootDeviceEnvironmentRef()); executionEnvironment = pDevice->getExecutionEnvironment(); @@ -162,7 +162,7 @@ struct CommandStreamReceiverWithAubDumpTest : public ::testing::TestWithParam, DeviceFixture { void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); MockAubCenterFixture::SetUp(); setMockAubCenter(pDevice->getRootDeviceEnvironmentRef()); } void TearDown() override { MockAubCenterFixture::TearDown(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/perf_tests/api/api_tests.cpp b/opencl/test/unit_test/perf_tests/api/api_tests.cpp index e3827573c1..74e20c68df 100644 --- a/opencl/test/unit_test/perf_tests/api/api_tests.cpp +++ b/opencl/test/unit_test/perf_tests/api/api_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -23,7 +23,7 @@ void api_fixture::SetUp() { setReferenceTime(); PlatformFixture::SetUp(numPlatformDevices, platformDevices); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); ASSERT_NE(nullptr, pDevice); auto pDevice = pPlatform->getDevice(0); @@ -40,7 +40,7 @@ void api_fixture::TearDown() { delete pContext; delete pProgram; CommandQueueHwFixture::TearDown(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); PlatformFixture::TearDown(); } } // namespace NEO diff --git a/opencl/test/unit_test/perf_tests/fixtures/device_fixture.cpp b/opencl/test/unit_test/perf_tests/fixtures/device_fixture.cpp index 997d1fb91c..015153e6c5 100644 --- a/opencl/test/unit_test/perf_tests/fixtures/device_fixture.cpp +++ b/opencl/test/unit_test/perf_tests/fixtures/device_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ using NEO::Device; using NEO::HardwareInfo; using NEO::platformDevices; -void DeviceFixture::SetUp() { +void DeviceFixture::setUp() { pDevice = ClDeviceHelper<>::create(); ASSERT_NE(nullptr, pDevice); @@ -24,6 +24,6 @@ void DeviceFixture::SetUp() { ASSERT_NE(nullptr, const_cast(pTagMemory)); } -void DeviceFixture::TearDown() { +void DeviceFixture::tearDown() { delete pDevice; } diff --git a/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp b/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp index 2a05217198..b8e513a917 100644 --- a/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp +++ b/opencl/test/unit_test/xe_hpc_core/built_in_xe_hpc_core_tests_ocl.cpp @@ -13,7 +13,7 @@ #include "hw_cmds_xe_hpc_core_base.h" using namespace NEO; -using XeHpcCoreBuiltInTests = TestLegacy; +using XeHpcCoreBuiltInTests = Test; XE_HPC_CORETEST_F(XeHpcCoreBuiltInTests, GivenBuiltinTypeBinaryWhenGettingBuiltinResourceForNotRegisteredRevisionThenBinaryBuiltinIsNotAvailable) { pDevice->getRootDeviceEnvironment().getMutableHardwareInfo()->platform.usRevId += 0xdead; diff --git a/shared/test/common/built_ins/built_in_tests_shared.inl b/shared/test/common/built_ins/built_in_tests_shared.inl index f547e49f81..55a976536f 100644 --- a/shared/test/common/built_ins/built_in_tests_shared.inl +++ b/shared/test/common/built_ins/built_in_tests_shared.inl @@ -75,7 +75,7 @@ void givenUseBindlessBuiltinEnabledWhenBinExtensionPassedThenNameHasBindlessPref using namespace NEO; -using BuiltInSharedTest = TestLegacy; +using BuiltInSharedTest = Test; HWTEST_F(BuiltInSharedTest, GivenBuiltinTypeBinaryWhenGettingBuiltinResourceForNotRegisteredRevisionThenBuiltinFromDefaultRevisionIsTaken) { pDevice->getRootDeviceEnvironment().getMutableHardwareInfo()->platform.usRevId += 0xdead; auto mockBuiltinsLib = std::unique_ptr(new MockBuiltinsLib()); diff --git a/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h b/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h index f1f6563969..991bf5f6bb 100644 --- a/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h +++ b/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h @@ -13,13 +13,13 @@ namespace NEO { struct AubCommandStreamReceiverFixture : public DeviceFixture, MockAubCenterFixture { void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); MockAubCenterFixture::SetUp(); setMockAubCenter(*pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]); } void TearDown() { MockAubCenterFixture::TearDown(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; } // namespace NEO diff --git a/shared/test/common/fixtures/device_fixture.cpp b/shared/test/common/fixtures/device_fixture.cpp index 05a5109350..c11d358a88 100644 --- a/shared/test/common/fixtures/device_fixture.cpp +++ b/shared/test/common/fixtures/device_fixture.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" namespace NEO { -void DeviceFixture::SetUp() { +void DeviceFixture::setUp() { hardwareInfo = *defaultHwInfo; setUpImpl(&hardwareInfo); } @@ -26,7 +26,7 @@ void DeviceFixture::setUpImpl(const NEO::HardwareInfo *hardwareInfo) { ASSERT_NE(nullptr, const_cast(pTagMemory)); } -void DeviceFixture::TearDown() { +void DeviceFixture::tearDown() { delete pDevice; pDevice = nullptr; } diff --git a/shared/test/common/fixtures/device_fixture.h b/shared/test/common/fixtures/device_fixture.h index e2888f5a7c..eef9878169 100644 --- a/shared/test/common/fixtures/device_fixture.h +++ b/shared/test/common/fixtures/device_fixture.h @@ -12,9 +12,9 @@ namespace NEO { struct HardwareInfo; struct DeviceFixture { - void SetUp(); // NOLINT(readability-identifier-naming) + void setUp(); void setUpImpl(const NEO::HardwareInfo *hardwareInfo); - void TearDown(); // NOLINT(readability-identifier-naming) + void tearDown(); MockDevice *createWithUsDeviceIdRevId(unsigned short usDeviceId, unsigned short usRevId); diff --git a/shared/test/common/helpers/hw_helper_tests.h b/shared/test/common/helpers/hw_helper_tests.h index 35957f341a..22c3afea11 100644 --- a/shared/test/common/helpers/hw_helper_tests.h +++ b/shared/test/common/helpers/hw_helper_tests.h @@ -13,7 +13,7 @@ using namespace NEO; -using HwHelperTest = TestLegacy; +using HwHelperTest = Test; struct ComputeSlmTestInput { uint32_t expected; diff --git a/shared/test/common/os_interface/windows/wddm_fixture.h b/shared/test/common/os_interface/windows/wddm_fixture.h index b378adccc2..b3610ee010 100644 --- a/shared/test/common/os_interface/windows/wddm_fixture.h +++ b/shared/test/common/os_interface/windows/wddm_fixture.h @@ -148,7 +148,7 @@ struct WddmFixtureWithMockGdiDllWddmNoCleanup : public GdiDllFixture, public Moc struct WddmInstrumentationGmmFixture : DeviceFixture { void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); executionEnvironment = pDevice->getExecutionEnvironment(); auto rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); wddm = static_cast(Wddm::createWddm(nullptr, *rootDeviceEnvironment)); @@ -158,7 +158,7 @@ struct WddmInstrumentationGmmFixture : DeviceFixture { rootDeviceEnvironment->osInterface->setDriverModel(std::unique_ptr(wddm)); } void TearDown() { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } WddmMock *wddm; diff --git a/shared/test/unit_test/aub/aub_helper_tests.cpp b/shared/test/unit_test/aub/aub_helper_tests.cpp index 69686c5d65..60fde4ee6f 100644 --- a/shared/test/unit_test/aub/aub_helper_tests.cpp +++ b/shared/test/unit_test/aub/aub_helper_tests.cpp @@ -105,7 +105,7 @@ TEST(AubHelper, WhenHBMSizePerTileInGigabytesIsNotSetThenGetMemBankSizeReturnsCo EXPECT_EQ(8 * MemoryConstants::gigaByte, AubHelper::getPerTileLocalMemorySize(&hwInfo)); } -using AubHelperHwTest = TestLegacy; +using AubHelperHwTest = Test; HWTEST_F(AubHelperHwTest, GivenDisabledLocalMemoryWhenGetDataHintForPml4EntryIsCalledThenTraceNotypeIsReturned) { AubHelperHw aubHelper(false); diff --git a/shared/test/unit_test/built_ins/sip_tests.cpp b/shared/test/unit_test/built_ins/sip_tests.cpp index 90f180f0fc..ec90bbd636 100644 --- a/shared/test/unit_test/built_ins/sip_tests.cpp +++ b/shared/test/unit_test/built_ins/sip_tests.cpp @@ -19,7 +19,7 @@ using namespace NEO; struct RawBinarySipFixture : public DeviceFixture { - void SetUp() { + void setUp() { DebugManager.flags.LoadBinarySipFromFile.set("dummy_file.bin"); backupSipInitType = std::make_unique>(&MockSipData::useMockSip, false); @@ -37,11 +37,11 @@ struct RawBinarySipFixture : public DeviceFixture { backupFcloseCalled = std::make_unique>(&IoFunctions::mockFcloseCalled, 0u); backupFailAfterNFopenCount = std::make_unique>(&IoFunctions::failAfterNFopenCount, 0u); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } - void TearDown() { - DeviceFixture::TearDown(); + void tearDown() { + DeviceFixture::tearDown(); } DebugManagerStateRestore dbgRestorer; @@ -74,7 +74,7 @@ TEST(SipBinaryFromFile, givenFilenameWithoutExtnesionWhenCreatingHeaderFilenameT EXPECT_EQ("abc_header", headerName); } -using RawBinarySipTest = TestLegacy; +using RawBinarySipTest = Test; TEST_F(RawBinarySipTest, givenRawBinaryFileWhenInitSipKernelThenSipIsLoadedFromFile) { bool ret = SipKernel::initSipKernel(SipKernelType::Csr, *pDevice); @@ -289,7 +289,7 @@ struct HexadecimalHeaderSipKernel : public SipKernel { using SipKernel::getSipKernelImpl; using SipKernel::initHexadecimalArraySipKernel; }; -using HexadecimalHeaderSipTest = TestLegacy; +using HexadecimalHeaderSipTest = Test; TEST_F(HexadecimalHeaderSipTest, whenInitHexadecimalArraySipKernelIsCalledThenSipKernelIsCorrect) { VariableBackup backupSipClassType(&SipKernel::classType, SipClassType::HexadecimalHeaderFile); @@ -333,7 +333,7 @@ TEST_F(HexadecimalHeaderSipTest, whenInitHexadecimalArraySipKernelIsCalledTwiceT EXPECT_EQ(sipAllocation, sipAllocation2); } -using StateSaveAreaSipTest = TestLegacy; +using StateSaveAreaSipTest = Test; TEST_F(StateSaveAreaSipTest, givenEmptyStateSaveAreaHeaderWhenGetStateSaveAreaSizeCalledThenMaxDbgSurfaceSizeIsReturned) { MockSipData::useMockSip = true; diff --git a/shared/test/unit_test/command_container/command_container_tests.cpp b/shared/test/unit_test/command_container/command_container_tests.cpp index 31812d4659..46ff49be2a 100644 --- a/shared/test/unit_test/command_container/command_container_tests.cpp +++ b/shared/test/unit_test/command_container/command_container_tests.cpp @@ -24,10 +24,10 @@ class CommandContainerTest : public DeviceFixture, public: void SetUp() override { ::testing::Test::SetUp(); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); ::testing::Test::TearDown(); } }; @@ -554,11 +554,11 @@ class CommandContainerHeaps : public DeviceFixture, public ::testing::TestWithParam { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; diff --git a/shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp b/shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp index 8bdbb499bf..faab82687f 100644 --- a/shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp +++ b/shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/test_macros/hw_test.h" using namespace NEO; -using CommandEncoderXeHpgCorePlusTests = TestLegacy; +using CommandEncoderXeHpgCorePlusTests = Test; HWTEST2_F(CommandEncoderXeHpgCorePlusTests, givenSpecifiedL1CacheControlWhenAppendingRssThenProgramProvidedL1CachePolicy, IsAtLeastXeHpgCore) { DebugManagerStateRestore restorer; diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp index 67321e4a2c..ad94d2af53 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -855,7 +855,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenEngineI EXPECT_NE(0u, aubCsr->handle); } -using InjectMmmioTest = TestLegacy; +using InjectMmmioTest = Test; HWTEST_F(InjectMmmioTest, givenAddMmioKeySetToZeroWhenInitAdditionalMmioCalledThenDoNotWriteMmio) { DebugManagerStateRestore stateRestore; diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp index 82f3dc561b..6a360418fb 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp @@ -42,7 +42,7 @@ struct XeHPAndLaterAubCommandStreamReceiverTests : DeviceFixture, ::testing::Tes } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; diff --git a/shared/test/unit_test/command_stream/aub_subcapture_tests.cpp b/shared/test/unit_test/command_stream/aub_subcapture_tests.cpp index 3a3b85e367..dee92393d6 100644 --- a/shared/test/unit_test/command_stream/aub_subcapture_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_subcapture_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,12 +16,12 @@ using namespace NEO; struct AubSubCaptureTest : public DeviceFixture, public ::testing::Test { void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); dbgRestore = new DebugManagerStateRestore(); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); delete dbgRestore; } static constexpr const char *kernelName = "kernel_name"; diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp index 31af316de3..71a85b0a94 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp @@ -14,7 +14,7 @@ #include "shared/test/unit_test/mocks/mock_aub_stream.h" #include "shared/test/unit_test/mocks/mock_csr_simulated_common_hw.h" -using XeHPAndLaterMockSimulatedCsrHwTests = TestLegacy; +using XeHPAndLaterMockSimulatedCsrHwTests = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterMockSimulatedCsrHwTests, givenLocalMemoryEnabledWhenGlobalMmiosAreInitializedThenLmemIsInitializedAndLmemCfgMmioIsWritten) { std::unique_ptr> csrSimulatedCommonHw(new MockSimulatedCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); @@ -202,7 +202,7 @@ class XeHPAndLaterTileRangeRegisterTest : public DeviceFixture, public ::testing } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } void checkMMIOs(MMIOList &list, uint32_t tilesNumber, uint32_t localMemorySizeTotalInGB) { diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp index 21f576420a..a2e7b85e8d 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -48,7 +48,7 @@ using namespace std::chrono_literals; struct CommandStreamReceiverTest : public DeviceFixture, public ::testing::Test { void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); commandStreamReceiver = &pDevice->getGpgpuCommandStreamReceiver(); ASSERT_NE(nullptr, commandStreamReceiver); @@ -57,7 +57,7 @@ struct CommandStreamReceiverTest : public DeviceFixture, } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } CommandStreamReceiver *commandStreamReceiver = nullptr; diff --git a/shared/test/unit_test/command_stream/linear_stream_tests.cpp b/shared/test/unit_test/command_stream/linear_stream_tests.cpp index b599ace501..73de6701aa 100644 --- a/shared/test/unit_test/command_stream/linear_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/linear_stream_tests.cpp @@ -154,7 +154,7 @@ TEST_F(LinearStreamTest, givenLinearStreamWithoutCmdContainerWhenOneByteLeftInSt reinterpret_cast(&linearStream)->sizeUsed = linearStream.getMaxAvailableSpace() - 1; EXPECT_NO_THROW(linearStream.getSpace(1)); } -using CommandContainerLinearStreamTest = TestLegacy; +using CommandContainerLinearStreamTest = Test; TEST_F(CommandContainerLinearStreamTest, givenLinearStreamWithCmdContainerWhenOneByteLeftInStreamThenGetSpaceThrowAbort) { CommandContainer cmdContainer; cmdContainer.initialize(pDevice, nullptr, true); diff --git a/shared/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp b/shared/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp index 389103ea21..46b8a74747 100644 --- a/shared/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/command_stream/tbx_command_stream_receiver_tests_xehp_and_later.cpp @@ -30,7 +30,7 @@ struct XeHPAndLaterTbxCommandStreamReceiverTests : DeviceFixture, ::testing::Tes } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; diff --git a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp index fac665ee12..cbcac1b222 100644 --- a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -45,7 +45,7 @@ struct TbxFixture : public TbxCommandStreamFixture, TbxFixture() : MockAubCenterFixture(CommandStreamReceiverType::CSR_TBX) {} void SetUp() { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); setMockAubCenter(*pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]); TbxCommandStreamFixture::SetUp(pDevice); MockAubCenterFixture::SetUp(); @@ -54,7 +54,7 @@ struct TbxFixture : public TbxCommandStreamFixture, void TearDown() { MockAubCenterFixture::TearDown(); TbxCommandStreamFixture::TearDown(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; diff --git a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp index ad08236d55..aa99514f9c 100644 --- a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp +++ b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp @@ -38,7 +38,7 @@ class CompilerInterfaceTest : public DeviceFixture, public ::testing::Test { public: void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); // create the compiler interface this->pCompilerInterface = new MockCompilerInterface(); @@ -64,7 +64,7 @@ class CompilerInterfaceTest : public DeviceFixture, void TearDown() override { pSource.reset(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } MockCompilerInterface *pCompilerInterface; diff --git a/shared/test/unit_test/debugger/test_l0_debugger.cpp b/shared/test/unit_test/debugger/test_l0_debugger.cpp index 09587ff532..5e6d6fd3e7 100644 --- a/shared/test/unit_test/debugger/test_l0_debugger.cpp +++ b/shared/test/unit_test/debugger/test_l0_debugger.cpp @@ -173,7 +173,7 @@ TEST(Debugger, GivenLegacyDebuggerWhenInitializingDebuggerL0ThenAbortIsCalledAft executionEnvironment->decRefInternal(); } -using L0DebuggerTest = TestLegacy; +using L0DebuggerTest = Test; HWTEST_F(L0DebuggerTest, GivenDeviceWhenAllocateCalledThenDebuggerIsCreated) { auto debugger = DebuggerL0Hw::allocate(pDevice); @@ -568,11 +568,11 @@ HWTEST_F(L0DebuggerMultiSubDeviceTest, givenMultiSubDevicesWhenSbaTrackingBuffer struct L0DebuggerSimpleParameterizedTest : public ::testing::TestWithParam, DeviceFixture { void SetUp() override { NEO::DebugManager.flags.DebuggerForceSbaTrackingMode.set(GetParam()); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } DebugManagerStateRestore restorer; diff --git a/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp b/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp index ae7cd002e0..d6ed2abb9b 100644 --- a/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp +++ b/shared/test/unit_test/debugger/test_l0_debugger_single_address_space.cpp @@ -14,14 +14,14 @@ namespace NEO { -struct SingleAddressSpaceFixture : public TestLegacy { +struct SingleAddressSpaceFixture : public Test { void SetUp() override { NEO::DebugManager.flags.DebuggerForceSbaTrackingMode.set(1); - TestLegacy::SetUp(); + Test::SetUp(); } void TearDown() override { - TestLegacy::TearDown(); + Test::TearDown(); } DebugManagerStateRestore restorer; @@ -334,4 +334,4 @@ HWTEST2_F(SingleAddressSpaceFixture, GivenAllZeroSbaAddressesWhenProgrammingSbaT pDevice->getMemoryManager()->freeGraphicsMemory(streamAllocation); } -} // namespace NEO \ No newline at end of file +} // namespace NEO diff --git a/shared/test/unit_test/device/linux/neo_device_linux_tests.cpp b/shared/test/unit_test/device/linux/neo_device_linux_tests.cpp index b794676b5e..7778b9fb6f 100644 --- a/shared/test/unit_test/device/linux/neo_device_linux_tests.cpp +++ b/shared/test/unit_test/device/linux/neo_device_linux_tests.cpp @@ -10,7 +10,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/test.h" -using DeviceTest = TestLegacy; +using DeviceTest = Test; TEST_F(DeviceTest, GivenDeviceWhenGetAdapterLuidThenLuidIsNotSet) { std::array luid, expectedLuid; diff --git a/shared/test/unit_test/device/neo_device_tests.cpp b/shared/test/unit_test/device/neo_device_tests.cpp index 9917196dd4..9075a3ddcc 100644 --- a/shared/test/unit_test/device/neo_device_tests.cpp +++ b/shared/test/unit_test/device/neo_device_tests.cpp @@ -50,7 +50,7 @@ TEST(Device, givenNoDebuggerWhenGettingDebuggerThenNullptrIsReturned) { EXPECT_EQ(nullptr, device->getSourceLevelDebugger()); } -using DeviceTest = TestLegacy; +using DeviceTest = Test; TEST_F(DeviceTest, whenInitializeRayTracingIsCalledAndRtBackedBufferIsNullptrThenMemoryBackedBufferIsCreated) { EXPECT_EQ(nullptr, pDevice->getRTMemoryBackedBuffer()); @@ -124,7 +124,7 @@ TEST_F(DeviceTest, GivenDeviceWhenGenerateUuidThenValidValuesAreSet) { EXPECT_EQ(memcmp(&uuid, &expectedUuid, HwInfoConfig::uuidSize), 0); } -using DeviceGetCapsTest = TestLegacy; +using DeviceGetCapsTest = Test; TEST_F(DeviceGetCapsTest, givenMockCompilerInterfaceWhenInitializeCapsIsCalledThenMaxParameterSizeIsSetCorrectly) { auto pCompilerInterface = new MockCompilerInterface; diff --git a/shared/test/unit_test/device/windows/neo_device_windows_tests.cpp b/shared/test/unit_test/device/windows/neo_device_windows_tests.cpp index e1120b2d1e..c4a3044c1e 100644 --- a/shared/test/unit_test/device/windows/neo_device_windows_tests.cpp +++ b/shared/test/unit_test/device/windows/neo_device_windows_tests.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/mocks/mock_wddm.h" #include "shared/test/common/test_macros/test.h" -using DeviceTest = TestLegacy; +using DeviceTest = Test; TEST_F(DeviceTest, GivenDeviceWhenGetAdapterLuidThenLuidIsSet) { std::array luid, expectedLuid; diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp index bc2f9b782b..0f45b0c366 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp @@ -24,7 +24,7 @@ #include "shared/test/unit_test/fixtures/direct_submission_fixture.h" #include "shared/test/unit_test/mocks/mock_direct_submission_diagnostic_collector.h" -using DirectSubmissionTest = TestLegacy; +using DirectSubmissionTest = Test; HWTEST_F(DirectSubmissionTest, whenDebugCacheFlushDisabledSetThenExpectNoCpuCacheFlush) { DebugManagerStateRestore restore; diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp index 6a4fea5bb0..22f6062675 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp @@ -29,9 +29,9 @@ namespace CpuIntrinsicsTests { extern std::atomic sfenceCounter; } // namespace CpuIntrinsicsTests -using DirectSubmissionTest = TestLegacy; +using DirectSubmissionTest = Test; -using DirectSubmissionDispatchBufferTest = TestLegacy; +using DirectSubmissionDispatchBufferTest = Test; struct DirectSubmissionDispatchMiMemFenceTest : public DirectSubmissionDispatchBufferTest { void SetUp() override { diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp index 7731eb1956..fbfd6c0aac 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/direct_submission_fixture.h" -using DirectSubmissionTestXE_HP_CORE = TestLegacy; +using DirectSubmissionTestXE_HP_CORE = Test; XE_HP_CORE_TEST_F(DirectSubmissionTestXE_HP_CORE, givenBlitterUsedWhenDispatchingPrefetchMitigationThenExpectBbStartCmd) { using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START; diff --git a/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp b/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp index bbf1dfb3c0..3931bd1dae 100644 --- a/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp +++ b/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using BlitterDispatcheTest = TestLegacy; +using BlitterDispatcheTest = Test; HWTEST_F(BlitterDispatcheTest, givenBlitterWhenAskingForPreemptionCmdSizeThenReturnZero) { EXPECT_EQ(0u, BlitterDispatcher::getSizePreemption()); diff --git a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp index 05104573fe..cdb54f7660 100644 --- a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp +++ b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,15 +12,15 @@ using namespace NEO; -void DispatcherFixture::SetUp() { - DeviceFixture::SetUp(); +void DispatcherFixture::setUp() { + DeviceFixture::setUp(); bufferAllocation = alignedMalloc(MemoryConstants::pageSize, MemoryConstants::pageSize); cmdBuffer.replaceBuffer(bufferAllocation, MemoryConstants::pageSize); } -void DispatcherFixture::TearDown() { +void DispatcherFixture::tearDown() { alignedFree(bufferAllocation); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } diff --git a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h index e6b8bcd1bd..2f3bf533ec 100644 --- a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h +++ b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h @@ -14,8 +14,8 @@ namespace NEO { class DispatcherFixture : public DeviceFixture { public: - void SetUp(); - void TearDown(); + void setUp(); + void tearDown(); NEO::LinearStream cmdBuffer; void *bufferAllocation; diff --git a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp index 5122bbea25..60fb366cfd 100644 --- a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp +++ b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp @@ -12,7 +12,7 @@ using namespace NEO; -using DispatcherTest = TestLegacy; +using DispatcherTest = Test; HWTEST_F(DispatcherTest, givenBaseDispatcherWhenAskingForStartCmdSizeThenReturnBbStartCmdSize) { using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START; diff --git a/shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp b/shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp index e9bce2f2e3..04089f9d37 100644 --- a/shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp +++ b/shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp @@ -12,7 +12,7 @@ #include "shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h" #include "shared/test/unit_test/fixtures/preemption_fixture.h" -using RenderDispatcherTest = TestLegacy; +using RenderDispatcherTest = Test; using namespace NEO; diff --git a/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp b/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp index 7bb57d6be3..e68994fbcf 100644 --- a/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp +++ b/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using DG2CommandEncoderTest = TestLegacy; +using DG2CommandEncoderTest = Test; HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterCommandEncoderTest, whenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned_IsAtLeastXeHpCore, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(CommandEncoderTest, whenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned_Platforms, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterCommandEncoderTest, givenCommandContainerWithDirtyHeapWhenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned_IsAtLeastXeHpCore, IGFX_DG2); diff --git a/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp b/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp index a8f3840adb..7c13e51e42 100644 --- a/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp @@ -36,7 +36,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterHardwareCommandsTest, givenXeHPAndLater EXPECT_EQ(0u, EncodeWA::getAdditionalPipelineSelectSize(device)); } -using XeHPAndLaterCommandEncoderTest = TestLegacy; +using XeHPAndLaterCommandEncoderTest = Test; HWTEST2_F(XeHPAndLaterCommandEncoderTest, whenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned, IsAtLeastXeHpCore) { auto container = CommandContainer(); diff --git a/shared/test/unit_test/encoders/test_command_encoder.cpp b/shared/test/unit_test/encoders/test_command_encoder.cpp index b033c723cd..920a0629e6 100644 --- a/shared/test/unit_test/encoders/test_command_encoder.cpp +++ b/shared/test/unit_test/encoders/test_command_encoder.cpp @@ -19,7 +19,7 @@ HWTEST_EXCLUDE_PRODUCT(CommandEncoderTest, whenGettingRequiredSizeForStateBaseAd HWTEST_EXCLUDE_PRODUCT(CommandEncoderTest, whenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned_Platforms, IGFX_ROCKETLAKE); HWTEST_EXCLUDE_PRODUCT(CommandEncoderTest, whenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned_Platforms, IGFX_ICELAKE_LP); -using CommandEncoderTest = TestLegacy; +using CommandEncoderTest = Test; using Platforms = IsWithinProducts; HWTEST2_F(CommandEncoderTest, whenGettingRequiredSizeForStateBaseAddressCommandThenCorrectSizeIsReturned, Platforms) { diff --git a/shared/test/unit_test/encoders/test_encode_3dstate_btd_pvc_and_later.cpp b/shared/test/unit_test/encoders/test_encode_3dstate_btd_pvc_and_later.cpp index 6913a1e487..66e101b62f 100644 --- a/shared/test/unit_test/encoders/test_encode_3dstate_btd_pvc_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_3dstate_btd_pvc_and_later.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using CommandEncodeEnableRayTracing = TestLegacy; +using CommandEncodeEnableRayTracing = Test; HWTEST2_F(CommandEncodeEnableRayTracing, whenEnableRayTracingIsProgrammedThen3DStateBtdIsEncodedInStream, IsAtLeastXeHpcCore) { using _3DSTATE_BTD = typename FamilyType::_3DSTATE_BTD; diff --git a/shared/test/unit_test/encoders/test_encode_atomic.cpp b/shared/test/unit_test/encoders/test_encode_atomic.cpp index c01ce85703..338e3d379a 100644 --- a/shared/test/unit_test/encoders/test_encode_atomic.cpp +++ b/shared/test/unit_test/encoders/test_encode_atomic.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using CommandEncodeAtomic = TestLegacy; +using CommandEncodeAtomic = Test; HWTEST_F(CommandEncodeAtomic, WhenProgrammingMiAtomicThenExpectAllFieldsSetCorrectly) { using MI_ATOMIC = typename FamilyType::MI_ATOMIC; diff --git a/shared/test/unit_test/encoders/test_encode_command_buffer.cpp b/shared/test/unit_test/encoders/test_encode_command_buffer.cpp index fdf2ff46e8..178dd102a6 100644 --- a/shared/test/unit_test/encoders/test_encode_command_buffer.cpp +++ b/shared/test/unit_test/encoders/test_encode_command_buffer.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using EncodeBatchBufferStartOrEndTest = TestLegacy; +using EncodeBatchBufferStartOrEndTest = Test; HWTEST_F(EncodeBatchBufferStartOrEndTest, givenCommandContainerWhenEncodeBBEndThenCommandIsAdded) { CommandContainer cmdContainer; @@ -94,7 +94,7 @@ HWTEST_F(EncodeBatchBufferStartOrEndTest, givenGpuAddressWhenEncodeBBStartThenAd } } -using EncodeNoopTest = TestLegacy; +using EncodeNoopTest = Test; HWTEST_F(EncodeNoopTest, WhenAligningLinearStreamToCacheLineSizeThenItIsAlignedCorrectly) { CommandContainer cmdContainer; diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp index 8c2e4af78d..55b2b02053 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp @@ -25,7 +25,7 @@ using namespace NEO; -using CommandEncodeStatesTest = TestLegacy; +using CommandEncodeStatesTest = Test; TEST_F(CommandEncodeStatesTest, givenDefaultCommandContainerWhenGettingNumIddPerBlockThen64IsReturned) { auto numIdds = cmdContainer->getNumIddPerBlock(); @@ -57,7 +57,7 @@ HWTEST_F(CommandEncodeStatesTest, givenDispatchInterfaceWhenDispatchKernelThenWa ASSERT_NE(itorPC, commands.end()); } -using CommandEncodeStatesUncachedMocsTests = TestLegacy; +using CommandEncodeStatesUncachedMocsTests = Test; HWTEST_F(CommandEncodeStatesUncachedMocsTests, whenEncodingDispatchKernelWithUncachedMocsAndDirtyHeapsThenCorrectMocsIsSet) { DebugManagerStateRestore restore; @@ -698,7 +698,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, CommandEncodeStatesTest, giveNextIddInBlockZeorWhenD ASSERT_NE(itorPC, commands.end()); } -using EncodeDispatchKernelTest = TestLegacy; +using EncodeDispatchKernelTest = Test; HWTEST2_F(EncodeDispatchKernelTest, givenBindfulKernelWhenDispatchingKernelThenSshFromContainerIsUsed, IsAtLeastSkl) { using BINDING_TABLE_STATE = typename FamilyType::BINDING_TABLE_STATE; @@ -1037,8 +1037,8 @@ HWCMDTEST_F(IGFX_GEN8_CORE, InterfaceDescriptorDataTests, givenVariousValuesWhen EXPECT_TRUE(idd.getBarrierEnable()); } -using BindlessCommandEncodeStatesTest = TestLegacy; -using BindlessCommandEncodeStatesContainerTest = TestLegacy; +using BindlessCommandEncodeStatesTest = Test; +using BindlessCommandEncodeStatesContainerTest = Test; HWTEST_F(BindlessCommandEncodeStatesContainerTest, givenBindlessKernelAndBindlessModeEnabledWhenEncodingKernelThenCmdContainerHasNullptrSSH) { using BINDING_TABLE_STATE = typename FamilyType::BINDING_TABLE_STATE; diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp index 81957f6668..c9792d9a92 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp @@ -19,7 +19,7 @@ using namespace NEO; -using CommandEncodeStatesTestDg2AndLater = TestLegacy; +using CommandEncodeStatesTestDg2AndLater = Test; HWTEST2_F(CommandEncodeStatesTestDg2AndLater, givenEventAddressWhenEncodeAndPVCAndDG2ThenSetDataportSubsliceCacheFlushIstSet, IsAtLeastXeHpgCore) { using POSTSYNC_DATA = typename FamilyType::POSTSYNC_DATA; diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp index ab85947b61..16bd07bf7c 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_pvc_and_later.cpp @@ -17,7 +17,7 @@ using namespace NEO; -using CommandEncodeStatesTestPvcAndLater = TestLegacy; +using CommandEncodeStatesTestPvcAndLater = Test; HWTEST2_F(CommandEncodeStatesTestPvcAndLater, givenOverrideSlmTotalSizeDebugVariableWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly, IsAtLeastXeHpcCore) { using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; @@ -93,7 +93,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTestPvcAndLater, givenCommandCon EXPECT_EQ(hwInfoConfig.isGrfNumReportedWithScm(), cmd->getLargeGrfMode()); } -using CommandEncodeStatesTestHpc = TestLegacy; +using CommandEncodeStatesTestHpc = Test; HWTEST2_F(CommandEncodeStatesTestHpc, GivenVariousSlmTotalSizesAndSettingRevIDToDifferentValuesWhenSetAdditionalInfoIsCalledThenCorrectValuesAreSet, IsPVC) { using PREFERRED_SLM_ALLOCATION_SIZE = typename FamilyType::INTERFACE_DESCRIPTOR_DATA::PREFERRED_SLM_ALLOCATION_SIZE; diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp index ba794b1219..6e6d87c40d 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp @@ -28,7 +28,7 @@ using namespace NEO; -using CommandEncodeStatesTest = TestLegacy; +using CommandEncodeStatesTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, givenSlmTotalSizeGraterThanZeroWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly) { using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; @@ -936,17 +936,17 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, WalkerThreadTestXeHPAndLater, WhenExecutionMaskNotZ } struct CommandEncodeStatesImplicitScalingFixture : public CommandEncodeStatesFixture { - void SetUp() { + void setUp() { DebugManager.flags.CreateMultipleSubDevices.set(2); osLocalMemoryBackup = std::make_unique>(&OSInterface::osEnableLocalMemory, true); mockDeviceBackup = std::make_unique>(&MockDevice::createSingleDevice, false); apiSupportBackup = std::make_unique>(&ImplicitScaling::apiSupport, true); - CommandEncodeStatesFixture::SetUp(); + CommandEncodeStatesFixture::setUp(); } - void TearDown() { - CommandEncodeStatesFixture::TearDown(); + void tearDown() { + CommandEncodeStatesFixture::tearDown(); } DebugManagerStateRestore restorer; @@ -955,7 +955,7 @@ struct CommandEncodeStatesImplicitScalingFixture : public CommandEncodeStatesFix std::unique_ptr> apiSupportBackup; }; -using CommandEncodeStatesImplicitScaling = TestLegacy; +using CommandEncodeStatesImplicitScaling = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesImplicitScaling, givenStaticPartitioningWhenNonTimestampEventProvidedThenExpectTimestampComputeWalkerPostSync) { @@ -990,19 +990,19 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesImplicitScaling, } struct CommandEncodeStatesDynamicImplicitScalingFixture : CommandEncodeStatesImplicitScalingFixture { - void SetUp() { + void setUp() { DebugManager.flags.EnableStaticPartitioning.set(0); - CommandEncodeStatesImplicitScalingFixture::SetUp(); + CommandEncodeStatesImplicitScalingFixture::setUp(); } - void TearDown() { - CommandEncodeStatesImplicitScalingFixture::TearDown(); + void tearDown() { + CommandEncodeStatesImplicitScalingFixture::tearDown(); } DebugManagerStateRestore restore{}; }; -using CommandEncodeStatesDynamicImplicitScaling = TestLegacy; +using CommandEncodeStatesDynamicImplicitScaling = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesDynamicImplicitScaling, givenImplicitScalingWhenEncodingDispatchKernelThenExpectPartitionCommandBuffer) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; diff --git a/shared/test/unit_test/encoders/test_encode_enable_raytracing.cpp b/shared/test/unit_test/encoders/test_encode_enable_raytracing.cpp index 921fd513e1..01030aaa43 100644 --- a/shared/test/unit_test/encoders/test_encode_enable_raytracing.cpp +++ b/shared/test/unit_test/encoders/test_encode_enable_raytracing.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using CommandEncodeEnableRayTracing = TestLegacy; +using CommandEncodeEnableRayTracing = Test; HWTEST_F(CommandEncodeEnableRayTracing, programEnableRayTracing) { uint32_t pCmdBuffer[1024]; diff --git a/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp index 88a17536b9..62b093e3d7 100644 --- a/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_grf_mode_xe_hp_and_later.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using CommandEncodeStatesTest = TestLegacy; +using CommandEncodeStatesTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, givenCommandContainerWhenNumGrfRequiredIsDefaultThenLargeGrfModeDisabled) { using PIPELINE_SELECT = typename FamilyType::PIPELINE_SELECT; diff --git a/shared/test/unit_test/encoders/test_encode_math.cpp b/shared/test/unit_test/encoders/test_encode_math.cpp index 780a8b5e72..0a875848d4 100644 --- a/shared/test/unit_test/encoders/test_encode_math.cpp +++ b/shared/test/unit_test/encoders/test_encode_math.cpp @@ -139,7 +139,7 @@ HWTEST_F(EncodeMathMMIOTest, givenAluRegistersWhenEncodeAluAndIsCalledThenAluPar EXPECT_EQ(aluParam[4].DW0.Value, 0u); } -using CommandEncoderMathTest = TestLegacy; +using CommandEncoderMathTest = Test; HWTEST_F(CommandEncoderMathTest, WhenReservingCommandThenBitfieldSetCorrectly) { using MI_MATH = typename FamilyType::MI_MATH; diff --git a/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp index 35a23faea8..2d64477ee8 100644 --- a/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_math_xehp_and_later.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using XeHPAndLaterCommandEncoderMathTest = TestLegacy; +using XeHPAndLaterCommandEncoderMathTest = Test; HWTEST2_F(XeHPAndLaterCommandEncoderMathTest, WhenAppendsAGreaterThanThenPredicateCorrectlySetAndRemapEnabled, IsAtLeastXeHpCore) { using MI_LOAD_REGISTER_MEM = typename FamilyType::MI_LOAD_REGISTER_MEM; diff --git a/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp b/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp index a1c0460198..34d7949b19 100644 --- a/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp +++ b/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp @@ -11,7 +11,7 @@ using namespace NEO; -using CommandEncodeStatesTest = TestLegacy; +using CommandEncodeStatesTest = Test; HWCMDTEST_F(IGFX_GEN8_CORE, CommandEncodeStatesTest, WhenProgrammingThenMediaInterfaceDescriptorLoadIsUsed) { using MEDIA_STATE_FLUSH = typename FamilyType::MEDIA_STATE_FLUSH; diff --git a/shared/test/unit_test/encoders/test_encode_media_interface_descriptor_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_media_interface_descriptor_xehp_and_later.cpp index f25a89c9e3..f47fd55269 100644 --- a/shared/test/unit_test/encoders/test_encode_media_interface_descriptor_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_media_interface_descriptor_xehp_and_later.cpp @@ -9,7 +9,7 @@ using namespace NEO; -using CommandEncodeStatesTest = TestLegacy; +using CommandEncodeStatesTest = Test; HWTEST2_F(CommandEncodeStatesTest, givenCommandContainerWhenEncodingMediaDescriptorThenUsedSizeDidNotIncreased, IsAtLeastXeHpCore) { auto sizeBefore = cmdContainer->getCommandStream()->getUsed(); diff --git a/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp b/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp index 718256389d..fd95648437 100644 --- a/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp +++ b/shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp @@ -10,7 +10,7 @@ using namespace NEO; -using XeHPAndLaterEncodeMiFlushDWTest = TestLegacy; +using XeHPAndLaterEncodeMiFlushDWTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterEncodeMiFlushDWTest, whenMiFlushDwIsProgrammedThenSetFlushCcsAndLlc) { using MI_FLUSH_DW = typename FamilyType::MI_FLUSH_DW; diff --git a/shared/test/unit_test/encoders/test_encode_semaphore.cpp b/shared/test/unit_test/encoders/test_encode_semaphore.cpp index 2f1fe1626a..41540eb2e5 100644 --- a/shared/test/unit_test/encoders/test_encode_semaphore.cpp +++ b/shared/test/unit_test/encoders/test_encode_semaphore.cpp @@ -12,7 +12,7 @@ using namespace NEO; -using CommandEncodeSemaphore = TestLegacy; +using CommandEncodeSemaphore = Test; HWTEST_F(CommandEncodeSemaphore, WhenProgrammingThenMiSemaphoreWaitIsUsed) { using MI_SEMAPHORE_WAIT = typename FamilyType::MI_SEMAPHORE_WAIT; diff --git a/shared/test/unit_test/encoders/test_encode_set_mmio.cpp b/shared/test/unit_test/encoders/test_encode_set_mmio.cpp index 9d0e42c14a..2efc027d33 100644 --- a/shared/test/unit_test/encoders/test_encode_set_mmio.cpp +++ b/shared/test/unit_test/encoders/test_encode_set_mmio.cpp @@ -14,19 +14,19 @@ using namespace NEO; class CommandSetMMIOFixture : public DeviceFixture { public: - void SetUp() { - DeviceFixture::SetUp(); + void setUp() { + DeviceFixture::setUp(); cmdContainer = std::make_unique(); cmdContainer->initialize(pDevice, nullptr, true); } - void TearDown() { + void tearDown() { cmdContainer.reset(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr cmdContainer; }; -using CommandSetMMIOTest = TestLegacy; +using CommandSetMMIOTest = Test; HWTEST_F(CommandSetMMIOTest, WhenProgrammingThenLoadRegisterImmIsUsed) { EncodeSetMMIO::encodeIMM(*cmdContainer.get(), 0x2000, 0xbaa, false); diff --git a/shared/test/unit_test/encoders/test_encode_states.cpp b/shared/test/unit_test/encoders/test_encode_states.cpp index 9aa4c0628d..cd176451d1 100644 --- a/shared/test/unit_test/encoders/test_encode_states.cpp +++ b/shared/test/unit_test/encoders/test_encode_states.cpp @@ -21,7 +21,7 @@ using namespace NEO; -using CommandEncodeStatesTest = TestLegacy; +using CommandEncodeStatesTest = Test; HWTEST_F(CommandEncodeStatesTest, GivenCommandStreamWhenEncodeCopySamplerStateThenIndirectStatePointerIsCorrect) { bool deviceUsesDsh = pDevice->getHardwareInfo().capabilityTable.supportsImages; @@ -63,7 +63,7 @@ HWTEST2_F(CommandEncodeStatesTest, givenDebugVariableSetWhenCopyingSamplerStateT auto pSamplerState = reinterpret_cast(ptrOffset(dsh->getCpuBase(), samplerStateOffset)); EXPECT_EQ(pSamplerState->getLowQualityFilter(), SAMPLER_STATE::LOW_QUALITY_FILTER_ENABLE); } -using BindlessCommandEncodeStatesTest = TestLegacy; +using BindlessCommandEncodeStatesTest = Test; HWTEST_F(BindlessCommandEncodeStatesTest, GivenBindlessEnabledWhenBorderColorWithoutAlphaThenBorderColorPtrReturned) { using SAMPLER_BORDER_COLOR_STATE = typename FamilyType::SAMPLER_BORDER_COLOR_STATE; diff --git a/shared/test/unit_test/fixtures/command_container_fixture.h b/shared/test/unit_test/fixtures/command_container_fixture.h index 1b184b9acf..1e7781516d 100644 --- a/shared/test/unit_test/fixtures/command_container_fixture.h +++ b/shared/test/unit_test/fixtures/command_container_fixture.h @@ -20,15 +20,15 @@ class CommandEncodeStatesFixture : public DeviceFixture { using CommandContainer::dirtyHeaps; }; - void SetUp() { - DeviceFixture::SetUp(); + void setUp() { + DeviceFixture::setUp(); cmdContainer = std::make_unique(); cmdContainer->initialize(pDevice, nullptr, true); cmdContainer->setDirtyStateForAllHeaps(false); } - void TearDown() { + void tearDown() { cmdContainer.reset(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr cmdContainer; KernelDescriptor descriptor; diff --git a/shared/test/unit_test/fixtures/direct_submission_fixture.h b/shared/test/unit_test/fixtures/direct_submission_fixture.h index 6309012b39..90a41b692a 100644 --- a/shared/test/unit_test/fixtures/direct_submission_fixture.h +++ b/shared/test/unit_test/fixtures/direct_submission_fixture.h @@ -22,8 +22,8 @@ extern std::atomic lastClFlushedPtr; } struct DirectSubmissionFixture : public DeviceFixture { - void SetUp() { - DeviceFixture::SetUp(); + void setUp() { + DeviceFixture::setUp(); DeviceFactory::prepareDeviceEnvironments(*pDevice->getExecutionEnvironment()); osContext = pDevice->getDefaultEngine().osContext; @@ -33,8 +33,8 @@ struct DirectSubmissionFixture : public DeviceFixture { }; struct DirectSubmissionDispatchBufferFixture : public DirectSubmissionFixture { - void SetUp() { - DirectSubmissionFixture::SetUp(); + void setUp() { + DirectSubmissionFixture::setUp(); MemoryManager *memoryManager = pDevice->getExecutionEnvironment()->memoryManager.get(); const AllocationProperties commandBufferProperties{pDevice->getRootDeviceIndex(), 0x1000, AllocationType::COMMAND_BUFFER, pDevice->getDeviceBitfield()}; @@ -45,11 +45,11 @@ struct DirectSubmissionDispatchBufferFixture : public DirectSubmissionFixture { batchBuffer.usedSize = 0x40; } - void TearDown() { + void tearDown() { MemoryManager *memoryManager = pDevice->getExecutionEnvironment()->memoryManager.get(); memoryManager->freeGraphicsMemory(commandBuffer); - DirectSubmissionFixture::TearDown(); + DirectSubmissionFixture::tearDown(); } BatchBuffer batchBuffer; diff --git a/shared/test/unit_test/fixtures/front_window_fixture.cpp b/shared/test/unit_test/fixtures/front_window_fixture.cpp index b8d47c618d..5d7848ff05 100644 --- a/shared/test/unit_test/fixtures/front_window_fixture.cpp +++ b/shared/test/unit_test/fixtures/front_window_fixture.cpp @@ -15,12 +15,13 @@ using namespace NEO; MemManagerFixture::FrontWindowMemManagerMock::FrontWindowMemManagerMock(NEO::ExecutionEnvironment &executionEnvironment) : MockMemoryManager(executionEnvironment) {} void MemManagerFixture::FrontWindowMemManagerMock::forceLimitedRangeAllocator(uint32_t rootDeviceIndex, uint64_t range) { getGfxPartition(rootDeviceIndex)->init(range, 0, 0, gfxPartitions.size(), true); } -void MemManagerFixture::SetUp() { + +void MemManagerFixture::setUp() { DebugManagerStateRestore dbgRestorer; DebugManager.flags.UseExternalAllocatorForSshAndDsh.set(true); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); memManager = std::unique_ptr(new FrontWindowMemManagerMock(*pDevice->getExecutionEnvironment())); } -void MemManagerFixture::TearDown() { - DeviceFixture::TearDown(); -} \ No newline at end of file +void MemManagerFixture::tearDown() { + DeviceFixture::tearDown(); +} diff --git a/shared/test/unit_test/fixtures/front_window_fixture.h b/shared/test/unit_test/fixtures/front_window_fixture.h index 54f12b0be4..5fa430357b 100644 --- a/shared/test/unit_test/fixtures/front_window_fixture.h +++ b/shared/test/unit_test/fixtures/front_window_fixture.h @@ -19,8 +19,8 @@ class MemManagerFixture : public DeviceFixture { void forceLimitedRangeAllocator(uint32_t rootDeviceIndex, uint64_t range); }; - void SetUp(); - void TearDown(); + void setUp(); + void tearDown(); std::unique_ptr memManager; }; diff --git a/shared/test/unit_test/fixtures/implicit_scaling_fixture.cpp b/shared/test/unit_test/fixtures/implicit_scaling_fixture.cpp index dac55fdaba..f469000ad4 100644 --- a/shared/test/unit_test/fixtures/implicit_scaling_fixture.cpp +++ b/shared/test/unit_test/fixtures/implicit_scaling_fixture.cpp @@ -12,8 +12,8 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/default_hw_info.h" -void ImplicitScalingFixture::SetUp() { - CommandEncodeStatesFixture::SetUp(); +void ImplicitScalingFixture::setUp() { + CommandEncodeStatesFixture::setUp(); apiSupportBackup = std::make_unique>(&ImplicitScaling::apiSupport, true); osLocalMemoryBackup = std::make_unique>(&OSInterface::osEnableLocalMemory, true); @@ -32,7 +32,7 @@ void ImplicitScalingFixture::SetUp() { testHardwareInfo = *defaultHwInfo; } -void ImplicitScalingFixture::TearDown() { +void ImplicitScalingFixture::tearDown() { alignedFree(alignedMemory); - CommandEncodeStatesFixture::TearDown(); + CommandEncodeStatesFixture::tearDown(); } diff --git a/shared/test/unit_test/fixtures/implicit_scaling_fixture.h b/shared/test/unit_test/fixtures/implicit_scaling_fixture.h index a5eae582ed..271d092d6b 100644 --- a/shared/test/unit_test/fixtures/implicit_scaling_fixture.h +++ b/shared/test/unit_test/fixtures/implicit_scaling_fixture.h @@ -19,8 +19,8 @@ using namespace NEO; struct ImplicitScalingFixture : public CommandEncodeStatesFixture { - void SetUp(); - void TearDown(); + void setUp(); + void tearDown(); static constexpr uint64_t gpuVa = (1ull << 48); static constexpr size_t bufferSize = 1024u; @@ -35,4 +35,4 @@ struct ImplicitScalingFixture : public CommandEncodeStatesFixture { void *alignedMemory = nullptr; }; -using ImplicitScalingTests = TestLegacy; +using ImplicitScalingTests = Test; diff --git a/shared/test/unit_test/gen11/test_encode_math_gen11.cpp b/shared/test/unit_test/gen11/test_encode_math_gen11.cpp index 4562ba76fa..b187862156 100644 --- a/shared/test/unit_test/gen11/test_encode_math_gen11.cpp +++ b/shared/test/unit_test/gen11/test_encode_math_gen11.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using CommandEncoderMathTestGen11 = TestLegacy; +using CommandEncoderMathTestGen11 = Test; GEN11TEST_F(CommandEncoderMathTestGen11, WhenAppendsAGreaterThanThenPredicateCorrectlySet) { using MI_LOAD_REGISTER_MEM = typename FamilyType::MI_LOAD_REGISTER_MEM; diff --git a/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp b/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp index bce0f0ecb6..c84f7c222b 100644 --- a/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp +++ b/shared/test/unit_test/gen12lp/adln/test_device_caps_adln.cpp @@ -12,7 +12,7 @@ using namespace NEO; -using AdlnUsDeviceIdTest = TestLegacy; +using AdlnUsDeviceIdTest = Test; ADLNTEST_F(AdlnUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) { unsigned short adlnSimulationIds[1] = { diff --git a/shared/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl b/shared/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl index 11c4dad3f8..d97a0a0fb4 100644 --- a/shared/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl +++ b/shared/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl @@ -20,7 +20,7 @@ using namespace NEO; -using Gen12LPAubCommandStreamReceiverTests = TestLegacy; +using Gen12LPAubCommandStreamReceiverTests = Test; GEN12LPTEST_F(Gen12LPAubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenGetGUCWorkQueueItemHeaderIsCalledThenAppropriateValueDependingOnEngineTypeIsReturned) { std::unique_ptr> aubCsr(new AUBCommandStreamReceiverHw("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); diff --git a/shared/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl b/shared/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl index 773f71a324..1d30439c5a 100644 --- a/shared/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl +++ b/shared/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl @@ -15,7 +15,7 @@ using namespace NEO; -using Gen12LPCommandStreamReceiverSimulatedCommonHwTests = TestLegacy; +using Gen12LPCommandStreamReceiverSimulatedCommonHwTests = Test; GEN12LPTEST_F(Gen12LPCommandStreamReceiverSimulatedCommonHwTests, givenAubCommandStreamReceiverWhewGlobalMmiosAreInitializedThenMOCSRegistersAreConfigured) { MockSimulatedCsrHw csrSimulatedCommonHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); diff --git a/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp index 832e1cc608..1eab825533 100644 --- a/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp @@ -17,7 +17,7 @@ using namespace NEO; -using CommandEncoderTest = TestLegacy; +using CommandEncoderTest = Test; GEN12LPTEST_F(CommandEncoderTest, WhenAdjustComputeModeIsCalledThenStateComputeModeShowsNonCoherencySet) { using STATE_COMPUTE_MODE = typename FamilyType::STATE_COMPUTE_MODE; diff --git a/shared/test/unit_test/gen12lp/test_encode_math_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_encode_math_gen12lp.cpp index b4c0f7386d..6d92bf2c0e 100644 --- a/shared/test/unit_test/gen12lp/test_encode_math_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_encode_math_gen12lp.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using CommandEncoderMathTestGen12Lp = TestLegacy; +using CommandEncoderMathTestGen12Lp = Test; GEN12LPTEST_F(CommandEncoderMathTestGen12Lp, WhenAppendsAGreaterThanThenPredicateCorrectlySetAndRemapEnabled) { using MI_LOAD_REGISTER_MEM = typename FamilyType::MI_LOAD_REGISTER_MEM; diff --git a/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp b/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp index 645296810c..eb54a0216d 100644 --- a/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp +++ b/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp @@ -50,7 +50,7 @@ GEN8TEST_F(MemorySynchronizatiopCommandsTestsGen8, WhenProgrammingCacheFlushThen EXPECT_TRUE(pipeControl->getConstantCacheInvalidationEnable()); } -using HwInfoConfigTestGen8 = TestLegacy; +using HwInfoConfigTestGen8 = Test; GEN8TEST_F(HwInfoConfigTestGen8, givenHwInfosWhenIsMatrixMultiplyAccumulateSupportedThenReturnFalse) { EXPECT_FALSE(HwInfoConfig::get(productFamily)->isMatrixMultiplyAccumulateSupported(*defaultHwInfo)); } diff --git a/shared/test/unit_test/gen8/test_device_caps_gen8.cpp b/shared/test/unit_test/gen8/test_device_caps_gen8.cpp index 2a31b14bad..10311cf9f3 100644 --- a/shared/test/unit_test/gen8/test_device_caps_gen8.cpp +++ b/shared/test/unit_test/gen8/test_device_caps_gen8.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using Gen8DeviceCaps = TestLegacy; +using Gen8DeviceCaps = Test; GEN8TEST_F(Gen8DeviceCaps, GivenDefaultWhenCheckingPreemptionModeThenDisabledIsReported) { EXPECT_TRUE(PreemptionMode::Disabled == pDevice->getHardwareInfo().capabilityTable.defaultPreemptionMode); diff --git a/shared/test/unit_test/gen8/test_encode_math_gen8.cpp b/shared/test/unit_test/gen8/test_encode_math_gen8.cpp index a2fca003d5..a67325945f 100644 --- a/shared/test/unit_test/gen8/test_encode_math_gen8.cpp +++ b/shared/test/unit_test/gen8/test_encode_math_gen8.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using CommandEncoderMathTestGen8 = TestLegacy; +using CommandEncoderMathTestGen8 = Test; GEN8TEST_F(CommandEncoderMathTestGen8, WhenAppendsAGreaterThanThenPredicateCorrectlySet) { using MI_LOAD_REGISTER_MEM = typename FamilyType::MI_LOAD_REGISTER_MEM; diff --git a/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp b/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp index 3d95983b5f..1c3cebd2e7 100644 --- a/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp +++ b/shared/test/unit_test/gen9/test_command_encoder_gen9.cpp @@ -17,7 +17,7 @@ using namespace NEO; -using CommandEncoderTest = TestLegacy; +using CommandEncoderTest = Test; GEN9TEST_F(CommandEncoderTest, WhenProgrammingThenLoadRegisterImmIsUsed) { CommandContainer cmdContainer; diff --git a/shared/test/unit_test/gen9/test_encode_math_gen9.cpp b/shared/test/unit_test/gen9/test_encode_math_gen9.cpp index 07210da0a7..e5fb8e3843 100644 --- a/shared/test/unit_test/gen9/test_encode_math_gen9.cpp +++ b/shared/test/unit_test/gen9/test_encode_math_gen9.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using CommandEncoderMathTestGen9 = TestLegacy; +using CommandEncoderMathTestGen9 = Test; GEN9TEST_F(CommandEncoderMathTestGen9, WhenAppendsAGreaterThanThenPredicateCorrectlySet) { using MI_LOAD_REGISTER_MEM = typename FamilyType::MI_LOAD_REGISTER_MEM; diff --git a/shared/test/unit_test/heap_assigner/heap_assigner_tests.cpp b/shared/test/unit_test/heap_assigner/heap_assigner_tests.cpp index 181f1cb1d2..469bbdd998 100644 --- a/shared/test/unit_test/heap_assigner/heap_assigner_tests.cpp +++ b/shared/test/unit_test/heap_assigner/heap_assigner_tests.cpp @@ -11,7 +11,7 @@ namespace NEO { -class AlocationHelperTests : public TestLegacy { +class AlocationHelperTests : public Test { public: HeapAssigner heapAssigner = {}; }; diff --git a/shared/test/unit_test/helpers/bindless_heaps_helper_tests.cpp b/shared/test/unit_test/helpers/bindless_heaps_helper_tests.cpp index eae9789ac1..27cc5e8453 100644 --- a/shared/test/unit_test/helpers/bindless_heaps_helper_tests.cpp +++ b/shared/test/unit_test/helpers/bindless_heaps_helper_tests.cpp @@ -30,7 +30,7 @@ TEST(BindlessHeapsHelper, givenBindlessModeFlagDisabledWhenCreatingRootDevicesTh EXPECT_EQ(deviceFactory->rootDevices[0]->getBindlessHeapsHelper(), nullptr); } -using BindlessHeapsHelperTests = TestLegacy; +using BindlessHeapsHelperTests = Test; TEST_F(BindlessHeapsHelperTests, givenBindlessHeapHelperWhenItsCreatedThenSpecialSshAllocatedAtHeapBegining) { auto bindlessHeapHelper = std::make_unique(pDevice->getMemoryManager(), pDevice->getNumGenericSubDevices() > 1, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); @@ -197,4 +197,4 @@ TEST_F(BindlessHeapsHelperTests, givenDeviceWhenBindlessHeapHelperInitializedThe DeviceBitfield devBitfield = 7; auto bindlessHeapHelper = std::make_unique(pDevice->getMemoryManager(), pDevice->getNumGenericSubDevices() > 1, pDevice->getRootDeviceIndex(), devBitfield); EXPECT_EQ(reinterpret_cast(pDevice->getMemoryManager())->recentlyPassedDeviceBitfield, devBitfield); -} \ No newline at end of file +} diff --git a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp index 48c7a2c541..4dbd5fa0fd 100644 --- a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp +++ b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp @@ -131,7 +131,7 @@ TEST(BlitCommandsHelperTest, GivenCopySizeYAndZEqual0WhenConstructingPropertiesF EXPECT_EQ(blitProperties.copySize, expectedSize); } -using BlitTests = TestLegacy; +using BlitTests = Test; HWTEST_F(BlitTests, givenDebugVariablesWhenGettingMaxBlitSizeThenHonorUseProvidedValues) { DebugManagerStateRestore restore{}; diff --git a/shared/test/unit_test/helpers/blit_commands_helper_tests.inl b/shared/test/unit_test/helpers/blit_commands_helper_tests.inl index d9211ef56e..cbb0f3c680 100644 --- a/shared/test/unit_test/helpers/blit_commands_helper_tests.inl +++ b/shared/test/unit_test/helpers/blit_commands_helper_tests.inl @@ -16,11 +16,11 @@ using namespace NEO; struct BlitColorTests : public DeviceFixture, public testing::TestWithParam { void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; diff --git a/shared/test/unit_test/helpers/blit_commands_helper_tests_gen12lp.cpp b/shared/test/unit_test/helpers/blit_commands_helper_tests_gen12lp.cpp index e801192704..cbc33c2489 100644 --- a/shared/test/unit_test/helpers/blit_commands_helper_tests_gen12lp.cpp +++ b/shared/test/unit_test/helpers/blit_commands_helper_tests_gen12lp.cpp @@ -20,7 +20,7 @@ using namespace NEO; -using BlitTests = TestLegacy; +using BlitTests = Test; HWTEST2_F(BlitTests, givenOneBytePerPixelWhenAppendColorDepthThenCorrectDepthIsSet, IsGen12LP) { using XY_BLOCK_COPY_BLT = typename FamilyType::XY_BLOCK_COPY_BLT; diff --git a/shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp b/shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp index d8eb85b044..cedcb5b545 100644 --- a/shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp +++ b/shared/test/unit_test/helpers/compiler_hw_info_config_tests.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using CompilerHwInfoConfigFixture = TestLegacy; +using CompilerHwInfoConfigFixture = Test; HWTEST_F(CompilerHwInfoConfigFixture, WhenIsMidThreadPreemptionIsSupportedIsCalledThenCorrectResultIsReturned) { auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); diff --git a/shared/test/unit_test/helpers/hw_helper_extended_tests.cpp b/shared/test/unit_test/helpers/hw_helper_extended_tests.cpp index 819143ec0e..bde39a7421 100644 --- a/shared/test/unit_test/helpers/hw_helper_extended_tests.cpp +++ b/shared/test/unit_test/helpers/hw_helper_extended_tests.cpp @@ -11,7 +11,7 @@ using namespace NEO; -typedef TestLegacy HwHelperTest; +typedef Test HwHelperTest; HWTEST_F(HwHelperTest, GivenHwInfoWithEnabledBliterWhenCheckCopyEnginesCountThenReturnedOne) { HardwareInfo hwInfo{}; diff --git a/shared/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp b/shared/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp index c53179eb7f..3d3bff9b0e 100644 --- a/shared/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp +++ b/shared/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp @@ -12,7 +12,7 @@ using namespace NEO; -using HwHelperDg2AndLaterTest = TestLegacy; +using HwHelperDg2AndLaterTest = Test; HWTEST2_F(HwHelperDg2AndLaterTest, GivenUseL1CacheAsTrueWhenCallSetL1CachePolicyThenL1CachePolicyL1CacheControlIsSetProperly, IsAtLeastXeHpgCore) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; diff --git a/shared/test/unit_test/helpers/state_base_address_tests.cpp b/shared/test/unit_test/helpers/state_base_address_tests.cpp index 31ff77fac5..c3e173afba 100644 --- a/shared/test/unit_test/helpers/state_base_address_tests.cpp +++ b/shared/test/unit_test/helpers/state_base_address_tests.cpp @@ -76,7 +76,7 @@ HWTEST2_F(SBATest, WhenProgramStateBaseAddressParametersIsCalledThenSBACmdHasBin EXPECT_TRUE(cmd->getBindlessSurfaceStateBaseAddressModifyEnable()); } -using SbaForBindlessTests = TestLegacy; +using SbaForBindlessTests = Test; HWTEST2_F(SbaForBindlessTests, givenGlobalBindlessBaseAddressWhenProgramStateBaseAddressThenSbaProgrammedCorrectly, IsAtLeastSkl) { using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; diff --git a/shared/test/unit_test/helpers/state_base_address_tests.h b/shared/test/unit_test/helpers/state_base_address_tests.h index 63ecfae8b6..5dba4e2cad 100644 --- a/shared/test/unit_test/helpers/state_base_address_tests.h +++ b/shared/test/unit_test/helpers/state_base_address_tests.h @@ -18,7 +18,7 @@ struct SBATest : public NEO::DeviceFixture, public ::testing::Test { void SetUp() override { - NEO::DeviceFixture::SetUp(); + NEO::DeviceFixture::setUp(); size_t sizeStream = 512; size_t alignmentStream = 0x1000; sshBuffer = alignedMalloc(sizeStream, alignmentStream); @@ -36,7 +36,7 @@ struct SBATest : public NEO::DeviceFixture, public ::testing::Test { alignedFree(linearStreamBuffer); delete ssh.getGraphicsAllocation(); alignedFree(sshBuffer); - NEO::DeviceFixture::TearDown(); + NEO::DeviceFixture::tearDown(); } IndirectHeap ssh = {nullptr}; void *sshBuffer = nullptr; diff --git a/shared/test/unit_test/helpers/test_blit_commands_helper_pvc_and_later.cpp b/shared/test/unit_test/helpers/test_blit_commands_helper_pvc_and_later.cpp index 106bf911b4..9e762ec625 100644 --- a/shared/test/unit_test/helpers/test_blit_commands_helper_pvc_and_later.cpp +++ b/shared/test/unit_test/helpers/test_blit_commands_helper_pvc_and_later.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using BlitTests = TestLegacy; +using BlitTests = Test; HWTEST2_F(BlitTests, givenOneBytePatternWhenFillPatternWithBlitThenCommandIsProgrammed, IsPVC) { using MEM_SET = typename FamilyType::MEM_SET; diff --git a/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp b/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp index dbfffa2b8a..7b603be08d 100644 --- a/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp +++ b/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp @@ -18,7 +18,7 @@ #include "gtest/gtest.h" #include "test_traits_common.h" -using BlitTests = TestLegacy; +using BlitTests = Test; using BlitPlatforms = IsAtLeastProduct; diff --git a/shared/test/unit_test/helpers/timestamp_packet_tests.cpp b/shared/test/unit_test/helpers/timestamp_packet_tests.cpp index eaa472bcaa..0008bd98e2 100644 --- a/shared/test/unit_test/helpers/timestamp_packet_tests.cpp +++ b/shared/test/unit_test/helpers/timestamp_packet_tests.cpp @@ -203,12 +203,12 @@ struct DeviceTimestampPacketTests : public ::testing::Test, DeviceFixture { void SetUp() override { DebugManager.flags.EnableTimestampPacket.set(1); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); executionEnvironment = pDevice->executionEnvironment; } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); }; }; diff --git a/shared/test/unit_test/image/image_surface_state_fixture.h b/shared/test/unit_test/image/image_surface_state_fixture.h index 531e30bf04..b5ac7bd32e 100644 --- a/shared/test/unit_test/image/image_surface_state_fixture.h +++ b/shared/test/unit_test/image/image_surface_state_fixture.h @@ -26,13 +26,13 @@ class ImageSurfaceStateTests : public DeviceFixture, public: ImageSurfaceStateTests() = default; void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); gmmHelper = pDevice->getGmmHelper(); mockGmm = std::make_unique(gmmHelper); } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } std::unique_ptr mockGmm; diff --git a/shared/test/unit_test/memory_manager/special_heap_pool_tests.cpp b/shared/test/unit_test/memory_manager/special_heap_pool_tests.cpp index cd9de80022..8ba8cae9a6 100644 --- a/shared/test/unit_test/memory_manager/special_heap_pool_tests.cpp +++ b/shared/test/unit_test/memory_manager/special_heap_pool_tests.cpp @@ -13,7 +13,7 @@ namespace NEO { -using FrontWindowAllocatorTests = TestLegacy; +using FrontWindowAllocatorTests = Test; TEST_F(FrontWindowAllocatorTests, givenAllocateInFrontWindowPoolFlagWhenAllocate32BitGraphicsMemoryThenAllocateAtHeapBegining) { AllocationData allocData = {}; diff --git a/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp index 36436a8835..811d311257 100644 --- a/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp @@ -173,16 +173,16 @@ class WddmCommandStreamMockGdiTest : public ::testing::Test { }; using WddmCommandStreamTest = ::TestLegacy; -using WddmDefaultTest = ::TestLegacy; +using WddmDefaultTest = ::Test; struct DeviceCommandStreamTest : ::TestLegacy, DeviceFixture { void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); MockAubCenterFixture::SetUp(); setMockAubCenter(pDevice->getRootDeviceEnvironmentRef()); } void TearDown() override { MockAubCenterFixture::TearDown(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; diff --git a/shared/test/unit_test/preamble/preamble_fixture.h b/shared/test/unit_test/preamble/preamble_fixture.h index b1be613853..f21ab60150 100644 --- a/shared/test/unit_test/preamble/preamble_fixture.h +++ b/shared/test/unit_test/preamble/preamble_fixture.h @@ -18,13 +18,13 @@ struct PreambleFixture : public DeviceFixture, public HardwareParse, public ::testing::Test { void SetUp() override { - DeviceFixture::SetUp(); + DeviceFixture::setUp(); HardwareParse::SetUp(); } void TearDown() override { HardwareParse::TearDown(); - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } }; @@ -37,11 +37,11 @@ class PreambleVfeState : public DeviceFixture, ::testing::Test::SetUp(); LinearStreamFixture::SetUp(); HardwareParse::SetUp(); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); testWaTable = &pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->getMutableHardwareInfo()->workaroundTable; } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); HardwareParse::TearDown(); LinearStreamFixture::TearDown(); ::testing::Test::TearDown(); diff --git a/shared/test/unit_test/scratch_space_controler/scratch_space_controler_tests.cpp b/shared/test/unit_test/scratch_space_controler/scratch_space_controler_tests.cpp index d5fa2ad034..53f30bc973 100644 --- a/shared/test/unit_test/scratch_space_controler/scratch_space_controler_tests.cpp +++ b/shared/test/unit_test/scratch_space_controler/scratch_space_controler_tests.cpp @@ -45,7 +45,7 @@ class MockScratchSpaceControllerBase : public ScratchSpaceControllerBase { bool programBindlessSurfaceStateForScratchCalled = false; }; -using ScratchComtrolerTests = TestLegacy; +using ScratchComtrolerTests = Test; HWTEST_F(ScratchComtrolerTests, givenCommandQueueWhenProgramHeapsCalledThenThenProgramHeapsCalled) { MockCsrHw2 csr(*pDevice->getExecutionEnvironment(), 0, pDevice->getDeviceBitfield()); diff --git a/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp b/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp index 5f75dbaf29..cc185da6bc 100644 --- a/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp +++ b/shared/test/unit_test/scratch_space_controler/scratch_space_controler_xehp_and_later_tests.cpp @@ -47,7 +47,7 @@ class MockScratchSpaceControllerXeHPAndLater : public ScratchSpaceControllerXeHP bool scratchDirty = false; }; -using ScratchComtrolerTests = TestLegacy; +using ScratchComtrolerTests = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, ScratchComtrolerTests, givenBindlessModeOnWhenGetPatchedOffsetCalledThenBindlessOffsetReturned) { DebugManagerStateRestore restorer; diff --git a/shared/test/unit_test/utilities/software_tags_manager_tests.cpp b/shared/test/unit_test/utilities/software_tags_manager_tests.cpp index be4f73490e..df55bc40fe 100644 --- a/shared/test/unit_test/utilities/software_tags_manager_tests.cpp +++ b/shared/test/unit_test/utilities/software_tags_manager_tests.cpp @@ -34,7 +34,7 @@ struct VeryLargeTag : public BaseTag { struct SoftwareTagsManagerTests : public DeviceFixture, public ::testing::Test { void SetUp() override { DebugManager.flags.EnableSWTags.set(true); - DeviceFixture::SetUp(); + DeviceFixture::setUp(); tagsManager = pDevice->getRootDeviceEnvironment().tagsManager.get(); @@ -44,7 +44,7 @@ struct SoftwareTagsManagerTests : public DeviceFixture, public ::testing::Test { } void TearDown() override { - DeviceFixture::TearDown(); + DeviceFixture::tearDown(); } template diff --git a/shared/test/unit_test/xe_hp_core/test_encode_xe_hp_core.cpp b/shared/test/unit_test/xe_hp_core/test_encode_xe_hp_core.cpp index d31d97fef5..678f07ccff 100644 --- a/shared/test/unit_test/xe_hp_core/test_encode_xe_hp_core.cpp +++ b/shared/test/unit_test/xe_hp_core/test_encode_xe_hp_core.cpp @@ -124,11 +124,11 @@ struct EncodeKernelGlobalAtomicsFixture : public CommandEncodeStatesFixture, pub osLocalMemoryBackup = std::make_unique>(&OSInterface::osEnableLocalMemory, true); mockDeviceBackup = std::make_unique>(&MockDevice::createSingleDevice, false); - CommandEncodeStatesFixture::SetUp(); + CommandEncodeStatesFixture::setUp(); } void TearDown() override { - CommandEncodeStatesFixture::TearDown(); + CommandEncodeStatesFixture::tearDown(); } DebugManagerStateRestore restorer; diff --git a/shared/test/unit_test/xe_hp_core/test_hw_info_config_xe_hp_core.cpp b/shared/test/unit_test/xe_hp_core/test_hw_info_config_xe_hp_core.cpp index aa422ad82b..6d2df514d8 100644 --- a/shared/test/unit_test/xe_hp_core/test_hw_info_config_xe_hp_core.cpp +++ b/shared/test/unit_test/xe_hp_core/test_hw_info_config_xe_hp_core.cpp @@ -17,7 +17,7 @@ using namespace NEO; -using XeHPMaxThreadsTest = TestLegacy; +using XeHPMaxThreadsTest = Test; XEHPTEST_F(XeHPMaxThreadsTest, givenXEHPWithA0SteppingThenMaxThreadsForWorkgroupWAIsRequired) { const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); @@ -35,7 +35,7 @@ XEHPTEST_F(XeHPMaxThreadsTest, givenXEHPWithBSteppingThenMaxThreadsForWorkgroupW EXPECT_FALSE(isWARequired); } -using TestXeHPHwInfoConfig = TestLegacy; +using TestXeHPHwInfoConfig = Test; XEHPTEST_F(TestXeHPHwInfoConfig, givenHwInfoConfigWhenRevisionIsAtLeastBThenAllowStatelessCompression) { DebugManagerStateRestore restore; diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp index e58ba1c408..2571751323 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_encode_dispatch_kernel_pvc.cpp @@ -52,7 +52,7 @@ PVCTEST_F(CommandEncodeStatesPvcTest, GivenSmallSlmTotalSizesWhenSetAdditionalIn } } -using EncodeKernelPvcTest = TestLegacy; +using EncodeKernelPvcTest = Test; PVCTEST_F(EncodeKernelPvcTest, givenRevisionBAndAboveWhenSpecialModeRequiredThenDontReprogramPipelineSelect) { bool requiresUncachedMocs = false; diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_sample_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_sample_pvc.cpp index 272f5b2b32..1e9bee89c9 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_sample_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_sample_pvc.cpp @@ -12,7 +12,7 @@ using namespace NEO; -using PvcOnlyTest = TestLegacy; +using PvcOnlyTest = Test; PVCTEST_F(PvcOnlyTest, WhenGettingHardwareInfoThenPvcIsReturned) { EXPECT_EQ(IGFX_PVC, pDevice->getHardwareInfo().platform.eProductFamily); diff --git a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp index df60581bed..2781e7341c 100644 --- a/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp @@ -290,7 +290,7 @@ XE_HPC_CORETEST_F(CommandEncodeXeHpcCoreTest, whenAdjustComputeModeIsCalledThenC EXPECT_EQ(EU_THREAD_SCHEDULING_MODE_OVERRIDE::EU_THREAD_SCHEDULING_MODE_OVERRIDE_HW_DEFAULT, pScm->getEuThreadSchedulingModeOverride()); } -using EncodeKernelXeHpcCoreTest = TestLegacy; +using EncodeKernelXeHpcCoreTest = Test; XE_HPC_CORETEST_F(EncodeKernelXeHpcCoreTest, givenNoFenceAsPostSyncOperationInComputeWalkerWhenEnqueueKernelIsCalledThenDoNotGenerateFenceCommands) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; diff --git a/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp index 980c01432f..6b7029a90c 100644 --- a/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/test_sample_xe_hpc_core.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using XeHpcCoreOnlyTest = TestLegacy; +using XeHpcCoreOnlyTest = Test; XE_HPC_CORETEST_F(XeHpcCoreOnlyTest, WhenGettingRenderCoreFamilyThenOnlyHpcCoreIsReturned) { EXPECT_EQ(IGFX_XE_HPC_CORE, pDevice->getRenderCoreFamily()); diff --git a/shared/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp index da1817d5ed..5596155f7d 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/test_hw_info_config_dg2.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using TestDg2HwInfoConfig = TestLegacy; +using TestDg2HwInfoConfig = Test; HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTestWindows, givenHardwareInfoWhenCallingIsAdditionalStateBaseAddressWARequiredThenFalseIsReturned, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTestWindows, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_DG2);