From e6fc458d4bcebe1c8433c0a847f3ba1b9a6f425f Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Thu, 11 Aug 2022 11:28:20 +0000 Subject: [PATCH] Add a struct for test fixtures with correct method naming convention Signed-off-by: Mateusz Jablonski --- .../test/aub_tests/aub_hello_world_test.cpp | 2 +- .../bindless/bindless_kernel_aub_tests.cpp | 2 +- .../append_kernel_indirect_aub_tests.cpp | 2 +- .../aub_tests/debugger/debugger_aub_tests.cpp | 2 +- .../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 | 6 +-- .../gen12lp/test_events_gen12lp.cpp | 2 +- .../gen12lp/test_module_gen12lp.cpp | 2 +- ...test_cmdlist_append_launch_kernel_gen9.cpp | 2 +- ...test_cmdlist_append_range_barrier_gen9.cpp | 2 +- .../unit_tests/gen9/test_cmdlist_gen9.cpp | 2 +- .../test_cmdqueue_enqueuecommandlist_gen9.cpp | 2 +- .../unit_tests/gen9/test_cmdqueue_gen9.cpp | 2 +- .../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 | 2 +- .../linux/test_cache_reservation_impl.cpp | 4 +- .../windows/test_cache_reservation_impl.cpp | 2 +- .../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 | 4 +- .../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 | 12 +++--- .../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 +- .../sources/cmdlist/test_cmdlist_fill.cpp | 4 +- .../cmdlist/test_cmdlist_memory_extension.cpp | 4 +- .../cmdlist/test_cmdlist_xehp_and_later.cpp | 12 +++--- .../sources/cmdqueue/test_cmdqueue_1.cpp | 10 ++--- .../sources/cmdqueue/test_cmdqueue_2.cpp | 14 +++---- .../sources/cmdqueue/test_cmdqueue_3.cpp | 2 +- .../test_cmdqueue_enqueue_cmdlist.cpp | 6 +-- .../test_cmdqueue_enqueue_cmdlist_2.cpp | 2 +- .../context/context_drm/test_context.cpp | 4 +- .../context_drm_or_wddm/test_context.cpp | 4 +- .../context/context_wddm/test_context.cpp | 4 +- .../sources/context/test_context.cpp | 10 ++--- .../debugger/linux/test_l0_debugger_linux.cpp | 4 +- .../sources/debugger/test_l0_debugger_1.cpp | 6 +-- .../test_l0_debugger_sba_tracking.cpp | 18 ++++---- .../debugger/test_module_with_debug.cpp | 16 +++---- .../debugger/test_source_level_debugger.cpp | 6 +-- .../windows/test_l0_debugger_windows.cpp | 2 +- .../unit_tests/sources/device/test_device.cpp | 16 +++---- .../driver/host_pointer_manager_tests.cpp | 6 +-- .../unit_tests/sources/driver/test_driver.cpp | 8 ++-- .../unit_tests/sources/event/test_event.cpp | 30 ++++++------- .../unit_tests/sources/fence/test_fence.cpp | 6 +-- .../sources/helper/heap_assigner_l0_tests.cpp | 2 +- .../unit_tests/sources/image/test_image.cpp | 6 +-- .../sources/kernel/test_function.cpp | 2 +- .../unit_tests/sources/kernel/test_kernel.cpp | 38 ++++++++--------- .../unit_tests/sources/memory/test_memory.cpp | 6 +-- .../unit_tests/sources/module/test_module.cpp | 42 +++++++++---------- .../sources/module/test_module_2.cpp | 2 +- .../sources/sampler/test_sampler.cpp | 8 ++-- .../xe_hp_core/test_cmdlist_xe_hp_core.cpp | 10 ++--- .../test_cmdqueue_debugger_xe_hp_core.cpp | 4 +- ...cmdqueue_enqueuecommandlist_xe_hp_core.cpp | 2 +- .../xe_hp_core/test_device_xe_hp_core.cpp | 6 +-- .../xe_hp_core/test_module_xe_hp_core.cpp | 2 +- .../built_in_xe_hpc_core_tests_l0.cpp | 2 +- .../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 | 8 ++-- .../xe_hpc_core/test_cmdqueue_xe_hpc_core.cpp | 2 +- .../xe_hpc_core/test_device_xe_hpc_core.cpp | 12 +++--- .../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 | 6 +-- .../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 | 4 +- .../debug/debug_session_thread_tests.cpp | 2 +- .../debug/linux/test_debug_api_linux.cpp | 12 +++--- .../sources/debug/test_debug_api.cpp | 2 +- .../debug/windows/test_debug_api_windows.cpp | 4 +- .../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_oa_enumeration_windows.cpp | 2 +- .../sources/sysman/linux/test_sysman.cpp | 4 +- .../sources/sysman/windows/test_sysman.cpp | 2 +- opencl/test/unit_test/api/cl_api_tests.h | 2 +- .../api/cl_create_context_from_type_tests.inl | 4 +- .../unit_test/api/cl_get_device_ids_tests.inl | 2 +- ...on_function_address_for_platform_tests.inl | 2 +- ...cl_get_kernel_sub_group_info_khr_tests.inl | 4 +- .../cl_get_kernel_sub_group_info_tests.inl | 4 +- .../api/cl_get_platform_info_tests.inl | 6 +-- .../api/cl_icd_get_platform_ids_khr_tests.inl | 4 +- ...cl_mem_locally_uncached_resource_tests.cpp | 2 +- .../api/cl_retain_release_device_tests.inl | 6 +-- .../cl_set_kernel_arg_svm_pointer_tests.inl | 2 +- .../api/cl_set_kernel_exec_info_tests.inl | 2 +- .../aub_mem_dump/aub_alloc_dump_tests.cpp | 2 +- ...nqueue_resource_barrier_xehp_and_later.cpp | 2 +- ...ine_data_local_id_tests_xehp_and_later.cpp | 6 +-- ...aub_scratch_space_tests_xehp_and_later.cpp | 4 +- .../enqueue_kernel_aub_tests.cpp | 4 +- .../aub_command_stream_tests.cpp | 2 +- .../command_stream/aub_mem_dump_tests.cpp | 4 +- .../command_stream/aub_mi_atomic_tests.cpp | 2 +- ..._walker_partition_tests_xehp_and_later.cpp | 8 ++-- .../aub_batch_buffer_tests_gen11.cpp | 4 +- .../gen12lp/aub_mem_dump_tests_gen12lp.cpp | 4 +- .../aub_batch_buffer_tests_gen12lp.cpp | 4 +- .../batch_buffer/aub_batch_buffer_tests.cpp | 4 +- .../aub_mem_dump_tests_xe_hp_core.cpp | 2 +- .../aub_mem_dump_tests_xe_hpc_core.cpp | 2 +- .../enqueue_kernel_aub_tests_xe_hpc_core.cpp | 2 +- .../aub_mem_dump_tests_xe_hpg_core.cpp | 2 +- .../dispatch_walker_tests_dg2_and_later.cpp | 2 +- .../dispatch_walker_tests_xehp_and_later.cpp | 2 +- .../command_queue/enqueue_barrier_tests.cpp | 2 +- .../enqueue_copy_buffer_to_image_tests.cpp | 2 +- .../enqueue_copy_image_tests.cpp | 2 +- .../enqueue_copy_image_to_buffer_tests.cpp | 2 +- .../enqueue_fill_buffer_tests.cpp | 2 +- .../command_queue/enqueue_kernel_1_tests.cpp | 2 +- .../command_queue/enqueue_kernel_2_tests.cpp | 2 +- .../command_queue/enqueue_kernel_mt_tests.cpp | 4 +- .../command_queue/enqueue_marker_tests.cpp | 2 +- .../enqueue_migrate_mem_objects_tests.cpp | 2 +- .../enqueue_read_buffer_rect_tests.cpp | 2 +- .../enqueue_read_buffer_tests.cpp | 2 +- .../enqueue_read_image_tests.cpp | 4 +- .../enqueue_resource_barier_tests.cpp | 2 +- .../command_queue/enqueue_thread_tests.cpp | 2 +- .../enqueue_write_buffer_rect_tests.cpp | 2 +- .../enqueue_write_buffer_tests.cpp | 2 +- .../enqueue_write_image_tests.cpp | 4 +- .../unit_test/command_queue/finish_tests.cpp | 2 +- .../enqueue_kernel_gl_tests_windows.cpp | 2 +- .../command_queue/zero_size_enqueue_tests.cpp | 4 +- .../cl_command_stream_receiver_tests.cpp | 2 +- .../cl_tbx_command_stream_tests.cpp | 2 +- .../command_stream/cmd_parse_tests.cpp | 2 +- ...and_stream_receiver_flush_task_1_tests.cpp | 2 +- .../command_stream_receiver_hw_1_tests.cpp | 2 +- .../command_stream_receiver_hw_3_tests.cpp | 2 +- .../command_stream_receiver_hw_fixture.h | 6 +-- ...nd_stream_receiver_with_aub_dump_tests.cpp | 2 +- .../context/context_negative_tests.cpp | 4 +- opencl/test/unit_test/device/device_tests.cpp | 2 +- .../fixtures/cl_preemption_fixture.h | 2 +- .../unit_test/fixtures/hello_world_fixture.h | 2 +- .../unit_test/fixtures/kernel_arg_fixture.h | 2 +- .../gen11/ehl/test_device_caps_ehl.cpp | 2 +- .../unit_test/gen11/enqueue_kernel_gen11.cpp | 2 +- .../gen11/icllp/test_device_caps_icllp.cpp | 2 +- .../unit_test/gen11/kernel_tests_gen11.cpp | 2 +- .../gen11/lkf/test_device_caps_lkf.cpp | 2 +- .../unit_test/gen11/sampler_tests_gen11.cpp | 2 +- ...bx_command_stream_receiver_tests_gen11.cpp | 2 +- .../gen11/test_device_caps_gen11.cpp | 2 +- .../unit_test/gen11/test_sample_gen11.cpp | 2 +- .../gen12lp/adlp/test_device_caps_adlp.cpp | 2 +- .../gen12lp/adls/test_device_caps_adls.cpp | 2 +- .../gen12lp/dg1/test_device_caps_dg1.cpp | 2 +- .../gen12lp/kernel_tests_gen12lp.inl | 2 +- .../gen12lp/sampler_tests_gen12lp.inl | 4 +- ..._command_stream_receiver_tests_gen12lp.inl | 4 +- .../gen12lp/test_device_caps_gen12lp.inl | 4 +- .../unit_test/gen12lp/test_sample_gen12lp.inl | 6 +-- .../test/unit_test/gen8/kernel_tests_gen8.cpp | 2 +- .../gen8/test_cl_device_caps_gen8.cpp | 2 +- .../gen8/test_platform_caps_gen8.cpp | 2 +- .../unit_test/gen9/bxt/device_tests_bxt.cpp | 2 +- .../gen9/bxt/test_device_caps_bxt.cpp | 4 +- .../windows/test_device_caps_bxt_windows.cpp | 2 +- .../gen9/cfl/test_device_caps_cfl.cpp | 2 +- .../windows/test_device_caps_cfl_windows.cpp | 2 +- .../unit_test/gen9/enqueue_kernel_gen9.cpp | 2 +- .../gen9/glk/test_device_caps_glk.cpp | 4 +- .../windows/test_device_caps_glk_windows.cpp | 2 +- .../gen9/kbl/test_device_caps_kbl.cpp | 2 +- .../windows/test_device_caps_kbl_windows.cpp | 2 +- .../test/unit_test/gen9/kernel_tests_gen9.cpp | 2 +- .../unit_test/gen9/sampler_tests_gen9.cpp | 2 +- .../unit_test/gen9/skl/device_tests_skl.cpp | 2 +- .../gen9/skl/test_device_caps_skl.cpp | 4 +- .../unit_test/gen9/skl/test_sample_skl.cpp | 2 +- .../windows/test_device_caps_skl_windows.cpp | 2 +- .../unit_test/gen9/test_device_caps_gen9.cpp | 2 +- .../test/unit_test/gen9/test_sample_gen9.cpp | 2 +- .../unit_test/gmm_helper/gmm_helper_tests.cpp | 2 +- opencl/test/unit_test/gtpin/gtpin_tests.cpp | 4 +- .../aub_helper_hw_tests_xehp_and_later.cpp | 2 +- .../helpers/dispatch_info_builder_tests.cpp | 2 +- .../unit_test/helpers/dispatch_info_tests.cpp | 2 +- ...ngine_node_helper_tests_xehp_and_later.cpp | 2 +- .../hardware_commands_helper_tests.cpp | 4 +- .../helpers/heap_assigner_ocl_tests.cpp | 2 +- .../helpers/hw_helper_tests_dg2_and_later.cpp | 2 +- .../helpers/hw_helper_tests_dg2_or_below.cpp | 2 +- .../hw_helper_tests_xehp_and_later.cpp | 2 +- .../unit_test/kernel/cache_flush_tests.inl | 2 +- .../cache_flush_xehp_and_later_tests.inl | 2 +- .../kernel/gl/kernel_arg_buffer_tests.cpp | 4 +- .../kernel/kernel_accelerator_arg_tests.cpp | 2 +- .../kernel/kernel_arg_buffer_tests.cpp | 4 +- .../kernel/kernel_arg_pipe_tests.cpp | 2 +- .../unit_test/kernel/kernel_arg_svm_tests.cpp | 2 +- opencl/test/unit_test/kernel/kernel_tests.cpp | 18 ++++---- .../kernel/substitute_kernel_heap_tests.cpp | 2 +- .../unit_test/linux/drm_null_device_tests.cpp | 2 +- .../test/unit_test/linux/main_linux_dll.cpp | 2 +- .../mem_obj/destructor_callback_tests.cpp | 4 +- .../memory_manager/memory_manager_tests.cpp | 6 +-- .../unified_memory_manager_tests.cpp | 4 +- .../api/cl_get_device_info_tests_mt.inl | 4 +- .../api/cl_get_platform_ids_tests_mt.inl | 4 +- .../api/cl_get_platform_info_tests_mt.inl | 4 +- .../api/cl_intel_tracing_tests_mt.inl | 4 +- .../linux/cl_drm_memory_manager_tests.cpp | 2 +- .../linux/drm_gem_close_worker_tests.cpp | 2 +- .../linux/drm_va_sharing_tests.cpp | 2 +- .../windows/file_logger_win_tests.cpp | 2 +- .../windows/wddm_memory_manager_tests.h | 4 +- .../test/unit_test/program/program_tests.cpp | 8 ++-- .../sampler/sampler_set_arg_tests.cpp | 2 +- .../sampler/sampler_tests_xehp_and_later.cpp | 2 +- .../sharings/va/va_sharing_tests.cpp | 2 +- .../test_device_caps_xe_hp_core.cpp | 2 +- .../xe_hp_core/test_sample_xe_hp_core.cpp | 2 +- .../xe_hp_core/xehp/sampler_tests_xehp.inl | 4 +- .../xe_hp_core/xehp/test_device_caps_xehp.inl | 2 +- .../xehp/test_local_work_size_xehp.inl | 2 +- .../xe_hp_core/xehp/test_sub_devices_xehp.inl | 4 +- .../built_in_xe_hpc_core_tests_ocl.cpp | 2 +- .../hw_helper_tests_xe_hpc_core.cpp | 2 +- .../pvc/engine_node_helper_tests_pvc.cpp | 2 +- .../xe_hpc_core/pvc/hw_helper_tests_pvc.cpp | 4 +- .../xe_hpc_core/pvc/sampler_tests_pvc.cpp | 2 +- .../xe_hpc_core/pvc/test_device_caps_pvc.cpp | 2 +- .../test_device_caps_xe_hpc_core.cpp | 2 +- .../xe_hpg_core/dg2/sampler_tests_dg2.cpp | 2 +- .../xe_hpg_core/dg2/test_device_caps_dg2.cpp | 2 +- .../test_device_caps_xe_hpg_core.cpp | 2 +- .../xe_hpg_core/test_sample_xe_hpg_core.cpp | 4 +- .../built_ins/built_in_tests_shared.inl | 2 +- .../common/fixtures/linear_stream_fixture.h | 2 +- shared/test/common/helpers/hw_helper_tests.h | 2 +- .../os_interface/windows/wddm_fixture.h | 8 ++-- shared/test/common/test_macros/test.h | 14 +++++++ .../test/unit_test/aub/aub_helper_tests.cpp | 2 +- shared/test/unit_test/built_ins/sip_tests.cpp | 6 +-- ...nd_encoder_tests_xe_hpg_core_and_later.cpp | 2 +- .../aub_command_stream_receiver_1_tests.cpp | 2 +- .../aub_command_stream_receiver_2_tests.cpp | 4 +- .../aub_command_stream_receiver_3_tests.cpp | 2 +- .../command_stream/aub_file_stream_tests.cpp | 2 +- ...mulated_common_hw_tests_xehp_and_later.cpp | 2 +- .../command_stream_receiver_tests.cpp | 2 +- .../command_stream/linear_stream_tests.cpp | 2 +- .../tbx_command_stream_tests.cpp | 2 +- .../unit_test/debugger/test_l0_debugger.cpp | 2 +- .../test_l0_debugger_single_address_space.cpp | 6 +-- .../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_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 | 6 +-- .../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 | 2 +- .../unit_test/encoders/test_encode_states.cpp | 4 +- .../fixtures/command_container_fixture.h | 2 +- .../fixtures/implicit_scaling_fixture.h | 2 +- .../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 +- .../windows/gmm_callbacks_tests_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 +- .../test/unit_test/gmm_helper/gmm_tests.cpp | 2 +- .../heap_assigner/heap_assigner_tests.cpp | 2 +- .../unit_test/helpers/app_resource_tests.cpp | 2 +- .../helpers/bindless_heaps_helper_tests.cpp | 2 +- .../helpers/blit_commands_helper_tests.cpp | 2 +- .../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 +- ...est_blit_commands_helper_pvc_and_later.cpp | 2 +- ...st_blit_commands_helper_xehp_and_later.cpp | 2 +- .../memory_manager/address_mapper_tests.cpp | 2 +- .../memory_manager/host_ptr_manager_tests.cpp | 2 +- .../memory_manager/page_table_tests.cpp | 6 +-- .../special_heap_pool_tests.cpp | 2 +- .../gdi_interface_logging_tests.cpp | 6 +-- .../linux/drm_buffer_object_tests.cpp | 2 +- .../linux/drm_buffer_object_tests_prelim.cpp | 2 +- ...rm_command_stream_xehp_and_later_tests.cpp | 2 +- .../linux/drm_memory_info_prelim_tests.cpp | 2 +- ...m_memory_manager_localmem_prelim_tests.cpp | 4 +- ...memory_manager_localmem_upstream_tests.cpp | 4 +- .../linux/drm_memory_manager_tests.cpp | 16 +++---- .../linux/drm_special_heap_test.cpp | 2 +- .../os_interface/os_library_tests.cpp | 2 +- .../windows/device_command_stream_tests.cpp | 8 ++-- .../windows/wddm_preemption_tests.cpp | 2 +- .../windows/wddm_shared_allocations_test.cpp | 2 +- .../windows/wddm_special_heap_test.cpp | 2 +- .../os_interface/windows/wddm_tests.cpp | 2 +- .../scratch_space_controler_tests.cpp | 2 +- ...h_space_controler_xehp_and_later_tests.cpp | 2 +- .../utilities/tag_allocator_tests.cpp | 2 +- .../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 +- 363 files changed, 652 insertions(+), 638 deletions(-) diff --git a/level_zero/core/test/aub_tests/aub_hello_world_test.cpp b/level_zero/core/test/aub_tests/aub_hello_world_test.cpp index 2b7b96cdb3..9c8b44a194 100644 --- a/level_zero/core/test/aub_tests/aub_hello_world_test.cpp +++ b/level_zero/core/test/aub_tests/aub_hello_world_test.cpp @@ -18,7 +18,7 @@ namespace L0 { namespace ult { -using AUBHelloWorldL0 = Test; +using AUBHelloWorldL0 = TestLegacy; TEST_F(AUBHelloWorldL0, whenAppendMemoryCopyIsCalledThenMemoryIsProperlyCopied) { uint8_t size = 8; uint8_t val = 255; diff --git a/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp b/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp index 0ffbf9562c..7f60de4def 100644 --- a/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/bindless/bindless_kernel_aub_tests.cpp @@ -22,7 +22,7 @@ namespace L0 { namespace ult { -struct L0BindlessAub : Test { +struct L0BindlessAub : TestLegacy { void SetUp() override { DebugManager.flags.UseBindlessMode.set(1); diff --git a/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp b/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp index 9e4c3f788c..a3de1ed387 100644 --- a/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/cmdlist/append_kernel_indirect_aub_tests.cpp @@ -19,7 +19,7 @@ namespace L0 { namespace ult { -struct AUBAppendKernelIndirectL0 : Test { +struct AUBAppendKernelIndirectL0 : TestLegacy { static ze_module_handle_t createModuleFromFile(const std::string &fileName, ze_context_handle_t context, ze_device_handle_t device) { ze_module_handle_t moduleHandle; diff --git a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp index ba108aa300..bde455ce03 100644 --- a/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp +++ b/level_zero/core/test/aub_tests/debugger/debugger_aub_tests.cpp @@ -28,7 +28,7 @@ namespace L0 { namespace ult { -struct DebuggerAub : Test { +struct DebuggerAub : TestLegacy { void SetUp() override { AUBFixtureL0::SetUp(NEO::defaultHwInfo.get(), true); 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 555567f87e..1e221ee70e 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 = Test; +using KernelPropertyTest = TestLegacy; 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 a604e67b41..7d7505d1ff 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 = Test; +using CacheFlushTests = TestLegacy; 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 41d630cbb5..9311c26437 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 = Test; +using CommandListCreate = TestLegacy; 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 bff72c75ab..01b37a5bd3 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 = Test; +using DeviceFixtureGen12LP = TestLegacy; 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 = Test; +using CommandQueueGroupTest = TestLegacy; HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsGen12LP) { @@ -74,7 +74,7 @@ class DeviceCopyQueueGroupFixture : public DeviceFixture { DebugManagerStateRestore restorer; }; -using DeviceCopyQueueGroupTest = Test; +using DeviceCopyQueueGroupTest = TestLegacy; HWTEST2_F(DeviceCopyQueueGroupTest, givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsGen12LP) { 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 38a7b8fdfb..2706499497 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,7 +15,7 @@ namespace L0 { namespace ult { -struct TimestampEvent : public Test { +struct TimestampEvent : public TestLegacy { void SetUp() override { DeviceFixture::SetUp(); ze_event_pool_desc_t eventPoolDesc = {}; 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 49c5c89eb0..f11cd4c367 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 = Test; +using KernelPropertyTest = TestLegacy; 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 4570ff4338..bb04cf737a 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 = Test; +using CommandListAppendLaunchKernel = TestLegacy; 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 1879de397e..94d0a7fa69 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 = Test; +using CommandListAppendGen9 = TestLegacy; TEST(CommandListAppendMemoryRangesBarrier, WhenAppendingMemoryRangesBarrierThenSuccessIsReturned) { MockCommandList commandList; 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 ad0a2dbb1a..780217e3af 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 = Test; +using CommandListProgramL3 = TestLegacy; 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 736a387ea2..e98773839a 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 = Test; +using CommandQueueExecuteCommandListsGen9 = TestLegacy; 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 7982fa69a7..e4f3ed84b6 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 @@ -184,7 +184,7 @@ struct CommandQueueGroupMultiDeviceFixture : public MultiDeviceFixture { L0::Device *device = nullptr; }; -using CommandQueueGroupMultiDevice = Test; +using CommandQueueGroupMultiDevice = TestLegacy; 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 980c034bc5..4915084800 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 = Test; +using DevicePropertyTest = TestLegacy; 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 = Test; +using CommandQueueGroupTest = TestLegacy; 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 cdeed8fb7e..4b5066b57c 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 = Test; +using KernelPropertyTest = TestLegacy; 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 381a0fbb21..be2bba6471 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 = Test; +using BuiltInTestL0 = TestLegacy; 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 0566a8283f..1deb55d3fa 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 @@ -82,7 +82,7 @@ class BuiltinFunctionsLibFixture : public DeviceFixture { }; template -using TestBuiltinFunctionsLibImpl = Test>; +using TestBuiltinFunctionsLibImpl = TestLegacy>; 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 c62b23d396..32ad7854b9 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -30,7 +30,7 @@ class CacheReservationFixture : public DeviceFixture { CacheReservation *cache = nullptr; }; -using CacheReservationTest = Test; +using CacheReservationTest = TestLegacy; TEST_F(CacheReservationTest, GivenCacheReservationCreatedWhenCallingReserveCacheThenReturnFalse) { size_t cacheLevel = 3; diff --git a/level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp b/level_zero/core/test/unit_tests/sources/cache/windows/test_cache_reservation_impl.cpp index 45b5d7903d..b506fe3aba 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 @@ -29,7 +29,7 @@ class CacheReservationFixture : public DeviceFixture { CacheReservation *cache = nullptr; }; -using CacheReservationTest = Test; +using CacheReservationTest = TestLegacy; TEST_F(CacheReservationTest, GivenCacheReservationCreatedWhenCallingReserveCacheThenReturnFalse) { size_t cacheLevel = 3; 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 442b9a83c6..0310b5dafd 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 = Test; +using ContextCommandListCreate = TestLegacy; TEST_F(ContextCommandListCreate, whenCreatingCommandListFromContextThenSuccessIsReturned) { ze_command_list_desc_t desc = {}; @@ -61,7 +61,7 @@ HWTEST2_F(ContextCommandListCreate, givenImmediateCmdListWhenGettingLogicalState commandList->destroy(); } -using CommandListCreate = Test; +using CommandListCreate = TestLegacy; TEST_F(CommandListCreate, whenCommandListIsCreatedWithInvalidProductFamilyThenFailureIsReturned) { ze_result_t returnValue; @@ -345,7 +345,7 @@ TEST_F(CommandListCreate, givenValidPtrThenAppendMemAdviseSetAndClearCachingThen ASSERT_EQ(res, ZE_RESULT_SUCCESS); } -using CommandListMemAdvisePageFault = Test; +using CommandListMemAdvisePageFault = TestLegacy; 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 933b4667a5..0fb3d52fae 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 = Test; -using CommandListAppend = Test; +using CommandListCreate = TestLegacy; +using CommandListAppend = TestLegacy; template class MockCommandListHw : public WhiteBox<::L0::CommandListCoreFamily> { @@ -1199,7 +1199,7 @@ HWTEST2_F(CommandListCreate, givenCommandListThenSshCorrectlyReserved, Supported EXPECT_EQ(commandList.getReserveSshSize(), size); } -using CommandListAppendMemoryCopyBlit = Test; +using CommandListAppendMemoryCopyBlit = TestLegacy; 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 c635341085..298114e7c3 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 = Test; +using CommandListCreate = TestLegacy; 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 cbf14b34f4..e07d46fa0c 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 = Test; +using CommandListCreate = TestLegacy; HWTEST2_F(CommandListCreate, givenCopyOnlyCommandListWhenAppendWriteGlobalTimestampCalledThenMiFlushDWWithTimestampEncoded, IsAtLeastSkl) { using GfxFamily = typename NEO::GfxFamilyMapper::GfxFamily; @@ -248,7 +248,7 @@ class CommandListImmediateFlushTaskTests : public DeviceFixture { DebugManagerStateRestore restorer; }; -using CommandListImmediateFlushTaskComputeTests = Test; +using CommandListImmediateFlushTaskComputeTests = TestLegacy; HWTEST2_F(CommandListImmediateFlushTaskComputeTests, givenDG2CommandListIsInititalizedThenByDefaultFlushTaskSubmissionEnabled, IsDG2) { ze_command_queue_desc_t queueDesc = {}; ze_result_t returnValue; @@ -720,7 +720,7 @@ HWTEST2_F(CommandListCreate, whenCommandListIsCreatedThenFlagsAreCorrectlySet, I } } -using HostPointerManagerCommandListTest = Test; +using HostPointerManagerCommandListTest = TestLegacy; HWTEST2_F(HostPointerManagerCommandListTest, givenImportedHostPointerWhenAppendMemoryFillUsingHostPointerThenAppendFillUsingHostPointerAllocation, IsAtLeastSkl) { 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 7308b39e33..7f4e25b8e5 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 = Test; +using CommandListCreate = TestLegacy; 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 9ff377cbf5..47481d663f 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 = Test>; +using MultiTileImmediateCommandListTest = TestLegacy>; 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 = Test>; +using MultiTileImmediateInternalCommandListTest = TestLegacy>; 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 = Test>; +using MultiTileCopyEngineCommandListTest = TestLegacy>; 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 = Test; +using CommandListExecuteImmediate = TestLegacy; 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 = Test; +using CommandListTest = TestLegacy; 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 8ebee4eccb..c59199639a 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 = Test; +using CommandListCreate = TestLegacy; 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 = Test; +using CommandListAppendLaunchKernel = TestLegacy; HWTEST2_F(CommandListAppendLaunchKernel, givenSignalEventWhenAppendLaunchCooperativeKernelIsCalledThenSuccessIsReturned, IsAtLeastSkl) { createKernel(); @@ -464,7 +464,7 @@ HWTEST2_F(CommandListCreate, givenCommandListAndHostPointersWhenMemoryCopyCalled } } -using CmdlistAppendLaunchKernelTests = Test; +using CmdlistAppendLaunchKernelTests = TestLegacy; 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 2c99939fcd..98e2a29089 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -29,7 +29,7 @@ TEST(zeCommandListAppendMemoryPrefetch, whenCalledThenRedirectedToObject) { ASSERT_EQ(ZE_RESULT_SUCCESS, res); } -using zeCommandListAppendMemAdviseTest = Test; +using zeCommandListAppendMemAdviseTest = TestLegacy; 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 c172dca78f..027c58c306 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 = Test; +using CommandListAppendBarrier = TestLegacy; HWTEST_F(CommandListAppendBarrier, WhenAppendingBarrierThenPipeControlIsGenerated) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; @@ -191,7 +191,7 @@ void validateMultiTileBarrier(void *cmdBuffer, size_t &parsedOffset, } } -using MultiTileCommandListAppendBarrier = Test>; +using MultiTileCommandListAppendBarrier = TestLegacy>; HWTEST2_F(MultiTileCommandListAppendBarrier, WhenAppendingBarrierThenPipeControlIsGenerated, IsWithinXeGfxFamily) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; @@ -505,7 +505,7 @@ HWTEST2_F(MultiTileCommandListAppendBarrier, true); } -using MultiTileImmediateCommandListAppendBarrier = Test>; +using MultiTileImmediateCommandListAppendBarrier = TestLegacy>; 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 b67efed19b..7b88e35f55 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 = Test; +using CommandListAppendEventReset = TestLegacy; 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 e2af585b98..50bb84fdd0 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 = Test; +using CommandListAppendLaunchKernel = TestLegacy; 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 f8d25da343..8ad39dbc17 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,7 +23,7 @@ namespace L0 { namespace ult { -struct CommandListAppendLaunchKernelSWTags : public Test { +struct CommandListAppendLaunchKernelSWTags : public TestLegacy { void SetUp() override { NEO::MockCompilerEnableGuard mock(true); NEO::DebugManager.flags.EnableSWTags.set(true); @@ -33,7 +33,7 @@ struct CommandListAppendLaunchKernelSWTags : public Test { DebugManagerStateRestore dbgRestorer; }; -struct CommandListDualStorage : public Test { +struct CommandListDualStorage : public TestLegacy { void SetUp() override { NEO::MockCompilerEnableGuard mock(true); DebugManager.flags.EnableLocalMemory.set(1); @@ -799,7 +799,7 @@ HWTEST_F(CommandListAppendLaunchKernelSWTags, givenEnableSWTagsWhenAppendMemoryC EXPECT_TRUE(tagFound); } -using CommandListArbitrationPolicyTest = Test; +using CommandListArbitrationPolicyTest = TestLegacy; HWTEST_F(CommandListArbitrationPolicyTest, whenCreatingCommandListThenDefaultThreadArbitrationPolicyIsUsed) { using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; @@ -921,7 +921,7 @@ HWTEST_F(CommandListArbitrationPolicyTest, whenCommandListIsResetThenOriginalThr } } -using CmdlistAppendLaunchKernelTests = Test; +using CmdlistAppendLaunchKernelTests = TestLegacy; struct CmdlistAppendLaunchKernelWithImplicitArgsTests : CmdlistAppendLaunchKernelTests { void SetUp() override { @@ -1215,7 +1215,7 @@ HWTEST_F(CmdlistAppendLaunchKernelTests, whenEncodingWorkDimForIndirectDispatchT } } -using CommandListAppendLaunchKernel = Test; +using CommandListAppendLaunchKernel = TestLegacy; 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 = Test; +using MultiTileCommandListAppendLaunchFunctionXeHpCoreTest = TestLegacy; 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 d6d31055a8..7c0c418011 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 = Test; +using CommandListAppendLaunchKernel = TestLegacy; 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 = Test; +using MultiTileImmediateCommandListAppendLaunchFunctionXeHpCoreTest = TestLegacy; 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 999b60eef0..c152a6fe8c 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 = Test; +using AppendMemoryCopy = TestLegacy; 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 09e664a6ce..b4e4a66285 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 = Test; +using MultiPartitionPrologueTest = TestLegacy; 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 = Test; +using MultiPartitionEpilogueTest = TestLegacy; 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 25cf6d1bab..484b7a1ad1 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 = Test; +using CommandListAppendSignalEvent = TestLegacy; 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 bcda2f4096..0141bf45d8 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 = Test; +using CommandListAppendWaitOnEvent = TestLegacy; 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 = Test>; +using MultTileCommandListAppendWaitOnEvent = TestLegacy>; 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 5273d58728..1860c18eed 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 = Test; +using AppendMemoryCopy = TestLegacy; HWTEST2_F(AppendMemoryCopy, givenCopyOnlyCommandListWhenAppenBlitFillCalledWithLargePatternSizeThenMemCopyWasCalled, IsAtLeastSkl) { MockCommandListForMemFill cmdList; diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp index 9b9ac842b8..09637f5741 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill.cpp @@ -107,9 +107,9 @@ struct MultiTileAppendFillFixture : public AppendFillFixture { DebugManagerStateRestore restorer; }; -using AppendFillTest = Test; +using AppendFillTest = TestLegacy; -using MultiTileAppendFillTest = Test; +using MultiTileAppendFillTest = TestLegacy; HWTEST2_F(AppendFillTest, givenCallToAppendMemoryFillWithImmediateValueThenSuccessIsReturned, IsAtLeastSkl) { diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp index c0f00a9f7b..aff1d8863c 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 @@ -67,7 +67,7 @@ class CommandListMemoryExtensionFixture : public DeviceFixture { void *ptr = nullptr; }; -using CommandListAppendWaitOnMemExtension = Test; +using CommandListAppendWaitOnMemExtension = TestLegacy; TEST_F(CommandListAppendWaitOnMemExtension, givenAppendWaitOnMemReturnsUnsupported) { ze_result_t result = ZE_RESULT_SUCCESS; @@ -76,7 +76,7 @@ TEST_F(CommandListAppendWaitOnMemExtension, givenAppendWaitOnMemReturnsUnsupport EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result); } -using CommandListAppendWriteToMemExtension = Test; +using CommandListAppendWriteToMemExtension = TestLegacy; TEST_F(CommandListAppendWriteToMemExtension, givenAppendWriteToMemReturnsUnsupported) { ze_result_t result = ZE_RESULT_SUCCESS; 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 a1a3aac836..af431ce7b7 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 = Test; +using CommandListTests = TestLegacy; 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 = Test>; +using MultiTileCommandListTests = TestLegacy>; 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 = Test; +using CommandListTestsReserveSize = TestLegacy; HWTEST2_F(CommandListTestsReserveSize, givenCommandListWhenGetReserveSshSizeThen4PagesReturned, IsAtLeastXeHpCore) { L0::CommandListCoreFamily commandList(1u); EXPECT_EQ(commandList.getReserveSshSize(), 4 * MemoryConstants::pageSize); } -using CommandListAppendLaunchKernel = Test; +using CommandListAppendLaunchKernel = TestLegacy; HWTEST2_F(CommandListAppendLaunchKernel, givenVariousKernelsWhenUpdateStreamPropertiesIsCalledThenRequiredStateFinalStateAndCommandsToPatchAreCorrectlySet, IsAtLeastXeHpCore) { DebugManagerStateRestore restorer; DebugManager.flags.AllowMixingRegularAndCooperativeKernels.set(1); @@ -279,8 +279,8 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenVariousKernelsAndPatchingDisallowe pCommandList->reset(); } -using AppendMemoryCopyXeHpAndLater = Test; -using MultiTileAppendMemoryCopyXeHpAndLater = Test; +using AppendMemoryCopyXeHpAndLater = TestLegacy; +using MultiTileAppendMemoryCopyXeHpAndLater = TestLegacy; 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 23ae0753a1..47d8c9990f 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 = Test; +using CommandQueueCreate = TestLegacy; TEST_F(CommandQueueCreate, whenCreatingCommandQueueThenItIsInitialized) { auto csr = std::unique_ptr(neoDevice->createCommandStreamReceiver()); @@ -640,7 +640,7 @@ TEST_F(CommandQueueCreate, givenCmdQueueWithBlitCopyWhenExecutingCopyBlitCommand commandQueue->destroy(); } -using DeviceCreateCommandQueueTest = Test; +using DeviceCreateCommandQueueTest = TestLegacy; TEST_F(DeviceCreateCommandQueueTest, givenLowPriorityDescWhenCreateCommandQueueIsCalledThenLowPriorityCsrIsAssigned) { ze_command_queue_desc_t desc{}; desc.ordinal = 0u; @@ -839,7 +839,7 @@ struct MultiDeviceCreateCommandQueueFixture : MultiDeviceFixture { } }; -using MultiDeviceCreateCommandQueueTest = Test; +using MultiDeviceCreateCommandQueueTest = TestLegacy; TEST_F(MultiDeviceCreateCommandQueueTest, givenLowPriorityDescWhenCreateCommandQueueIsCalledThenLowPriorityCsrIsAssigned) { auto device = driverHandle->devices[0]; @@ -887,7 +887,7 @@ class MockCommandQueue : public L0::CommandQueueHw { } }; -using ExecuteCommandListTests = Test; +using ExecuteCommandListTests = TestLegacy; 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 = Test; +using CommandQueueDestroy = TestLegacy; 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 41e10d4d3d..b40bf0822f 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 = Test; +using ContextCreateCommandQueueTest = TestLegacy; 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 = Test; +using AubCsrTest = TestLegacy; 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 = Test; -using MultiTileCommandQueueSynchronizeTest = Test; +using CommandQueueSynchronizeTest = TestLegacy; +using MultiTileCommandQueueSynchronizeTest = TestLegacy; template struct SynchronizeCsr : public NEO::UltCommandStreamReceiver { @@ -503,7 +503,7 @@ HWTEST_F(CommandQueueSynchronizeTest, givenSynchronousCommandQueueWhenTagUpdateF L0::CommandQueue::fromHandle(commandQueue)->destroy(); } -using CommandQueuePowerHintTest = Test; +using CommandQueuePowerHintTest = TestLegacy; HWTEST_F(CommandQueuePowerHintTest, givenDriverHandleWithPowerHintAndOsContextPowerHintUnsetThenSuccessIsReturned) { auto csr = std::unique_ptr>(new TestCmdQueueCsr(*device->getNEODevice()->getExecutionEnvironment(), @@ -698,7 +698,7 @@ TEST_F(CommandQueueInitTests, whenDestroyCommandQueueThenStoreCommandBuffersAsRe EXPECT_FALSE(deviceImp->allocationsForReuse->peekIsEmpty()); } -struct DeviceWithDualStorage : Test { +struct DeviceWithDualStorage : TestLegacy { void SetUp() override { NEO::MockCompilerEnableGuard mock(true); DebugManager.flags.EnableLocalMemory.set(1); @@ -775,7 +775,7 @@ HWTEST2_F(DeviceWithDualStorage, givenCmdListWithAppendedKernelAndUsmTransferAnd ASSERT_EQ(ZE_RESULT_SUCCESS, res); commandQueue->destroy(); } -using CommandQueueScratchTests = Test; +using CommandQueueScratchTests = TestLegacy; 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 a8ea3909cb..e825c7a914 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 @@ -376,7 +376,7 @@ HWTEST2_F(CommandQueueCommandsMultiTile, givenCommandQueueOnMultiTileWhenWalkerP EXPECT_EQ(nullptr, workPartitionAllocation); } -using CommandQueueIndirectAllocations = Test; +using CommandQueueIndirectAllocations = TestLegacy; 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 09e524d4f8..8a15adee27 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,7 +28,7 @@ namespace L0 { namespace ult { -struct CommandQueueExecuteCommandLists : public Test { +struct CommandQueueExecuteCommandLists : public TestLegacy { void SetUp() override { DeviceFixture::SetUp(); @@ -58,7 +58,7 @@ struct CommandQueueExecuteCommandLists : public Test { ze_command_list_handle_t commandLists[numCommandLists]; }; -struct MultiDeviceCommandQueueExecuteCommandLists : public Test { +struct MultiDeviceCommandQueueExecuteCommandLists : public TestLegacy { void SetUp() override { DebugManager.flags.EnableWalkerPartition.set(1); numRootDevices = 1u; @@ -976,7 +976,7 @@ HWTEST_F(CommandQueueExecuteCommandLists, GivenCopyCommandQueueWhenExecutingCopy commandQueue->destroy(); } -struct CommandQueueExecuteCommandListSWTagsTests : public Test { +struct CommandQueueExecuteCommandListSWTagsTests : public TestLegacy { void SetUp() override { DebugManager.flags.EnableSWTags.set(true); DeviceFixture::SetUp(); 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 8398973c61..7a205e665a 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 = Test; +using CommandQueueExecuteCommandListsSimpleTest = TestLegacy; 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 aba2d21ea3..e5df1bc905 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 = Test; +using ContextIsShareable = TestLegacy; 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 = Test; +using GetMemHandlePtrTest = TestLegacy; TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithValidHandleThenSuccessIsReturned) { MemoryManagerMemHandleMock *fixtureMemoryManager = static_cast(currMemoryManager); 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 8ed9f32004..ae08bae6b9 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 = Test; +using ContextIsShareable = TestLegacy; 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 = Test; +using GetMemHandlePtrTest = TestLegacy; 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 93f9a6fbc5..7c7d1ab683 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 = Test; +using ContextIsShareable = TestLegacy; 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 = Test; +using GetMemHandlePtrTest = TestLegacy; TEST_F(GetMemHandlePtrTest, whenCallingGetMemHandlePtrWithValidHandleThenSuccessIsReturned) { MemoryManagerMemHandleMock *fixtureMemoryManager = static_cast(currMemoryManager); 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 97975f0480..cf0805a228 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 = Test; +using MultiDeviceContextTests = TestLegacy; TEST_F(MultiDeviceContextTests, whenCreatingContextWithZeroNumDevicesThenAllDevicesAreAssociatedWithTheContext) { @@ -224,7 +224,7 @@ TEST_F(ContextHostAllocTests, context->destroy(); } -using ContextGetStatusTest = Test; +using ContextGetStatusTest = TestLegacy; 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 = Test; +using ContextPowerSavingHintTest = TestLegacy; 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 = Test; +using ContextTest = TestLegacy; TEST_F(ContextTest, whenCreatingAndDestroyingContextThenSuccessIsReturned) { ze_context_handle_t hContext; @@ -326,7 +326,7 @@ TEST_F(ContextTest, whenCreatingAndDestroyingContextThenSuccessIsReturned) { EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -using ContextMakeMemoryResidentTests = Test; +using ContextMakeMemoryResidentTests = TestLegacy; TEST_F(ContextMakeMemoryResidentTests, givenUknownPointerPassedToMakeMemoryResidentThenInvalidArgumentIsReturned) { diff --git a/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp b/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp index 913c200637..7bdf8fbdf1 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/linux/test_l0_debugger_linux.cpp @@ -99,8 +99,8 @@ struct L0DebuggerLinuxMultitileFixture : public L0DebuggerLinuxFixture { L0::Device *subDevice1 = nullptr; }; -using L0DebuggerLinuxTest = Test; -using L0DebuggerLinuxMultitileTest = Test; +using L0DebuggerLinuxTest = TestLegacy; +using L0DebuggerLinuxMultitileTest = TestLegacy; TEST_F(L0DebuggerLinuxTest, givenProgramDebuggingEnabledWhenDriverHandleIsCreatedThenItAllocatesL0Debugger) { EXPECT_NE(nullptr, neoDevice->getDebugger()); diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp index ab7ee4d290..f23b5ead5e 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp @@ -21,7 +21,7 @@ namespace L0 { namespace ult { -using L0DebuggerTest = Test; +using L0DebuggerTest = TestLegacy; using L0DebuggerParameterizedTests = L0DebuggerHwParameterizedFixture; TEST_F(L0DebuggerTest, givenL0DebuggerWhenCallingIsLegacyThenFalseIsReturned) { @@ -75,7 +75,7 @@ TEST_F(L0DebuggerTest, givenProgramDebuggingEnabledWhenDebuggerIsCreatedThenComp EXPECT_FALSE(neoDevice->getHardwareInfo().capabilityTable.ftrRenderCompressedImages); } -using L0DebuggerPerContextAddressSpaceTest = Test; +using L0DebuggerPerContextAddressSpaceTest = TestLegacy; HWTEST_F(L0DebuggerPerContextAddressSpaceTest, givenDebuggingEnabledWhenCommandListIsExecutedThenValidKernelDebugCommandsAreAdded) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; using STATE_SIP = typename FamilyType::STATE_SIP; @@ -219,7 +219,7 @@ HWTEST_P(L0DebuggerParameterizedTests, givenEnabledDebuggingWhenIsaTypeAllocated } } -using L0DebuggerSimpleTest = Test; +using L0DebuggerSimpleTest = TestLegacy; 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 35388466f6..a54f153b4a 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,22 +19,22 @@ namespace L0 { namespace ult { -struct PerContextAddressSpaceFixture : public Test { +struct PerContextAddressSpaceFixture : public TestLegacy { void SetUp() override { NEO::DebugManager.flags.DebuggerForceSbaTrackingMode.set(0); - Test::SetUp(); + TestLegacy::SetUp(); } void TearDown() override { - Test::TearDown(); + TestLegacy::TearDown(); } DebugManagerStateRestore restorer; }; -using L0DebuggerPerContextAddressSpaceTest = Test; +using L0DebuggerPerContextAddressSpaceTest = TestLegacy; -using L0DebuggerTest = Test; +using L0DebuggerTest = TestLegacy; using L0DebuggerParameterizedTests = L0DebuggerHwParameterizedFixture; @@ -208,7 +208,7 @@ HWTEST2_F(L0DebuggerTest, givenDebuggingEnabledAndDebuggerLogsWhenCommandQueueIs commandQueue->destroy(); } -using L0DebuggerSimpleTest = Test; +using L0DebuggerSimpleTest = TestLegacy; HWTEST2_F(L0DebuggerSimpleTest, givenNullL0DebuggerAndDebuggerLogsWhenCommandQueueIsSynchronizedThenSbaAddressesAreNotPrinted, Gen12Plus) { DebugManagerStateRestore restorer; @@ -332,14 +332,14 @@ HWTEST2_F(L0DebuggerTest, givenDebuggingEnabledWhenCommandListIsExecutedThenSbaB INSTANTIATE_TEST_CASE_P(SBAModesForDebugger, L0DebuggerParameterizedTests, ::testing::Values(0, 1)); -struct L0DebuggerSingleAddressSpace : public Test { +struct L0DebuggerSingleAddressSpace : public TestLegacy { void SetUp() override { NEO::DebugManager.flags.DebuggerForceSbaTrackingMode.set(1); - Test::SetUp(); + TestLegacy::SetUp(); } void TearDown() override { - Test::TearDown(); + TestLegacy::TearDown(); } DebugManagerStateRestore restorer; diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp index 2c9194fc3e..48f63c55ec 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp @@ -25,7 +25,7 @@ namespace L0 { namespace ult { -using DeviceWithDebuggerEnabledTest = Test; +using DeviceWithDebuggerEnabledTest = TestLegacy; TEST_F(DeviceWithDebuggerEnabledTest, givenDebuggingEnabledWhenModuleIsCreatedThenDebugOptionsAreUsed) { NEO::MockCompilerEnableGuard mock(true); auto cip = new NEO::MockCompilerInterfaceCaptureBuildOptions(); @@ -160,7 +160,7 @@ TEST_F(DeviceWithDebuggerEnabledTest, GivenNonDebuggeableKernelWhenModuleIsIniti EXPECT_FALSE(module->isDebugEnabled()); } -using ModuleWithSLDTest = Test; +using ModuleWithSLDTest = TestLegacy; 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 = Test; +using ModuleWithZebinAndSLDTest = TestLegacy; TEST_F(ModuleWithZebinAndSLDTest, GivenZebinThenCreateDebugZebinAndPassToSLD) { module->addEmptyZebin(); module->addSegments(); @@ -310,7 +310,7 @@ TEST_F(ModuleWithZebinAndSLDTest, GivenZebinThenCreateDebugZebinAndPassToSLD) { EXPECT_TRUE(module->translationUnit->debugData); } -using KernelDebugSurfaceTest = Test; +using KernelDebugSurfaceTest = TestLegacy; HWTEST_F(KernelDebugSurfaceTest, givenDebuggerAndBindfulKernelWhenAppendingKernelToCommandListThenBindfulSurfaceStateForDebugSurfaceIsProgrammed) { NEO::MockCompilerEnableGuard mock(true); @@ -376,7 +376,7 @@ HWTEST_F(KernelDebugSurfaceTest, givenDebuggerAndBindfulKernelWhenAppendingKerne EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_TYPE_SURFTYPE_BUFFER, debugSurfaceState->getSurfaceType()); } -using ModuleWithDebuggerL0Test = Test; +using ModuleWithDebuggerL0Test = TestLegacy; TEST_F(ModuleWithDebuggerL0Test, givenDebuggingEnabledWhenModuleIsCreatedThenDebugOptionsAreNotUsed) { NEO::MockCompilerEnableGuard mock(true); auto cip = new NEO::MockCompilerInterfaceCaptureBuildOptions(); @@ -401,7 +401,7 @@ TEST_F(ModuleWithDebuggerL0Test, givenDebuggingEnabledWhenModuleIsCreatedThenDeb EXPECT_FALSE(CompilerOptions::contains(cip->buildOptions, L0::BuildOptions::optDisable)); } -using KernelInitializeTest = Test; +using KernelInitializeTest = TestLegacy; TEST_F(KernelInitializeTest, givenDebuggingEnabledWhenKernelsAreInitializedThenAllocationsAreNotResidentAndNotCopied) { uint32_t kernelHeap = 0xDEAD; @@ -549,7 +549,7 @@ HWTEST_F(ModuleWithDebuggerL0Test, GivenNoDebugDataWhenInitializingModuleThenDoN EXPECT_EQ(0u, getMockDebuggerL0Hw()->notifyModuleCreateCount); } -using ModuleWithZebinAndL0DebuggerTest = Test; +using ModuleWithZebinAndL0DebuggerTest = TestLegacy; HWTEST_F(ModuleWithZebinAndL0DebuggerTest, GivenZebinDebugDataWhenInitializingModuleThenRegisterElfAndNotifyModuleCreate) { NEO::MockCompilerEnableGuard mock(true); @@ -780,7 +780,7 @@ HWTEST_F(ModuleWithZebinAndL0DebuggerTest, GivenModuleDebugHandleZeroWhenInitial EXPECT_EQ(std::numeric_limits::max(), getMockDebuggerL0Hw()->removedZebinModuleHandle); } -using NotifyModuleLoadTest = Test; +using NotifyModuleLoadTest = TestLegacy; HWTEST_F(NotifyModuleLoadTest, givenDebuggingEnabledWhenModuleIsCreatedAndFullyLinkedThenIsaAllocationsAreCopiedAndResidentOnlyForUserModules) { NEO::MockCompilerEnableGuard mock(true); diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp index d6bd95be12..4a92c19f50 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp @@ -25,7 +25,7 @@ namespace L0 { namespace ult { -using CommandQueueDebugCommandsTest = Test; +using CommandQueueDebugCommandsTest = TestLegacy; HWTEST2_F(CommandQueueDebugCommandsTest, givenDebuggingEnabledWhenCommandListIsExecutedThenKernelDebugCommandsAreAdded, IsAtMostGen12lp) { NEO::MockCompilerEnableGuard mock(true); @@ -158,7 +158,7 @@ HWTEST2_F(CommandQueueDebugCommandsTest, givenDebuggingEnabledWhenCommandListIsE commandQueue->destroy(); } -using SLDebuggerInternalUsageTest = Test; +using SLDebuggerInternalUsageTest = TestLegacy; HWTEST2_F(SLDebuggerInternalUsageTest, givenDebuggingEnabledWhenInternalCmdQIsUsedThenDebuggerPathsAreNotExecuted, IsAtLeastSkl) { using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM; @@ -232,7 +232,7 @@ HWTEST2_F(SLDebuggerInternalUsageTest, givenDebuggingEnabledWhenInternalCmdQIsUs commandList->destroy(); } -using DeviceWithDebuggerEnabledTest = Test; +using DeviceWithDebuggerEnabledTest = TestLegacy; TEST_F(DeviceWithDebuggerEnabledTest, givenDebuggingEnabledWhenDeviceIsCreatedThenItHasDebugSurfaceCreatedWithCorrectAllocationType) { ASSERT_NE(nullptr, deviceL0->getDebugSurface()); diff --git a/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp b/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp index 6ddfef2073..7d37608d40 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/windows/test_l0_debugger_windows.cpp @@ -74,7 +74,7 @@ struct L0DebuggerWindowsFixture { MockGdi *gdi = nullptr; }; -using L0DebuggerWindowsTest = Test; +using L0DebuggerWindowsTest = TestLegacy; TEST_F(L0DebuggerWindowsTest, givenProgramDebuggingEnabledWhenDriverHandleIsCreatedThenItAllocatesL0Debugger) { EXPECT_NE(nullptr, neoDevice->getDebugger()); 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 a716d9c60e..03dbeae928 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 = Test; +using DeviceTests = TestLegacy; TEST_F(DeviceTests, WhenGettingMemoryAccessPropertiesThenSuccessIsReturned) { ze_device_memory_access_properties_t properties; @@ -2663,7 +2663,7 @@ TEST_F(MultipleDevicesTest, givenTopologyMapForSubdeviceZeroWhenGettingPhysicalS EXPECT_FALSE(ret); } -using MultipleDevicesWithCustomHwInfoTest = Test; +using MultipleDevicesWithCustomHwInfoTest = TestLegacy; TEST_F(MultipleDevicesWithCustomHwInfoTest, givenTopologyWhenMappingToAndFromApiAndPhysicalSliceIdThenIdsAreMatching) { L0::Device *device0 = driverHandle->devices[0]; @@ -3247,7 +3247,7 @@ struct MultiSubDeviceFixture : public DeviceFixture { std::unique_ptr> apiSupportBackup; }; -using MultiSubDeviceTest = Test>; +using MultiSubDeviceTest = TestLegacy>; 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 = Test>; +using MultiSubDeviceTestNoApi = TestLegacy>; TEST_F(MultiSubDeviceTestNoApi, GivenNoApiSupportAndLocalMemoryEnabledWhenDeviceContainsSubDevicesThenItIsNotImplicitScalingCapable) { EXPECT_FALSE(device->isImplicitScalingCapable()); EXPECT_EQ(subDevice, deviceImp->getActiveDevice()); } -using MultiSubDeviceTestNoLocalMemory = Test>; +using MultiSubDeviceTestNoLocalMemory = TestLegacy>; TEST_F(MultiSubDeviceTestNoLocalMemory, GivenApiSupportAndLocalMemoryDisabledWhenDeviceContainsSubDevicesThenItIsNotImplicitScalingCapable) { EXPECT_FALSE(device->isImplicitScalingCapable()); EXPECT_EQ(subDevice, deviceImp->getActiveDevice()); } -using MultiSubDeviceTestNoApiForceOn = Test>; +using MultiSubDeviceTestNoApiForceOn = TestLegacy>; TEST_F(MultiSubDeviceTestNoApiForceOn, GivenNoApiSupportAndLocalMemoryEnabledWhenForcedImplicitScalingThenItIsImplicitScalingCapable) { EXPECT_TRUE(device->isImplicitScalingCapable()); EXPECT_EQ(neoDevice, deviceImp->getActiveDevice()); } -using MultiSubDeviceEnabledImplicitScalingTest = Test>; +using MultiSubDeviceEnabledImplicitScalingTest = TestLegacy>; 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 = Test; +using DeviceSimpleTests = TestLegacy; 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/host_pointer_manager_tests.cpp b/level_zero/core/test/unit_tests/sources/driver/host_pointer_manager_tests.cpp index a427d7f3f3..967c5ea73a 100644 --- a/level_zero/core/test/unit_tests/sources/driver/host_pointer_manager_tests.cpp +++ b/level_zero/core/test/unit_tests/sources/driver/host_pointer_manager_tests.cpp @@ -15,7 +15,7 @@ namespace L0 { namespace ult { -using HostPointerManagerTest = Test; +using HostPointerManagerTest = TestLegacy; TEST_F(HostPointerManagerTest, givenMultipleGraphicsAllocationWhenCopyingHostPointerDataThenCopyOnlyExistingAllocations) { @@ -437,7 +437,7 @@ TEST_F(HostPointerManagerTest, givenMisalignedPointerRegisteredWhenGettingRelati EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -using ForceDisabledHostPointerManagerTest = Test; +using ForceDisabledHostPointerManagerTest = TestLegacy; TEST_F(ForceDisabledHostPointerManagerTest, givenHostPointerManagerForceDisabledThenReturnFeatureUnsupported) { EXPECT_EQ(nullptr, hostDriverHandle->hostPointerManager.get()); @@ -458,7 +458,7 @@ TEST_F(ForceDisabledHostPointerManagerTest, givenHostPointerManagerForceDisabled EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result); } -using ForceEnabledHostPointerManagerTest = Test; +using ForceEnabledHostPointerManagerTest = TestLegacy; TEST_F(ForceEnabledHostPointerManagerTest, givenHostPointerManagerForceEnabledThenReturnSuccess) { EXPECT_NE(nullptr, hostDriverHandle->hostPointerManager.get()); diff --git a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp index 53cf90ecef..bc882257fa 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 = Test; +using DriverHandleImpTest = TestLegacy; 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 = Test; +using DriverVersionTest = TestLegacy; TEST_F(DriverVersionTest, givenCallToGetExtensionPropertiesThenSupportedExtensionsAreReturned) { uint32_t count = 0; @@ -150,7 +150,7 @@ TEST_F(DriverVersionTest, whenCallingGetDriverPropertiesRepeatedlyThenTheSameUui } } -using ImportNTHandle = Test; +using ImportNTHandle = TestLegacy; class MemoryManagerNTHandleMock : public NEO::OsAgnosticMemoryManager { public: @@ -653,7 +653,7 @@ struct HostImportApiFixture : public HostPointerManagerFixure { ze_driver_handle_t driverHandle; }; -using DriverExperimentalApiTest = Test; +using DriverExperimentalApiTest = TestLegacy; TEST_F(DriverExperimentalApiTest, whenRetrievingApiFunctionThenExpectProperPointer) { decltype(&zexDriverImportExternalPointer) expectedImport = L0::zexDriverImportExternalPointer; 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 54073dd392..f6840429af 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 = Test; -using EventCreate = Test; +using EventPoolCreate = TestLegacy; +using EventCreate = TestLegacy; class MemoryManagerEventPoolFailMock : public NEO::MemoryManager { public: @@ -294,7 +294,7 @@ class MemoryManagerEventPoolIPCMock : public NEO::MockMemoryManager { NEO::MockGraphicsAllocation *alloc; }; -using EventPoolIPCHandleTests = Test; +using EventPoolIPCHandleTests = TestLegacy; 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 = Test; +using EventPoolOpenIPCHandleFailTests = TestLegacy; TEST_F(EventPoolOpenIPCHandleFailTests, givenFailureToAllocateMemoryWhenOpeningIpcHandleForEventPoolThenInvalidArgumentIsReturned) { uint32_t numEvents = 4; @@ -497,7 +497,7 @@ class MultiDeviceEventPoolOpenIPCHandleFailTestsMemoryManager : public FailMemor uint32_t calls = 0; }; -using MultiDeviceEventPoolOpenIPCHandleFailTests = Test; +using MultiDeviceEventPoolOpenIPCHandleFailTests = TestLegacy; TEST_F(MultiDeviceEventPoolOpenIPCHandleFailTests, givenFailureToAllocateMemoryWhenOpeningIpcHandleForEventPoolWithMultipleDevicesThenOutOfHostMemoryIsReturned) { @@ -788,7 +788,7 @@ HWTEST2_F(EventCreate, givenPlatformNotSupportsMultTileWhenDebugKeyIsSetToUseCon event->destroy(); } -class EventSynchronizeTest : public Test { +class EventSynchronizeTest : public TestLegacy { public: void SetUp() override { DeviceFixture::SetUp(); @@ -1002,7 +1002,7 @@ TEST_F(EventSynchronizeTest, givenInfiniteTimeoutWhenWaitingForTimestampEventCom EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -using EventPoolIPCEventResetTests = Test; +using EventPoolIPCEventResetTests = TestLegacy; 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 = Test; +using EventAubCsrTest = TestLegacy; HWTEST_F(EventAubCsrTest, givenCallToEventHostSynchronizeWithAubModeCsrReturnsSuccess) { std::unique_ptr> driverHandle; @@ -1132,7 +1132,7 @@ struct EventCreateAllocationResidencyTest : public ::testing::Test { L0::Device *device = nullptr; }; -class TimestampEventCreate : public Test { +class TimestampEventCreate : public TestLegacy { public: void SetUp() override { DeviceFixture::SetUp(); @@ -1267,7 +1267,7 @@ TEST_F(TimestampEventCreate, givenEventWithStaticPartitionOffThenQueryTimestampE EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, result); } -class TimestampDeviceEventCreate : public Test { +class TimestampDeviceEventCreate : public TestLegacy { public: void SetUp() override { DeviceFixture::SetUp(); @@ -1305,7 +1305,7 @@ TEST_F(TimestampDeviceEventCreate, givenTimestampDeviceEventThenAllocationsIsOfG EXPECT_EQ(NEO::AllocationType::GPU_TIMESTAMP_DEVICE_BUFFER, allocation->getAllocationType()); } -using EventQueryTimestampExpWithSubDevice = Test; +using EventQueryTimestampExpWithSubDevice = TestLegacy; TEST_F(EventQueryTimestampExpWithSubDevice, givenEventWhenQuerytimestampExpWithSubDeviceThenReturnsCorrectValueReturned) { std::unique_ptr eventPool; @@ -1542,7 +1542,7 @@ TEST_F(TimestampEventCreate, givenEventWhenQueryKernelTimestampThenNotReadyRetur EXPECT_EQ(0u, resultTimestamp.global.kernelEnd); } -using EventPoolCreateMultiDevice = Test; +using EventPoolCreateMultiDevice = TestLegacy; TEST_F(EventPoolCreateMultiDevice, givenReturnSubDevicesAsApiDevicesWhenCallZeGetDevicesThenSubDevicesAreReturnedAsSeparateDevices) { DebugManagerStateRestore restorer; @@ -1683,7 +1683,7 @@ TEST_F(EventPoolCreateMultiDevice, whenCreatingEventPoolWithNoDevicesThenEventPo EXPECT_EQ(allocation->getGraphicsAllocations().size(), numRootDevices); } -using EventPoolCreateSingleDevice = Test; +using EventPoolCreateSingleDevice = TestLegacy; TEST_F(EventPoolCreateSingleDevice, whenCreatingEventPoolWithNoDevicesThenEventPoolCreateSucceedsAndSingleDeviceIsUsed) { ze_event_pool_desc_t eventPoolDesc = {}; @@ -1823,7 +1823,7 @@ class EventFixture : public DeviceFixture { EventPool *eventPool; }; -using EventTests = Test; +using EventTests = TestLegacy; TEST_F(EventTests, WhenQueryingStatusThenSuccessIsReturned) { auto event = whiteboxCast(Event::create(eventPool, &eventDesc, device)); @@ -2011,7 +2011,7 @@ struct EventSizeFixture : public DeviceFixture { std::unique_ptr eventObj1; }; -using EventSizeTests = Test; +using EventSizeTests = TestLegacy; HWTEST_F(EventSizeTests, whenCreatingEventPoolThenUseCorrectSizeAndAlignment) { ze_result_t result = ZE_RESULT_SUCCESS; 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 73e3fbc4f7..27e4840626 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 = Test; +using FenceTest = TestLegacy; 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 = Test; +using FenceSynchronizeTest = TestLegacy; 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 = Test; +using FenceAubCsrTest = TestLegacy; 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 b69a590ffb..54d2f858e0 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 = Test; +using AlocationHelperTests = TestLegacy; 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 158bf7905b..6416040c8b 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 = Test; -using ImageView = Test; +using ImageCreate = TestLegacy; +using ImageView = TestLegacy; HWTEST2_F(ImageCreate, givenValidImageDescriptionWhenImageCreateThenImageIsCreatedCorrectly, IsAtLeastSkl) { ze_image_desc_t zeDesc = {}; @@ -813,7 +813,7 @@ TEST(ImageFormatDescHelperTest, givenSupportedSwizzlesThenProperClEnumIsReturned EXPECT_EQ(getClChannelOrder(format), static_cast(CL_BGRA)); } -using ImageGetMemoryProperties = Test; +using ImageGetMemoryProperties = TestLegacy; 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 cd8c08a04c..50bf01d983 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 = Test; +using KernelImp = TestLegacy; TEST_F(KernelImp, GivenCrossThreadDataThenIsCorrectlyPatchedWithGlobalWorkSizeAndGroupCount) { uint32_t *crossThreadData = 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 d2788519dc..d86ad4041f 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 = Test; +using KernelInitTest = TestLegacy; 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 = Test; +using KernelBaseAddressTests = TestLegacy; TEST_F(KernelBaseAddressTests, whenQueryingKernelBaseAddressThenCorrectAddressIsReturned) { uint32_t perHwThreadPrivateMemorySizeRequested = 32u; @@ -102,7 +102,7 @@ struct MockKernelWithCallTracking : Mock<::L0::Kernel> { size_t setArgBufferWithAllocCalled = 0u; }; -using SetKernelArgCacheTest = Test; +using SetKernelArgCacheTest = TestLegacy; TEST_F(SetKernelArgCacheTest, givenValidBufferArgumentWhenSetMultipleTimesThenSetArgBufferWithAllocOnlyCalledIfNeeded) { MockKernelWithCallTracking mockKernel; @@ -172,7 +172,7 @@ TEST_F(SetKernelArgCacheTest, givenValidBufferArgumentWhenSetMultipleTimesThenSe svmAllocsManager->freeSVMAlloc(svmAllocation); } -using KernelImpSetGroupSizeTest = Test; +using KernelImpSetGroupSizeTest = TestLegacy; TEST_F(KernelImpSetGroupSizeTest, WhenCalculatingLocalIdsThenGrfSizeIsTakenFromCapabilityTable) { Mock mockKernel; @@ -246,7 +246,7 @@ TEST_F(KernelImpSetGroupSizeTest, givenZeroGroupSizeWhenSettingGroupSizeThenInva EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, ret); } -using SetKernelArg = Test; +using SetKernelArg = TestLegacy; using ImageSupport = IsWithinProducts; HWTEST2_F(SetKernelArg, givenImageAndKernelWhenSetArgImageThenCrossThreadDataIsSet, ImageSupport) { @@ -390,7 +390,7 @@ class KernelImmutableDataFixture : public ModuleImmutableDataFixture { } }; -using KernelImmutableDataTests = Test; +using KernelImmutableDataTests = TestLegacy; TEST_F(KernelImmutableDataTests, givenKernelInitializedWithNoPrivateMemoryThenPrivateMemoryIsNull) { uint32_t perHwThreadPrivateMemorySizeRequested = 0u; @@ -1490,7 +1490,7 @@ TEST_F(KernelPropertiesTests, WhenGetExtensionIsCalledWithUnknownExtensionTypeTh EXPECT_EQ(nullptr, kernel->getExtension(0U)); } -using KernelLocalIdsTest = Test; +using KernelLocalIdsTest = TestLegacy; TEST_F(KernelLocalIdsTest, WhenKernelIsCreatedThenDefaultLocalIdGenerationbyRuntimeIsTrue) { createKernel(); @@ -1498,9 +1498,9 @@ TEST_F(KernelLocalIdsTest, WhenKernelIsCreatedThenDefaultLocalIdGenerationbyRunt EXPECT_TRUE(kernel->requiresGenerationOfLocalIdsByRuntime()); } -struct KernelIsaTests : Test { +struct KernelIsaTests : TestLegacy { void SetUp() override { - Test::SetUp(); + TestLegacy::SetUp(); auto &capabilityTable = device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo()->capabilityTable; bool createBcsEngine = !capabilityTable.blitterOperationsSupported; @@ -1649,7 +1649,7 @@ TEST_F(KernelIsaTests, givenGlobalBuffersWhenCreatingKernelImmutableDataThenBuff EXPECT_EQ(1, std::count(resCont.begin(), resCont.end(), &globalConstBuffer)); } -using KernelImpPatchBindlessTest = Test; +using KernelImpPatchBindlessTest = TestLegacy; TEST_F(KernelImpPatchBindlessTest, GivenKernelImpWhenPatchBindlessOffsetCalledThenOffsetPatchedCorrectly) { Mock kernel; @@ -1746,7 +1746,7 @@ HWTEST2_F(KernelImpPatchBindlessTest, GivenKernelImpWhenSetSurfaceStateBindfulTh EXPECT_TRUE(memcmp(&surfaceStateAfter, &surfaceStateBefore, size) == 0); } -using KernelImpL3CachingTests = Test; +using KernelImpL3CachingTests = TestLegacy; HWTEST2_F(KernelImpL3CachingTests, GivenKernelImpWhenSetSurfaceStateWithUnalignedMemoryThenL3CachingIsDisabled, MatchAny) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; @@ -1845,7 +1845,7 @@ TEST_F(KernelImpPatchBindlessTest, GivenUndefiedBidfulAndBindlesstOffsetWhenSetA EXPECT_FALSE(mockKernel.setSurfaceStateCalled); } -using KernelBindlessUncachedMemoryTests = Test; +using KernelBindlessUncachedMemoryTests = TestLegacy; TEST_F(KernelBindlessUncachedMemoryTests, givenBindlessKernelAndAllocDataNoTfoundThenKernelRequiresUncachedMocsIsSet) { ze_kernel_desc_t desc = {}; @@ -2173,7 +2173,7 @@ HWTEST2_F(SetKernelArg, givenSupportsMediaBlockAndIsMediaBlockImageWhenSetArgIma } } -using ImportHostPointerSetKernelArg = Test; +using ImportHostPointerSetKernelArg = TestLegacy; TEST_F(ImportHostPointerSetKernelArg, givenHostPointerImportedWhenSettingKernelArgThenUseHostPointerAllocation) { createKernel(); @@ -2242,7 +2242,7 @@ TEST_F(KernelGlobalWorkOffsetTests, whenSettingGlobalOffsetThenCrossThreadDataIs EXPECT_EQ(*(dst.begin() + desc.payloadMappings.dispatchTraits.globalWorkOffset[2]), globalOffsetz); } -using KernelWorkDimTests = Test; +using KernelWorkDimTests = TestLegacy; TEST_F(KernelWorkDimTests, givenGroupCountsWhenPatchingWorkDimThenCrossThreadDataIsPatched) { uint32_t perHwThreadPrivateMemorySizeRequested = 32u; @@ -2279,7 +2279,7 @@ TEST_F(KernelWorkDimTests, givenGroupCountsWhenPatchingWorkDimThenCrossThreadDat } } -using KernelPrintHandlerTest = Test; +using KernelPrintHandlerTest = TestLegacy; struct MyPrintfHandler : public PrintfHandler { static uint32_t getPrintfSurfaceInitialDataSize() { return PrintfHandler::printfSurfaceInitialDataSize; @@ -2300,7 +2300,7 @@ TEST_F(KernelPrintHandlerTest, whenPrintPrintfOutputIsCalledThenPrintfBufferIsUs EXPECT_EQ(buffer, MyPrintfHandler::getPrintfSurfaceInitialDataSize()); } -using PrintfTest = Test; +using PrintfTest = TestLegacy; TEST_F(PrintfTest, givenKernelWithPrintfThenPrintfBufferIsCreated) { Mock mockModule(this->device, nullptr); @@ -2373,7 +2373,7 @@ TEST_F(PrintfTest, WhenCreatingPrintfBufferThenCrossThreadDataIsPatched) { mockKernel.crossThreadData.release(); } -using KernelPatchtokensPrintfStringMapTests = Test; +using KernelPatchtokensPrintfStringMapTests = TestLegacy; TEST_F(KernelPatchtokensPrintfStringMapTests, givenKernelWithPrintfStringsMapUsageEnabledWhenPrintOutputThenProperStringIsPrinted) { std::unique_ptr mockKernelImmData = std::make_unique(0u); @@ -2458,7 +2458,7 @@ TEST_F(KernelPatchtokensPrintfStringMapTests, givenKernelWithPrintfStringsMapUsa EXPECT_STREQ(expectedString.c_str(), output.c_str()); } -using KernelImplicitArgTests = Test; +using KernelImplicitArgTests = TestLegacy; TEST_F(KernelImplicitArgTests, givenKernelWithImplicitArgsWhenInitializeThenPrintfSurfaceIsCreatedAndProperlyPatchedInImplicitArgs) { std::unique_ptr mockKernelImmData = std::make_unique(0u); @@ -2543,7 +2543,7 @@ TEST_F(KernelImplicitArgTests, givenKernelWithImplicitArgsWhenSettingKernelParam EXPECT_EQ(0, memcmp(pImplicitArgs, &expectedImplicitArgs, sizeof(ImplicitArgs))); } -using MultiTileModuleTest = Test; +using MultiTileModuleTest = TestLegacy; 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 3ce549bcbd..e50b955b2b 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 = Test; +using MemoryTest = TestLegacy; struct CompressionMemoryTest : public MemoryTest { GraphicsAllocation *allocDeviceMem(size_t size) { @@ -3046,7 +3046,7 @@ TEST_F(MemoryFailedOpenIpcHandleImplicitScalingTest, EXPECT_EQ(ZE_RESULT_SUCCESS, result); } -using DeviceMemorySizeTest = Test; +using DeviceMemorySizeTest = TestLegacy; TEST_F(DeviceMemorySizeTest, givenSizeGreaterThanLimitThenDeviceAllocationFails) { size_t size = neoDevice->getDeviceInfo().maxMemAllocSize + 1; @@ -3438,7 +3438,7 @@ TEST_F(AllocHostMemoryTest, EXPECT_EQ(nullptr, ptr); } -using ContextMemoryTest = Test; +using ContextMemoryTest = TestLegacy; 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 aaae3e9a39..01b4880fa1 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 = Test; +using ModuleTest = TestLegacy; HWTEST_F(ModuleTest, givenBinaryWithDebugDataWhenModuleCreatedFromNativeBinaryThenDebugDataIsStored) { size_t size = 0; @@ -372,7 +372,7 @@ HWTEST_F(ModuleTest, givenUnalignedHostBufferWhenSurfaceStateProgrammedThenUnali Kernel::fromHandle(kernelHandle)->destroy(); } -using ModuleUncachedBufferTest = Test; +using ModuleUncachedBufferTest = TestLegacy; struct KernelImpUncachedTest : public KernelImp { using KernelImp::kernelRequiresUncachedMocsCount; @@ -665,7 +665,7 @@ struct ModuleSpecConstantsFixture : public DeviceFixture { }; template -using ModuleSpecConstantsTests = Test>; +using ModuleSpecConstantsTests = TestLegacy>; using ModuleSpecConstantsLongTests = ModuleSpecConstantsTests; TEST_F(ModuleSpecConstantsLongTests, givenSpecializationConstantsSetWithLongSizeInDescriptorThenModuleCorrectlyPassesThemToTheCompiler) { @@ -990,7 +990,7 @@ struct ModuleStaticLinkFixture : public DeviceFixture { bool testSingle = false; }; -using ModuleStaticLinkTests = Test; +using ModuleStaticLinkTests = TestLegacy; TEST_F(ModuleStaticLinkTests, givenMultipleModulesProvidedForSpirVStaticLinkAndCompilerFailsThenFailureIsReturned) { runLinkFailureTest(); @@ -1012,7 +1012,7 @@ TEST_F(ModuleStaticLinkTests, givenSingleModuleProvidedForSpirVStaticLinkAndBuil runSprivLinkBuildWithOneModule(); } -using ModuleLinkingTest = Test; +using ModuleLinkingTest = TestLegacy; 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 = Test; +using ModulePropertyTest = TestLegacy; TEST_F(ModulePropertyTest, whenZeModuleGetPropertiesIsCalledThenGetPropertiesIsCalled) { Mock module(device, nullptr); @@ -1144,21 +1144,21 @@ TEST_F(ModulePropertyTest, givenCallToGetPropertiesWithUnresolvedSymbolsThenFlag EXPECT_EQ(expectedFlags, moduleProperties.flags); } -struct ModuleFunctionPointerTests : public Test { +struct ModuleFunctionPointerTests : public TestLegacy { void SetUp() override { - Test::SetUp(); + TestLegacy::SetUp(); module0 = std::make_unique>(device, nullptr, ModuleType::User); } void TearDown() override { module0.reset(nullptr); - Test::TearDown(); + TestLegacy::TearDown(); } std::unique_ptr> module0; }; -struct ModuleDynamicLinkTests : public Test { +struct ModuleDynamicLinkTests : public TestLegacy { void SetUp() override { - Test::SetUp(); + TestLegacy::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 Test { module0.reset(nullptr); module1.reset(nullptr); module2.reset(nullptr); - Test::TearDown(); + TestLegacy::TearDown(); } std::unique_ptr> module0; std::unique_ptr> module1; @@ -1657,7 +1657,7 @@ TEST_F(ModuleDynamicLinkTests, givenModuleWithUnresolvedSymbolsNotPresentInAnoth zeModuleBuildLogDestroy(dynLinkLog); } -using ModuleDynamicLinkTest = Test; +using ModuleDynamicLinkTest = TestLegacy; TEST_F(ModuleDynamicLinkTest, givenUnresolvedSymbolsWhenModuleIsCreatedThenIsaAllocationsAreNotCopied) { NEO::MockCompilerEnableGuard mock(true); auto cip = new NEO::MockCompilerInterfaceCaptureBuildOptions(); @@ -1944,7 +1944,7 @@ HWTEST_F(MultiDeviceModuleSetArgBufferTest, } } -using ContextModuleCreateTest = Test; +using ContextModuleCreateTest = TestLegacy; HWTEST_F(ContextModuleCreateTest, givenCallToCreateModuleThenModuleIsReturned) { std::string testFile; @@ -1971,7 +1971,7 @@ HWTEST_F(ContextModuleCreateTest, givenCallToCreateModuleThenModuleIsReturned) { EXPECT_EQ(ZE_RESULT_SUCCESS, res); } -using ModuleTranslationUnitTest = Test; +using ModuleTranslationUnitTest = TestLegacy; 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 = Test; +using PrintfModuleTest = TestLegacy; HWTEST_F(PrintfModuleTest, GivenModuleWithPrintfWhenKernelIsCreatedThenPrintfAllocationIsPlacedInResidencyContainer) { std::string testFile; @@ -2618,7 +2618,7 @@ TEST_F(ModuleTest, whenContainsStatefulAccessIsCalledThenResultIsCorrect) { } } -using ModuleInitializeTest = Test; +using ModuleInitializeTest = TestLegacy; TEST_F(ModuleInitializeTest, whenModuleInitializeIsCalledThenCorrectResultIsReturned) { class MockModuleImp : public ModuleImp { @@ -2691,7 +2691,7 @@ TEST_F(ModuleInitializeTest, whenModuleInitializeIsCalledThenCorrectResultIsRetu } } -using ModuleDebugDataTest = Test; +using ModuleDebugDataTest = TestLegacy; 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 = Test; +using ModuleTests = TestLegacy; 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 = Test; +using ModuleIsaCopyTest = TestLegacy; TEST_F(ModuleIsaCopyTest, whenModuleIsInitializedThenIsaIsCopied) { MockImmutableMemoryManager *mockMemoryManager = static_cast(device->getNEODevice()->getMemoryManager()); @@ -3060,7 +3060,7 @@ TEST_F(ModuleIsaCopyTest, whenModuleIsInitializedThenIsaIsCopied) { } } -using ModuleWithZebinTest = Test; +using ModuleWithZebinTest = TestLegacy; 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 e158c3473f..10a57d141b 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 @@ -47,7 +47,7 @@ class ModuleOnlineCompiled : public DeviceFixture, public testing::Test { std::unique_ptr> module; }; -using ModuleTests = Test; +using ModuleTests = TestLegacy; 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 8596927b19..e6268db1dc 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 Test, + : public TestLegacy, public ::testing::WithParamInterface> { public: void SetUp() override { - Test::SetUp(); + TestLegacy::SetUp(); } void TearDown() override { - Test::TearDown(); + TestLegacy::TearDown(); } }; @@ -151,7 +151,7 @@ INSTANTIATE_TEST_CASE_P(SamplerDescCombinations, SamplerCreateTest, samplerFilterMode, samplerIsNormalized)); -using ContextCreateSamplerTest = Test; +using ContextCreateSamplerTest = TestLegacy; 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 073a0fc190..e88f4b8bb4 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 = Test; -using CommandListAppendLaunchKernel = Test; +using CommandListCreate = TestLegacy; +using CommandListAppendLaunchKernel = TestLegacy; -using CommandListAppendLaunchKernelWithAtomics = Test; +using CommandListAppendLaunchKernelWithAtomics = TestLegacy; HWTEST2_F(CommandListAppendLaunchKernelWithAtomics, givenKernelWithNoGlobalAtomicsThenLastSentGlobalAtomicsInContainerStaysFalse, IsXeHpCore) { Mock<::L0::Kernel> kernel; @@ -144,7 +144,7 @@ HWTEST2_F(CommandListAppendLaunchKernelWithAtomics, givenKernelWithGlobalAtomics EXPECT_FALSE(pCommandList->commandContainer.lastSentUseGlobalAtomics); } -using MultTileCommandListAppendLaunchKernelL3Flush = Test>; +using MultTileCommandListAppendLaunchKernelL3Flush = TestLegacy>; 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 = Test; +using CommandListAppendLaunchKernelL3Flush = TestLegacy; 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_debugger_xe_hp_core.cpp b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp index bb5aa72bac..1409fbb3c9 100644 --- a/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hp_core/test_cmdqueue_debugger_xe_hp_core.cpp @@ -24,8 +24,8 @@ namespace L0 { namespace ult { -using CommandQueueDebugCommandsForSldXeHP = Test; -using CommandQueueDebugCommandsDebuggerL0XeHP = Test; +using CommandQueueDebugCommandsForSldXeHP = TestLegacy; +using CommandQueueDebugCommandsDebuggerL0XeHP = TestLegacy; XEHPTEST_F(CommandQueueDebugCommandsForSldXeHP, givenSteppingA0OrBWhenGlobalSipIsUsedThenMmioIsRestoredAtTheEndOfCmdBuffer) { 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 aabfa73772..93df61f828 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 = Test; +using CommandQueueExecuteCommandListsXE_HP_CORE = TestLegacy; 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 8de441a95b..075988f19c 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 = Test; +using DeviceFixtureXeHpCore = TestLegacy; 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 = Test; +using CommandQueueGroupTest = TestLegacy; HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpCore) { const uint32_t rootDeviceIndex = 0u; @@ -117,7 +117,7 @@ class DeviceCopyQueueGroupFixture : public DeviceFixture { DebugManagerStateRestore restorer; }; -using DeviceCopyQueueGroupTest = Test; +using DeviceCopyQueueGroupTest = TestLegacy; HWTEST2_F(DeviceCopyQueueGroupTest, givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsXeHpCore) { 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 a548cc729a..6fb8cdd77f 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 = Test; +using KernelPropertyTest = TestLegacy; 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 e048bf6357..41b2231e7a 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 = Test; +using XeHpcCoreBuiltInTestL0 = TestLegacy; HWTEST_EXCLUDE_PRODUCT(BuiltInSharedTest, GivenBuiltinTypeBinaryWhenGettingBuiltinResourceForNotRegisteredRevisionThenBuiltinFromDefaultRevisionIsTaken, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(BuiltInTestL0, givenDeviceWithUnregisteredBinaryBuiltinWhenGettingBuiltinKernelThenTakeBinaryBuiltinFromDefaultRevision, IGFX_XE_HPC_CORE); 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 9b3db656cb..3be96f6f6b 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 = Test; +using CommandListStatePrefetchPvcXt = TestLegacy; PVCTEST_F(CommandListStatePrefetchPvcXt, givenCommandBufferIsExhaustedWhenPrefetchApiCalledAndIsPvcXtNotBaseDieA0ThenProgramStatePrefetch) { auto hwInfo = device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo(); @@ -36,7 +36,7 @@ PVCTEST_F(CommandListStatePrefetchPvcXt, givenDebugFlagSetWhenPrefetchApiCalledA checkIfDebugFlagSetWhenPrefetchApiCalledAThenStatePrefetchProgrammed(hwInfo); } -using CommandListEventFenceTestsPvc = Test; +using CommandListEventFenceTestsPvc = TestLegacy; 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 = Test; +using CommandListAppendBarrierXeHpcCore = TestLegacy; 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 39f8f65a93..0171d99c16 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 = Test; +using DeviceTestPvcXt = TestLegacy; PVCTEST_F(DeviceTestPvcXt, whenCallingGetMemoryPropertiesWithNonNullPtrAndRevisionIsNotBaseDieA0OnPvcXtThenMaxClockRateReturnedIsZero) { auto &device = driverHandle->devices[0]; @@ -31,7 +31,7 @@ PVCTEST_F(DeviceTestPvcXt, whenCallingGetMemoryPropertiesWithNonNullPtrAndRevisi checkIfCallingGetMemoryPropertiesWithNonNullPtrThenMaxClockRateReturnZero(hwInfo); } -using DeviceTestPvc = Test; +using DeviceTestPvc = TestLegacy; 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 6cd8afd7fc..95504eaa47 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 @@ -28,7 +28,7 @@ struct LocalMemoryModuleFixture : public ModuleFixture { DebugManagerStateRestore restore; }; -using CommandListAppendLaunchKernelXeHpcCore = Test; +using CommandListAppendLaunchKernelXeHpcCore = TestLegacy; 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 = Test; +using CommandListStatePrefetchXeHpcCore = TestLegacy; HWTEST2_F(CommandListStatePrefetchXeHpcCore, givenUnifiedSharedMemoryWhenPrefetchApiIsCalledThenDontRequestMemoryPrefetchByDefault, IsXeHpcCore) { auto pCommandList = std::make_unique>>(); @@ -386,7 +386,7 @@ HWTEST2_F(CommandListStatePrefetchXeHpcCore, givenAppendMemoryPrefetchForKmdMigr commandQueue->destroy(); } -using CommandListEventFenceTestsXeHpcCore = Test; +using CommandListEventFenceTestsXeHpcCore = TestLegacy; 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 = Test; +using CommandListAppendRangesBarrierXeHpcCore = TestLegacy; 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 18a291e6b7..1a15e55728 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 @@ -45,7 +45,7 @@ struct CommandQueueCreateMultiOrdinalFixture : public DeviceFixture { L0::Device *device = nullptr; }; -using CommandQueueCommandsXeHpc = Test; +using CommandQueueCommandsXeHpc = TestLegacy; 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 cc5a1aab9d..4a23d111c0 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 = Test; +using DeviceTestXeHpc = TestLegacy; HWTEST2_F(DeviceTestXeHpc, WhenGettingImagePropertiesThenPropertiesAreNotSet, IsXeHpcCore) { ze_image_properties_t properties{}; @@ -85,7 +85,7 @@ HWTEST2_F(DeviceTestXeHpc, givenXeHpcBStepWhenCreatingMultiTileDeviceThenExpectI delete device; } -using MultiDeviceCommandQueueGroupWithNineCopyEnginesTest = Test>; +using MultiDeviceCommandQueueGroupWithNineCopyEnginesTest = TestLegacy>; HWTEST2_F(MultiDeviceCommandQueueGroupWithNineCopyEnginesTest, givenMainAndLinkCopyEngineSupportAndCCSAndImplicitScalingThenExpectedQueueGroupsAreReturned, IsXeHpcCore) { uint32_t count = 0; @@ -279,7 +279,7 @@ HWTEST2_F(MultiDeviceCommandQueueGroupWithNineCopyEnginesTest, givenMainAndLinkC } } -using MultiDeviceCommandQueueGroupWithNoCopyEnginesTest = Test>; +using MultiDeviceCommandQueueGroupWithNoCopyEnginesTest = TestLegacy>; HWTEST2_F(MultiDeviceCommandQueueGroupWithNoCopyEnginesTest, givenNoCopyEngineSupportAndCCSAndImplicitScalingThenExpectedQueueGroupsAreReturned, IsXeHpcCore) { uint32_t count = 0; @@ -298,7 +298,7 @@ HWTEST2_F(MultiDeviceCommandQueueGroupWithNoCopyEnginesTest, } } -using MultiDeviceCommandQueueGroupWithNoCopyEnginesAndNoImplicitScalingTest = Test>; +using MultiDeviceCommandQueueGroupWithNoCopyEnginesAndNoImplicitScalingTest = TestLegacy>; HWTEST2_F(MultiDeviceCommandQueueGroupWithNoCopyEnginesAndNoImplicitScalingTest, givenNoCopyEngineSupportAndCCSAndNoImplicitScalingThenOnlyTheQueueGroupsFromSubDeviceAreReturned, IsXeHpcCore) { uint32_t count = 0; @@ -317,7 +317,7 @@ HWTEST2_F(MultiDeviceCommandQueueGroupWithNoCopyEnginesAndNoImplicitScalingTest, } } -using CommandQueueGroupTest = Test; +using CommandQueueGroupTest = TestLegacy; HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpcCore) { const uint32_t rootDeviceIndex = 0u; @@ -374,7 +374,7 @@ class DeviceCopyQueueGroupXeHpcFixture : public DeviceFixture { } DebugManagerStateRestore restorer; }; -using DeviceCopyQueueGroupXeHpcTest = Test; +using DeviceCopyQueueGroupXeHpcTest = TestLegacy; 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 877315e237..38989f2603 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 = Test; +using KernelPropertyTest = TestLegacy; 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 3e921f4079..2e8f900ad1 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 = Test; +using CommandListTests = TestLegacy; 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 701c4f146d..acf10f3a09 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 = Test; +using CommandQueueTestDG2 = TestLegacy; 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 ae5dba22e1..9a592fb527 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 = Test; +using SamplerCreateTest = TestLegacy; 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 94ca378bbf..4130d43ec3 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 = Test; +using CommandListCreate = TestLegacy; 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 = Test; +using CommandListAppendLaunchKernelXeHpgCore = TestLegacy; 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 39d63f2142..b357f1649b 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 = Test; +using CommandQueueExecuteCommandListsXeHpgCore = TestLegacy; 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 89ed07cfd7..32f6ef7cfc 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 = Test; +using CommandQueueGroupTest = TestLegacy; HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpgCore) { const uint32_t rootDeviceIndex = 0u; @@ -97,7 +97,7 @@ class DeviceCopyQueueGroupFixture : public DeviceFixture { DebugManagerStateRestore restorer; }; -using DeviceCopyQueueGroupTest = Test; +using DeviceCopyQueueGroupTest = TestLegacy; HWTEST2_F(DeviceCopyQueueGroupTest, givenBlitterSupportAndEnableBlitterOperationsSupportSetToZeroThenNoCopyEngineIsReturned, IsXeHpgCore) { @@ -123,7 +123,7 @@ HWTEST2_F(DeviceCopyQueueGroupTest, } } -using TestDeviceXeHpgCore = Test; +using TestDeviceXeHpgCore = TestLegacy; 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 d670c34e2f..400a754b5e 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 = Test; +using ImageCreate = TestLegacy; 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 57417fa9fa..3d3f64363b 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 = Test; +using KernelPropertyTest = TestLegacy; 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 8677d751a7..5213ff402a 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 = Test; +using MultiTileDebugSessionTest = TestLegacy; TEST_F(MultiTileDebugSessionTest, givenThreadsFromMultipleTilesWhenResumeCalledThenThreadsResumedInAllTiles) { zet_debug_config_t config = {}; @@ -1701,7 +1701,7 @@ struct DebugSessionRegistersAccess { NEO::MockDevice *neoDevice = nullptr; }; -using DebugSessionRegistersAccessTest = Test; +using DebugSessionRegistersAccessTest = TestLegacy; TEST_F(DebugSessionRegistersAccessTest, givenTypeToRegsetDescCalledThenCorrectRegdescIsReturned) { session->stateSaveAreaHeader = MockSipData::createStateSaveAreaHeader(2); 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 89fb1fefd8..7a2a8c1e34 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 = Test; +using DebugSessionMultiTile = TestLegacy; 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 c9c20ff6d4..f1be1d363c 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 @@ -871,7 +871,7 @@ TEST(DebugSessionTest, GivenNullptrEventWhenReadingEventThenErrorNullptrReturned EXPECT_EQ(ZE_RESULT_ERROR_INVALID_NULL_POINTER, result); } -using DebugApiLinuxTest = Test; +using DebugApiLinuxTest = TestLegacy; TEST_F(DebugApiLinuxTest, givenDeviceWhenCallingDebugAttachThenSuccessAndValidSessionHandleAreReturned) { zet_debug_config_t config = {}; @@ -3710,7 +3710,7 @@ struct DebugApiLinuxVmBindFixture : public DebugApiLinuxFixture { std::unique_ptr session; }; -using DebugApiLinuxVmBindTest = Test; +using DebugApiLinuxVmBindTest = TestLegacy; TEST_F(DebugApiLinuxVmBindTest, GivenVmBindEventWithKnownUuidClassWhenHandlingEventThenBindInfoIsStoredForVm) { uint64_t sbaAddress = 0x1234000; @@ -5400,7 +5400,7 @@ TEST_F(DebugApiLinuxTest, givenEnginesEventHandledThenLrcToContextHandleMapIsFil EXPECT_TRUE(hasSubstr(infoMessage, std::string("ENGINES event: client_handle = 34, ctx_handle = 20, num_engines = 2 DESTROY"))); } -using DebugApiLinuxAttentionTest = Test; +using DebugApiLinuxAttentionTest = TestLegacy; TEST_F(DebugApiLinuxAttentionTest, GivenEuAttentionEventForThreadsWhenHandlingEventThenNewlyStoppedThreadsSaved) { zet_debug_config_t config = {}; @@ -5801,7 +5801,7 @@ TEST_F(DebugApiLinuxAttentionTest, GivenInvalidVmHandleWhenHandlingAttentionEven EXPECT_EQ(0u, sessionMock->pendingInterrupts.size()); EXPECT_FALSE(sessionMock->triggerEvents); } -using DebugApiLinuxAsyncThreadTest = Test; +using DebugApiLinuxAsyncThreadTest = TestLegacy; TEST_F(DebugApiLinuxAsyncThreadTest, GivenPollReturnsErrorAndEinvalWhenReadingInternalEventsAsyncThenDetachEventIsGenerated) { zet_debug_config_t config = {}; @@ -6125,7 +6125,7 @@ struct DebugApiRegistersAccessFixture : public DebugApiLinuxFixture { EuThread::ThreadId stoppedThreadId{0, stoppedThread}; }; -using DebugApiRegistersAccessTest = Test; +using DebugApiRegistersAccessTest = TestLegacy; TEST_F(DebugApiRegistersAccessTest, givenInvalidClientHandleWhenReadRegistersCalledThenErrorIsReturned) { session->clientHandle = MockDebugSessionLinux::invalidClientHandle; @@ -6637,7 +6637,7 @@ TEST_F(DebugApiRegistersAccessTest, givenWriteSbaRegistersCalledThenErrorInvalid EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, zetDebugWriteRegisters(session->toHandle(), {0, 0, 0, 0}, ZET_DEBUG_REGSET_TYPE_SBA_INTEL_GPU, 0, 1, nullptr)); } -using DebugApiLinuxMultitileTest = Test; +using DebugApiLinuxMultitileTest = TestLegacy; TEST_F(DebugApiLinuxMultitileTest, GivenMultitileDeviceWhenCallingResumeThenThreadsFromBothTilesAreResumed) { zet_debug_config_t config = {}; 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 d39e167976..561318bb5b 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 @@ -34,7 +34,7 @@ struct DebugApiFixture : public DeviceFixture { MockBuiltins *mockBuiltins = nullptr; }; -using DebugApiTest = Test; +using DebugApiTest = TestLegacy; TEST_F(DebugApiTest, givenDeviceWhenGettingDebugPropertiesThenNoFlagIsSet) { zet_device_debug_properties_t debugProperties = {}; 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 36f0f44b88..356ff5195f 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 @@ -113,7 +113,7 @@ struct DebugApiWindowsFixture : public DeviceFixture { WddmEuDebugInterfaceMock *mockWddm = nullptr; }; -using DebugApiWindowsTest = Test; +using DebugApiWindowsTest = TestLegacy; TEST_F(DebugApiWindowsTest, GivenReadOfGpuVaFailDueToEscapeCallFailureWhenTryingToReadSbaThenErrorIsReported) { zet_debug_config_t config = {}; @@ -849,7 +849,7 @@ TEST(DebugSessionWindowsTest, whenTranslateEscapeErrorStatusCalledThenCorrectZeR EXPECT_EQ(ZE_RESULT_ERROR_UNKNOWN, DebugSessionWindows::translateEscapeReturnStatusToZeResult(DBGUMD_RETURN_TYPE_MAX)); } -using DebugApiWindowsAsyncThreadTest = Test; +using DebugApiWindowsAsyncThreadTest = TestLegacy; TEST_F(DebugApiWindowsAsyncThreadTest, GivenDebugSessionWhenStartingAndClosingAsyncThreadThenThreadIsStartedAndFinishes) { auto session = std::make_unique(zet_debug_config_t{0x1234}, device); diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_enumeration_1.cpp index 4c0a9d6640..f69b3fe678 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 = Test; +using MetricEnumerationTest = TestLegacy; 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 = Test; +using MultiDeviceMetricEnumerationTest = TestLegacy; 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 f703e92959..6df48599a6 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 = Test; +using MetricEnumerationTest = TestLegacy; TEST_F(MetricEnumerationTest, givenTimeAndBufferSizeWhenOpenIoStreamReturnsErrorThenTheMetricGroupOpenIoStreamReturnsErrorUnknown) { @@ -138,7 +138,7 @@ TEST_F(MetricEnumerationTest, givenTTypedValueWhenCopyValueIsCalledReturnsFilled } } -using MetricEnumerationMultiDeviceTest = Test; +using MetricEnumerationMultiDeviceTest = TestLegacy; 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 2e0d606039..762eb46ddd 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 = Test; +using MetricInitializationTest = TestLegacy; 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 6cf44f871d..8e2e8f98e4 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 = Test; +using MetricStreamerTest = TestLegacy; 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 2640f8a3e5..12cda7b7cc 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 = Test; +using MetricStreamerMultiDeviceTest = TestLegacy; 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 47323aa4db..0c71969e6c 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 = Test; +using MetricStreamerMultiDeviceTest = TestLegacy; TEST_F(MetricStreamerMultiDeviceTest, givenEnableWalkerPartitionIsOnWhenZetCommandListAppendMetricStreamerMarkerIsCalledForSubDeviceThenReturnsSuccess) { 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 cc8ca9a958..1c5ba3f75a 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 = Test; +using MetricEnumerationTestWindows = TestLegacy; TEST_F(MetricEnumerationTestWindows, givenCorrectWindowsAdapterWhenGetMetricsAdapterThenReturnSuccess) { 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 6a4e41114f..79ff5c7b30 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 = Test; +using MockDeviceSysmanGetTest = TestLegacy; TEST_F(MockDeviceSysmanGetTest, GivenValidSysmanHandleSetInDeviceStructWhenGetThisSysmanHandleThenHandlesShouldBeSimilar) { SysmanDeviceImp *sysman = new SysmanDeviceImp(device->toHandle()); device->setSysmanHandle(sysman); @@ -397,7 +397,7 @@ class UnknownDriverModel : public DriverModel { } }; -using SysmanUnknownDriverModelTest = Test; +using SysmanUnknownDriverModelTest = TestLegacy; 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/test_sysman.cpp b/level_zero/tools/test/unit_tests/sources/sysman/windows/test_sysman.cpp index 40d9a1bd32..814dcbdc2e 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 = Test; +using MockDeviceSysmanGetTest = TestLegacy; TEST_F(MockDeviceSysmanGetTest, GivenValidSysmanHandleSetInDeviceStructWhenGetThisSysmanHandleThenHandlesShouldBeSimilar) { SysmanDeviceImp *sysman = new SysmanDeviceImp(device->toHandle()); device->setSysmanHandle(sysman); diff --git a/opencl/test/unit_test/api/cl_api_tests.h b/opencl/test/unit_test/api/cl_api_tests.h index 49202e9a36..60de68b6d1 100644 --- a/opencl/test/unit_test/api/cl_api_tests.h +++ b/opencl/test/unit_test/api/cl_api_tests.h @@ -117,7 +117,7 @@ struct api_fixture_using_aligned_memory_manager { MockClDevice *device; }; -using api_test_using_aligned_memory_manager = Test; +using api_test_using_aligned_memory_manager = TestLegacy; void CL_CALLBACK notifyFuncProgram( cl_program program, diff --git a/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl b/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl index 4b9684607a..46f107b5f2 100644 --- a/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl +++ b/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ using namespace NEO; -struct clCreateContextFromTypeTests : Test { +struct clCreateContextFromTypeTests : TestLegacy { cl_int retVal = CL_DEVICE_NOT_AVAILABLE; }; diff --git a/opencl/test/unit_test/api/cl_get_device_ids_tests.inl b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl index 08ecf7ce28..b284570034 100644 --- a/opencl/test/unit_test/api/cl_get_device_ids_tests.inl +++ b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl @@ -15,7 +15,7 @@ using namespace NEO; -using clGetDeviceIDsTests = Test; +using clGetDeviceIDsTests = TestLegacy; namespace ULT { diff --git a/opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl b/opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl index 345871e701..ff84d7b75c 100644 --- a/opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl +++ b/opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl @@ -11,7 +11,7 @@ using namespace NEO; -using clGetExtensionFunctionAddressForPlatformTests = Test; +using clGetExtensionFunctionAddressForPlatformTests = TestLegacy; namespace ULT { diff --git a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl index 55afbd6e36..14a21b9e66 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -34,7 +34,7 @@ struct KernelSubGroupInfoKhrFixture : HelloWorldFixture KernelSubGroupInfoKhrTest; +typedef TestLegacy KernelSubGroupInfoKhrTest; template struct KernelSubGroupInfoKhrParamFixture : KernelSubGroupInfoKhrFixture, diff --git a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl index 43f4aff944..b2bfead795 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -51,7 +51,7 @@ struct KernelSubGroupInfoFixture : HelloWorldFixture { namespace ULT { -typedef Test KernelSubGroupInfoTest; +typedef TestLegacy KernelSubGroupInfoTest; template struct KernelSubGroupInfoParamFixture : KernelSubGroupInfoFixture, diff --git a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl index 46c0715689..a9500b2980 100644 --- a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl @@ -12,14 +12,14 @@ using namespace NEO; -struct clGetPlatformInfoTests : Test { +struct clGetPlatformInfoTests : TestLegacy { void SetUp() override { - Test::SetUp(); + TestLegacy::SetUp(); } void TearDown() override { delete[] paramValue; - Test::TearDown(); + TestLegacy::TearDown(); } char *getPlatformInfoString(Platform *pPlatform, cl_platform_info paramName) { diff --git a/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl index d681c29a7f..81a39194b2 100644 --- a/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl +++ b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ using namespace NEO; -using clIcdGetPlatformIDsKHRTests = Test; +using clIcdGetPlatformIDsKHRTests = TestLegacy; namespace ULT { diff --git a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp index a909f2d82d..12f22b3b21 100644 --- a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp +++ b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp @@ -56,7 +56,7 @@ const size_t n = 512; [[maybe_unused]] const cl_mem_properties_intel propertiesUncacheable[] = {CL_MEM_FLAGS_INTEL, CL_MEM_LOCALLY_UNCACHED_RESOURCE, 0}; [[maybe_unused]] const cl_mem_properties_intel propertiesUncacheableInSurfaceState[] = {CL_MEM_FLAGS_INTEL, CL_MEM_LOCALLY_UNCACHED_SURFACE_STATE_RESOURCE, 0}; -using clMemLocallyUncachedResourceFixture = Test>; +using clMemLocallyUncachedResourceFixture = TestLegacy>; HWCMDTEST_F(IGFX_GEN8_CORE, clMemLocallyUncachedResourceFixture, GivenAtLeastOneLocallyUncacheableResourceWhenSettingKernelArgumentsThenKernelIsUncacheable) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/api/cl_retain_release_device_tests.inl b/opencl/test/unit_test/api/cl_retain_release_device_tests.inl index b3082ac901..375acacf85 100644 --- a/opencl/test/unit_test/api/cl_retain_release_device_tests.inl +++ b/opencl/test/unit_test/api/cl_retain_release_device_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,10 +11,10 @@ using namespace NEO; -struct clRetainReleaseDeviceTests : Test { +struct clRetainReleaseDeviceTests : TestLegacy { void SetUp() override { DebugManager.flags.CreateMultipleRootDevices.set(maxRootDeviceCount); - Test::SetUp(); + TestLegacy::SetUp(); } DebugManagerStateRestore restorer; const uint32_t rootDeviceIndex = 1u; diff --git a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl index fe6d192b03..6d9a114709 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl @@ -55,7 +55,7 @@ class KernelArgSvmApiFixture : public ApiFixture<> { char pCrossThreadData[64]{}; }; -typedef Test clSetKernelArgSVMPointerTests; +typedef TestLegacy clSetKernelArgSVMPointerTests; namespace ULT { diff --git a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl index 346aa21e4d..7a52366375 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl @@ -53,7 +53,7 @@ class KernelExecInfoFixture : public ApiFixture<> { cl_device_svm_capabilities svmCapabilities = 0; }; -typedef Test clSetKernelExecInfoTests; +typedef TestLegacy clSetKernelExecInfoTests; namespace ULT { diff --git a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp index 77f32343c3..e1731fe91f 100644 --- a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp +++ b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp @@ -22,7 +22,7 @@ using namespace NEO; -typedef Test AubAllocDumpTests; +typedef TestLegacy AubAllocDumpTests; struct AubFileStreamMock : public AubMemDump::AubFileStream { void write(const char *data, size_t size) override { diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_enqueue_resource_barrier_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_enqueue_resource_barrier_xehp_and_later.cpp index 6e49750204..5fc31e83f1 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_enqueue_resource_barrier_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_enqueue_resource_barrier_xehp_and_later.cpp @@ -20,7 +20,7 @@ using namespace NEO; -using ResourceBarrierAubTest = Test>; +using ResourceBarrierAubTest = TestLegacy>; struct L3ControlSupportedMatcher { template diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp index b9cd4c5b27..2bcdb412e5 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp @@ -128,7 +128,7 @@ struct InlineDataFixture : AubDispatchThreadDataFixture { } }; -using XeHPAndLaterAubInlineDataTest = Test; +using XeHPAndLaterAubInlineDataTest = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubInlineDataTest, givenCrossThreadFitIntoSingleGrfWhenInlineDataAllowedThenCopyAllCrossThreadIntoInline) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; @@ -297,7 +297,7 @@ struct HwLocalIdsFixture : AubDispatchThreadDataFixture { } }; -using XeHPAndLaterAubHwLocalIdsTest = Test; +using XeHPAndLaterAubHwLocalIdsTest = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubHwLocalIdsTest, WhenEnqueueDimensionsArePow2ThenSetEmitLocalIdsAndGenerateLocalIdsFields) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; @@ -417,7 +417,7 @@ struct HwLocalIdsWithSubGroups : AubDispatchThreadDataFixture { } }; -using XeHPAndLaterAubHwLocalIdsWithSubgroupsTest = Test; +using XeHPAndLaterAubHwLocalIdsWithSubgroupsTest = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubHwLocalIdsWithSubgroupsTest, givenKernelUsingSubgroupsWhenLocalIdsAreGeneratedByHwThenValuesAreCorrect) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp index 6d7eff8fe3..fe51e6fe65 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp @@ -127,7 +127,7 @@ struct Gen12AubScratchSpaceForPrivateFixture : public KernelAUBFixture; +using Gen12AubScratchSpaceForPrivateTest = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, Gen12AubScratchSpaceForPrivateTest, WhenKernelUsesScratchSpaceForPrivateThenExpectCorrectResults) { cl_uint workDim = 1; @@ -297,7 +297,7 @@ struct Gen12AubScratchSpaceForSpillFillFixture : public KernelAUBFixture; +using Gen12AubScratchSpaceForSpillFillTest = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, Gen12AubScratchSpaceForSpillFillTest, givenSurfaceStateScratchSpaceEnabledWhenKernelUsesScratchForSpillFillThenExpectCorrectResults) { cl_uint workDim = 1; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp index 2f4d399e13..b6e7225fb8 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp @@ -466,7 +466,7 @@ struct AUBSimpleArgNonUniformFixture : public KernelAUBFixture>; +using AUBSimpleKernelStatelessTest = TestLegacy>; HWTEST_F(AUBSimpleKernelStatelessTest, givenSimpleKernelWhenStatelessPathIsUsedThenExpectCorrectBuffer) { @@ -512,7 +512,7 @@ HWTEST_F(AUBSimpleKernelStatelessTest, givenSimpleKernelWhenStatelessPathIsUsedT bufferExpected, bufferSize); } -using AUBSimpleArgNonUniformTest = Test; +using AUBSimpleArgNonUniformTest = TestLegacy; HWTEST_F(AUBSimpleArgNonUniformTest, givenOpenCL20SupportWhenProvidingWork1DimNonUniformGroupThenExpectTwoWalkers) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; cl_uint workDim = 1; diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp index 2eaa771096..3a9c28042b 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp @@ -70,7 +70,7 @@ struct AUBFixture : public AUBCommandStreamFixture, } }; -typedef Test AUBcommandstreamTests; +typedef TestLegacy AUBcommandstreamTests; HWTEST_F(AUBcommandstreamTests, WhenFlushingTwiceThenCompletes) { CommandStreamReceiverHw::addBatchBufferEnd(*pCS, nullptr); diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp index 22fcd68a64..1354c93128 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -43,7 +43,7 @@ TEST(PageTableTraits, when32BitTraitsAreUsedThenPageTableAddressesAreCorrect) { EXPECT_EQ(BIT(36), AubMemDump::PageTableTraits<32>::pdpBaseAddress); } -typedef Test AubMemDumpTests; +typedef TestLegacy AubMemDumpTests; HWTEST_F(AubMemDumpTests, givenAubFileStreamWhenOpenAndCloseIsCalledThenFileNameIsReportedCorrectly) { AUBCommandStreamReceiver::AubFileStream aubFile; diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp index 314e2f97f4..328e4ed93e 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp @@ -83,7 +83,7 @@ struct MiAtomicAubFixture : public AUBFixture { GraphicsAllocation *systemSurface = nullptr; }; -using MiAtomicAubTest = Test; +using MiAtomicAubTest = TestLegacy; HWTEST_F(MiAtomicAubTest, WhenDispatchingAtomicMoveOperationThenExpectCorrectEndValues) { using MI_ATOMIC = typename FamilyType::MI_ATOMIC; diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp index 8bf0036c5c..bdcd1327b5 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp @@ -253,7 +253,7 @@ struct AubWalkerPartitionZeroFixture : public AubWalkerPartitionFixture { std::unique_ptr commandBufferProperties; }; -using AubWalkerPartitionZeroTest = Test; +using AubWalkerPartitionZeroTest = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, AubWalkerPartitionZeroTest, whenPartitionCountSetToZeroThenProvideEqualSingleWalker) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; @@ -649,7 +649,7 @@ struct MultiLevelBatchAubFixture : public AUBFixture { GraphicsAllocation *thirdLevelBatch = nullptr; }; -using MultiLevelBatchTestsWithNesting = Test>; +using MultiLevelBatchTestsWithNesting = TestLegacy>; HWCMDTEST_F(IGFX_XE_HP_CORE, MultiLevelBatchTestsWithNesting, givenConditionalBatchBufferEndWhenItExitsThirdLevelCommandBufferThenSecondLevelBatchIsResumed) { auto writeAddress = helperSurface->getGpuAddress(); @@ -802,7 +802,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MultiLevelBatchTestsWithNesting, givenCommandBuffer flushStream(); expectMemory(reinterpret_cast(writeAddress), &writeValue, sizeof(writeValue)); } -using MultiLevelBatchTestsWithoutNesting = Test>; +using MultiLevelBatchTestsWithoutNesting = TestLegacy>; HWCMDTEST_F(IGFX_XE_HP_CORE, MultiLevelBatchTestsWithoutNesting, givenConditionalBBEndWhenItExitsFromSecondLevelThenUpperLevelIsResumed) { auto writeAddress = helperSurface->getGpuAddress(); @@ -1184,7 +1184,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(DispatchParamtersForTests), ::testing::ValuesIn(testWorkingDimensions))); -using AubWparidTests = Test; +using AubWparidTests = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, AubWparidTests, whenPartitionCountSetAndPartitionIdSpecifiedViaWPARIDThenProvideEqualNumberWalkers) { size_t globalWorkOffset[3] = {0, 0, 0}; diff --git a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp index ffdfdfbe17..dade98b0e4 100644 --- a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp +++ b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -using Gen11AubBatchBufferTests = Test; +using Gen11AubBatchBufferTests = TestLegacy; static constexpr auto gpuBatchBufferAddr = 0x800400001000; // 48-bit GPU address diff --git a/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp index ce81d0adb7..b1fe1275d9 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ namespace NEO { -using Gen12LPAubMemDumpTests = Test; +using Gen12LPAubMemDumpTests = TestLegacy; GEN12LPTEST_F(Gen12LPAubMemDumpTests, GivenCcsThenExpectationsAreMet) { setupAUB(pDevice, aub_stream::ENGINE_CCS); diff --git a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp index 2147f9c62c..02754558de 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp @@ -16,8 +16,8 @@ #include "opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -using Gen12LPAubBatchBufferTests = Test; -using Gen12LPTimestampTests = Test>; +using Gen12LPAubBatchBufferTests = TestLegacy; +using Gen12LPTimestampTests = TestLegacy>; static constexpr auto gpuBatchBufferAddr = 0x400400001000; // 47-bit GPU address diff --git a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp index 2c63463a5b..16ecea3761 100644 --- a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp +++ b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -using AubBatchBufferTests = Test; +using AubBatchBufferTests = TestLegacy; static constexpr auto gpuBatchBufferAddr = 0x800400001000ull; // 48-bit GPU address diff --git a/opencl/test/unit_test/aub_tests/xe_hp_core/aub_mem_dump_tests_xe_hp_core.cpp b/opencl/test/unit_test/aub_tests/xe_hp_core/aub_mem_dump_tests_xe_hp_core.cpp index f918c858ef..6949dc2046 100644 --- a/opencl/test/unit_test/aub_tests/xe_hp_core/aub_mem_dump_tests_xe_hp_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hp_core/aub_mem_dump_tests_xe_hp_core.cpp @@ -14,7 +14,7 @@ namespace NEO { extern bool overrideCommandStreamReceiverCreation; -using XeHpCoreAubMemDumpTests = Test; +using XeHpCoreAubMemDumpTests = TestLegacy; XE_HP_CORE_TEST_F(XeHpCoreAubMemDumpTests, GivenCcsThenExpectationsAreMet) { setupAUB(pDevice, aub_stream::ENGINE_CCS); diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_mem_dump_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_mem_dump_tests_xe_hpc_core.cpp index c1f6c4b034..3c94ca6efb 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_mem_dump_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_mem_dump_tests_xe_hpc_core.cpp @@ -12,7 +12,7 @@ #include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -using XeHpcCoreAubMemDumpTests = Test; +using XeHpcCoreAubMemDumpTests = TestLegacy; XE_HPC_CORETEST_F(XeHpcCoreAubMemDumpTests, GivenCcsThenExpectationsAreMet) { setupAUB(pDevice, aub_stream::ENGINE_CCS); diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp index cdf41a6fe9..515ae11620 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp @@ -17,7 +17,7 @@ using namespace NEO; extern const HardwareInfo *defaultHwInfo; -using AUBSimpleKernelStatelessTest = Test>; +using AUBSimpleKernelStatelessTest = TestLegacy>; HWTEST_F(AUBSimpleKernelStatelessTest, givenPrefetchEnabledWhenEnqueuedKernelThenDataIsCorrect) { DebugManagerStateRestore restore; diff --git a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_mem_dump_tests_xe_hpg_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_mem_dump_tests_xe_hpg_core.cpp index a2f92314ff..8ec7efc395 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_mem_dump_tests_xe_hpg_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_mem_dump_tests_xe_hpg_core.cpp @@ -14,7 +14,7 @@ namespace NEO { extern bool overrideCommandStreamReceiverCreation; -using XeHpgCoreAubMemDumpTests = Test; +using XeHpgCoreAubMemDumpTests = TestLegacy; XE_HPG_CORETEST_F(XeHpgCoreAubMemDumpTests, GivenCcsThenExpectationsAreMet) { setupAUB(pDevice, aub_stream::ENGINE_CCS); diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp index 1b85366537..70f7eda4eb 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp @@ -71,7 +71,7 @@ struct Dg2AndLaterDispatchWalkerBasicFixture : public LinearStreamFixture { }; using WalkerDispatchTestDg2AndLater = ::testing::Test; -using Dg2AndLaterDispatchWalkerBasicTest = Test; +using Dg2AndLaterDispatchWalkerBasicTest = TestLegacy; using matcherDG2AndLater = IsAtLeastXeHpgCore; HWTEST2_F(WalkerDispatchTestDg2AndLater, whenProgramComputeWalkerThenApplyL3WAForSpecificPlatformAndRevision, matcherDG2AndLater) { diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp index 8914ec504b..07f21bec40 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp @@ -86,7 +86,7 @@ struct XeHPAndLaterDispatchWalkerBasicFixture : public LinearStreamFixture { std::unique_ptr kernel; }; -using XeHPAndLaterDispatchWalkerBasicTest = Test; +using XeHPAndLaterDispatchWalkerBasicTest = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterDispatchWalkerBasicTest, whenWorkDimOneThenLocalWorkSizeEqualsLocalXDim) { using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER; diff --git a/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp index d5df8cabbb..df5523fd14 100644 --- a/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp @@ -19,7 +19,7 @@ using namespace NEO; -using BarrierTest = Test; +using BarrierTest = TestLegacy; HWTEST_F(BarrierTest, givenCsrWithHigherLevelThenCommandQueueWhenEnqueueBarrierIsCalledThenCommandQueueAlignsToCsrWithoutSendingAnyCommands) { auto pCmdQ = this->pCmdQ; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp index 417c3e0dd7..6cc94290d8 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -372,7 +372,7 @@ HWTEST_F(EnqueueCopyBufferToImageStatefulTest, givenBigBufferWhenCopyingBufferTo EXPECT_EQ(CL_SUCCESS, retVal); } -using OneMipLevelCopyBufferToImageImageTests = Test; +using OneMipLevelCopyBufferToImageImageTests = TestLegacy; HWTEST_F(OneMipLevelCopyBufferToImageImageTests, GivenNotMippedImageWhenCopyingBufferToImageThenDoNotProgramDestinationMipLevel) { auto srcBuffer = std::unique_ptr(createBuffer()); diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp index d4189b3573..672dce8ef8 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp @@ -347,7 +347,7 @@ INSTANTIATE_TEST_CASE_P(MipMapCopyImageTest_GivenImagesWithNonZeroMipLevelsWhenC ::testing::ValuesIn(types), ::testing::ValuesIn(types))); -using OneMipLevelCopyImageImageTests = Test; +using OneMipLevelCopyImageImageTests = TestLegacy; HWTEST_F(OneMipLevelCopyImageImageTests, GivenNotMippedImageWhenCopyingImageThenDoNotProgramSourceAndDestinationMipLevels) { auto dstImage = std::unique_ptr(createImage()); diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp index 99e1df1f4d..3a413dbee0 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -365,7 +365,7 @@ HWTEST_F(EnqueueCopyImageToBufferStatefulTest, givenBufferWhenCopyingImageToBuff EXPECT_EQ(CL_SUCCESS, retVal); } -using OneMipLevelCopyImageToBufferImageTests = Test; +using OneMipLevelCopyImageToBufferImageTests = TestLegacy; HWTEST_F(OneMipLevelCopyImageToBufferImageTests, GivenNotMippedImageWhenCopyingImageToBufferThenDoNotProgramSourceMipLevel) { auto dstBuffer = std::unique_ptr(createBuffer()); diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp index 1fee627681..704665ad78 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp @@ -29,7 +29,7 @@ using namespace NEO; -typedef Test EnqueueFillBufferCmdTests; +typedef TestLegacy EnqueueFillBufferCmdTests; HWTEST_F(EnqueueFillBufferCmdTests, WhenFillingBufferThenTaskCountIsAlignedWithCsr) { //this test case assumes IOQ diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp index c8d5e9e310..1c8fb71931 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp @@ -25,7 +25,7 @@ using namespace NEO; typedef HelloWorldFixture EnqueueKernelFixture; -typedef Test EnqueueKernelTest; +typedef TestLegacy EnqueueKernelTest; TEST_F(EnqueueKernelTest, GivenNullKernelWhenEnqueuingKernelThenInvalidKernelErrorIsReturned) { size_t globalWorkSize[3] = {1, 1, 1}; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp index 9071856858..423d6b75c4 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp @@ -793,7 +793,7 @@ HWTEST_F(EnqueueKernelTests, whenEnqueueingKernelThenCsrCorrectlySetsRequiredThr } typedef HelloWorldFixture EnqueueKernelFixture; -typedef Test EnqueueKernelTest; +typedef TestLegacy EnqueueKernelTest; template class MyCmdQ : public MockCommandQueueHw { diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp index 8b053ba752..652ac7016f 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" typedef HelloWorldFixture EnqueueKernelFixture; -typedef Test EnqueueKernelTest; +typedef TestLegacy EnqueueKernelTest; HWTEST_F(EnqueueKernelTest, givenCsrInBatchingModeWhenFinishIsCalledThenBatchesSubmissionsAreFlushed) { auto mockCsr = new MockCsrHw2(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); diff --git a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp index b03959b686..23296f0cd3 100644 --- a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp @@ -18,7 +18,7 @@ using namespace NEO; -using MarkerTest = Test; +using MarkerTest = TestLegacy; HWTEST_F(MarkerTest, GivenCsrAndCmdqWithSameTaskLevelWhenEnqueingMarkerThenPipeControlIsAdded) { typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; diff --git a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp index 7ec38ce02b..2a53ccb5df 100644 --- a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp @@ -33,7 +33,7 @@ class MigrateMemObjectsFixture } }; -typedef Test MigrateMemObjectsTest; +typedef TestLegacy MigrateMemObjectsTest; TEST_F(MigrateMemObjectsTest, GivenNullEventWhenMigratingEventsThenSuccessIsReturned) { diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp index 142c31a199..c93ec455d6 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -632,7 +632,7 @@ HWTEST_F(EnqueueReadWriteBufferRectDispatch, givenOffsetResultingInMisalignedPtr } } -using NegativeFailAllocationTest = Test; +using NegativeFailAllocationTest = TestLegacy; HWTEST_F(NegativeFailAllocationTest, givenEnqueueReadBufferRectWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp index eab3648819..b2df099a2a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp @@ -720,7 +720,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenEnqueueReadBufferNonBlockingWhenAUBDump EXPECT_FALSE(srcBuffer->forceDisallowCPUCopy); } -using NegativeFailAllocationTest = Test; +using NegativeFailAllocationTest = TestLegacy; HWTEST_F(NegativeFailAllocationTest, givenEnqueueReadBufferWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index e13b9abb20..f27edfecc4 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -1036,7 +1036,7 @@ HWTEST_P(MipMapReadImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalled INSTANTIATE_TEST_CASE_P(MipMapReadImageTest_GivenImageWithMipLevelNonZeroWhenWriteImageIsCalledThenProperMipLevelIsSet, MipMapReadImageTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); -using NegativeFailAllocationTest = Test; +using NegativeFailAllocationTest = TestLegacy; HWTEST_F(NegativeFailAllocationTest, givenEnqueueWriteImageWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; @@ -1063,7 +1063,7 @@ HWTEST_F(NegativeFailAllocationTest, givenEnqueueWriteImageWhenHostPtrAllocation EXPECT_EQ(CL_OUT_OF_RESOURCES, retVal); } -using OneMipLevelReadImageTests = Test; +using OneMipLevelReadImageTests = TestLegacy; HWTEST_F(OneMipLevelReadImageTests, GivenNotMippedImageWhenReadingImageThenDoNotProgramSourceMipLevel) { auto queue = createQueue(); diff --git a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp index 1d54dd3ccd..849e3faf55 100644 --- a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using ResourceBarrierTest = Test; +using ResourceBarrierTest = TestLegacy; HWTEST_F(ResourceBarrierTest, givenNullArgsAndHWCommandQueueWhenEnqueueResourceBarrierCalledThenCorrectStatusReturned) { cl_resource_barrier_descriptor_intel descriptor{}; diff --git a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp index f39007cdf9..bd05178494 100644 --- a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp @@ -133,7 +133,7 @@ struct EnqueueThreadingFixture : public ClDeviceFixture { } }; -typedef Test EnqueueThreading; +typedef TestLegacy EnqueueThreading; struct EnqueueThreadingImage : EnqueueThreading { void SetUp() override { diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp index 20b9115b56..d51f05dd18 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp @@ -631,7 +631,7 @@ HWTEST_F(EnqueueReadWriteBufferRectDispatch, givenOffsetResultingInMisalignedPtr } } -using NegativeFailAllocationTest = Test; +using NegativeFailAllocationTest = TestLegacy; HWTEST_F(NegativeFailAllocationTest, givenEnqueueWriteBufferRectWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp index ad5c54d9a7..29ce25c87c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp @@ -505,7 +505,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenEnqueueWriteBufferCalledWhenLockedPtrI EXPECT_EQ(0u, memoryManager.unlockResourceCalled); } -using NegativeFailAllocationTest = Test; +using NegativeFailAllocationTest = TestLegacy; HWTEST_F(NegativeFailAllocationTest, givenEnqueueWriteBufferWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index bb67e74822..28cc8f2994 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -514,7 +514,7 @@ HWTEST_P(MipMapWriteImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalle INSTANTIATE_TEST_CASE_P(MipMapWriteImageTest_GivenImageWithMipLevelNonZeroWhenReadImageIsCalledThenProperMipLevelIsSet, MipMapWriteImageTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); -using NegativeFailAllocationTest = Test; +using NegativeFailAllocationTest = TestLegacy; HWTEST_F(NegativeFailAllocationTest, givenEnqueueReadImageWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; @@ -541,7 +541,7 @@ HWTEST_F(NegativeFailAllocationTest, givenEnqueueReadImageWhenHostPtrAllocationC EXPECT_EQ(CL_OUT_OF_RESOURCES, retVal); } -using OneMipLevelWriteImageTests = Test; +using OneMipLevelWriteImageTests = TestLegacy; HWTEST_F(OneMipLevelWriteImageTests, GivenNotMippedImageWhenWritingImageThenDoNotProgramDestinationMipLevel) { auto queue = createQueue(); diff --git a/opencl/test/unit_test/command_queue/finish_tests.cpp b/opencl/test/unit_test/command_queue/finish_tests.cpp index e03de7d82f..50f6943258 100644 --- a/opencl/test/unit_test/command_queue/finish_tests.cpp +++ b/opencl/test/unit_test/command_queue/finish_tests.cpp @@ -41,7 +41,7 @@ struct FinishFixture : public ClDeviceFixture, } }; -typedef Test FinishTest; +typedef TestLegacy FinishTest; HWTEST_F(FinishTest, GivenCsGreaterThanCqWhenFinishIsCalledThenPipeControlIsNotAdded) { typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; diff --git a/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp b/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp index 01be2012fd..0e50353075 100644 --- a/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp +++ b/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp @@ -24,7 +24,7 @@ using namespace NEO; typedef HelloWorldFixture EnqueueKernelFixture; -typedef Test EnqueueKernelTest; +typedef TestLegacy EnqueueKernelTest; TEST_F(EnqueueKernelTest, givenKernelWithSharedObjArgsWhenEnqueueIsCalledThenResetPatchAddress) { diff --git a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp index 1ba76d7204..6f56dcb14f 100644 --- a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,7 +19,7 @@ using namespace NEO; -class ZeroSizeEnqueueHandlerTest : public Test { +class ZeroSizeEnqueueHandlerTest : public TestLegacy { public: MockContext context; cl_int retVal; 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 c5ae8f9ddb..8d043c219b 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 = Test; +using ClCommandStreamReceiverTests = TestLegacy; HWTEST_F(ClCommandStreamReceiverTests, givenCommandStreamReceiverWhenFenceAllocationIsRequiredAndCreateGlobalFenceAllocationIsCalledThenFenceAllocationIsAllocated) { RAIIHwHelperFactory> hwHelperBackup{pDevice->getHardwareInfo().platform.eRenderCoreFamily}; diff --git a/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp index 0db68dbe6a..17df3f1282 100644 --- a/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp @@ -18,7 +18,7 @@ using namespace NEO; -using ClTbxCommandStreamTests = Test; +using ClTbxCommandStreamTests = TestLegacy; HWTEST_F(ClTbxCommandStreamTests, givenTbxCsrWhenDispatchBlitEnqueueThenProcessCorrectly) { DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableBlitterOperationsSupport.set(1); 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 79d1707483..a639a03c76 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 = Test; +using CommandParse = TestLegacy; HWTEST_F(CommandParse, WhenGeneratingCommandBufferThenIsNotNull) { typedef typename FamilyType::PARSE PARSE; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp index e7573ad14f..afe8e95d68 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -1019,7 +1019,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, GivenBothCsWhenFlushingTaskThenCha EXPECT_EQ(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT, bbs->getAddressSpaceIndicator()); } -typedef Test CommandStreamReceiverCQFlushTaskTests; +typedef TestLegacy CommandStreamReceiverCQFlushTaskTests; HWTEST_F(CommandStreamReceiverCQFlushTaskTests, WhenGettingCsThenReturnCsWithEnoughSize) { CommandQueueHw commandQueue(nullptr, pClDevice, 0, false); auto &commandStreamReceiver = commandQueue.getGpgpuCommandStreamReceiver(); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp index aa7b3be262..1d2ff014e2 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp @@ -508,7 +508,7 @@ HWTEST_F(CommandStreamReceiverFlushTests, WhenAddingBatchBufferEndThenBatchBuffe ptrOffset(commandStream.getCpuBase(), usedPrevious)); EXPECT_NE(nullptr, batchBufferEnd); } -typedef Test CommandStreamReceiverHwTest; +typedef TestLegacy CommandStreamReceiverHwTest; HWTEST_F(CommandStreamReceiverHwTest, givenCsrHwWhenTypeIsCheckedThenCsrHwIsReturned) { auto csr = std::unique_ptr(CommandStreamReceiverHw::create(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_3_tests.cpp index c25a5efe77..c05bf5f87a 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_3_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_3_tests.cpp @@ -19,7 +19,7 @@ struct MockScratchSpaceController : ScratchSpaceControllerBase { using ScratchSpaceControllerBase::ScratchSpaceControllerBase; }; -using ScratchSpaceControllerTest = Test; +using ScratchSpaceControllerTest = TestLegacy; TEST_F(ScratchSpaceControllerTest, whenScratchSpaceControllerIsDestroyedThenItReleasePrivateScratchSpaceAllocation) { MockScratchSpaceController scratchSpaceController(pDevice->getRootDeviceIndex(), *pDevice->getExecutionEnvironment(), *pDevice->getGpgpuCommandStreamReceiver().getInternalAllocationStorage()); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h index 23b3638149..cbb5aba91e 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h @@ -11,15 +11,15 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" using namespace NEO; -struct BcsTests : public Test { +struct BcsTests : public TestLegacy { void SetUp() override { - Test::SetUp(); + TestLegacy::SetUp(); context = std::make_unique(pClDevice); } void TearDown() override { context.reset(); - Test::TearDown(); + TestLegacy::TearDown(); } std::optional flushBcsTask(CommandStreamReceiver *bcsCsr, const BlitProperties &blitProperties, bool blocking, Device &device) { 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 9532426f97..9fc2e51c8a 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 @@ -171,7 +171,7 @@ struct CommandStreamReceiverWithAubDumpTest : public ::testing::TestWithParam, DeviceFixture { +struct CommandStreamReceiverWithAubDumpSimpleTest : TestLegacy, DeviceFixture { void SetUp() override { DeviceFixture::SetUp(); MockAubCenterFixture::SetUp(); diff --git a/opencl/test/unit_test/context/context_negative_tests.cpp b/opencl/test/unit_test/context/context_negative_tests.cpp index ba40dda54f..9f999707be 100644 --- a/opencl/test/unit_test/context/context_negative_tests.cpp +++ b/opencl/test/unit_test/context/context_negative_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,7 +21,7 @@ using namespace NEO; //////////////////////////////////////////////////////////////////////////////// -typedef Test ContextFailureInjection; +typedef TestLegacy ContextFailureInjection; TEST_F(ContextFailureInjection, GivenFailedAllocationInjectionWhenCreatingContextThenOutOfHostMemoryErrorIsReturned) { auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(nullptr)); diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index c5ef320d9c..3ab0fbdfab 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -35,7 +35,7 @@ using namespace NEO; -typedef Test DeviceTest; +typedef TestLegacy DeviceTest; TEST_F(DeviceTest, givenDeviceWhenGetProductAbbrevThenReturnsHardwarePrefix) { const auto productAbbrev = pDevice->getProductAbbrev(); diff --git a/opencl/test/unit_test/fixtures/cl_preemption_fixture.h b/opencl/test/unit_test/fixtures/cl_preemption_fixture.h index 3d3d7fb46f..3ba3638908 100644 --- a/opencl/test/unit_test/fixtures/cl_preemption_fixture.h +++ b/opencl/test/unit_test/fixtures/cl_preemption_fixture.h @@ -24,7 +24,7 @@ struct KernelInfo; struct WorkaroundTable; using PreemptionEnqueueKernelFixture = HelloWorldFixture; -using PreemptionEnqueueKernelTest = Test; +using PreemptionEnqueueKernelTest = TestLegacy; } // namespace NEO class DevicePreemptionTests : public ::testing::Test { diff --git a/opencl/test/unit_test/fixtures/hello_world_fixture.h b/opencl/test/unit_test/fixtures/hello_world_fixture.h index 1c278f84b4..a4dd6eaf2b 100644 --- a/opencl/test/unit_test/fixtures/hello_world_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_fixture.h @@ -128,7 +128,7 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, }; template -struct HelloWorldTest : Test> { +struct HelloWorldTest : TestLegacy> { }; template diff --git a/opencl/test/unit_test/fixtures/kernel_arg_fixture.h b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h index c9a1aa10f3..5f1d6ddedd 100644 --- a/opencl/test/unit_test/fixtures/kernel_arg_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h @@ -27,7 +27,7 @@ namespace iOpenCL { struct SKernelBinaryHeaderCommon; } -class KernelImageArgTest : public Test { +class KernelImageArgTest : public TestLegacy { public: KernelImageArgTest() { } diff --git a/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp index a298c40339..ec17c9bad2 100644 --- a/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using EhlTest = Test; +using EhlTest = TestLegacy; EHLTEST_F(EhlTest, givenDeviceIdWhenAskingForSimulationThenReturnValidValue) { unsigned short ehlSimulationIds[2] = { diff --git a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp index ca2a305f1c..b731fd558a 100644 --- a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp @@ -19,7 +19,7 @@ namespace NEO { -using Gen11EnqueueTest = Test; +using Gen11EnqueueTest = TestLegacy; GEN11TEST_F(Gen11EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKernelIsSubmittedThenDefaultPolicyIsProgrammed) { MockContext mc; CommandQueueHw cmdQ{&mc, pClDevice, 0, false}; diff --git a/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp index e6d1045534..61ddc4ee69 100644 --- a/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using IcllpTest = Test; +using IcllpTest = TestLegacy; ICLLPTEST_F(IcllpTest, givenIcllpWhenSlmSizeIsRequiredThenReturnCorrectValue) { EXPECT_EQ(64u, pDevice->getHardwareInfo().capabilityTable.slmSize); diff --git a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp index 2dd8c07e9c..ee874fc07c 100644 --- a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using Gen11KernelTest = Test; +using Gen11KernelTest = TestLegacy; GEN11TEST_F(Gen11KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsTrue) { MockKernelWithInternals mockKernel(*pClDevice); auto retVal = mockKernel.mockKernel->Kernel::canTransformImages(); diff --git a/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp index b44c042079..8c28ab1eae 100644 --- a/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using LkfTest = Test; +using LkfTest = TestLegacy; LKFTEST_F(LkfTest, givenLkfWhenSlmSizeIsRequiredThenReturnCorrectValue) { EXPECT_EQ(64u, pDevice->getHardwareInfo().capabilityTable.slmSize); diff --git a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp index 21f2779af7..cbf63f06a7 100644 --- a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp @@ -16,7 +16,7 @@ using namespace NEO; -typedef Test Gen11SamplerTest; +typedef TestLegacy Gen11SamplerTest; GEN11TEST_F(Gen11SamplerTest, WhenAppendingSamplerStateParamsThenStateIsNotChanged) { typedef typename FamilyType::SAMPLER_STATE SAMPLER_STATE; diff --git a/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp index 68612285b8..f3548b28f8 100644 --- a/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using Gen11TbxCommandStreamReceiverTests = Test; +using Gen11TbxCommandStreamReceiverTests = TestLegacy; GEN11TEST_F(Gen11TbxCommandStreamReceiverTests, whenAskedForPollForCompletionParametersThenReturnCorrectValues) { class MyMockTbxHw : public TbxCommandStreamReceiverHw { diff --git a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp index c3bfe97aea..0b4fce3369 100644 --- a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp @@ -15,7 +15,7 @@ using namespace NEO; -typedef Test Gen11DeviceCaps; +typedef TestLegacy Gen11DeviceCaps; GEN11TEST_F(Gen11DeviceCaps, GivenDefaultWhenCheckingPreemptionModeThenMidThreadIsReturned) { EXPECT_TRUE(PreemptionMode::MidThread == pDevice->getHardwareInfo().capabilityTable.defaultPreemptionMode); diff --git a/opencl/test/unit_test/gen11/test_sample_gen11.cpp b/opencl/test/unit_test/gen11/test_sample_gen11.cpp index 567586321b..aa407aaf1f 100644 --- a/opencl/test/unit_test/gen11/test_sample_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_sample_gen11.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test Gen11OnlyTeset; +typedef TestLegacy Gen11OnlyTeset; GEN11TEST_F(Gen11OnlyTeset, WhenGettingRenderCoreFamilyThenGen11CoreIsReturned) { EXPECT_EQ(IGFX_GEN11_CORE, pDevice->getRenderCoreFamily()); diff --git a/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp b/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp index ed0376f0c0..7efe8cf9ec 100644 --- a/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp +++ b/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using AdlpUsDeviceIdTest = Test; +using AdlpUsDeviceIdTest = TestLegacy; ADLPTEST_F(AdlpUsDeviceIdTest, GivenNonZeroIdThenIsSimulationIsTrue) { unsigned short simulationIds[] = { diff --git a/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp b/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp index cacc28f56d..7903edabe4 100644 --- a/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp +++ b/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using AdlsUsDeviceIdTest = Test; +using AdlsUsDeviceIdTest = TestLegacy; ADLSTEST_F(AdlsUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) { unsigned short adlsSimulationIds[1] = { diff --git a/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp index 3400a72366..891a49dcf7 100644 --- a/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using Dg1DeviceCaps = Test; +using Dg1DeviceCaps = TestLegacy; DG1TEST_F(Dg1DeviceCaps, givenDg1WhenCheckSupportCacheFlushAfterWalkerThenFalse) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.supportCacheFlushAfterWalker); diff --git a/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl index 5d00262b53..f9634e697b 100644 --- a/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl @@ -14,7 +14,7 @@ using namespace NEO; -using Gen12LpKernelTest = Test; +using Gen12LpKernelTest = TestLegacy; GEN12LPTEST_F(Gen12LpKernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsFalse) { MockKernelWithInternals mockKernel(*pClDevice); auto retVal = mockKernel.mockKernel->Kernel::canTransformImages(); diff --git a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl index 2264d391dc..db79c9773e 100644 --- a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,7 +16,7 @@ using namespace NEO; -typedef Test Gen12LpSamplerTest; +typedef TestLegacy Gen12LpSamplerTest; HWTEST2_F(Gen12LpSamplerTest, givenTglLpSamplerWhenUsingDefaultFilteringAndAppendSamplerStateParamsThenDisableLowQualityFilter, IsTGLLP) { EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); diff --git a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl index 8b5a7b4fc1..088e2e40c1 100644 --- a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ using namespace NEO; -using Gen12LPTbxCommandStreamReceiverTests = Test; +using Gen12LPTbxCommandStreamReceiverTests = TestLegacy; GEN12LPTEST_F(Gen12LPTbxCommandStreamReceiverTests, givenNullPtrGraphicsAlloctionWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { auto tbxCsr = std::make_unique>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); diff --git a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl index 01830d4110..f4712bc34c 100644 --- a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test Gen12LpDeviceCaps; +typedef TestLegacy Gen12LpDeviceCaps; HWTEST2_F(Gen12LpDeviceCaps, WhenCheckingExtensionStringThenFp64IsNotSupported, IsTGLLP) { const auto &caps = pClDevice->getDeviceInfo(); @@ -113,7 +113,7 @@ GEN12LPTEST_F(Gen12LpDeviceCaps, givenGen12LpDeviceWhenCheckingPipesSupportThenF EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.supportsPipes); } -using TglLpUsDeviceIdTest = Test; +using TglLpUsDeviceIdTest = TestLegacy; HWTEST2_F(TglLpUsDeviceIdTest, WhenCheckingSimulationCapThenResultIsCorrect, IsTGLLP) { unsigned short tglLpSimulationIds[2] = { diff --git a/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl index c0d491e1c5..7a35358979 100644 --- a/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,13 +11,13 @@ using namespace NEO; -typedef Test TigerlakeLpOnlyTest; +typedef TestLegacy TigerlakeLpOnlyTest; HWTEST2_F(TigerlakeLpOnlyTest, WhenGettingHardwareInfoThenProductFamilyIsTigerlakeLp, IsTGLLP) { EXPECT_EQ(IGFX_TIGERLAKE_LP, pDevice->getHardwareInfo().platform.eProductFamily); } -typedef Test Gen12LpOnlyTeset; +typedef TestLegacy Gen12LpOnlyTeset; GEN12LPTEST_F(Gen12LpOnlyTeset, WhenGettingRenderCoreFamilyThenGen12lpCoreIsReturned) { EXPECT_NE(IGFX_GEN9_CORE, pDevice->getRenderCoreFamily()); diff --git a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp index 180f0b2a00..dd26a24ea9 100644 --- a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using Gen8KernelTest = Test; +using Gen8KernelTest = TestLegacy; GEN8TEST_F(Gen8KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsFalse) { MockKernelWithInternals mockKernel(*pClDevice); auto retVal = mockKernel.mockKernel->Kernel::canTransformImages(); diff --git a/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp index d847610154..80e46a1e87 100644 --- a/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using Gen8ClDeviceCaps = Test; +using Gen8ClDeviceCaps = TestLegacy; GEN8TEST_F(Gen8ClDeviceCaps, WhenCheckingExtensionStringThenFp64IsSupported) { const auto &caps = pClDevice->getDeviceInfo(); diff --git a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp index a4ddc62147..1f6708a80c 100644 --- a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using Gen8PlatformCaps = Test; +using Gen8PlatformCaps = TestLegacy; GEN8TEST_F(Gen8PlatformCaps, WhenCheckingExtensionStringThenFp64IsSupported) { const auto &caps = pPlatform->getPlatformInfo(); diff --git a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp index e0f55ac258..a513bdc632 100644 --- a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test DeviceTest; +typedef TestLegacy DeviceTest; BXTTEST_F(DeviceTest, givenBxtDeviceWhenAskedForProflingTimerResolutionThen52IsReturned) { auto resolution = pDevice->getProfilingTimerResolution(); diff --git a/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp index 8181a1613e..2050f251be 100644 --- a/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test BxtDeviceCaps; +typedef TestLegacy BxtDeviceCaps; BXTTEST_F(BxtDeviceCaps, WhenCheckingProfilingTimerResolutionThenCorrectResolutionIsReturned) { const auto &caps = pDevice->getDeviceInfo(); @@ -45,7 +45,7 @@ BXTTEST_F(BxtDeviceCaps, WhenCheckFtrSupportsInteger64BitAtomicsThenReturnFalse) EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); } -typedef Test BxtUsDeviceIdTest; +typedef TestLegacy BxtUsDeviceIdTest; BXTTEST_F(BxtUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) { unsigned short bxtSimulationIds[3] = { diff --git a/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp index fffbcb512b..332c5af5f9 100644 --- a/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp +++ b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test BxtDeviceCapsWindows; +typedef TestLegacy BxtDeviceCapsWindows; BXTTEST_F(BxtDeviceCapsWindows, GivenWhenGettingKmdNotifyPropertiesThenItIsDisabled) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify); diff --git a/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp index 1f85b77244..b68184b9e9 100644 --- a/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test CflDeviceCaps; +typedef TestLegacy CflDeviceCaps; CFLTEST_F(CflDeviceCaps, GivenCFLWhenCheckftr64KBpagesThenTrue) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftr64KBpages); diff --git a/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp index 8b5cd4ca54..a237b01b1d 100644 --- a/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp +++ b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test CflDeviceCapsWindows; +typedef TestLegacy CflDeviceCapsWindows; CFLTEST_F(CflDeviceCapsWindows, GivenWhenGettingKmdNotifyPropertiesThenItIsDisabled) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify); diff --git a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp index 859893939d..bd5e868d22 100644 --- a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp @@ -19,7 +19,7 @@ namespace NEO { -using Gen9EnqueueTest = Test; +using Gen9EnqueueTest = TestLegacy; GEN9TEST_F(Gen9EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKernelIsSubmittedThenRoundRobinPolicyIsProgrammed) { MockContext mc; CommandQueueHw cmdQ{&mc, pClDevice, 0, false}; diff --git a/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp index 5c78d25673..dac322d493 100644 --- a/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test Gen9DeviceCaps; +typedef TestLegacy Gen9DeviceCaps; GLKTEST_F(Gen9DeviceCaps, WhenCheckingProfilingTimerResolutionThenCorrectResolutionIsReturned) { const auto &caps = pDevice->getDeviceInfo(); @@ -36,7 +36,7 @@ GLKTEST_F(Gen9DeviceCaps, GlkIs32BitOsAllocatorAvailable) { } } -typedef Test GlkUsDeviceIdTest; +typedef TestLegacy GlkUsDeviceIdTest; GLKTEST_F(GlkUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) { unsigned short glkSimulationIds[3] = { diff --git a/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp index a23eab67fd..6a2947c513 100644 --- a/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp +++ b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test GlkDeviceCapsWindows; +typedef TestLegacy GlkDeviceCapsWindows; GLKTEST_F(GlkDeviceCapsWindows, WhenCheckingKmdNotifyPropertiesThenKmdNotifyIsEnabledCorrectly) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify); diff --git a/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp index 3cbf1f2f0a..d6d0171c32 100644 --- a/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp @@ -11,7 +11,7 @@ using namespace NEO; -typedef Test KblDeviceCaps; +typedef TestLegacy KblDeviceCaps; KBLTEST_F(KblDeviceCaps, GivenKBLWhenCheckftr64KBpagesThenTrue) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftr64KBpages); diff --git a/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp index 1346a3129d..9dfdae19a3 100644 --- a/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp +++ b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp @@ -11,7 +11,7 @@ using namespace NEO; -typedef Test KblDeviceCapsWindows; +typedef TestLegacy KblDeviceCapsWindows; KBLTEST_F(KblDeviceCapsWindows, GivenWhenGettingKmdNotifyPropertiesThenItIsDisabled) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify); diff --git a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp index a0c69efc06..648642347c 100644 --- a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp @@ -16,7 +16,7 @@ using namespace NEO; -using Gen9KernelTest = Test; +using Gen9KernelTest = TestLegacy; GEN9TEST_F(Gen9KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsTrue) { MockKernelWithInternals mockKernel(*pClDevice); auto retVal = mockKernel.mockKernel->Kernel::canTransformImages(); diff --git a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp index 0d21787c3a..0cb8e50c19 100644 --- a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp @@ -16,7 +16,7 @@ using namespace NEO; -typedef Test Gen9SamplerTest; +typedef TestLegacy Gen9SamplerTest; GEN9TEST_F(Gen9SamplerTest, WhenAppendingSamplerStateParamsThenStateIsNotChanged) { typedef typename FamilyType::SAMPLER_STATE SAMPLER_STATE; diff --git a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp index 17be7e7f9e..83460330f2 100644 --- a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test DeviceTest; +typedef TestLegacy DeviceTest; SKLTEST_F(DeviceTest, givenSklDeviceWhenAskedForProflingTimerResolutionThen83IsReturned) { auto resolution = pDevice->getProfilingTimerResolution(); diff --git a/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp index 630dc5fb8e..ca79871753 100644 --- a/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test SklDeviceCaps; +typedef TestLegacy SklDeviceCaps; SKLTEST_F(SklDeviceCaps, WhenCheckingProfilingTimerResolutionThenCorrectResolutionIsReturned) { const auto &caps = pDevice->getDeviceInfo(); @@ -35,7 +35,7 @@ SKLTEST_F(SklDeviceCaps, WhenCheckingCapabilitiesThenSvmIsEnabled) { EXPECT_EQ(expectedCaps, caps.svmCapabilities); } -typedef Test SklUsDeviceIdTest; +typedef TestLegacy SklUsDeviceIdTest; SKLTEST_F(SklUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) { unsigned short sklSimulationIds[6] = { diff --git a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp index e237977c15..72afa8017e 100644 --- a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test SkylakeOnlyTest; +typedef TestLegacy SkylakeOnlyTest; SKLTEST_F(SkylakeOnlyTest, WhenGettingProductFamilyThenSkylakeIsReturned) { EXPECT_EQ(IGFX_SKYLAKE, pDevice->getHardwareInfo().platform.eProductFamily); diff --git a/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp index 3713a3eca4..467c65300d 100644 --- a/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp +++ b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test SklDeviceCapsWindows; +typedef TestLegacy SklDeviceCapsWindows; SKLTEST_F(SklDeviceCapsWindows, GivenWhenGettingKmdNotifyPropertiesThenItIsDisabled) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify); diff --git a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp index c01f8d8e60..c93082871a 100644 --- a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp @@ -15,7 +15,7 @@ using namespace NEO; -typedef Test Gen9DeviceCaps; +typedef TestLegacy Gen9DeviceCaps; GEN9TEST_F(Gen9DeviceCaps, WhenCheckingExtensionStringThenFp64CorrectlyReported) { const auto &caps = pClDevice->getDeviceInfo(); diff --git a/opencl/test/unit_test/gen9/test_sample_gen9.cpp b/opencl/test/unit_test/gen9/test_sample_gen9.cpp index 4e660e7c90..04e866ab13 100644 --- a/opencl/test/unit_test/gen9/test_sample_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_sample_gen9.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef Test Gen9OnlyTest; +typedef TestLegacy Gen9OnlyTest; GEN9TEST_F(Gen9OnlyTest, WhenGettingRenderCoreFamilyThenGen9CoreIsReturned) { EXPECT_EQ(IGFX_GEN9_CORE, pDevice->getRenderCoreFamily()); diff --git a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp index 1045cdc5d4..7e684acfd2 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -35,7 +35,7 @@ #include "GL/glext.h" #include "igfxfmid.h" -using MockExecutionEnvironmentGmmFixtureTest = Test; +using MockExecutionEnvironmentGmmFixtureTest = TestLegacy; using namespace ::testing; diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index 8130084d5c..00d575ffea 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -218,7 +218,7 @@ class GTPinFixture : public ContextFixture, public MemoryManagementFixture { DebugManagerStateRestore restore; }; -typedef Test GTPinTests; +typedef TestLegacy GTPinTests; TEST_F(GTPinTests, givenInvalidArgumentsThenGTPinInitFails) { bool isInitialized = false; @@ -2402,7 +2402,7 @@ class GTPinFixtureWithLocalMemory : public GTPinFixture { DebugManagerStateRestore restore; }; -using GTPinTestsWithLocalMemory = Test; +using GTPinTestsWithLocalMemory = TestLegacy; TEST_F(GTPinTestsWithLocalMemory, whenPlatformHasNoSvmSupportThenGtPinBufferCantBeAllocatedInSharedMemory) { DebugManager.flags.GTPinAllocateBufferInSharedMemory.set(-1); diff --git a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp index a255860182..44921f206c 100644 --- a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using AubHelperHwTestXeHPAndLater = Test; +using AubHelperHwTestXeHPAndLater = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, AubHelperHwTestXeHPAndLater, givenAubHelperWhenGetDataHintForPml4EntryIsCalledThenTracePpgttLevel4IsReturned) { AubHelperHw aubHelper(true); diff --git a/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp index 4a204a8467..d7fc3fa2d0 100644 --- a/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp +++ b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp @@ -69,7 +69,7 @@ class DispatchInfoBuilderFixture : public ContextFixture, public ClDeviceFixture char pCrossThreadData[128]; }; -typedef Test DispatchInfoBuilderTest; +typedef TestLegacy DispatchInfoBuilderTest; template class DispatchInfoBuilderMock : DispatchInfoBuilder { diff --git a/opencl/test/unit_test/helpers/dispatch_info_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_tests.cpp index d2e3c47dc1..65689e95ea 100644 --- a/opencl/test/unit_test/helpers/dispatch_info_tests.cpp +++ b/opencl/test/unit_test/helpers/dispatch_info_tests.cpp @@ -53,7 +53,7 @@ class DispatchInfoFixture : public ContextFixture, public ClDeviceFixture { MockKernel *pKernel = nullptr; }; -typedef Test DispatchInfoTest; +typedef TestLegacy DispatchInfoTest; TEST_F(DispatchInfoTest, GivenNoGeometryWhenDispatchInfoIsCreatedThenValuesAreSetCorrectly) { std::unique_ptr dispatchInfo(new DispatchInfo); diff --git a/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp index 7f2d7095e8..dde13b1821 100644 --- a/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using EngineNodeHelperTestsXeHPAndLater = ::Test; +using EngineNodeHelperTestsXeHPAndLater = ::TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, EngineNodeHelperTestsXeHPAndLater, WhenGetBcsEngineTypeIsCalledThenBcsEngineIsReturned) { const auto hwInfo = pDevice->getHardwareInfo(); diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp index c1580222f5..bc474189cf 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp @@ -1196,7 +1196,7 @@ TEST_F(HardwareCommandsTest, givenCacheFlushAfterWalkerEnabledWhenPlatformNotSup EXPECT_EQ(0U, allocationsForCacheFlush.size()); } -using KernelCacheFlushTests = Test>; +using KernelCacheFlushTests = TestLegacy>; HWTEST_F(KernelCacheFlushTests, givenLocallyUncachedBufferWhenGettingAllocationsForFlushThenEmptyVectorIsReturned) { DebugManagerStateRestore dbgRestore; @@ -1225,7 +1225,7 @@ HWTEST_F(KernelCacheFlushTests, givenLocallyUncachedBufferWhenGettingAllocations clReleaseMemObject(bufferRegular); } -struct HardwareCommandsImplicitArgsTests : Test { +struct HardwareCommandsImplicitArgsTests : TestLegacy { void SetUp() override { ClDeviceFixture::SetUp(); diff --git a/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp b/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp index 3194670ddb..914895931c 100644 --- a/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp +++ b/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp @@ -13,7 +13,7 @@ namespace NEO { -using AlocationHelperTests = Test; +using AlocationHelperTests = TestLegacy; HWTEST_F(AlocationHelperTests, givenLinearStreamTypeWhenUseExternalAllocatorForSshAndDshDisabledThenUse32BitIsFalse) { DebugManagerStateRestore dbgRestorer; diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp index d616a657f4..24697418ef 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp @@ -17,7 +17,7 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" using PipeControlHelperTestsDg2AndLater = ::testing::Test; -using HwHelperTestsDg2AndLater = Test; +using HwHelperTestsDg2AndLater = TestLegacy; HWTEST2_F(PipeControlHelperTestsDg2AndLater, WhenAddingPipeControlWAThenCorrectCommandsAreProgrammed, IsAtLeastXeHpgCore) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp index 996807d365..45c323918f 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp @@ -12,7 +12,7 @@ using namespace NEO; -using HwHelperDg2OrBelowTests = Test; +using HwHelperDg2OrBelowTests = TestLegacy; using isDG2OrBelow = IsAtMostProduct; HWTEST2_F(HwHelperDg2OrBelowTests, WhenGettingIsKmdMigrationSupportedThenFalseIsReturned, isDG2OrBelow) { diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp index b3635aa843..233c8f0f59 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp @@ -25,7 +25,7 @@ #include "engine_node.h" -using HwHelperTestXeHPAndLater = Test; +using HwHelperTestXeHPAndLater = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, WhenGettingMaxBarriersPerSliceThen32IsReturned) { auto &helper = HwHelper::get(renderCoreFamily); diff --git a/opencl/test/unit_test/kernel/cache_flush_tests.inl b/opencl/test/unit_test/kernel/cache_flush_tests.inl index e548ed18c8..9b6723f3df 100644 --- a/opencl/test/unit_test/kernel/cache_flush_tests.inl +++ b/opencl/test/unit_test/kernel/cache_flush_tests.inl @@ -203,7 +203,7 @@ class GivenCacheFlushAfterWalkerEnabledWhenProgramGlobalSurfacePresentAndPostSyn }; using EnqueueKernelFixture = HelloWorldFixture; -using EnqueueKernelTest = Test; +using EnqueueKernelTest = TestLegacy; template class GivenCacheFlushAfterWalkerEnabledAndProperSteppingIsSetWhenAllocationRequiresCacheFlushThenFlushCommandPresentAfterWalker : public EnqueueKernelTest { diff --git a/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl b/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl index 3456c3606b..a0061388ed 100644 --- a/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl +++ b/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl @@ -235,7 +235,7 @@ class GivenCacheFlushAfterWalkerEnabledWhenProgramGlobalSurfacePresentAndPostSyn }; using EnqueueKernelFixture = HelloWorldFixture; -using EnqueueKernelTest = Test; +using EnqueueKernelTest = TestLegacy; template class GivenCacheFlushAfterWalkerEnabledWhenAllocationRequiresCacheFlushThenFlushCommandPresentAfterWalker : public EnqueueKernelTest { diff --git a/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp index 0584a7959c..d76c066ab4 100644 --- a/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp +++ b/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -28,7 +28,7 @@ using namespace NEO; -typedef Test KernelArgBufferTest; +typedef TestLegacy KernelArgBufferTest; TEST_F(KernelArgBufferTest, givenSharedBufferWhenSetArgIsCalledThenReportSharedObjUsage) { MockGlSharing glSharing; diff --git a/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp index e17ba408c2..3ad844c7c9 100644 --- a/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp @@ -79,7 +79,7 @@ class KernelArgAcceleratorFixture : public ContextFixture, public ClDeviceFixtur char pCrossThreadData[64]; }; -typedef Test KernelArgAcceleratorTest; +typedef TestLegacy KernelArgAcceleratorTest; TEST_F(KernelArgAcceleratorTest, WhenCreatingVmeAcceleratorThenCorrectKernelArgsAreSet) { cl_int status; diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp index c08de6b6ab..c2ecc43847 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp @@ -29,7 +29,7 @@ using namespace NEO; -struct KernelArgBufferTest : public Test { +struct KernelArgBufferTest : public TestLegacy { struct AllocationTypeHelper { AllocationType allocationType; bool compressed; @@ -770,7 +770,7 @@ class KernelArgBufferFixtureBindless : public KernelArgBufferFixture { const CrossThreadDataOffset bindlessOffset = 0x10; }; -typedef Test KernelArgBufferTestBindless; +typedef TestLegacy KernelArgBufferTestBindless; HWTEST_F(KernelArgBufferTestBindless, givenUsedBindlessBuffersWhenPatchingSurfaceStateOffsetsThenCorrectOffsetIsPatchedInCrossThreadData) { using DataPortBindlessSurfaceExtendedMessageDescriptor = typename FamilyType::DataPortBindlessSurfaceExtendedMessageDescriptor; diff --git a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp index cbc546e713..8e0ac72e6d 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp @@ -73,7 +73,7 @@ class KernelArgPipeFixture : public ContextFixture, public ClDeviceFixture { char pCrossThreadData[64]; }; -typedef Test KernelArgPipeTest; +typedef TestLegacy KernelArgPipeTest; TEST_F(KernelArgPipeTest, GivenValidPipeWhenSettingKernelArgThenPipeAddressIsCorrect) { Pipe *pipe = new MockPipe(pContext); diff --git a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp index 9c48a57d44..b49da672e8 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp @@ -71,7 +71,7 @@ class KernelArgSvmFixture : public ContextFixture, public ClDeviceFixture { char pCrossThreadData[64]; }; -typedef Test KernelArgSvmTest; +typedef TestLegacy KernelArgSvmTest; TEST_F(KernelArgSvmTest, GivenValidSvmPtrWhenSettingKernelArgThenSvmPtrIsCorrect) { const ClDeviceInfo &devInfo = pClDevice->getDeviceInfo(); diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index 97100ebf71..3f23d8f121 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -401,7 +401,7 @@ class KernelFromBinaryTest : public ProgramSimpleFixture { ProgramSimpleFixture::TearDown(); } }; -typedef Test KernelFromBinaryTests; +typedef TestLegacy KernelFromBinaryTests; TEST_F(KernelFromBinaryTests, GivenKernelNumArgsWhenGettingInfoThenNumberOfKernelArgsIsReturned) { CreateProgramFromBinary(pContext, pContext->getDevices(), "kernel_num_args"); @@ -490,9 +490,9 @@ TEST_F(KernelFromBinaryTests, givenArgumentDeclaredAsConstantWhenKernelIsCreated EXPECT_TRUE(pKernelInfo->getArgDescriptorAt(0).isReadOnly()); } -typedef Test KernelPrivateSurfaceTest; -typedef Test KernelGlobalSurfaceTest; -typedef Test KernelConstantSurfaceTest; +typedef TestLegacy KernelPrivateSurfaceTest; +typedef TestLegacy KernelGlobalSurfaceTest; +typedef TestLegacy KernelConstantSurfaceTest; class CommandStreamReceiverMock : public CommandStreamReceiver { typedef CommandStreamReceiver BaseClass; @@ -1052,7 +1052,7 @@ TEST_F(KernelConstantSurfaceTest, givenStatelessKernelWhenKernelIsCreatedThenCon delete kernel; } -typedef Test KernelResidencyTest; +typedef TestLegacy KernelResidencyTest; HWTEST_F(KernelResidencyTest, givenKernelWhenMakeResidentIsCalledThenKernelIsaIsMadeResident) { ASSERT_NE(nullptr, pDevice); @@ -2085,7 +2085,7 @@ HWTEST_F(KernelResidencyTest, WhenMakingArgsResidentThenImageFromImageCheckIsCor EXPECT_EQ(CommandStreamReceiver::SamplerCacheFlushState::samplerCacheFlushBefore, commandStreamReceiver.samplerCacheFlushRequired); } -struct KernelExecutionEnvironmentTest : public Test { +struct KernelExecutionEnvironmentTest : public TestLegacy { void SetUp() override { ClDeviceFixture::SetUp(); @@ -2160,7 +2160,7 @@ TEST_F(KernelExecutionEnvironmentTest, GivenCompiledWorkGroupSizeIsGreaterThanMa this->pKernelInfo->kernelDescriptor.kernelAttributes.requiredWorkgroupSize[2] = oldRequiredWorkGroupSizeZ; } -struct KernelCrossThreadTests : Test { +struct KernelCrossThreadTests : TestLegacy { KernelCrossThreadTests() { } @@ -3043,7 +3043,7 @@ TEST_F(KernelTests, givenKernelWithSimdEqual1WhenKernelCreatedThenMaxWorgGroupSi EXPECT_EQ(kernel->getMaxKernelWorkGroupSize(), maxThreadsPerWG); } -struct KernelLargeGrfTests : Test { +struct KernelLargeGrfTests : TestLegacy { void SetUp() override { ClDeviceFixture::SetUp(); program = std::make_unique(toClDeviceVector(*pClDevice)); @@ -3130,7 +3130,7 @@ HWTEST2_F(KernelConstantSurfaceTest, givenKernelWithConstantSurfaceWhenKernelIsC program.setConstantSurface(nullptr); } -using KernelImplicitArgsTest = Test; +using KernelImplicitArgsTest = TestLegacy; TEST_F(KernelImplicitArgsTest, WhenKernelRequiresImplicitArgsThenImplicitArgsStructIsCreatedAndProperlyInitialized) { auto pKernelInfo = std::make_unique(); pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 32; diff --git a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp index b99b2803c3..3dd4accf97 100644 --- a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp +++ b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp @@ -15,7 +15,7 @@ using namespace NEO; -typedef Test KernelSubstituteTest; +typedef TestLegacy KernelSubstituteTest; TEST_F(KernelSubstituteTest, givenKernelWhenSubstituteKernelHeapWithGreaterSizeThenAllocatesNewKernelAllocation) { MockKernelWithInternals kernel(*pClDevice); diff --git a/opencl/test/unit_test/linux/drm_null_device_tests.cpp b/opencl/test/unit_test/linux/drm_null_device_tests.cpp index 338da90a83..c899541532 100644 --- a/opencl/test/unit_test/linux/drm_null_device_tests.cpp +++ b/opencl/test/unit_test/linux/drm_null_device_tests.cpp @@ -46,7 +46,7 @@ class DrmNullDeviceTestsFixture { DebugManagerStateRestore dbgRestorer; }; -typedef Test DrmNullDeviceTests; +typedef TestLegacy DrmNullDeviceTests; TEST_F(DrmNullDeviceTests, GIVENdrmNullDeviceWHENcallGetDeviceIdTHENreturnProperDeviceId) { int ret = drmNullDevice->queryDeviceIdAndRevision(); diff --git a/opencl/test/unit_test/linux/main_linux_dll.cpp b/opencl/test/unit_test/linux/main_linux_dll.cpp index 22c4e76735..5632c7067c 100644 --- a/opencl/test/unit_test/linux/main_linux_dll.cpp +++ b/opencl/test/unit_test/linux/main_linux_dll.cpp @@ -69,7 +69,7 @@ class DrmTestsFixture { RootDeviceEnvironment *rootDeviceEnvironment = nullptr; }; -typedef Test DrmTests; +typedef TestLegacy DrmTests; void initializeTestedDevice() { for (uint32_t i = 0; deviceDescriptorTable[i].deviceId != 0; i++) { diff --git a/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp b/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp index 7f188b4b4d..120d217eb8 100644 --- a/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp +++ b/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -35,7 +35,7 @@ class DestructorCallbackFixture : public MemoryManagementFixture { cl_int retVal = CL_SUCCESS; }; -typedef Test DestructorCallbackTest; +typedef TestLegacy DestructorCallbackTest; static std::vector calls(32); void CL_CALLBACK callBack1(cl_mem memObj, void *userData) { diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp index 8cb80d7522..510a0acfed 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -58,7 +58,7 @@ using namespace NEO; -typedef Test MemoryAllocatorTest; +typedef TestLegacy MemoryAllocatorTest; TEST(MemoryManagerTest, givenDebugVariableWhenCreatingMemoryManagerThenSetSupportForMultiStorageResources) { DebugManagerStateRestore restore; @@ -1852,7 +1852,7 @@ TEST_F(MemoryAllocatorTest, GivenSizeWhenGmmIsCreatedThenNonNullPointerIsReturne delete gmm; } -typedef Test MemoryManagerWithCsrTest; +typedef TestLegacy MemoryManagerWithCsrTest; TEST_F(MemoryManagerWithCsrTest, GivenAllocationsInHostPtrManagerWhenBiggerOverllapingAllocationIsCreatedAndNothingToCleanThenAbortExecution) { void *cpuPtr1 = (void *)0x100004; @@ -2557,7 +2557,7 @@ TEST(MemoryManagerTest, givenForcedLinearImages3DImageAndProperDescriptorValuesW alignedFree(hostPtr); } -class HeapSelectorTest : public Test { +class HeapSelectorTest : public TestLegacy { public: using BaseClass = ClDeviceFixture; void SetUp() override { diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index fc39479f92..c635585404 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -58,9 +58,9 @@ struct SVMMemoryAllocatorFixture { std::map deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; }; -using SVMMemoryAllocatorTest = Test>; +using SVMMemoryAllocatorTest = TestLegacy>; -using SVMLocalMemoryAllocatorTest = Test>; +using SVMLocalMemoryAllocatorTest = TestLegacy>; TEST_F(SVMMemoryAllocatorTest, whenCreateZeroSizedSVMAllocationThenReturnNullptr) { auto ptr = svmManager->createSVMAlloc(0, {}, rootDeviceIndices, deviceBitfields); diff --git a/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl index ac6f1a50bc..abd68155b4 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ using namespace NEO; namespace ULT { -using clGetDeviceInfoMtTests = Test; +using clGetDeviceInfoMtTests = TestLegacy; TEST_F(clGetDeviceInfoMtTests, GivenMultipleThreadsQueryingDeviceExtensionsWithVersionThenReturnedValuesAreValid) { UltClDeviceFactory deviceFactory{1, 0}; diff --git a/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl index aa992a0bda..13842323f6 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ using namespace NEO; -using clGetPlatformIDsMtTests = Test; +using clGetPlatformIDsMtTests = TestLegacy; namespace ULT { diff --git a/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl index 3ef54ca220..d2b3747e4e 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ using namespace NEO; namespace ULT { -using clGetPlatformInfoMtTests = Test; +using clGetPlatformInfoMtTests = TestLegacy; TEST_F(clGetPlatformInfoMtTests, GivenMultipleThreadsQueryingPlatformExtensionsWithVersionThenReturnedValuesAreValid) { UltClDeviceFactory deviceFactory{1, 0}; diff --git a/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl index 499216fb91..bdab11ae07 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl @@ -18,10 +18,10 @@ using namespace NEO; namespace ULT { -struct IntelTracingMtTest : public Test { +struct IntelTracingMtTest : public TestLegacy { void SetUp() override { DebugManager.flags.CreateMultipleRootDevices.set(maxRootDeviceCount); - Test::SetUp(); + TestLegacy::SetUp(); testedClDevice = pPlatform->getClDevice(rootDeviceIndex); } DebugManagerStateRestore restorer; diff --git a/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp index 19bf22d9b2..266c58775a 100644 --- a/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/cl_drm_memory_manager_tests.cpp @@ -46,7 +46,7 @@ using namespace NEO; -using DrmMemoryManagerTest = Test; +using DrmMemoryManagerTest = TestLegacy; struct ClDrmMemoryManagerTest : public DrmMemoryManagerTest { void SetUp() override { diff --git a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp index 2793dd5f9d..21f866b9ba 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp @@ -97,7 +97,7 @@ class DrmGemCloseWorkerFixture { MockExecutionEnvironment executionEnvironment; }; -typedef Test DrmGemCloseWorkerTests; +typedef TestLegacy DrmGemCloseWorkerTests; TEST_F(DrmGemCloseWorkerTests, WhenClosingGemThenSucceeds) { this->drmMock->gem_close_expected = 1; diff --git a/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp index b72665ae9e..dba576be40 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_va_sharing_tests.cpp @@ -17,7 +17,7 @@ namespace NEO { -using DrmVaSharingTest = Test; +using DrmVaSharingTest = TestLegacy; TEST_F(DrmVaSharingTest, givenDrmMemoryManagerWhenSharedVaSurfaceIsImportedWithDrmPrimeFdToHandleThenDrmPrimeFdCanBeClosed) { mock->ioctl_expected.total = -1; diff --git a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp index 4d861e2aeb..5eb31c5a0c 100644 --- a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp @@ -16,7 +16,7 @@ using namespace NEO; -using FileLoggerTests = Test; +using FileLoggerTests = TestLegacy; TEST_F(FileLoggerTests, GivenLogAllocationMemoryPoolFlagThenLogsCorrectInfo) { std::string testFile = "testfile"; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h index e23b1c4dc3..6eee128ee9 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h @@ -45,7 +45,7 @@ class WddmMemoryManagerFixture : public GdiDllFixture { const uint32_t rootDeviceIndex = 0u; }; -typedef ::Test WddmMemoryManagerTest; +typedef ::TestLegacy WddmMemoryManagerTest; class MockWddmMemoryManagerFixture { public: @@ -90,7 +90,7 @@ class MockWddmMemoryManagerFixture { MockGdi *gdi = nullptr; }; -typedef ::Test WddmMemoryManagerResidencyTest; +typedef ::TestLegacy WddmMemoryManagerResidencyTest; class ExecutionEnvironmentFixture : public ::testing::Test { public: diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index 12425c5fa2..df3c4b3f6b 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -1377,7 +1377,7 @@ class PatchTokenFromBinaryTest : public ProgramSimpleFixture { ProgramSimpleFixture::TearDown(); } }; -using PatchTokenTests = Test; +using PatchTokenTests = TestLegacy; template class CommandStreamReceiverMock : public UltCommandStreamReceiver { @@ -1556,7 +1556,7 @@ class ProgramPatchTokenFromBinaryTest : public ProgramSimpleFixture { ProgramSimpleFixture::TearDown(); } }; -typedef Test ProgramPatchTokenTests; +typedef TestLegacy ProgramPatchTokenTests; TEST(ProgramFromBinaryTests, givenBinaryWithInvalidICBEThenErrorIsReturned) { cl_int retVal = CL_INVALID_BINARY; @@ -1644,7 +1644,7 @@ TEST(ProgramFromBinaryTests, givenEmptyProgramThenErrorIsReturned) { EXPECT_EQ(CL_INVALID_BINARY, retVal); } -using ProgramWithDebugSymbolsTests = Test; +using ProgramWithDebugSymbolsTests = TestLegacy; TEST_F(ProgramWithDebugSymbolsTests, GivenProgramCreatedWithDashGOptionWhenGettingProgramBinariesThenDebugDataIsIncluded) { CreateProgramFromBinary(pContext, pContext->getDevices(), "CopyBuffer_simd16", "-g"); @@ -2969,7 +2969,7 @@ TEST(setProgramSpecializationConstantTest, givenUninitializedCompilerinterfaceWh EXPECT_EQ(CL_OUT_OF_HOST_MEMORY, retVal); } -using ProgramBinTest = Test; +using ProgramBinTest = TestLegacy; TEST_F(ProgramBinTest, givenPrintProgramBinaryProcessingTimeSetWhenBuildProgramThenProcessingTimeIsPrinted) { DebugManagerStateRestore restorer; diff --git a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp index 91c4e8b331..38ef26d814 100644 --- a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp +++ b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp @@ -102,7 +102,7 @@ class SamplerSetArgFixture : public ClDeviceFixture { Sampler *sampler = nullptr; }; -typedef Test SamplerSetArgTest; +typedef TestLegacy SamplerSetArgTest; HWTEST_F(SamplerSetArgTest, WhenSettingKernelArgSamplerThenSamplerStatesAreCorrect) { typedef typename FamilyType::SAMPLER_STATE SAMPLER_STATE; createSampler(); diff --git a/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp b/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp index 77c181d646..8a3ce33be2 100644 --- a/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using XeHPAndLaterSamplerTest = Test; +using XeHPAndLaterSamplerTest = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterSamplerTest, GivenDefaultThenLowQualityFilterIsDisabled) { using SAMPLER_STATE = typename FamilyType::SAMPLER_STATE; diff --git a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp index 59229ef5c7..9b5044ef1e 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp @@ -1238,7 +1238,7 @@ TEST_F(VaSharingTests, givenPlaneArgumentEquals2WithoutNoProperFormatsThenReturn EXPECT_EQ(result, CL_SUCCESS); } -class VaDeviceTests : public Test { +class VaDeviceTests : public TestLegacy { public: VaDeviceTests() { ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false; diff --git a/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp index e6e2a436f2..f79bf6aef3 100644 --- a/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp @@ -15,7 +15,7 @@ using namespace NEO; -typedef Test XE_HP_COREDeviceCaps; +typedef TestLegacy XE_HP_COREDeviceCaps; HWCMDTEST_F(IGFX_XE_HP_CORE, XE_HP_COREDeviceCaps, givenKernelWhenCanTransformImagesIsCalledThenReturnsTrue) { MockKernelWithInternals mockKernel(*pClDevice); diff --git a/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp index 446a5f0786..22866e0b54 100644 --- a/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp @@ -11,7 +11,7 @@ using namespace NEO; -typedef Test XE_HP_COREOnlyTest; +typedef TestLegacy XE_HP_COREOnlyTest; XE_HP_CORE_TEST_F(XE_HP_COREOnlyTest, WhenGettingRenderCoreFamilyThenOnlyXeHpCoreIsReturned) { EXPECT_EQ(IGFX_XE_HP_CORE, pDevice->getRenderCoreFamily()); diff --git a/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl index 9921c70c97..f586170850 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,7 +16,7 @@ using namespace NEO; -typedef Test XeHPSamplerTest; +typedef TestLegacy XeHPSamplerTest; XEHPTEST_F(XeHPSamplerTest, givenXeHPSamplerWhenUsingDefaultFilteringAndAppendSamplerStateParamsThenDisableLowQualityFilter) { EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl index 547cb64141..2b954ae845 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl @@ -14,7 +14,7 @@ using namespace NEO; -typedef Test XeHPUsDeviceIdTest; +typedef TestLegacy XeHPUsDeviceIdTest; XEHPTEST_F(XeHPUsDeviceIdTest, WhenGettingHardwareInfoThenProductFamilyIsXeHpSdv) { EXPECT_EQ(IGFX_XE_HP_SDV, pDevice->getHardwareInfo().platform.eProductFamily); diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl index 900a6f3a34..da844d4471 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl @@ -15,7 +15,7 @@ using namespace NEO; -using XeHPComputeWorkgroupSizeTest = Test; +using XeHPComputeWorkgroupSizeTest = TestLegacy; XEHPTEST_F(XeHPComputeWorkgroupSizeTest, giveXeHpA0WhenKernelIsaIsBelowThresholdAndThereAreNoImageBarriersAndSlmThenSmallWorkgorupSizeIsSelected) { auto program = std::make_unique(toClDeviceVector(*pClDevice)); diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl index cfa27150c9..d89e8eb2d0 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ using namespace NEO; -using XeHPUsDeviceIdTest = Test; +using XeHPUsDeviceIdTest = TestLegacy; HWTEST_EXCLUDE_PRODUCT(SubDeviceTests, givenCCSEngineWhenCallingGetDefaultEngineWithWaThenTheSameEngineIsReturned, IGFX_XE_HP_SDV); 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 b8e513a917..2a05217198 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 = Test; +using XeHpcCoreBuiltInTests = TestLegacy; XE_HPC_CORETEST_F(XeHpcCoreBuiltInTests, GivenBuiltinTypeBinaryWhenGettingBuiltinResourceForNotRegisteredRevisionThenBinaryBuiltinIsNotAvailable) { pDevice->getRootDeviceEnvironment().getMutableHardwareInfo()->platform.usRevId += 0xdead; diff --git a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp index 9f0ff61dc6..dfad0faa39 100644 --- a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp @@ -23,7 +23,7 @@ #include "hw_cmds_xe_hpc_core_base.h" -using HwHelperTestsXeHpcCore = Test; +using HwHelperTestsXeHpcCore = TestLegacy; XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, givenXeHpcThenAuxTranslationIsNotRequired) { auto &clHwHelper = ClHwHelper::get(renderCoreFamily); diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp index fc7d39be91..bcd61ccf63 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp @@ -16,7 +16,7 @@ #include "opencl/test/unit_test/mocks/mock_context.h" using namespace NEO; -using EngineNodeHelperPvcTests = ::Test; +using EngineNodeHelperPvcTests = ::TestLegacy; PVCTEST_F(EngineNodeHelperPvcTests, WhenGetBcsEngineTypeIsCalledForPVCThenCorrectBcsEngineIsReturned) { using namespace aub_stream; diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp index 5e5bec729e..a655402131 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp @@ -16,7 +16,7 @@ namespace NEO { -using HwHelperTestsPvcXt = Test; +using HwHelperTestsPvcXt = TestLegacy; PVCTEST_F(HwHelperTestsPvcXt, givenSingleTileCsrOnPvcXtWhenAllocatingCsrSpecificAllocationsAndIsNotBaseDieA0ThenStoredInProperMemoryPool) { auto hwInfo = *defaultHwInfo; @@ -34,7 +34,7 @@ PVCTEST_F(HwHelperTestsPvcXt, givenMultiTileCsrOnPvcWhenAllocatingCsrSpecificAll checkIfMultiTileCsrWhenAllocatingCsrSpecificAllocationsThenStoredInLocalMemoryPool(&hwInfo); } -using HwHelperTestsPvc = Test; +using HwHelperTestsPvc = TestLegacy; PVCTEST_F(HwHelperTestsPvc, givenRevisionEnumAndPlatformFamilyTypeThenProperValueForIsWorkaroundRequiredIsReturned) { uint32_t steppings[] = { REVISION_A0, diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp index 150029e6f2..528000491d 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp @@ -18,7 +18,7 @@ using namespace NEO; -typedef Test PvcSamplerTest; +typedef TestLegacy PvcSamplerTest; PVCTEST_F(PvcSamplerTest, givenPvcSamplerWhenUsingDefaultFilteringAndAppendSamplerStateParamsThenDisableLowQualityFilter) { EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp index bc636ddddf..a2d76fa12f 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp @@ -17,7 +17,7 @@ using namespace NEO; -using PvcDeviceCapsTests = Test; +using PvcDeviceCapsTests = TestLegacy; PVCTEST_F(PvcDeviceCapsTests, givenPvcProductWhenCheckBlitterOperationsSupportThenReturnFalse) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.blitterOperationsSupported); diff --git a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp index 8deb48d600..0c85c25720 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp @@ -19,7 +19,7 @@ using namespace NEO; -typedef Test XeHpcCoreDeviceCaps; +typedef TestLegacy XeHpcCoreDeviceCaps; XE_HPC_CORETEST_F(XeHpcCoreDeviceCaps, givenXeHpcCoreWhenCheckFtrSupportsInteger64BitAtomicsThenReturnTrue) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp index 4c48c1c00d..d00bb7e119 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp @@ -19,7 +19,7 @@ using namespace NEO; -using SamplerTest = Test; +using SamplerTest = TestLegacy; HWTEST2_F(SamplerTest, givenDg2SamplerWhenUsingDefaultFilteringAndAppendSamplerStateParamsThenNotEnableLowQualityFilter, IsDG2) { EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp index 689f6d474f..b4c5d4f817 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp @@ -20,7 +20,7 @@ using namespace NEO; -using Dg2UsDeviceIdTest = Test; +using Dg2UsDeviceIdTest = TestLegacy; DG2TEST_F(Dg2UsDeviceIdTest, givenDg2ProductWhenCheckBlitterOperationsSupportThenReturnFalse) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.blitterOperationsSupported); diff --git a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp index f7eeb28bd0..2e6f0d5a31 100644 --- a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp @@ -16,7 +16,7 @@ using namespace NEO; -typedef Test XeHpgCoreDeviceCaps; +typedef TestLegacy XeHpgCoreDeviceCaps; XE_HPG_CORETEST_F(XeHpgCoreDeviceCaps, givenXeHpgCoreWhenCheckFtrSupportsInteger64BitAtomicsThenReturnTrue) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); diff --git a/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp index e1bef66825..980355b69e 100644 --- a/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ using namespace NEO; -typedef Test XeHpgCoreOnlyTeset; +typedef TestLegacy XeHpgCoreOnlyTeset; XE_HPG_CORETEST_F(XeHpgCoreOnlyTeset, WhenGettingRenderCoreFamilyThenXeHpgCoreIsReturned) { EXPECT_EQ(IGFX_XE_HPG_CORE, pDevice->getRenderCoreFamily()); 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 55a976536f..f547e49f81 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 = Test; +using BuiltInSharedTest = TestLegacy; HWTEST_F(BuiltInSharedTest, GivenBuiltinTypeBinaryWhenGettingBuiltinResourceForNotRegisteredRevisionThenBuiltinFromDefaultRevisionIsTaken) { pDevice->getRootDeviceEnvironment().getMutableHardwareInfo()->platform.usRevId += 0xdead; auto mockBuiltinsLib = std::unique_ptr(new MockBuiltinsLib()); diff --git a/shared/test/common/fixtures/linear_stream_fixture.h b/shared/test/common/fixtures/linear_stream_fixture.h index 9883a39890..44bb13d121 100644 --- a/shared/test/common/fixtures/linear_stream_fixture.h +++ b/shared/test/common/fixtures/linear_stream_fixture.h @@ -29,5 +29,5 @@ struct LinearStreamFixture { uint32_t pCmdBuffer[1024]{}; }; -typedef Test LinearStreamTest; +typedef TestLegacy LinearStreamTest; } // namespace NEO diff --git a/shared/test/common/helpers/hw_helper_tests.h b/shared/test/common/helpers/hw_helper_tests.h index 22c3afea11..35957f341a 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 = Test; +using HwHelperTest = TestLegacy; 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 7d13fc24a6..b378adccc2 100644 --- a/shared/test/common/os_interface/windows/wddm_fixture.h +++ b/shared/test/common/os_interface/windows/wddm_fixture.h @@ -30,7 +30,7 @@ #include "shared/test/common/test_macros/hw_test.h" namespace NEO { -struct WddmFixture : public Test { +struct WddmFixture : public TestLegacy { void SetUp() override { MockExecutionEnvironmentGmmFixture::SetUp(); rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get(); @@ -167,8 +167,8 @@ struct WddmInstrumentationGmmFixture : DeviceFixture { }; using WddmTest = WddmFixture; -using WddmTestWithMockGdiDll = Test; -using WddmTestWithMockGdiDllNoCleanup = Test; -using WddmInstrumentationTest = Test; +using WddmTestWithMockGdiDll = TestLegacy; +using WddmTestWithMockGdiDllNoCleanup = TestLegacy; +using WddmInstrumentationTest = TestLegacy; using WddmTestSingle = ::testing::Test; } // namespace NEO diff --git a/shared/test/common/test_macros/test.h b/shared/test/common/test_macros/test.h index d59d0b62ad..9b58cde743 100644 --- a/shared/test/common/test_macros/test.h +++ b/shared/test/common/test_macros/test.h @@ -15,6 +15,20 @@ struct Test : public Fixture, public ::testing::Test { + void SetUp() override { + Fixture::setUp(); + } + + void TearDown() override { + Fixture::tearDown(); + } +}; + +template +struct TestLegacy + : public Fixture, + public ::testing::Test { + void SetUp() override { Fixture::SetUp(); } diff --git a/shared/test/unit_test/aub/aub_helper_tests.cpp b/shared/test/unit_test/aub/aub_helper_tests.cpp index 60fde4ee6f..69686c5d65 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 = Test; +using AubHelperHwTest = TestLegacy; 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 c2400f1744..90f180f0fc 100644 --- a/shared/test/unit_test/built_ins/sip_tests.cpp +++ b/shared/test/unit_test/built_ins/sip_tests.cpp @@ -74,7 +74,7 @@ TEST(SipBinaryFromFile, givenFilenameWithoutExtnesionWhenCreatingHeaderFilenameT EXPECT_EQ("abc_header", headerName); } -using RawBinarySipTest = Test; +using RawBinarySipTest = TestLegacy; 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 = Test; +using HexadecimalHeaderSipTest = TestLegacy; TEST_F(HexadecimalHeaderSipTest, whenInitHexadecimalArraySipKernelIsCalledThenSipKernelIsCorrect) { VariableBackup backupSipClassType(&SipKernel::classType, SipClassType::HexadecimalHeaderFile); @@ -333,7 +333,7 @@ TEST_F(HexadecimalHeaderSipTest, whenInitHexadecimalArraySipKernelIsCalledTwiceT EXPECT_EQ(sipAllocation, sipAllocation2); } -using StateSaveAreaSipTest = Test; +using StateSaveAreaSipTest = TestLegacy; TEST_F(StateSaveAreaSipTest, givenEmptyStateSaveAreaHeaderWhenGetStateSaveAreaSizeCalledThenMaxDbgSurfaceSizeIsReturned) { MockSipData::useMockSip = true; 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 faab82687f..8bdbb499bf 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 = Test; +using CommandEncoderXeHpgCorePlusTests = TestLegacy; HWTEST2_F(CommandEncoderXeHpgCorePlusTests, givenSpecifiedL1CacheControlWhenAppendingRssThenProgramProvidedL1CachePolicy, IsAtLeastXeHpgCore) { DebugManagerStateRestore restorer; diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp index ffffd8506f..b26c4a7de7 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -26,7 +26,7 @@ using namespace NEO; -using AubCommandStreamReceiverTests = Test; +using AubCommandStreamReceiverTests = TestLegacy; template struct MockAubCsrToTestDumpAubNonWritable : public AUBCommandStreamReceiverHw { 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 7d81c46db1..67321e4a2c 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 @@ -33,7 +33,7 @@ using namespace NEO; -using AubCommandStreamReceiverTests = Test; +using AubCommandStreamReceiverTests = TestLegacy; struct FlatBatchBufferHelperAubTests : AubCommandStreamReceiverTests { void SetUp() override { @@ -855,7 +855,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenEngineI EXPECT_NE(0u, aubCsr->handle); } -using InjectMmmioTest = Test; +using InjectMmmioTest = TestLegacy; HWTEST_F(InjectMmmioTest, givenAddMmioKeySetToZeroWhenInitAdditionalMmioCalledThenDoNotWriteMmio) { DebugManagerStateRestore stateRestore; diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp index 9a1cc70751..c78dd00ffc 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp @@ -262,7 +262,7 @@ TEST_F(HardwareContextContainerTests, givenMultipleHwContextWhenSingleMethodIsCa EXPECT_FALSE(mockHwContext1->readMemoryCalled); } -using AubCommandStreamReceiverTests = Test; +using AubCommandStreamReceiverTests = TestLegacy; HWTEST_F(AubCommandStreamReceiverTests, givenGraphicsAllocationWritableWhenDumpAllocationIsCalledAndDumpFormatIsSpecifiedThenGraphicsAllocationShouldBeDumped) { DebugManagerStateRestore dbgRestore; diff --git a/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp b/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp index c3a22a32b0..690974f210 100644 --- a/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_file_stream_tests.cpp @@ -32,7 +32,7 @@ using namespace NEO; -using AubFileStreamTests = Test; +using AubFileStreamTests = TestLegacy; struct AddPatchInfoCommentsAubTests : AubFileStreamTests { void SetUp() override { 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 e9db9b6b85..31af316de3 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 = Test; +using XeHPAndLaterMockSimulatedCsrHwTests = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterMockSimulatedCsrHwTests, givenLocalMemoryEnabledWhenGlobalMmiosAreInitializedThenLmemIsInitializedAndLmemCfgMmioIsWritten) { std::unique_ptr> csrSimulatedCommonHw(new MockSimulatedCsrHw(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); 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 a12850edfa..21f576420a 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 @@ -682,7 +682,7 @@ struct InitDirectSubmissionFixture { std::unique_ptr device; }; -using InitDirectSubmissionTest = Test; +using InitDirectSubmissionTest = TestLegacy; HWTEST_F(InitDirectSubmissionTest, givenDirectSubmissionControllerEnabledWhenInitDirectSubmissionThenCsrIsRegistered) { DebugManagerStateRestore restorer; 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 73de6701aa..b599ace501 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 = Test; +using CommandContainerLinearStreamTest = TestLegacy; TEST_F(CommandContainerLinearStreamTest, givenLinearStreamWithCmdContainerWhenOneByteLeftInStreamThenGetSpaceThrowAbort) { CommandContainer cmdContainer; cmdContainer.initialize(pDevice, nullptr, true); 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 6f6073f7b6..fac665ee12 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 @@ -58,7 +58,7 @@ struct TbxFixture : public TbxCommandStreamFixture, } }; -using TbxCommandStreamTests = Test; +using TbxCommandStreamTests = TestLegacy; using TbxCommandSteamSimpleTest = TbxCommandStreamTests; template diff --git a/shared/test/unit_test/debugger/test_l0_debugger.cpp b/shared/test/unit_test/debugger/test_l0_debugger.cpp index 6fff80478c..09587ff532 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 = Test; +using L0DebuggerTest = TestLegacy; HWTEST_F(L0DebuggerTest, GivenDeviceWhenAllocateCalledThenDebuggerIsCreated) { auto debugger = DebuggerL0Hw::allocate(pDevice); 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 10e19a5f00..ae7cd002e0 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 Test { +struct SingleAddressSpaceFixture : public TestLegacy { void SetUp() override { NEO::DebugManager.flags.DebuggerForceSbaTrackingMode.set(1); - Test::SetUp(); + TestLegacy::SetUp(); } void TearDown() override { - Test::TearDown(); + TestLegacy::TearDown(); } DebugManagerStateRestore restorer; 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 7778b9fb6f..b794676b5e 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 = Test; +using DeviceTest = TestLegacy; 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 9075a3ddcc..9917196dd4 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 = Test; +using DeviceTest = TestLegacy; 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 = Test; +using DeviceGetCapsTest = TestLegacy; 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 c4a3044c1e..e1120b2d1e 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 = Test; +using DeviceTest = TestLegacy; 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 0f45b0c366..bc2f9b782b 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 = Test; +using DirectSubmissionTest = TestLegacy; 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 22f6062675..6a4fea5bb0 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 = Test; +using DirectSubmissionTest = TestLegacy; -using DirectSubmissionDispatchBufferTest = Test; +using DirectSubmissionDispatchBufferTest = TestLegacy; 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 fbfd6c0aac..7731eb1956 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 = Test; +using DirectSubmissionTestXE_HP_CORE = TestLegacy; 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 3931bd1dae..bbf1dfb3c0 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 = Test; +using BlitterDispatcheTest = TestLegacy; HWTEST_F(BlitterDispatcheTest, givenBlitterWhenAskingForPreemptionCmdSizeThenReturnZero) { EXPECT_EQ(0u, BlitterDispatcher::getSizePreemption()); 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 60fb366cfd..5122bbea25 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 = Test; +using DispatcherTest = TestLegacy; 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 04089f9d37..e9bce2f2e3 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 = Test; +using RenderDispatcherTest = TestLegacy; 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 e68994fbcf..7bb57d6be3 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 = Test; +using DG2CommandEncoderTest = TestLegacy; 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 7c13e51e42..a8f3840adb 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 = Test; +using XeHPAndLaterCommandEncoderTest = TestLegacy; 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 920a0629e6..b033c723cd 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 = Test; +using CommandEncoderTest = TestLegacy; 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 66e101b62f..6913a1e487 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 = Test; +using CommandEncodeEnableRayTracing = TestLegacy; 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 338e3d379a..c01ce85703 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 = Test; +using CommandEncodeAtomic = TestLegacy; 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 178dd102a6..fdf2ff46e8 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 = Test; +using EncodeBatchBufferStartOrEndTest = TestLegacy; HWTEST_F(EncodeBatchBufferStartOrEndTest, givenCommandContainerWhenEncodeBBEndThenCommandIsAdded) { CommandContainer cmdContainer; @@ -94,7 +94,7 @@ HWTEST_F(EncodeBatchBufferStartOrEndTest, givenGpuAddressWhenEncodeBBStartThenAd } } -using EncodeNoopTest = Test; +using EncodeNoopTest = TestLegacy; 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 55b2b02053..8c2e4af78d 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 = Test; +using CommandEncodeStatesTest = TestLegacy; TEST_F(CommandEncodeStatesTest, givenDefaultCommandContainerWhenGettingNumIddPerBlockThen64IsReturned) { auto numIdds = cmdContainer->getNumIddPerBlock(); @@ -57,7 +57,7 @@ HWTEST_F(CommandEncodeStatesTest, givenDispatchInterfaceWhenDispatchKernelThenWa ASSERT_NE(itorPC, commands.end()); } -using CommandEncodeStatesUncachedMocsTests = Test; +using CommandEncodeStatesUncachedMocsTests = TestLegacy; HWTEST_F(CommandEncodeStatesUncachedMocsTests, whenEncodingDispatchKernelWithUncachedMocsAndDirtyHeapsThenCorrectMocsIsSet) { DebugManagerStateRestore restore; @@ -698,7 +698,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, CommandEncodeStatesTest, giveNextIddInBlockZeorWhenD ASSERT_NE(itorPC, commands.end()); } -using EncodeDispatchKernelTest = Test; +using EncodeDispatchKernelTest = TestLegacy; 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 = Test; -using BindlessCommandEncodeStatesContainerTest = Test; +using BindlessCommandEncodeStatesTest = TestLegacy; +using BindlessCommandEncodeStatesContainerTest = TestLegacy; 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 c9792d9a92..81957f6668 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 = Test; +using CommandEncodeStatesTestDg2AndLater = TestLegacy; 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 16bd07bf7c..ab85947b61 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 = Test; +using CommandEncodeStatesTestPvcAndLater = TestLegacy; 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 = Test; +using CommandEncodeStatesTestHpc = TestLegacy; 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 2d7c6a9571..ba794b1219 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 = Test; +using CommandEncodeStatesTest = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, givenSlmTotalSizeGraterThanZeroWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly) { using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; @@ -955,7 +955,7 @@ struct CommandEncodeStatesImplicitScalingFixture : public CommandEncodeStatesFix std::unique_ptr> apiSupportBackup; }; -using CommandEncodeStatesImplicitScaling = Test; +using CommandEncodeStatesImplicitScaling = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesImplicitScaling, givenStaticPartitioningWhenNonTimestampEventProvidedThenExpectTimestampComputeWalkerPostSync) { @@ -1002,7 +1002,7 @@ struct CommandEncodeStatesDynamicImplicitScalingFixture : CommandEncodeStatesImp DebugManagerStateRestore restore{}; }; -using CommandEncodeStatesDynamicImplicitScaling = Test; +using CommandEncodeStatesDynamicImplicitScaling = TestLegacy; 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 01030aaa43..921fd513e1 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 = Test; +using CommandEncodeEnableRayTracing = TestLegacy; 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 62b093e3d7..88a17536b9 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 = Test; +using CommandEncodeStatesTest = TestLegacy; 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 0a875848d4..780a8b5e72 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 = Test; +using CommandEncoderMathTest = TestLegacy; 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 2d64477ee8..35a23faea8 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 = Test; +using XeHPAndLaterCommandEncoderMathTest = TestLegacy; 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 34d7949b19..a1c0460198 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 = Test; +using CommandEncodeStatesTest = TestLegacy; 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 f47fd55269..f25a89c9e3 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 = Test; +using CommandEncodeStatesTest = TestLegacy; 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 fd95648437..718256389d 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 = Test; +using XeHPAndLaterEncodeMiFlushDWTest = TestLegacy; 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 41540eb2e5..2f1fe1626a 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 = Test; +using CommandEncodeSemaphore = TestLegacy; 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 b7d877bcfb..9d0e42c14a 100644 --- a/shared/test/unit_test/encoders/test_encode_set_mmio.cpp +++ b/shared/test/unit_test/encoders/test_encode_set_mmio.cpp @@ -26,7 +26,7 @@ class CommandSetMMIOFixture : public DeviceFixture { std::unique_ptr cmdContainer; }; -using CommandSetMMIOTest = Test; +using CommandSetMMIOTest = TestLegacy; 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 cd176451d1..9aa4c0628d 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 = Test; +using CommandEncodeStatesTest = TestLegacy; 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 = Test; +using BindlessCommandEncodeStatesTest = TestLegacy; 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 0501996b4e..1b184b9acf 100644 --- a/shared/test/unit_test/fixtures/command_container_fixture.h +++ b/shared/test/unit_test/fixtures/command_container_fixture.h @@ -82,4 +82,4 @@ struct WalkerThreadFixture { uint32_t requiredWorkGroupOrder; }; -using WalkerThreadTest = Test; +using WalkerThreadTest = TestLegacy; diff --git a/shared/test/unit_test/fixtures/implicit_scaling_fixture.h b/shared/test/unit_test/fixtures/implicit_scaling_fixture.h index 7c8012c4e6..a5eae582ed 100644 --- a/shared/test/unit_test/fixtures/implicit_scaling_fixture.h +++ b/shared/test/unit_test/fixtures/implicit_scaling_fixture.h @@ -35,4 +35,4 @@ struct ImplicitScalingFixture : public CommandEncodeStatesFixture { void *alignedMemory = nullptr; }; -using ImplicitScalingTests = Test; +using ImplicitScalingTests = TestLegacy; 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 b187862156..4562ba76fa 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 = Test; +using CommandEncoderMathTestGen11 = TestLegacy; 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 c84f7c222b..bce0f0ecb6 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 = Test; +using AdlnUsDeviceIdTest = TestLegacy; 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 d97a0a0fb4..11c4dad3f8 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 = Test; +using Gen12LPAubCommandStreamReceiverTests = TestLegacy; 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 1d30439c5a..773f71a324 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 = Test; +using Gen12LPCommandStreamReceiverSimulatedCommonHwTests = TestLegacy; 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 1eab825533..832e1cc608 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 = Test; +using CommandEncoderTest = TestLegacy; 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 6d92bf2c0e..b4c0f7386d 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 = Test; +using CommandEncoderMathTestGen12Lp = TestLegacy; GEN12LPTEST_F(CommandEncoderMathTestGen12Lp, WhenAppendsAGreaterThanThenPredicateCorrectlySetAndRemapEnabled) { using MI_LOAD_REGISTER_MEM = typename FamilyType::MI_LOAD_REGISTER_MEM; diff --git a/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp index 8992993c85..e26dd7bd60 100644 --- a/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp @@ -21,7 +21,7 @@ using namespace NEO; -using Gen12LpGmmCallbacksTests = ::Test; +using Gen12LpGmmCallbacksTests = ::TestLegacy; template struct MockAubCsrToTestNotifyAubCapture : public AUBCommandStreamReceiverHw { 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 eb54a0216d..645296810c 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 = Test; +using HwInfoConfigTestGen8 = TestLegacy; 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 10311cf9f3..2a31b14bad 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 = Test; +using Gen8DeviceCaps = TestLegacy; 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 a67325945f..a2fca003d5 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 = Test; +using CommandEncoderMathTestGen8 = TestLegacy; 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 1c3cebd2e7..3d95983b5f 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 = Test; +using CommandEncoderTest = TestLegacy; 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 e5fb8e3843..07210da0a7 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 = Test; +using CommandEncoderMathTestGen9 = TestLegacy; GEN9TEST_F(CommandEncoderMathTestGen9, WhenAppendsAGreaterThanThenPredicateCorrectlySet) { using MI_LOAD_REGISTER_MEM = typename FamilyType::MI_LOAD_REGISTER_MEM; diff --git a/shared/test/unit_test/gmm_helper/gmm_tests.cpp b/shared/test/unit_test/gmm_helper/gmm_tests.cpp index 39f625369d..4e350e3ebc 100644 --- a/shared/test/unit_test/gmm_helper/gmm_tests.cpp +++ b/shared/test/unit_test/gmm_helper/gmm_tests.cpp @@ -13,7 +13,7 @@ #include "shared/test/common/test_macros/test.h" namespace NEO { -using GmmTests = Test; +using GmmTests = TestLegacy; TEST_F(GmmTests, givenResourceUsageTypesCacheableWhenGreateGmmThenFlagCachcableIsTrue) { StorageInfo storageInfo{}; for (auto resourceUsageType : {GMM_RESOURCE_USAGE_OCL_IMAGE, 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 469bbdd998..181f1cb1d2 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 Test { +class AlocationHelperTests : public TestLegacy { public: HeapAssigner heapAssigner = {}; }; diff --git a/shared/test/unit_test/helpers/app_resource_tests.cpp b/shared/test/unit_test/helpers/app_resource_tests.cpp index 29712287b1..cf1618cbc4 100644 --- a/shared/test/unit_test/helpers/app_resource_tests.cpp +++ b/shared/test/unit_test/helpers/app_resource_tests.cpp @@ -19,7 +19,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/test_macros/test.h" -using MockExecutionEnvironmentTagTest = Test; +using MockExecutionEnvironmentTagTest = TestLegacy; using namespace NEO; 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 112aba2fd2..eae9789ac1 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 = Test; +using BindlessHeapsHelperTests = TestLegacy; TEST_F(BindlessHeapsHelperTests, givenBindlessHeapHelperWhenItsCreatedThenSpecialSshAllocatedAtHeapBegining) { auto bindlessHeapHelper = std::make_unique(pDevice->getMemoryManager(), pDevice->getNumGenericSubDevices() > 1, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); 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 4dbd5fa0fd..48c7a2c541 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 = Test; +using BlitTests = TestLegacy; HWTEST_F(BlitTests, givenDebugVariablesWhenGettingMaxBlitSizeThenHonorUseProvidedValues) { DebugManagerStateRestore restore{}; 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 cbc33c2489..e801192704 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 = Test; +using BlitTests = TestLegacy; 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 cedcb5b545..d8eb85b044 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 = Test; +using CompilerHwInfoConfigFixture = TestLegacy; 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 bde39a7421..819143ec0e 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 Test HwHelperTest; +typedef TestLegacy 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 3d3bff9b0e..c53179eb7f 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 = Test; +using HwHelperDg2AndLaterTest = TestLegacy; 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 c3e173afba..31ff77fac5 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 = Test; +using SbaForBindlessTests = TestLegacy; HWTEST2_F(SbaForBindlessTests, givenGlobalBindlessBaseAddressWhenProgramStateBaseAddressThenSbaProgrammedCorrectly, IsAtLeastSkl) { using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS; 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 9e762ec625..106bf911b4 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 = Test; +using BlitTests = TestLegacy; 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 7b603be08d..dbfffa2b8a 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 = Test; +using BlitTests = TestLegacy; using BlitPlatforms = IsAtLeastProduct; diff --git a/shared/test/unit_test/memory_manager/address_mapper_tests.cpp b/shared/test/unit_test/memory_manager/address_mapper_tests.cpp index eb6bf404a5..e81a7b6f88 100644 --- a/shared/test/unit_test/memory_manager/address_mapper_tests.cpp +++ b/shared/test/unit_test/memory_manager/address_mapper_tests.cpp @@ -27,7 +27,7 @@ class AddressMapperFixture { AddressMapper *mapper; }; -typedef Test AddressMapperTests; +typedef TestLegacy AddressMapperTests; TEST_F(AddressMapperTests, GivenAlignedPointersWhenMappingThenPointersAreAligned) { uint32_t m1 = mapper->map((void *)0x1000, MemoryConstants::pageSize); diff --git a/shared/test/unit_test/memory_manager/host_ptr_manager_tests.cpp b/shared/test/unit_test/memory_manager/host_ptr_manager_tests.cpp index 4582d75418..a025245651 100644 --- a/shared/test/unit_test/memory_manager/host_ptr_manager_tests.cpp +++ b/shared/test/unit_test/memory_manager/host_ptr_manager_tests.cpp @@ -832,7 +832,7 @@ TEST_F(HostPtrManagerTest, GivenHostPtrManagerFilledWithFragmentsWhenAskedForOve EXPECT_NE(nullptr, fragment3); } -using HostPtrAllocationTest = Test; +using HostPtrAllocationTest = TestLegacy; TEST_F(HostPtrAllocationTest, givenTwoAllocationsThatSharesOneFragmentWhenOneIsDestroyedThenFragmentRemains) { diff --git a/shared/test/unit_test/memory_manager/page_table_tests.cpp b/shared/test/unit_test/memory_manager/page_table_tests.cpp index 2e351a796d..6d82d093bb 100644 --- a/shared/test/unit_test/memory_manager/page_table_tests.cpp +++ b/shared/test/unit_test/memory_manager/page_table_tests.cpp @@ -136,9 +136,9 @@ void PageTableEntryChecker::testEntry(MockPDPE *pageTable, uint32_t pt EXPECT_EQ(reinterpret_cast(expectedValue), pageTable->entries[0]->entries[0]->entries[pteIndex]); } -typedef Test PageTableTests32; -typedef Test PageTableTests48; -typedef Test PageTableTestsGPU; +typedef TestLegacy PageTableTests32; +typedef TestLegacy PageTableTests48; +typedef TestLegacy PageTableTestsGPU; TEST_F(PageTableTests48, WhenPageTableIsCreatedThenWalkerIsDummy) { PageTable pt(&allocator); 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 8ba8cae9a6..cd9de80022 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 = Test; +using FrontWindowAllocatorTests = TestLegacy; TEST_F(FrontWindowAllocatorTests, givenAllocateInFrontWindowPoolFlagWhenAllocate32BitGraphicsMemoryThenAllocateAtHeapBegining) { AllocationData allocData = {}; diff --git a/shared/test/unit_test/os_interface/gdi_interface_logging_tests.cpp b/shared/test/unit_test/os_interface/gdi_interface_logging_tests.cpp index 2b222097c9..96a33c617d 100644 --- a/shared/test/unit_test/os_interface/gdi_interface_logging_tests.cpp +++ b/shared/test/unit_test/os_interface/gdi_interface_logging_tests.cpp @@ -79,7 +79,7 @@ struct GdiInterfaceLoggingFixture : public GdiInterfaceLoggingNoInitFixture { } }; -using GdiInterfaceLoggingTest = Test; +using GdiInterfaceLoggingTest = TestLegacy; TEST_F(GdiInterfaceLoggingTest, WhenGdiLoggingIsEnabledWhenLoggingOpenAdapterFromLuidThenExpectCorrectStrings) { D3DKMT_OPENADAPTERFROMLUID param = {}; @@ -1282,7 +1282,7 @@ struct GdiInterfaceLoggingToFileFixture : public GdiInterfaceLoggingFixture { } }; -using GdiInterfaceLoggingToFileTest = Test; +using GdiInterfaceLoggingToFileTest = TestLegacy; TEST_F(GdiInterfaceLoggingToFileTest, WhenGdiLoggingIsEnabledWhenLoggingAnyGdiThenExpectLogCountCorrect) { D3DKMT_OPENADAPTERFROMLUID param = {}; @@ -1295,7 +1295,7 @@ TEST_F(GdiInterfaceLoggingToFileTest, WhenGdiLoggingIsEnabledWhenLoggingAnyGdiTh EXPECT_EQ(2u, NEO::IoFunctions::mockVfptrinfCalled); } -using GdiInterfaceLoggingBaseTest = Test; +using GdiInterfaceLoggingBaseTest = TestLegacy; TEST_F(GdiInterfaceLoggingBaseTest, WhenGdiLoggingIsDisabledWhenLoggingAnyGdiThenExpectNoLogCall) { D3DKMT_OPENADAPTERFROMLUID param = {}; diff --git a/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp index 776d8e6b27..8dde489f51 100644 --- a/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp @@ -20,7 +20,7 @@ using namespace NEO; using DrmMockBufferObjectFixture = DrmBufferObjectFixture; -using DrmBufferObjectTest = Test; +using DrmBufferObjectTest = TestLegacy; TEST_F(DrmBufferObjectTest, WhenCallingExecThenReturnIsCorrect) { mock->ioctl_expected.total = 1; diff --git a/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests_prelim.cpp b/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests_prelim.cpp index fe27932d4e..2b39b88405 100644 --- a/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests_prelim.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests_prelim.cpp @@ -14,7 +14,7 @@ using namespace NEO; using DrmBufferObjectPrelimFixture = DrmBufferObjectFixture; -using DrmBufferObjectPrelimTest = Test; +using DrmBufferObjectPrelimTest = TestLegacy; TEST_F(DrmBufferObjectPrelimTest, GivenCompletionAddressWhenCallingExecThenReturnIsCorrect) { mock->ioctl_expected.total = 1; diff --git a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp index 0eff0820c8..7942ebe5a2 100644 --- a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_tests.cpp @@ -69,7 +69,7 @@ struct DrmCommandStreamMultiTileMemExecFixture { DrmMemoryManager *memoryManager = nullptr; }; -using DrmCommandStreamMultiTileMemExecTest = Test; +using DrmCommandStreamMultiTileMemExecTest = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, DrmCommandStreamMultiTileMemExecTest, GivenDrmSupportsCompletionFenceAndVmBindWhenCallingCsrExecThenMultipleTagAllocationIsPassed) { auto *testCsr = new TestedDrmCommandStreamReceiver(*executionEnvironment, 0, device->getDeviceBitfield()); diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp index d71b1d0693..f85a6c284a 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_info_prelim_tests.cpp @@ -115,7 +115,7 @@ struct DrmVmTestFixture { static constexpr uint8_t tileCount = 4u; }; -using DrmVmTestTest = Test; +using DrmVmTestTest = TestLegacy; TEST_F(DrmVmTestTest, givenNewMemoryInfoQuerySupportedWhenCreatingVirtualMemoryThenVmCreatedUsingNewRegion) { DebugManager.flags.EnableLocalMemory.set(1); diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp index 2a3c917e96..4c55c98657 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_prelim_tests.cpp @@ -1393,7 +1393,7 @@ TEST_F(DrmMemoryManagerLocalMemoryPrelimTest, givenSipKernelTypeWhenAllocatingTh memoryManager->freeGraphicsMemory(sipAllocation); } -using DrmMemoryManagerFailInjectionPrelimTest = Test; +using DrmMemoryManagerFailInjectionPrelimTest = TestLegacy; TEST_F(DrmMemoryManagerFailInjectionPrelimTest, givenEnabledLocalMemoryWhenNewFailsThenAllocateInDevicePoolReturnsStatusErrorAndNullallocation) { mock->ioctl_expected.total = -1; //don't care @@ -1573,7 +1573,7 @@ TEST_F(DrmMemoryManagerCopyMemoryToAllocationPrelimTest, givenDrmMemoryManagerWh drmMemoryManger.freeGraphicsMemory(allocation); } -typedef Test DrmMemoryManagerTestPrelim; +typedef TestLegacy DrmMemoryManagerTestPrelim; TEST_F(DrmMemoryManagerTestPrelim, whenSettingNumHandlesThenTheyAreRetrievedCorrectly) { mock->ioctl_expected.primeFdToHandle = 2; diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp index cf1d6d9b59..db9aa82ab8 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_localmem_upstream_tests.cpp @@ -647,7 +647,7 @@ TEST_F(DrmMemoryManagerLocalMemoryWithCustomMockTest, givenDrmMemoryManagerWithL EXPECT_EQ(nullptr, bo.peekLockedAddress()); } -using DrmMemoryManagerFailInjectionTest = Test; +using DrmMemoryManagerFailInjectionTest = TestLegacy; HWTEST2_F(DrmMemoryManagerFailInjectionTest, givenEnabledLocalMemoryWhenNewFailsThenAllocateInDevicePoolReturnsStatusErrorAndNullallocation, NonDefaultIoctlsSupported) { mock->ioctl_expected.total = -1; //don't care @@ -795,7 +795,7 @@ TEST_F(DrmMemoryManagerCopyMemoryToAllocationTest, givenDrmMemoryManagerWhenCopy drmMemoryManger.freeGraphicsMemory(allocation); } -using DrmMemoryManagerTestImpl = Test; +using DrmMemoryManagerTestImpl = TestLegacy; HWTEST2_F(DrmMemoryManagerTestImpl, givenDrmMemoryManagerWhenLockUnlockIsCalledOnAllocationInLocalMemoryThenCallIoctlGemMapOffsetAndReturnLockedPtr, NonDefaultIoctlsSupported) { mockExp->ioctl_expected.gemCreateExt = 1; diff --git a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index 0e92e11197..1bc44c76fc 100644 --- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -32,11 +32,11 @@ namespace { using MemoryManagerMultiDeviceSharedHandleTest = MemoryAllocatorMultiDeviceFixture<2>; -using DrmMemoryManagerTest = Test; -using DrmMemoryManagerWithLocalMemoryTest = Test; -using DrmMemoryManagerWithExplicitExpectationsTest = Test; -using DrmMemoryManagerWithLocalMemoryAndExplicitExpectationsTest = Test; -using DrmMemoryManagerUSMHostAllocationTests = Test; +using DrmMemoryManagerTest = TestLegacy; +using DrmMemoryManagerWithLocalMemoryTest = TestLegacy; +using DrmMemoryManagerWithExplicitExpectationsTest = TestLegacy; +using DrmMemoryManagerWithLocalMemoryAndExplicitExpectationsTest = TestLegacy; +using DrmMemoryManagerUSMHostAllocationTests = TestLegacy; AllocationProperties createAllocationProperties(uint32_t rootDeviceIndex, size_t size, bool forcePin) { MockAllocationProperties properties(rootDeviceIndex, size); @@ -2140,7 +2140,7 @@ TEST_F(DrmMemoryManagerTest, givenMemoryManagerWhenAskedForInternalAllocationWit memoryManager->freeGraphicsMemory(drmAllocation); } -using DrmMemoryManagerUSMHostAllocationTests = Test; +using DrmMemoryManagerUSMHostAllocationTests = TestLegacy; TEST_F(DrmMemoryManagerUSMHostAllocationTests, givenCallToAllocateGraphicsMemoryWithAlignmentWithIsHostUsmAllocationSetToFalseThenNewHostPointerIsUsedAndAllocationIsCreatedSuccesfully) { mock->ioctl_expected.gemUserptr = 1; @@ -3956,7 +3956,7 @@ TEST(DrmMemoryManagerSimpleTest, WhenDrmIsCreatedThenQueryPageFaultSupportIsCall EXPECT_TRUE(static_cast(drm.get())->queryPageFaultSupportCalled); } -using DrmMemoryManagerWithLocalMemoryTest = Test; +using DrmMemoryManagerWithLocalMemoryTest = TestLegacy; TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenDrmMemoryManagerWithLocalMemoryWhenLockResourceIsCalledOnAllocationInLocalMemoryThenReturnNullPtr) { DrmAllocation drmAllocation(rootDeviceIndex, AllocationType::UNKNOWN, nullptr, nullptr, 0u, 0u, MemoryPool::LocalMemory); @@ -3967,7 +3967,7 @@ TEST_F(DrmMemoryManagerWithLocalMemoryTest, givenDrmMemoryManagerWithLocalMemory memoryManager->unlockResource(&drmAllocation); } -using DrmMemoryManagerTest = Test; +using DrmMemoryManagerTest = TestLegacy; TEST_F(DrmMemoryManagerTest, givenDrmMemoryManagerWhenCopyMemoryToAllocationThenAllocationIsFilledWithCorrectData) { mock->ioctl_expected.gemUserptr = 1; diff --git a/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp b/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp index 76b5730bad..9e008bf751 100644 --- a/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_special_heap_test.cpp @@ -40,7 +40,7 @@ class DrmMemManagerFixture { std::unique_ptr executionEnvironment; }; -using DrmFrontWindowPoolAllocatorTests = Test; +using DrmFrontWindowPoolAllocatorTests = TestLegacy; TEST_F(DrmFrontWindowPoolAllocatorTests, givenAllocateInSpecialPoolFlagWhenDrmAllocate32BitGraphicsMemoryThenAllocateAtHeapBegining) { AllocationData allocData = {}; diff --git a/shared/test/unit_test/os_interface/os_library_tests.cpp b/shared/test/unit_test/os_interface/os_library_tests.cpp index 31760f8f23..f87ffe11eb 100644 --- a/shared/test/unit_test/os_interface/os_library_tests.cpp +++ b/shared/test/unit_test/os_interface/os_library_tests.cpp @@ -71,7 +71,7 @@ TEST(OSLibraryTest, whenSymbolNameIsInvalidThenGetProcAddressReturnsNullPointer) EXPECT_EQ(nullptr, ptr); } -using OsLibraryTestWithFailureInjection = Test; +using OsLibraryTestWithFailureInjection = TestLegacy; TEST_F(OsLibraryTestWithFailureInjection, GivenFailureInjectionWhenLibraryIsLoadedThenOnlyFailedAllocationIsNull) { InjectedFunction method = [](size_t failureIndex) { 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 07feb62b57..36436a8835 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 @@ -172,9 +172,9 @@ class WddmCommandStreamMockGdiTest : public ::testing::Test { } }; -using WddmCommandStreamTest = ::Test; -using WddmDefaultTest = ::Test; -struct DeviceCommandStreamTest : ::Test, DeviceFixture { +using WddmCommandStreamTest = ::TestLegacy; +using WddmDefaultTest = ::TestLegacy; +struct DeviceCommandStreamTest : ::TestLegacy, DeviceFixture { void SetUp() override { DeviceFixture::SetUp(); MockAubCenterFixture::SetUp(); @@ -322,7 +322,7 @@ struct WddmPreemptionHeaderFixture { WddmMock *wddm = nullptr; }; -using WddmPreemptionHeaderTests = ::Test; +using WddmPreemptionHeaderTests = ::TestLegacy; TEST_F(WddmPreemptionHeaderTests, givenWddmCommandStreamReceiverWhenPreemptionIsOffWhenWorkloadIsSubmittedThenHeaderDoesntHavePreemptionFieldSet) { hwInfo->capabilityTable.defaultPreemptionMode = PreemptionMode::Disabled; diff --git a/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp index 79456f7029..d7f5b8b284 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp @@ -15,7 +15,7 @@ using namespace NEO; -class WddmPreemptionTests : public Test { +class WddmPreemptionTests : public TestLegacy { public: void SetUp() override { WddmFixtureWithMockGdiDll::SetUp(); diff --git a/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp b/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp index 1c73f11aee..59a518d7d4 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp @@ -60,7 +60,7 @@ class WddmSharedTestsFixture : public GdiDllFixture, public MockExecutionEnviron RootDeviceEnvironment *rootDeviceEnvironment = nullptr; }; -using WdmmSharedTests = Test; +using WdmmSharedTests = TestLegacy; TEST_F(WdmmSharedTests, WhenCreatingSharedAllocationAndGetNTHandleFailedThenAllocationIsDeletedAndHandlesAreSetToZero) { init(); diff --git a/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp b/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp index fbaa8e1ccd..49703b00c9 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_special_heap_test.cpp @@ -43,7 +43,7 @@ class WddmMemManagerFixture { std::unique_ptr executionEnvironment; }; -using WddmFrontWindowPoolAllocatorTests = Test; +using WddmFrontWindowPoolAllocatorTests = TestLegacy; TEST_F(WddmFrontWindowPoolAllocatorTests, givenAllocateInFrontWindowPoolFlagWhenWddmAllocate32BitGraphicsMemoryThenAllocateAtHeapBegining) { AllocationData allocData = {}; diff --git a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp index e7bc251189..7e63fffef7 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp @@ -404,7 +404,7 @@ struct WddmSkipResourceCleanupFixtureWithMockGdiDll : public GdiDllFixture, publ RootDeviceEnvironment *rootDeviceEnvironment = nullptr; }; -using WddmSkipResourceCleanupFixtureTests = Test; +using WddmSkipResourceCleanupFixtureTests = TestLegacy; TEST_F(WddmSkipResourceCleanupFixtureTests, givenWaitForSynchronizationObjectFromCpuWhenSkipResourceCleanupIsTrueThenSuccessIsReturnedAndGdiFunctionIsNotCalled) { VariableBackup varBackup(&waitForSynchronizationObjectFromCpuCounter); 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 53f30bc973..d5fa2ad034 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 = Test; +using ScratchComtrolerTests = TestLegacy; 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 cc185da6bc..5f75dbaf29 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 = Test; +using ScratchComtrolerTests = TestLegacy; HWCMDTEST_F(IGFX_XE_HP_CORE, ScratchComtrolerTests, givenBindlessModeOnWhenGetPatchedOffsetCalledThenBindlessOffsetReturned) { DebugManagerStateRestore restorer; diff --git a/shared/test/unit_test/utilities/tag_allocator_tests.cpp b/shared/test/unit_test/utilities/tag_allocator_tests.cpp index 69f9c65536..2e605a1d27 100644 --- a/shared/test/unit_test/utilities/tag_allocator_tests.cpp +++ b/shared/test/unit_test/utilities/tag_allocator_tests.cpp @@ -24,7 +24,7 @@ using namespace NEO; -struct TagAllocatorTest : public Test { +struct TagAllocatorTest : public TestLegacy { void SetUp() override { DebugManager.flags.CreateMultipleSubDevices.set(4); MemoryAllocatorFixture::SetUp(); 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 6d2df514d8..aa422ad82b 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 = Test; +using XeHPMaxThreadsTest = TestLegacy; XEHPTEST_F(XeHPMaxThreadsTest, givenXEHPWithA0SteppingThenMaxThreadsForWorkgroupWAIsRequired) { const auto &hwInfoConfig = *HwInfoConfig::get(productFamily); @@ -35,7 +35,7 @@ XEHPTEST_F(XeHPMaxThreadsTest, givenXEHPWithBSteppingThenMaxThreadsForWorkgroupW EXPECT_FALSE(isWARequired); } -using TestXeHPHwInfoConfig = Test; +using TestXeHPHwInfoConfig = TestLegacy; 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 2571751323..e58ba1c408 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 = Test; +using EncodeKernelPvcTest = TestLegacy; 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 1e9bee89c9..272f5b2b32 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 = Test; +using PvcOnlyTest = TestLegacy; 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 2781e7341c..df60581bed 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 = Test; +using EncodeKernelXeHpcCoreTest = TestLegacy; 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 6b7029a90c..980c01432f 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 = Test; +using XeHpcCoreOnlyTest = TestLegacy; 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 5596155f7d..da1817d5ed 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 = Test; +using TestDg2HwInfoConfig = TestLegacy; HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTestWindows, givenHardwareInfoWhenCallingIsAdditionalStateBaseAddressWARequiredThenFalseIsReturned, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTestWindows, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_DG2);