diff --git a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.cpp index 8d00f2353e..3d9ed2183d 100644 --- a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.cpp +++ b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.cpp @@ -14,10 +14,10 @@ #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_manager.h" -#include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_device.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/driver/driver_imp.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h" diff --git a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl index 6cacfb4c0c..9863158398 100644 --- a/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl +++ b/level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl @@ -19,6 +19,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_operations_handler.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp index 2f41c0f845..a79d4a445f 100644 --- a/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp +++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.cpp @@ -14,6 +14,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h" #include "level_zero/core/test/unit_tests/mocks/mock_context.h" diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.h b/level_zero/core/test/unit_tests/fixtures/device_fixture.h index 2f8eed1418..c1f952810c 100644 --- a/level_zero/core/test/unit_tests/fixtures/device_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.h @@ -9,17 +9,17 @@ #include "shared/source/command_container/implicit_scaling.h" #include "shared/source/helpers/hw_info.h" -#include "shared/source/os_interface/os_interface.h" +#include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/os_time.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_device.h" -#include "level_zero/core/source/context/context_imp.h" -#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/core/test/unit_tests/mock.h" +#include "gtest/gtest.h" + class MockPageFaultManager; namespace NEO { diff --git a/level_zero/core/test/unit_tests/fixtures/in_order_cmd_list_fixture.h b/level_zero/core/test/unit_tests/fixtures/in_order_cmd_list_fixture.h index d92b80a01b..5fe2429bf8 100644 --- a/level_zero/core/test/unit_tests/fixtures/in_order_cmd_list_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/in_order_cmd_list_fixture.h @@ -13,7 +13,9 @@ #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/device/bcs_split.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/event/event_imp.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" diff --git a/level_zero/core/test/unit_tests/fixtures/kernel_max_cooperative_groups_count_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/kernel_max_cooperative_groups_count_fixture.cpp index cac5880c37..ef254a761e 100644 --- a/level_zero/core/test/unit_tests/fixtures/kernel_max_cooperative_groups_count_fixture.cpp +++ b/level_zero/core/test/unit_tests/fixtures/kernel_max_cooperative_groups_count_fixture.cpp @@ -10,6 +10,7 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/gfx_core_helper.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/module/module_imp.h" namespace L0 { diff --git a/level_zero/core/test/unit_tests/fixtures/module_fixture.cpp b/level_zero/core/test/unit_tests/fixtures/module_fixture.cpp index eab3124058..806c9dcf9f 100644 --- a/level_zero/core/test/unit_tests/fixtures/module_fixture.cpp +++ b/level_zero/core/test/unit_tests/fixtures/module_fixture.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" #include "gtest/gtest.h" 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 1596b33fce..caf8bc17e1 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 @@ -11,6 +11,7 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" diff --git a/level_zero/core/test/unit_tests/gen12lp/test_l0_gfx_core_helper_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_l0_gfx_core_helper_gen12lp.cpp index c3cdbaf44b..c8e1e7c794 100644 --- a/level_zero/core/test/unit_tests/gen12lp/test_l0_gfx_core_helper_gen12lp.cpp +++ b/level_zero/core/test/unit_tests/gen12lp/test_l0_gfx_core_helper_gen12lp.cpp @@ -9,6 +9,7 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" 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 d64890b991..9a34c55904 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "shared/source/kernel/kernel_properties.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" namespace L0 { diff --git a/level_zero/core/test/unit_tests/mt_tests/device/device_drm/test_mt_device_drm.cpp b/level_zero/core/test/unit_tests/mt_tests/device/device_drm/test_mt_device_drm.cpp index 690ff1c19d..597769692b 100644 --- a/level_zero/core/test/unit_tests/mt_tests/device/device_drm/test_mt_device_drm.cpp +++ b/level_zero/core/test/unit_tests/mt_tests/device/device_drm/test_mt_device_drm.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" diff --git a/level_zero/core/test/unit_tests/mt_tests/semaphore/test_mt_semaphore.cpp b/level_zero/core/test/unit_tests/mt_tests/semaphore/test_mt_semaphore.cpp index e7b102b84c..a9ed9ac1a4 100644 --- a/level_zero/core/test/unit_tests/mt_tests/semaphore/test_mt_semaphore.cpp +++ b/level_zero/core/test/unit_tests/mt_tests/semaphore/test_mt_semaphore.cpp @@ -5,19 +5,16 @@ * */ -#include "shared/source/os_interface/os_interface.h" -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/semaphore/external_semaphore_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_device.h" -#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" #include "level_zero/core/test/unit_tests/mocks/mock_event.h" -#include "level_zero/ze_intel_gpu.h" using namespace NEO; #include "gtest/gtest.h" diff --git a/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp b/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp index aa1accbb7c..a61679e544 100644 --- a/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp +++ b/level_zero/core/test/unit_tests/mt_tests/semaphore/windows/test_mt_semaphore_windows.cpp @@ -7,22 +7,23 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/os_interface.h" -#include "shared/test/common/mocks/mock_builtins.h" -#include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/os_interface/windows/wddm_fixture.h" +#include "shared/source/os_interface/windows/os_environment_win.h" +#include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/mocks/mock_wddm.h" +#include "shared/test/common/mocks/windows/mock_gdi_interface.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/semaphore/external_semaphore_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_device.h" -#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" #include "level_zero/core/test/unit_tests/mocks/mock_event.h" -#include "level_zero/ze_intel_gpu.h" + +#include "gtest/gtest.h" using namespace NEO; -#include "gtest/gtest.h" namespace L0 { namespace ult { diff --git a/level_zero/core/test/unit_tests/sources/cache/linux/test_cache_reservation_impl_prelim.cpp b/level_zero/core/test/unit_tests/sources/cache/linux/test_cache_reservation_impl_prelim.cpp index 1e5c54d22a..82f76ac9ac 100644 --- a/level_zero/core/test/unit_tests/sources/cache/linux/test_cache_reservation_impl_prelim.cpp +++ b/level_zero/core/test/unit_tests/sources/cache/linux/test_cache_reservation_impl_prelim.cpp @@ -14,6 +14,7 @@ #include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/cache/linux/cache_reservation_impl_prelim.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" using namespace NEO; 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 6a9c26e667..ed58990e37 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 @@ -5,9 +5,10 @@ * */ -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/test.h" -#include "level_zero/core/source/cache/windows/cache_reservation_impl.h" +#include "level_zero/core/source/cache/cache_reservation.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" using namespace NEO; 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 cc34ae70d2..19053ce795 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 @@ -9,7 +9,6 @@ #include "shared/source/direct_submission/relaxed_ordering_helper.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/compiler_product_helper.h" -#include "shared/source/indirect_heap/indirect_heap.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/unified_memory/usm_memory_support.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" @@ -20,21 +19,21 @@ #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/mock_cpu_page_fault_manager.h" -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_direct_submission_hw.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/builtin/builtin_functions_lib.h" #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" +#include "level_zero/core/source/image/image_hw.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_event.h" -#include "level_zero/core/test/unit_tests/mocks/mock_image.h" #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" #include "level_zero/core/test/unit_tests/sources/helper/ze_object_utils.h" 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 1f0d6c3498..fe6a2879f0 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 @@ -10,11 +10,13 @@ #include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" +#include "shared/test/common/helpers/test_traits.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/builtin/builtin_functions_lib.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/device/device.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/source/image/image_hw.h" @@ -24,11 +26,7 @@ #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h" #include "level_zero/core/test/unit_tests/sources/helper/ze_object_utils.h" -#include "test_traits_common.h" - using namespace NEO; -#include "shared/test/common/test_macros/header/heapful_test_definitions.h" -#include "shared/test/common/test_macros/heapless_matchers.h" namespace L0 { 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 ae70b7ad9d..d453cbe3a1 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 @@ -6,18 +6,17 @@ */ #include "shared/source/command_container/encode_surface_state.h" -#include "shared/source/direct_submission/relaxed_ordering_helper.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/mocks/mock_direct_submission_hw.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/source/image/image_hw.h" @@ -27,7 +26,6 @@ #include "level_zero/core/test/unit_tests/mocks/mock_event.h" using namespace NEO; -#include "shared/test/common/test_macros/heapless_matchers.h" namespace L0 { namespace ult { 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 e4cb5eeb8a..67868f5b98 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 @@ -5,7 +5,6 @@ * */ -#include "shared/source/built_ins/sip.h" #include "shared/source/command_container/cmdcontainer.h" #include "shared/source/command_container/command_encoder.h" #include "shared/source/command_container/encode_surface_state.h" @@ -21,6 +20,7 @@ #include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/source/image/image_hw.h" @@ -32,6 +32,10 @@ #include "level_zero/core/test/unit_tests/mocks/mock_module.h" #include "level_zero/core/test/unit_tests/sources/helper/ze_object_utils.h" +#include +#include +#include + using namespace NEO; #include "shared/test/common/test_macros/heapless_matchers.h" 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 489c585c62..1dd7af804d 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 @@ -6,11 +6,9 @@ */ #include "shared/source/helpers/aligned_memory.h" -#include "shared/source/helpers/file_io.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/state_base_address_helper.h" #include "shared/source/indirect_heap/indirect_heap.h" -#include "shared/source/kernel/implicit_args_helper.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" @@ -19,6 +17,7 @@ #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/kernel/kernel_imp.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_builtin_functions_lib_impl_timestamps.h" @@ -29,8 +28,6 @@ #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" -#include "test_traits_common.h" - namespace L0 { namespace ult { 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 b412df789d..630fab7dbd 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 @@ -9,36 +9,30 @@ #include "shared/source/command_stream/scratch_space_controller.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/compiler_product_helper.h" -#include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/source/kernel/kernel_descriptor.h" #include "shared/source/memory_manager/internal_allocation_storage.h" -#include "shared/source/memory_manager/memory_manager.h" #include "shared/source/program/sync_buffer_handler.h" -#include "shared/test/common/helpers/engine_descriptor_helper.h" +#include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/stream_capture.h" -#include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_operations_handler.h" -#include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test_checks_shared.h" #include "level_zero/core/source/builtin/builtin_functions_lib.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/image/image_hw.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" -#include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_event.h" -#include "level_zero/core/test/unit_tests/mocks/mock_image.h" #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h" #include "level_zero/core/test/unit_tests/sources/helper/ze_object_utils.h" -#include "test_traits_common.h" - using namespace NEO; #include "shared/test/common/test_macros/heapless_matchers.h" 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 3f7744bdc5..4146e8dd4e 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 @@ -5,7 +5,9 @@ * */ -#include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/hw_mapper.h" +#include "shared/source/utilities/stackvec.h" +#include "shared/test/common/helpers/test_traits.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" @@ -13,12 +15,20 @@ #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/hw_test.h" -#include "level_zero/core/source/event/event_imp.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" +#include "level_zero/ze_api.h" -#include "test_traits_common.h" +#include "igfxfmid.h" + +#include +#include +#include +#include +#include namespace NEO { namespace SysCalls { diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_8.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_8.cpp index 3202c8606a..35f653254c 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_8.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_8.cpp @@ -15,6 +15,7 @@ #include "level_zero/core/source/builtin/builtin_functions_lib.h" #include "level_zero/core/source/cmdlist/cmdlist_memory_copy_params.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event_imp.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" 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 c42d108fe4..7562736b1d 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 @@ -6,16 +6,20 @@ */ #include "shared/source/command_container/command_encoder.h" -#include "shared/source/helpers/api_specific_config.h" +#include "shared/source/helpers/append_operations.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/test_macros/hw_test.h" -#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" -#include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl" +#include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" +#include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" +#include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" namespace L0 { namespace ult { 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 da29a4369c..feed3cc849 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 @@ -12,6 +12,7 @@ #include "shared/test/common/mocks/mock_command_encoder.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" 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 d1208b35ef..9ce833b54b 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 @@ -7,18 +7,17 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/command_stream/scratch_space_controller.h" -#include "shared/source/helpers/addressing_mode_helper.h" -#include "shared/source/helpers/aligned_memory.h" -#include "shared/source/helpers/api_specific_config.h" -#include "shared/source/helpers/bindless_heaps_helper.h" +#include "shared/source/command_stream/task_count_helper.h" +#include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" -#include "shared/source/helpers/preamble.h" #include "shared/source/helpers/register_offsets.h" -#include "shared/source/indirect_heap/indirect_heap.h" -#include "shared/source/os_interface/product_helper.h" +#include "shared/source/helpers/vec.h" +#include "shared/source/unified_memory/unified_memory.h" +#include "shared/source/utilities/stackvec.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/helpers/test_traits.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_device.h" @@ -27,15 +26,27 @@ #include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/fixtures/command_container_fixture.h" -#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" +#include "level_zero/core/source/cmdlist/command_to_patch.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" +#include "level_zero/core/source/kernel/kernel.h" +#include "level_zero/core/source/kernel/kernel_imp.h" +#include "level_zero/core/source/kernel/kernel_mutable_state.h" +#include "level_zero/core/source/module/module.h" +#include "level_zero/core/source/module/module_imp.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" +#include "level_zero/ze_api.h" + +#include "igfxfmid.h" + +#include -#include "test_traits_common.h" using namespace NEO; #include "shared/test/common/test_macros/heapless_matchers.h" 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 584c89b77e..46a35cee83 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 @@ -5,29 +5,45 @@ * */ -#include "shared/source/command_container/implicit_scaling.h" +#include "shared/source/command_container/cmdcontainer.h" +#include "shared/source/command_container/command_encoder.h" +#include "shared/source/command_stream/linear_stream.h" +#include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/device/device.h" +#include "shared/source/device/device_info.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/helpers/constants.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/local_id_gen.h" #include "shared/source/helpers/per_thread_data.h" -#include "shared/source/indirect_heap/indirect_heap.h" +#include "shared/source/helpers/ptr_math.h" +#include "shared/source/helpers/register_offsets.h" +#include "shared/source/indirect_heap/indirect_heap_type.h" #include "shared/source/kernel/implicit_args_helper.h" -#include "shared/source/utilities/software_tags_manager.h" +#include "shared/source/memory_manager/graphics_allocation.h" +#include "shared/source/utilities/software_tags.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" +#include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/stream_capture.h" +#include "shared/test/common/helpers/test_traits.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_bindless_heaps_helper.h" -#include "shared/test/common/mocks/mock_compilers.h" -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" -#include "test_traits_common.h" +#include +#include +#include +#include +#include using namespace NEO; #include "shared/test/common/test_macros/heapless_matchers.h" 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 84e083e8d8..138a30f7d0 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 @@ -11,18 +11,18 @@ #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/kernel_helpers.h" #include "shared/source/helpers/register_offsets.h" -#include "shared/source/indirect_heap/indirect_heap.h" #include "shared/source/kernel/implicit_args_helper.h" #include "shared/source/utilities/mem_lifetime.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_sync_buffer_handler.h" #include "shared/test/common/test_macros/hw_test.h" -#include "shared/test/unit_test/fixtures/command_container_fixture.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/multi_tile_fixture.h" 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 0581a73a0d..c287471089 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 @@ -6,22 +6,36 @@ */ #include "shared/source/command_container/encode_surface_state.h" -#include "shared/source/helpers/compiler_product_helper.h" -#include "shared/source/helpers/gfx_core_helper.h" +#include "shared/source/command_stream/csr_definitions.h" +#include "shared/source/helpers/append_operations.h" +#include "shared/source/helpers/definitions/engine_group_types.h" #include "shared/source/helpers/register_offsets.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/utilities/staging_buffer_manager.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/helpers/variable_backup.h" +#include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/driver/driver_handle_imp.h" +#include "level_zero/core/source/event/event.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" -#include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl" +#include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/sources/helper/ze_object_utils.h" +#include "level_zero/core/test/unit_tests/white_box.h" + +#include +#include namespace L0 { namespace ult { 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 2d64f79fac..df636cc5ac 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 @@ -14,6 +14,7 @@ #include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" 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 f513e784bc..63d09d9cb4 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 @@ -17,7 +17,8 @@ #include "level_zero/core/source/builtin/builtin_functions_lib.h" #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" -#include "level_zero/core/source/image/image_hw.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/image/image.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp index 4c6382aa8f..1c41d33cdc 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_copy_event_xehp_and_later.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill_event_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill_event_xehp_and_later.cpp index c2063211b4..798358e1b5 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill_event_xehp_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_fill_event_xehp_and_later.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" 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 f8988ccaa1..2e4f6e706e 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 @@ -17,11 +17,12 @@ #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" -#include "level_zero/driver_experimental/zex_api.h" +#include "level_zero/driver_experimental/zex_cmdlist.h" namespace L0 { namespace ult { 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 d9a427c119..aa4faf7465 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 @@ -6,15 +6,10 @@ */ #include "shared/source/command_container/implicit_scaling.h" -#include "shared/source/command_stream/scratch_space_controller_base.h" +#include "shared/source/command_stream/scratch_space_controller.h" #include "shared/source/gmm_helper/gmm_helper.h" -#include "shared/source/gmm_helper/gmm_lib.h" -#include "shared/source/helpers/aligned_memory.h" -#include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/definitions/command_encoder_args.h" -#include "shared/source/helpers/gfx_core_helper.h" -#include "shared/source/helpers/preamble.h" #include "shared/source/helpers/state_base_address_helper.h" #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/source/os_interface/product_helper.h" @@ -26,14 +21,12 @@ #include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist_hw.h" -#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" -#include "test_traits_common.h" - using namespace NEO; #include "shared/test/common/test_macros/header/heapful_test_definitions.h" #include "shared/test/common/test_macros/heapless_matchers.h" 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 01ddf8b452..2e9e0d5c35 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 @@ -20,6 +20,7 @@ #include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/mock_method_macros.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/unit_tests/fixtures/aub_csr_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" 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 89928fb7ea..41393eda4a 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 @@ -5,13 +5,29 @@ * */ +#include "shared/source/command_container/cmdcontainer.h" +#include "shared/source/command_stream/linear_stream.h" +#include "shared/source/command_stream/preemption_mode.h" +#include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/device/device.h" #include "shared/source/gmm_helper/gmm_helper.h" -#include "shared/source/helpers/blit_properties.h" +#include "shared/source/helpers/common_types.h" +#include "shared/source/helpers/constants.h" +#include "shared/source/helpers/definitions/engine_group_types.h" +#include "shared/source/helpers/engine_control.h" +#include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/gfx_core_helper.h" +#include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/hw_mapper.h" #include "shared/source/helpers/state_base_address.h" #include "shared/source/indirect_heap/indirect_heap.h" +#include "shared/source/memory_manager/allocation_type.h" +#include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/os_interface/os_context.h" +#include "shared/source/os_interface/product_helper.h" +#include "shared/source/sku_info/sku_info_base.h" +#include "shared/source/utilities/reference_tracked_object.h" +#include "shared/source/utilities/stackvec.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_bindless_heaps_helper.h" @@ -20,9 +36,9 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_product_helper.h" -#include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/common/ult_helpers_l0.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" @@ -30,6 +46,16 @@ #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue_handle_indirect_allocs.h" #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" + +#include "aubstream/engine_node.h" +#include "gtsysinfo.h" +#include "igfxfmid.h" + +#include +#include +#include +#include + namespace L0 { namespace ult { struct MockMemoryManagerCommandQueueSBA : public MemoryManagerMock { diff --git a/level_zero/core/test/unit_tests/sources/context/test_context_drm.cpp b/level_zero/core/test/unit_tests/sources/context/test_context_drm.cpp index 4b43034918..bc5017b4de 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context_drm.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context_drm.cpp @@ -18,6 +18,7 @@ #include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/core/source/image/image.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/context/test_context_drm_or_wddm.cpp b/level_zero/core/test/unit_tests/sources/context/test_context_drm_or_wddm.cpp index d509f06dab..edc37a25ec 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context_drm_or_wddm.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context_drm_or_wddm.cpp @@ -15,6 +15,7 @@ #include "level_zero/core/source/context/context.h" #include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "gtest/gtest.h" diff --git a/level_zero/core/test/unit_tests/sources/context/test_context_helper.cpp b/level_zero/core/test/unit_tests/sources/context/test_context_helper.cpp index fbcb5311bf..4d3f28f020 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context_helper.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Intel Corporation + * Copyright (C) 2023-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,6 +14,7 @@ #include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/core/source/driver/driver_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" @@ -21,6 +22,7 @@ #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" #include "gtest/gtest.h" + namespace L0 { namespace ult { diff --git a/level_zero/core/test/unit_tests/sources/context/test_context_wddm.cpp b/level_zero/core/test/unit_tests/sources/context/test_context_wddm.cpp index cef8b0e6cb..7e4525ada6 100644 --- a/level_zero/core/test/unit_tests/sources/context/test_context_wddm.cpp +++ b/level_zero/core/test/unit_tests/sources/context/test_context_wddm.cpp @@ -5,22 +5,13 @@ * */ -#include "shared/source/built_ins/sip.h" -#include "shared/test/common/mocks/mock_command_stream_receiver.h" -#include "shared/test/common/mocks/mock_compilers.h" -#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h" -#include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/mocks/mock_svm_manager.h" #include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/driver/driver_handle_imp.h" -#include "level_zero/core/source/image/image.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" -#include "level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h" -#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" #include "gtest/gtest.h" diff --git a/level_zero/core/test/unit_tests/sources/context/windows/test_context_helper_windows.cpp b/level_zero/core/test/unit_tests/sources/context/windows/test_context_helper_windows.cpp index b7465371d8..c84474a419 100644 --- a/level_zero/core/test/unit_tests/sources/context/windows/test_context_helper_windows.cpp +++ b/level_zero/core/test/unit_tests/sources/context/windows/test_context_helper_windows.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/test_macros/test.h" #include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/core/source/driver/driver_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" @@ -22,6 +23,7 @@ #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" #include "gtest/gtest.h" + namespace L0 { namespace ult { 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 bd7a11867e..21f753e503 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 @@ -5,12 +5,12 @@ * */ +#include "shared/source/built_ins/sip.h" #include "shared/source/command_container/encode_surface_state.h" -#include "shared/source/gen_common/reg_configs_common.h" -#include "shared/source/gmm_helper/gmm_lib.h" #include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/preamble.h" #include "shared/source/indirect_heap/indirect_heap.h" +#include "shared/source/program/kernel_info.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/mock_product_helper_hw.h" #include "shared/test/common/helpers/raii_product_helper.h" @@ -21,15 +21,20 @@ #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/cmdlist/cmdlist_memory_copy_params.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" -#include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_event.h" #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" #include "level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h" +#include "level_zero/core/test/unit_tests/white_box.h" + +#include "igfxfmid.h" + +#include namespace L0 { namespace ult { 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 fe4c89d4fa..6de9b54ccc 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 @@ -5,24 +5,26 @@ * */ -#include "shared/source/gen_common/reg_configs_common.h" +#include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/bindless_heaps_helper.h" #include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/register_offsets.h" #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/stream_capture.h" -#include "shared/test/common/mocks/mock_gmm_helper.h" #include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist.h" #include "level_zero/core/source/cmdlist/cmdlist_launch_params.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_kernel.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" #include "level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h" +#include + using namespace NEO; #include "shared/test/common/test_macros/header/heapful_test_definitions.h" #include "shared/test/common/test_macros/heapless_matchers.h" 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 8a234367f2..f9f23fa11d 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 @@ -13,6 +13,7 @@ #include "shared/test/common/mocks/mock_l0_debugger.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/module/module_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/device/device_drm/test_device.cpp b/level_zero/core/test/unit_tests/sources/device/device_drm/test_device.cpp index 9d74cfb108..0099f9dea8 100644 --- a/level_zero/core/test/unit_tests/sources/device/device_drm/test_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/device_drm/test_device.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,6 +11,7 @@ #include "shared/test/common/mocks/mock_driver_model.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h" diff --git a/level_zero/core/test/unit_tests/sources/device/device_drm/test_device_exensions.cpp b/level_zero/core/test/unit_tests/sources/device/device_drm/test_device_exensions.cpp index ef2274ec81..00428c66b6 100644 --- a/level_zero/core/test/unit_tests/sources/device/device_drm/test_device_exensions.cpp +++ b/level_zero/core/test/unit_tests/sources/device/device_drm/test_device_exensions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Intel Corporation + * Copyright (C) 2023-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,6 +12,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" diff --git a/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device.cpp b/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device.cpp index 96d55df9bd..2040f23e51 100644 --- a/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device.cpp @@ -19,6 +19,7 @@ #include "shared/test/common/mocks/mock_driver_model.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h" diff --git a/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device_exensions.cpp b/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device_exensions.cpp index 65a8122786..c949f1c0c7 100644 --- a/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device_exensions.cpp +++ b/level_zero/core/test/unit_tests/sources/device/device_drm_or_wddm/test_device_exensions.cpp @@ -15,6 +15,7 @@ #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h" #include "level_zero/core/source/cache/cache_reservation.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" diff --git a/level_zero/core/test/unit_tests/sources/device/device_wddm/test_device_exensions.cpp b/level_zero/core/test/unit_tests/sources/device/device_wddm/test_device_exensions.cpp index 138317f980..07eecddac7 100644 --- a/level_zero/core/test/unit_tests/sources/device/device_wddm/test_device_exensions.cpp +++ b/level_zero/core/test/unit_tests/sources/device/device_wddm/test_device_exensions.cpp @@ -6,17 +6,25 @@ */ #include "shared/source/helpers/driver_model_type.h" -#include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h" -#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" -#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/driver/driver_handle_imp.h" +#include "level_zero/core/test/unit_tests/mock.h" +#include "level_zero/ze_api.h" #include "gtest/gtest.h" +#include +#include +#include +#include +#include + namespace L0 { namespace ult { struct DeviceExtensionTest : public ::testing::Test { diff --git a/level_zero/core/test/unit_tests/sources/device/linux/test_device_uuid.cpp b/level_zero/core/test/unit_tests/sources/device/linux/test_device_uuid.cpp index 7c1b3fe887..bed9383ae2 100644 --- a/level_zero/core/test/unit_tests/sources/device/linux/test_device_uuid.cpp +++ b/level_zero/core/test/unit_tests/sources/device/linux/test_device_uuid.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "gtest/gtest.h" diff --git a/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp b/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp index 5ddbe8179e..70bd05328a 100644 --- a/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp +++ b/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp @@ -18,6 +18,7 @@ #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/driver/driver_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_iaf.cpp b/level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_iaf.cpp index 2f52a1b9f6..5c8a0a8f47 100644 --- a/level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_iaf.cpp +++ b/level_zero/core/test/unit_tests/sources/fabric/linux/test_fabric_iaf.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/test_macros/test.h" #include "level_zero/api/extensions/public/ze_exp_ext.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/fabric/fabric.h" #include "level_zero/core/source/fabric/linux/fabric_device_iaf.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/sources/fabric/test_fabric.cpp b/level_zero/core/test/unit_tests/sources/fabric/test_fabric.cpp index a628095adb..d89aca3127 100644 --- a/level_zero/core/test/unit_tests/sources/fabric/test_fabric.cpp +++ b/level_zero/core/test/unit_tests/sources/fabric/test_fabric.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/test_macros/test.h" #include "level_zero/api/extensions/public/ze_exp_ext.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/fabric/fabric.h" #include "level_zero/core/source/fabric/fabric_device_interface.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" 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 04e6ef8ad0..ad714dfd8e 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 @@ -11,6 +11,7 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_memory_manager.h" 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 4108b52ba6..326880c609 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 @@ -5,29 +5,28 @@ * */ +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/surface_format_info.h" #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/source/memory_manager/memory_allocation.h" +#include "shared/source/memory_manager/multi_graphics_allocation.h" #include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/helpers/default_hw_info.h" +#include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_bindless_heaps_helper.h" -#include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/mocks/mock_gmm_client_context.h" -#include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_sip.h" #include "shared/test/common/mocks/mock_usm_memory_pool.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/source/image/image_format_desc_helper.h" -#include "level_zero/core/source/image/image_formats.h" #include "level_zero/core/test/common/ult_helpers_l0.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" -#include "level_zero/core/test/unit_tests/mocks/mock_device.h" #include "level_zero/core/test/unit_tests/mocks/mock_image.h" #include "third_party/opencl_headers/CL/cl_ext.h" 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 63b90334ee..fc93c4e6fd 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 @@ -5,24 +5,16 @@ * */ -#include "shared/source/compiler_interface/external_functions.h" #include "shared/source/debug_settings/debug_settings_manager.h" -#include "shared/source/debugger/debugger_l0.h" -#include "shared/source/device_binary_format/patchtokens_decoder.h" #include "shared/source/helpers/bindless_heaps_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/source/helpers/per_thread_data.h" #include "shared/source/helpers/ray_tracing_helper.h" -#include "shared/source/indirect_heap/indirect_heap.h" -#include "shared/source/kernel/implicit_args_helper.h" #include "shared/source/kernel/kernel_descriptor.h" #include "shared/source/program/kernel_info.h" -#include "shared/source/program/kernel_info_from_patchtokens.h" -#include "shared/source/release_helper/release_helper.h" #include "shared/source/utilities/stackvec.h" #include "shared/test/common/compiler_interface/linker_mock.h" -#include "shared/test/common/device_binary_format/patchtokens_tests.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/helpers/gtest_helpers.h" @@ -34,6 +26,7 @@ #include "shared/test/common/mocks/mock_release_helper.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/image/image_format_desc_helper.h" #include "level_zero/core/source/image/image_hw.h" #include "level_zero/core/source/kernel/kernel_hw.h" 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 dfcf8934c4..01292ea96a 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 @@ -41,6 +41,7 @@ #include "shared/test/common/mocks/mock_zebin_wrapper.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/kernel/kernel_imp.h" #include "level_zero/core/source/module/module_build_log.h" #include "level_zero/core/source/module/module_imp.h" diff --git a/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.cpp b/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.cpp index e886196286..952574c7cf 100644 --- a/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.cpp +++ b/level_zero/core/test/unit_tests/sources/mutable_cmdlist/fixtures/mutable_cmdlist_fixture.cpp @@ -9,9 +9,11 @@ #include "shared/source/helpers/gfx_core_helper.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/source/mutable_cmdlist/mutable_cmdlist.h" -#include "level_zero/driver_experimental/zex_api.h" +#include "level_zero/driver_experimental/zex_event.h" namespace L0 { namespace ult { diff --git a/level_zero/core/test/unit_tests/sources/printf_handler/test_printf_handler.cpp b/level_zero/core/test/unit_tests/sources/printf_handler/test_printf_handler.cpp index b3f0354653..b669b69b1d 100644 --- a/level_zero/core/test/unit_tests/sources/printf_handler/test_printf_handler.cpp +++ b/level_zero/core/test/unit_tests/sources/printf_handler/test_printf_handler.cpp @@ -10,6 +10,8 @@ #include "level_zero/core/source/printf_handler/printf_handler.h" #include "level_zero/core/test/unit_tests/mocks/mock_device.h" +#include "gtest/gtest.h" + namespace L0 { namespace ult { 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 40c182cc5a..b9e4a688fa 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 @@ -8,6 +8,8 @@ #include "shared/source/utilities/numeric.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_sampler.h" diff --git a/level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp b/level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp index 750f041d5d..205c003e99 100644 --- a/level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp +++ b/level_zero/core/test/unit_tests/sources/semaphore/test_semaphore.cpp @@ -8,6 +8,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/semaphore/external_semaphore_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" diff --git a/level_zero/core/test/unit_tests/xe2_hpg_core/test_cmdlist_xe2_hpg_core.cpp b/level_zero/core/test/unit_tests/xe2_hpg_core/test_cmdlist_xe2_hpg_core.cpp index c14730260b..583d9434ee 100644 --- a/level_zero/core/test/unit_tests/xe2_hpg_core/test_cmdlist_xe2_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe2_hpg_core/test_cmdlist_xe2_hpg_core.cpp @@ -5,21 +5,28 @@ * */ -#include "shared/source/os_interface/product_helper.h" #include "shared/source/unified_memory/usm_memory_support.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/memory_manager/mock_prefetch_manager.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/cmdlist/cmdlist_launch_params.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/cmdlist_fixture.inl" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" -#include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" #include "level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h" -#include "implicit_args.h" +#include "igfxfmid.h" +#include "malloc.h" + +#include +#include +#include +#include namespace L0 { namespace ult { diff --git a/level_zero/core/test/unit_tests/xe2_hpg_core/test_l0_gfx_core_helper_xe2_hpg_core.cpp b/level_zero/core/test/unit_tests/xe2_hpg_core/test_l0_gfx_core_helper_xe2_hpg_core.cpp index 08bc8ce196..cc5969b5ab 100644 --- a/level_zero/core/test/unit_tests/xe2_hpg_core/test_l0_gfx_core_helper_xe2_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe2_hpg_core/test_l0_gfx_core_helper_xe2_hpg_core.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" diff --git a/level_zero/core/test/unit_tests/xe3_core/test_cmdlist_xe3_core.cpp b/level_zero/core/test/unit_tests/xe3_core/test_cmdlist_xe3_core.cpp index 9f399a73e4..e2ba75ba61 100644 --- a/level_zero/core/test/unit_tests/xe3_core/test_cmdlist_xe3_core.cpp +++ b/level_zero/core/test/unit_tests/xe3_core/test_cmdlist_xe3_core.cpp @@ -5,22 +5,24 @@ * */ -#include "shared/source/command_stream/scratch_space_controller.h" -#include "shared/source/helpers/compiler_product_helper.h" -#include "shared/source/kernel/implicit_args_helper.h" -#include "shared/source/os_interface/product_helper.h" +#include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/helpers/definitions/engine_group_types.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/helpers/unit_test_helper.h" -#include "shared/test/common/mocks/mock_compiler_product_helper.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" -#include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" +#include "igfxfmid.h" + +#include +#include +#include + namespace L0 { namespace ult { diff --git a/level_zero/core/test/unit_tests/xe3_core/test_l0_gfx_core_helper_xe3_core.cpp b/level_zero/core/test/unit_tests/xe3_core/test_l0_gfx_core_helper_xe3_core.cpp index add595da7e..0cff33f0f8 100644 --- a/level_zero/core/test/unit_tests/xe3_core/test_l0_gfx_core_helper_xe3_core.cpp +++ b/level_zero/core/test/unit_tests/xe3_core/test_l0_gfx_core_helper_xe3_core.cpp @@ -5,16 +5,17 @@ * */ +#include "shared/source/xe3_core/hw_info_xe3_core.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" -#include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" -#include "hw_cmds_xe3_core.h" +#include namespace L0 { namespace ult { 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 988d82ebf5..e45a8e2c56 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 @@ -5,18 +5,23 @@ * */ -#include "shared/source/command_stream/linear_stream.h" -#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" -#include "shared/source/xe_hpc_core/pvc/device_ids_configs_pvc.h" +#include "shared/source/helpers/definitions/engine_group_types.h" +#include "shared/source/helpers/ptr_math.h" +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" +#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" +#include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" -#include "level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.h" -#include "implicit_args.h" +#include "igfxfmid.h" + +#include +#include namespace L0 { namespace ult { 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 5953488908..75b373c736 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 @@ -6,19 +6,18 @@ */ #include "shared/source/command_container/implicit_scaling.h" -#include "shared/source/xe_hpc_core/hw_cmds_pvc.h" +#include "shared/source/xe_hpc_core/hw_info_pvc.h" #include "shared/source/xe_hpc_core/pvc/device_ids_configs_pvc.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" -#include "level_zero/core/source/cmdlist/cmdlist_imp.h" -#include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.h" +#include "level_zero/ze_api.h" -#include "neo_aot_platforms.h" +#include "platforms.h" namespace L0 { namespace ult { 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 b0624b4053..cfce6db711 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 @@ -5,23 +5,35 @@ * */ -#include "shared/source/command_stream/linear_stream.h" +#include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/definitions/engine_group_types.h" +#include "shared/source/helpers/engine_control.h" #include "shared/source/helpers/gfx_core_helper.h" +#include "shared/source/helpers/ptr_math.h" #include "shared/source/os_interface/product_helper.h" #include "shared/source/unified_memory/usm_memory_support.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/memory_manager/mock_prefetch_manager.h" -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdqueue/cmdqueue.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" +#include +#include +#include +#include +#include + namespace L0 { template struct CommandListCoreFamily; 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 7bf1e71bc3..bacd7e0bbe 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 @@ -5,7 +5,7 @@ * */ -#include "shared/source/os_interface/product_helper.h" +#include "shared/source/sku_info/sku_info_base.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" @@ -16,14 +16,19 @@ #include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/source/cmdlist/cmdlist_memory_copy_params.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/device/bcs_split.h" #include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" -#include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" -#include "level_zero/core/test/unit_tests/mocks/mock_kernel.h" -#include "level_zero/core/test/unit_tests/mocks/mock_module.h" + +#include +#include +#include +#include +#include +#include namespace L0 { namespace ult { 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 459b648ec9..63ee5fb67c 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 @@ -14,6 +14,7 @@ #include "level_zero/core/source/cmdlist/cmdlist_imp.h" #include "level_zero/core/source/cmdqueue/cmdqueue.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_device.h" diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_event_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_event_xe_hpc_core.cpp index 76fb01b48a..f4762fc09c 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_event_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_event_xe_hpc_core.cpp @@ -5,14 +5,24 @@ * */ -#include "shared/test/common/mocks/mock_device.h" +#include "shared/source/device/device.h" +#include "shared/source/memory_manager/allocation_properties.h" +#include "shared/source/memory_manager/allocation_type.h" +#include "shared/source/memory_manager/graphics_allocation.h" +#include "shared/source/utilities/stackvec.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_event.h" +#include +#include +#include + namespace NEO { class ExecutionEnvironment; } // namespace NEO diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp index b902fef2b0..5a6edbc3b8 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/test_l0_gfx_core_helper_xe_hpc_core.cpp @@ -5,11 +5,11 @@ * */ -#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" -#include "shared/test/common/helpers/default_hw_info.h" +#include "shared/source/xe_hpc_core/hw_info.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" 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 2cb33f16d5..c1273e400e 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "shared/source/kernel/kernel_properties.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" namespace L0 { diff --git a/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp b/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp index 64355becab..0638487822 100644 --- a/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp +++ b/level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp @@ -7,7 +7,7 @@ #include "level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.h" -#include "implicit_args.h" +#include "level_zero/core/source/device/device.h" namespace NEO { struct HardwareInfo; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_kernel_dg2.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_kernel_dg2.cpp index 7d80743a98..e08a795f9f 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_kernel_dg2.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_kernel_dg2.cpp @@ -5,12 +5,23 @@ * */ -#include "shared/test/common/mocks/mock_device.h" +#include "shared/source/device/device.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/ptr_math.h" +#include "shared/source/utilities/stackvec.h" #include "shared/test/common/mocks/mock_l0_debugger.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" +#include +#include +#include +#include + namespace L0 { namespace ult { using KernelTestDG2 = Test; diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_module_dg2.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_module_dg2.cpp index 3077ae699f..e9a802ca8c 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_module_dg2.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/dg2/test_module_dg2.cpp @@ -5,13 +5,17 @@ * */ +#include "shared/source/device/device.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/constants.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/kernel/kernel_arg_descriptor.h" -#include "shared/test/common/mocks/mock_compilers.h" -#include "shared/test/common/mocks/mock_device.h" +#include "shared/source/memory_manager/allocation_type.h" #include "shared/test/common/mocks/mock_l0_debugger.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" 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 52a1240bcc..84ec6abcfb 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 @@ -6,19 +6,25 @@ */ #include "shared/source/command_stream/linear_stream.h" -#include "shared/source/gmm_helper/gmm_helper.h" +#include "shared/source/helpers/append_operations.h" #include "shared/source/helpers/bindless_heaps_helper.h" #include "shared/source/helpers/l3_range.h" #include "shared/source/helpers/register_offsets.h" #include "shared/source/helpers/state_base_address.h" +#include "shared/source/kernel/kernel_descriptor.h" +#include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" +#include "shared/test/common/helpers/test_traits_platforms.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/test_macros/hw_test.h" -#include "shared/test/common/xe_hpg_core/test_traits_xe_hpg_core.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/event/event.h" -#include "level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.h" +#include "level_zero/core/source/kernel/kernel.h" +#include "level_zero/core/source/kernel/kernel_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/fixtures/module_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" 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 0725b57313..ead1cc2485 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 @@ -7,6 +7,7 @@ #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/image/image.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/white_box.h" diff --git a/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_gfx_core_helper_xe_hpg_core.cpp b/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_gfx_core_helper_xe_hpg_core.cpp index 84c77eea3f..5f8683f778 100644 --- a/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_gfx_core_helper_xe_hpg_core.cpp +++ b/level_zero/core/test/unit_tests/xe_hpg_core/test_l0_gfx_core_helper_xe_hpg_core.cpp @@ -5,12 +5,12 @@ * */ -#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" -#include "shared/test/common/helpers/default_hw_info.h" +#include "shared/source/xe_hpg_core/hw_info.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" 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 37c19e8ad8..2b80e72fc7 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 @@ -1,17 +1,24 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/device/device.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/kernel/kernel_properties.h" -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/core/test/unit_tests/mocks/mock_module.h" +#include +#include +#include + namespace L0 { namespace ult { diff --git a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h index 3fb9476729..f0fbb095cd 100644 --- a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h +++ b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h @@ -17,6 +17,7 @@ #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/sysman/source/device/sysman_device.h" #include "level_zero/sysman/source/driver/sysman_driver.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp index b6270f829e..b145d2d04d 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp @@ -18,6 +18,7 @@ #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/metrics/linux/os_metric_ip_sampling_imp_linux.h" #include "level_zero/tools/source/metrics/os_interface_metric.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.cpp b/level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.cpp index 7ac3fa8740..89d1347079 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.cpp @@ -7,6 +7,8 @@ #include "level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/metrics/metric_ip_sampling_source.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp index 79e47aac62..df53893023 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.cpp @@ -7,9 +7,9 @@ #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" -#include "shared/source/command_container/implicit_scaling.h" #include "shared/test/common/mocks/mock_os_library.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/tools/source/metrics/metric_ip_sampling_source.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/source/metrics/metric_oa_streamer_imp.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric.cpp index a50016a8ab..e06c108866 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric.cpp @@ -7,8 +7,9 @@ #include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/test_macros/test.h" -#include "shared/test/common/test_macros/test_base.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_source.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp index d870a59b56..28d86c1553 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_enumeration.cpp @@ -7,17 +7,14 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/test_macros/hw_test.h" -#include "shared/test/common/test_macros/test_base.h" #include "level_zero/api/extensions/public/ze_exp_ext.h" #include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/metrics/metric_ip_sampling_source.h" -#include "level_zero/tools/source/metrics/metric_ip_sampling_streamer.h" -#include "level_zero/tools/source/metrics/metric_oa_source.h" -#include "level_zero/tools/source/metrics/os_interface_metric.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_ip_sampling.h" -#include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_source.h" #include "level_zero/zet_intel_gpu_metric.h" #include "level_zero/zet_intel_gpu_metric_export.h" #include diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer_1.cpp index fa5ea78aa0..6410340f92 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer_1.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer_1.cpp @@ -5,6 +5,8 @@ * */ +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/tools/source/metrics/metric_ip_sampling_streamer.h" #include "level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_ip_sampling.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer_2.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer_2.cpp index 9b32579e07..6086bc48e1 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer_2.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_ip_sampling_streamer_2.cpp @@ -5,7 +5,10 @@ * */ +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/tools/test/unit_tests/sources/metrics/metric_ip_sampling_fixture.h" + namespace L0 { namespace ult { 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 8e3633e694..f4f1fba480 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 @@ -10,10 +10,10 @@ #include "shared/test/common/test_macros/test_base.h" #include "level_zero/api/extensions/public/ze_exp_ext.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/gfx_core_helpers/l0_gfx_core_helper.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" -#include "level_zero/core/test/unit_tests/mocks/mock_driver.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" #include "level_zero/zet_intel_gpu_metric.h" 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 b8e1664a67..900afc1e8c 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 @@ -8,8 +8,8 @@ #include "shared/test/common/test_macros/test.h" #include "level_zero/api/extensions/public/ze_exp_ext.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/source/device/device_imp.h" -#include "level_zero/core/test/unit_tests/mocks/mock_driver.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp index 78a760a345..7f329077f7 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2024 Intel Corporation + * Copyright (C) 2020-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,9 +7,8 @@ #include "shared/test/common/test_macros/test_base.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" -#include "level_zero/core/test/unit_tests/mocks/mock_device.h" -#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp index 885c40a369..7e7636ec0a 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_2.cpp @@ -5,12 +5,10 @@ * */ -#include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/test_base.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" -#include "level_zero/core/test/unit_tests/mocks/mock_device.h" -#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp index 1e94940ca8..48e4a397b2 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_3.cpp @@ -1,21 +1,25 @@ /* - * Copyright (C) 2020-2024 Intel Corporation + * Copyright (C) 2020-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/test_base.h" +#include "level_zero/core/source/context/context.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" -#include "level_zero/core/test/unit_tests/mocks/mock_device.h" -#include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h" #include "gtest/gtest.h" +#include +#include + namespace L0 { namespace ult { diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_4.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_4.cpp index 58957afc28..4595fc61f6 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_4.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_4.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Intel Corporation + * Copyright (C) 2022-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "shared/test/common/test_macros/test_base.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" -#include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h" #include "gtest/gtest.h" diff --git a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_5.cpp b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_5.cpp index 50a6493dc9..9fc96c674b 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_5.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/test_metric_oa_query_pool_5.cpp @@ -6,7 +6,8 @@ */ #include "level_zero/api/extensions/public/ze_exp_ext.h" -#include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/test/unit_tests/sources/metrics/metric_query_pool_fixture.h" 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 a2c55f41be..92cc09506a 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 @@ -8,8 +8,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_base.h" +#include "level_zero/core/source/context/context_imp.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdlist.h" -#include "level_zero/core/test/unit_tests/mocks/mock_driver.h" #include "level_zero/core/test/unit_tests/mocks/mock_event.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" 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 3a4f92fb0a..a647508fd2 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2024 Intel Corporation + * Copyright (C) 2021-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,8 @@ #include "shared/test/common/test_macros/test_base.h" #include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/tools/source/metrics/metric_oa_source.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" 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 2dc95583a2..a6b6ec41dd 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 @@ -10,6 +10,8 @@ #include "level_zero/api/extensions/public/ze_exp_ext.h" #include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/context/context_imp.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/tools/test/unit_tests/sources/metrics/mock_metric_oa.h" namespace L0 { diff --git a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling.cpp b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling.cpp index 0132b746bc..3e337f3615 100644 --- a/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling.cpp +++ b/level_zero/tools/test/unit_tests/sources/metrics/windows/test_metric_ip_sampling.cpp @@ -5,13 +5,24 @@ * */ -#include "shared/test/common/mocks/mock_device.h" +#include "shared/source/device/device.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/constants.h" +#include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_wddm.h" #include "shared/test/common/test_macros/hw_test.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" -#include "level_zero/tools/source/metrics/metric_ip_sampling_source.h" -#include +#include "level_zero/tools/source/metrics/os_interface_metric.h" + +#include "igfxfmid.h" + +#include +#include +#include +#include namespace L0 { namespace ult { diff --git a/level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/test_zes_ecc.cpp b/level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/test_zes_ecc.cpp index 64c4489ecb..022945ee6d 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/test_zes_ecc.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/test_zes_ecc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Intel Corporation + * Copyright (C) 2022-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/os_interface/driver_info.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/tools/source/sysman/sysman_imp.h" #include "level_zero/tools/test/unit_tests/sources/sysman/ecc/windows/mock_ecc.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/windows/test_zes_fabric_port.cpp b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/windows/test_zes_fabric_port.cpp index 01d42c6f21..988b003c96 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/windows/test_zes_fabric_port.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/fabric_port/windows/test_zes_fabric_port.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2023 Intel Corporation + * Copyright (C) 2023-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "level_zero/core/source/device/device.h" #include "level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h" #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h index ecdec5a425..c4f28017ec 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h +++ b/level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h @@ -13,6 +13,7 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/mocks/mock_device.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/core/source/driver/driver.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" #include "level_zero/tools/source/sysman/linux/os_sysman_driver_imp.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/ras/windows/test_zes_ras.cpp b/level_zero/tools/test/unit_tests/sources/sysman/ras/windows/test_zes_ras.cpp index 9fca8fd303..ca7459730d 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/ras/windows/test_zes_ras.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/ras/windows/test_zes_ras.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2023 Intel Corporation + * Copyright (C) 2023-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "level_zero/core/source/device/device.h" #include "level_zero/tools/source/sysman/ras/ras_imp.h" #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h" diff --git a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/windows/test_zes_sysman_scheduler.cpp b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/windows/test_zes_sysman_scheduler.cpp index 8a020dbfb3..9a04b744fd 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/scheduler/windows/test_zes_sysman_scheduler.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/scheduler/windows/test_zes_sysman_scheduler.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2022-2023 Intel Corporation + * Copyright (C) 2022-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "level_zero/tools/source/sysman/scheduler/os_scheduler.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/tools/source/sysman/scheduler/scheduler_imp.h" #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h" 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 5c7c221ffc..340d6b6b5f 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 @@ -6,11 +6,11 @@ */ #include "shared/source/os_interface/debug_env_reader.h" -#include "shared/test/common/mocks/mock_driver_info.h" -#include "shared/test/common/test_macros/hw_test.h" +#include "shared/source/os_interface/driver_info.h" +#include "shared/test/common/test_macros/test.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/tools/source/sysman/sysman_imp.h" -#include "level_zero/tools/test/unit_tests/sources/sysman/firmware_util/mock_fw_util_fixture.h" #include "level_zero/tools/test/unit_tests/sources/sysman/windows/mock_sysman_fixture.h" namespace L0 { diff --git a/opencl/test/unit_test/event/event_callbacks_tests.cpp b/opencl/test/unit_test/event/event_callbacks_tests.cpp index fe7aaa45f6..eee177b613 100644 --- a/opencl/test/unit_test/event/event_callbacks_tests.cpp +++ b/opencl/test/unit_test/event/event_callbacks_tests.cpp @@ -12,6 +12,8 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" +#include "gtest/gtest.h" + #include using namespace NEO; diff --git a/opencl/test/unit_test/kernel/debug_kernel_tests.cpp b/opencl/test/unit_test/kernel/debug_kernel_tests.cpp index 34675992d7..374ffb2976 100644 --- a/opencl/test/unit_test/kernel/debug_kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/debug_kernel_tests.cpp @@ -11,6 +11,8 @@ #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" +#include "gtest/gtest.h" + #include using namespace NEO; diff --git a/opencl/test/unit_test/utilities/file_logger_tests.cpp b/opencl/test/unit_test/utilities/file_logger_tests.cpp index 5e33b802ca..63ef138129 100644 --- a/opencl/test/unit_test/utilities/file_logger_tests.cpp +++ b/opencl/test/unit_test/utilities/file_logger_tests.cpp @@ -20,7 +20,8 @@ #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_program.h" -#include +#include "gtest/gtest.h" + #include #include #include diff --git a/shared/test/common/fixtures/command_stream_receiver_fixture.cpp b/shared/test/common/fixtures/command_stream_receiver_fixture.cpp index 2648a9e5be..c06f928117 100644 --- a/shared/test/common/fixtures/command_stream_receiver_fixture.cpp +++ b/shared/test/common/fixtures/command_stream_receiver_fixture.cpp @@ -12,6 +12,8 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "gtest/gtest.h" + using namespace NEO; void CommandStreamReceiverFixture::setUp() { diff --git a/shared/test/common/mocks/mock_device.cpp b/shared/test/common/mocks/mock_device.cpp index 0b4ebf308e..02ef4e0aa7 100644 --- a/shared/test/common/mocks/mock_device.cpp +++ b/shared/test/common/mocks/mock_device.cpp @@ -19,6 +19,8 @@ #include "shared/test/common/mocks/mock_ostime.h" #include "shared/test/common/mocks/ult_device_factory.h" +#include "gtest/gtest.h" + using namespace NEO; bool MockDevice::createSingleDevice = true; @@ -207,6 +209,10 @@ std::unique_ptr MockDevice::createCommandStreamReceiver() return std::unique_ptr(createCommandStreamReceiverFunc(*executionEnvironment, getRootDeviceIndex(), getDeviceBitfield())); } +MockSubDevice::~MockSubDevice() { + EXPECT_EQ(nullptr, this->getDebugSurface()); +} + std::unique_ptr MockSubDevice::createCommandStreamReceiver() const { return std::unique_ptr(createCommandStreamReceiverFunc(*executionEnvironment, getRootDeviceIndex(), getDeviceBitfield())); } diff --git a/shared/test/common/mocks/mock_device.h b/shared/test/common/mocks/mock_device.h index d3727d3d68..859dad91ee 100644 --- a/shared/test/common/mocks/mock_device.h +++ b/shared/test/common/mocks/mock_device.h @@ -15,8 +15,6 @@ #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_memory_operations_handler.h" -#include "gtest/gtest.h" - namespace NEO { class CommandStreamReceiver; class DriverInfo; @@ -36,9 +34,7 @@ struct MockSubDevice : public SubDevice { using SubDevice::getGlobalMemorySize; using SubDevice::SubDevice; - ~MockSubDevice() override { - EXPECT_EQ(nullptr, this->getDebugSurface()); - } + ~MockSubDevice() override; std::unique_ptr createCommandStreamReceiver() const override; static decltype(&createCommandStream) createCommandStreamReceiverFunc; diff --git a/shared/test/unit_test/os_interface/wddm_linux/ccs_mode_drm_or_wddm_test.cpp b/shared/test/unit_test/os_interface/wddm_linux/ccs_mode_drm_or_wddm_test.cpp index ffdc90ac9f..071f88b571 100644 --- a/shared/test/unit_test/os_interface/wddm_linux/ccs_mode_drm_or_wddm_test.cpp +++ b/shared/test/unit_test/os_interface/wddm_linux/ccs_mode_drm_or_wddm_test.cpp @@ -21,6 +21,8 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_gmm_client_context.h" +#include "gtest/gtest.h" + static uint32_t ccsMode = 1u; struct MockWddmLinux : NEO::Wddm {