diff --git a/opencl/source/command_queue/command_queue_hw.h b/opencl/source/command_queue/command_queue_hw.h index be72f4f144..29b9c85c25 100644 --- a/opencl/source/command_queue/command_queue_hw.h +++ b/opencl/source/command_queue/command_queue_hw.h @@ -8,10 +8,8 @@ #pragma once #include "shared/source/built_ins/built_in_ops_base.h" #include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/transfer_direction.h" #include "shared/source/debug_settings/debug_settings_manager.h" -#include "shared/source/device/device.h" #include "shared/source/helpers/aux_translation.h" #include "shared/source/helpers/bcs_ccs_dependency_pair_container.h" #include "shared/source/helpers/engine_control.h" @@ -22,7 +20,6 @@ #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" -#include "opencl/source/command_queue/csr_selection_args.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/helpers/queue_helpers.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/source/command_queue/enqueue_barrier.h b/opencl/source/command_queue/enqueue_barrier.h index 0dc1b08aab..0d2c37a346 100644 --- a/opencl/source/command_queue/enqueue_barrier.h +++ b/opencl/source/command_queue/enqueue_barrier.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,7 @@ #include "shared/source/memory_manager/surface.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/helpers/dispatch_info.h" namespace NEO { diff --git a/opencl/source/command_queue/enqueue_copy_buffer_rect.h b/opencl/source/command_queue/enqueue_copy_buffer_rect.h index af198219f1..b5d2f1e156 100644 --- a/opencl/source/command_queue/enqueue_copy_buffer_rect.h +++ b/opencl/source/command_queue/enqueue_copy_buffer_rect.h @@ -10,6 +10,8 @@ #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/command_queue/csr_selection_args.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/memory_manager/mem_obj_surface.h" diff --git a/opencl/source/command_queue/enqueue_copy_buffer_to_image.h b/opencl/source/command_queue/enqueue_copy_buffer_to_image.h index 1b1b8d3da7..41d8b8bf23 100644 --- a/opencl/source/command_queue/enqueue_copy_buffer_to_image.h +++ b/opencl/source/command_queue/enqueue_copy_buffer_to_image.h @@ -8,6 +8,7 @@ #pragma once #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/mipmap.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/command_queue/enqueue_copy_image.h b/opencl/source/command_queue/enqueue_copy_image.h index e2845e57aa..cd9d66e616 100644 --- a/opencl/source/command_queue/enqueue_copy_image.h +++ b/opencl/source/command_queue/enqueue_copy_image.h @@ -6,20 +6,18 @@ */ #pragma once -#include "shared/source/built_ins/built_ins.h" + #include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/source/helpers/basic_math.h" +#include "shared/source/helpers/vec.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" -#include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/source/command_queue/csr_selection_args.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/mipmap.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/mem_obj_surface.h" -#include -#include - namespace NEO { template diff --git a/opencl/source/command_queue/enqueue_copy_image_to_buffer.h b/opencl/source/command_queue/enqueue_copy_image_to_buffer.h index b1786ee1c0..60ebb99c3c 100644 --- a/opencl/source/command_queue/enqueue_copy_image_to_buffer.h +++ b/opencl/source/command_queue/enqueue_copy_image_to_buffer.h @@ -8,6 +8,7 @@ #pragma once #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/mipmap.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/command_queue/enqueue_fill_buffer.h b/opencl/source/command_queue/enqueue_fill_buffer.h index 43aaf80bd0..d511f2aecb 100644 --- a/opencl/source/command_queue/enqueue_fill_buffer.h +++ b/opencl/source/command_queue/enqueue_fill_buffer.h @@ -7,12 +7,12 @@ #pragma once #include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/source/memory_manager/allocation_properties.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_manager.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/memory_manager/mem_obj_surface.h" diff --git a/opencl/source/command_queue/enqueue_fill_image.h b/opencl/source/command_queue/enqueue_fill_image.h index c8f98e7697..a173b33488 100644 --- a/opencl/source/command_queue/enqueue_fill_image.h +++ b/opencl/source/command_queue/enqueue_fill_image.h @@ -6,19 +6,14 @@ */ #pragma once -#include "shared/source/built_ins/built_ins.h" -#include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/source/helpers/basic_math.h" +#include "shared/source/helpers/vec.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" -#include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/mem_obj_surface.h" -#include -#include - namespace NEO { template diff --git a/opencl/source/command_queue/enqueue_marker.h b/opencl/source/command_queue/enqueue_marker.h index 7363a8c897..0410e43031 100644 --- a/opencl/source/command_queue/enqueue_marker.h +++ b/opencl/source/command_queue/enqueue_marker.h @@ -10,6 +10,7 @@ #include "shared/source/memory_manager/surface.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/helpers/dispatch_info.h" namespace NEO { diff --git a/opencl/source/command_queue/enqueue_migrate_mem_objects.h b/opencl/source/command_queue/enqueue_migrate_mem_objects.h index 29f383b64c..bb59714617 100644 --- a/opencl/source/command_queue/enqueue_migrate_mem_objects.h +++ b/opencl/source/command_queue/enqueue_migrate_mem_objects.h @@ -1,18 +1,15 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/source/device/device.h" #include "shared/source/memory_manager/surface.h" #include "opencl/source/command_queue/command_queue_hw.h" -#include "opencl/source/command_queue/gpgpu_walker.h" -#include "opencl/source/event/event.h" +#include "opencl/source/helpers/dispatch_info.h" namespace NEO { diff --git a/opencl/source/command_queue/enqueue_read_buffer.h b/opencl/source/command_queue/enqueue_read_buffer.h index e846bacf2d..bdd3b62e6d 100644 --- a/opencl/source/command_queue/enqueue_read_buffer.h +++ b/opencl/source/command_queue/enqueue_read_buffer.h @@ -6,21 +6,19 @@ */ #pragma once -#include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/cache_policy.h" #include "shared/source/helpers/engine_node_helper.h" -#include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/os_interface/os_context.h" +#include "shared/source/unified_memory/unified_memory.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/command_queue/csr_selection_args.h" #include "opencl/source/command_queue/enqueue_common.h" -#include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/memory_manager/mem_obj_surface.h" -#include - namespace NEO { template diff --git a/opencl/source/command_queue/enqueue_read_buffer_rect.h b/opencl/source/command_queue/enqueue_read_buffer_rect.h index 9b67407850..9b8b7efabe 100644 --- a/opencl/source/command_queue/enqueue_read_buffer_rect.h +++ b/opencl/source/command_queue/enqueue_read_buffer_rect.h @@ -6,11 +6,12 @@ */ #pragma once -#include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/command_queue/csr_selection_args.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/memory_manager/mem_obj_surface.h" diff --git a/opencl/source/command_queue/enqueue_read_image.h b/opencl/source/command_queue/enqueue_read_image.h index f6d1922ea9..c31bfb5523 100644 --- a/opencl/source/command_queue/enqueue_read_image.h +++ b/opencl/source/command_queue/enqueue_read_image.h @@ -6,17 +6,18 @@ */ #pragma once -#include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/cache_policy.h" #include "shared/source/helpers/engine_node_helper.h" +#include "shared/source/helpers/vec.h" #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/os_interface/os_context.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/command_queue/csr_selection_args.h" #include "opencl/source/context/context.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/mipmap.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/mem_obj_surface.h" diff --git a/opencl/source/command_queue/enqueue_svm.h b/opencl/source/command_queue/enqueue_svm.h index 91d9c044d9..6d403e30e1 100644 --- a/opencl/source/command_queue/enqueue_svm.h +++ b/opencl/source/command_queue/enqueue_svm.h @@ -6,12 +6,12 @@ */ #pragma once -#include "shared/source/built_ins/built_ins.h" #include "shared/source/memory_manager/surface.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/page_fault_manager/cpu_page_fault_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/command_queue/csr_selection_args.h" #include "opencl/source/command_queue/enqueue_common.h" #include "opencl/source/event/event.h" diff --git a/opencl/source/command_queue/enqueue_write_buffer.h b/opencl/source/command_queue/enqueue_write_buffer.h index 6a5820b781..5f748fd2ea 100644 --- a/opencl/source/command_queue/enqueue_write_buffer.h +++ b/opencl/source/command_queue/enqueue_write_buffer.h @@ -6,12 +6,13 @@ */ #pragma once -#include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/source/memory_manager/unified_memory_manager.h" +#include "shared/source/unified_memory/unified_memory.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/command_queue/csr_selection_args.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/memory_manager/mem_obj_surface.h" diff --git a/opencl/source/command_queue/enqueue_write_buffer_rect.h b/opencl/source/command_queue/enqueue_write_buffer_rect.h index 659253d7de..14c855786b 100644 --- a/opencl/source/command_queue/enqueue_write_buffer_rect.h +++ b/opencl/source/command_queue/enqueue_write_buffer_rect.h @@ -6,16 +6,15 @@ */ #pragma once -#include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" -#include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/source/command_queue/csr_selection_args.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/memory_manager/mem_obj_surface.h" -#include namespace NEO { template diff --git a/opencl/source/command_queue/enqueue_write_image.h b/opencl/source/command_queue/enqueue_write_image.h index 862e74bbee..cb21e466f8 100644 --- a/opencl/source/command_queue/enqueue_write_image.h +++ b/opencl/source/command_queue/enqueue_write_image.h @@ -6,22 +6,18 @@ */ #pragma once -#include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/source/helpers/basic_math.h" +#include "shared/source/helpers/vec.h" #include "shared/source/memory_manager/graphics_allocation.h" -#include "shared/source/utilities/staging_buffer_manager.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" -#include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/source/command_queue/csr_selection_args.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/mipmap.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/mem_obj_surface.h" -#include -#include - namespace NEO { template diff --git a/opencl/source/command_queue/gpgpu_walker.h b/opencl/source/command_queue/gpgpu_walker.h index 5e02a97588..fde4b0d95f 100644 --- a/opencl/source/command_queue/gpgpu_walker.h +++ b/opencl/source/command_queue/gpgpu_walker.h @@ -8,15 +8,13 @@ #pragma once #include "shared/source/command_stream/linear_stream.h" -#include "shared/source/command_stream/preemption.h" -#include "shared/source/helpers/register_offsets.h" #include "shared/source/indirect_heap/indirect_heap.h" -#include "opencl/source/command_queue/cl_local_work_size.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/hardware_commands_helper.h" namespace NEO { +class DispatchInfo; class Surface; struct RootDeviceEnvironment; diff --git a/opencl/source/command_queue/hardware_interface_base.inl b/opencl/source/command_queue/hardware_interface_base.inl index 78b73f68ad..889e54f820 100644 --- a/opencl/source/command_queue/hardware_interface_base.inl +++ b/opencl/source/command_queue/hardware_interface_base.inl @@ -10,8 +10,8 @@ #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/pause_on_gpu_properties.h" #include "shared/source/helpers/pipe_control_args.h" -#include "shared/source/memory_manager/internal_allocation_storage.h" +#include "opencl/source/command_queue/cl_local_work_size.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/source/helpers/cl_preemption_helper.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_wait_for_events_tests.inl b/opencl/test/unit_test/api/cl_enqueue_wait_for_events_tests.inl index d4090a40e4..5e60f16237 100644 --- a/opencl/test/unit_test/api/cl_enqueue_wait_for_events_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_wait_for_events_tests.inl @@ -14,12 +14,13 @@ #include "opencl/source/event/event.h" #include "opencl/source/event/user_event.h" #include "opencl/source/gtpin/gtpin_defs.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "cl_api_tests.h" -#include +#include using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_kernel_suggested_local_work_size_intel_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_suggested_local_work_size_intel_tests.inl index 67254e6335..a7a0523b6c 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_suggested_local_work_size_intel_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_suggested_local_work_size_intel_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "opencl/source/command_queue/cl_local_work_size.h" #include "opencl/source/command_queue/command_queue.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_set_event_callback_tests.inl b/opencl/test/unit_test/api/cl_set_event_callback_tests.inl index 8f874ea398..fc62175460 100644 --- a/opencl/test/unit_test/api/cl_set_event_callback_tests.inl +++ b/opencl/test/unit_test/api/cl_set_event_callback_tests.inl @@ -1,15 +1,17 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/libult/ult_command_stream_receiver.h" #include "opencl/source/event/event.h" #include "cl_api_tests.h" + using namespace NEO; namespace ClSetEventCallbackTests { diff --git a/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl index 02d63f83ec..d7850612e6 100644 --- a/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl +++ b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl @@ -5,19 +5,26 @@ * */ +#include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/device/device.h" +#include "shared/source/device/device_info.h" +#include "shared/source/helpers/aligned_memory.h" +#include "shared/source/helpers/ptr_math.h" +#include "shared/source/kernel/kernel_arg_descriptor.h" +#include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/unified_memory/usm_memory_support.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "opencl/source/api/api.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory_with_platform.h" -#include "opencl/test/unit_test/test_macros/test_checks_ocl.h" + +#include "CL/cl.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp index cdbb2bca54..5c3e5ffd7c 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp @@ -8,24 +8,23 @@ #include "shared/source/command_container/implicit_scaling.h" #include "shared/source/command_container/walker_partition_xehp_and_later.h" #include "shared/source/command_stream/aub_command_stream_receiver_hw.h" -#include "shared/source/memory_manager/internal_allocation_storage.h" +#include "shared/source/memory_manager/memory_manager.h" +#include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/os_interface/os_context.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/unit_test_helper.h" -#include "shared/test/common/mocks/mock_allocation_properties.h" -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/command_queue.h" +#include "opencl/source/context/context.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/aub_tests/fixtures/multicontext_ocl_aub_fixture.h" #include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "multitile_matchers.h" diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp index 3000097b0d..17c6f97e15 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -6,47 +6,46 @@ */ #include "shared/source/built_ins/built_ins.h" +#include "shared/source/built_ins/sip.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#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/gmm_helper.h" +#include "shared/source/helpers/append_operations.h" #include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hash.h" #include "shared/source/helpers/path.h" -#include "shared/source/helpers/string.h" +#include "shared/source/indirect_heap/indirect_heap_type.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/helpers/test_files.h" -#include "shared/test/common/libult/global_environment.h" -#include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/helpers/test_traits.h" #include "shared/test/common/mocks/mock_builtinslib.h" #include "shared/test/common/mocks/mock_compiler_interface.h" -#include "shared/test/common/mocks/mock_compilers.h" +#include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_memory_manager.h" -#include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/test_checks_shared.h" #include "shared/test/common/utilities/base_object_utils.h" #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" -#include "opencl/source/helpers/dispatch_info_builder.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/built_ins/built_ins_file_names.h" #include "opencl/test/unit_test/fixtures/built_in_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" -#include "opencl/test/unit_test/fixtures/run_kernel_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "opencl/test/unit_test/test_macros/test_checks_ocl.h" #include "gtest/gtest.h" #include "os_inc.h" -#include "test_traits_common.h" #include diff --git a/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp b/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp index 0522055b1a..32f8d80c3b 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/blit_enqueue_2_tests.cpp @@ -6,16 +6,17 @@ */ #include "shared/source/helpers/local_memory_access_modes.h" -#include "shared/source/memory_manager/unified_memory_manager.h" +#include "shared/source/memory_manager/allocation_type.h" #include "shared/source/utilities/hw_timestamps.h" +#include "shared/source/utilities/tag_allocator.h" #include "shared/test/common/compiler_interface/linker_mock.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/event/user_event.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/command_queue/blit_enqueue_fixture.h" -#include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/command_queue/blit_enqueue_fixture.h b/opencl/test/unit_test/command_queue/blit_enqueue_fixture.h index 1a36be9f23..deac0d0abb 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_fixture.h +++ b/opencl/test/unit_test/command_queue/blit_enqueue_fixture.h @@ -7,25 +7,21 @@ #pragma once +#include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/gmm_helper/gmm.h" -#include "shared/source/helpers/local_memory_access_modes.h" -#include "shared/source/helpers/pause_on_gpu_properties.h" +#include "shared/source/helpers/aux_translation.h" #include "shared/source/helpers/vec.h" -#include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/cmd_parse/hw_parse.h" -#include "shared/test/common/compiler_interface/linker_mock.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/unit_test_helper.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/common/mocks/mock_timestamp_container.h" +#include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/utilities/base_object_utils.h" -#include "opencl/source/event/user_event.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/command_queue/command_enqueue_fixture.h b/opencl/test/unit_test/command_queue/command_enqueue_fixture.h index a78c6abfa3..db2e93156e 100644 --- a/opencl/test/unit_test/command_queue/command_enqueue_fixture.h +++ b/opencl/test/unit_test/command_queue/command_enqueue_fixture.h @@ -6,8 +6,8 @@ */ #pragma once -#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" +#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -18,10 +18,7 @@ #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" #include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h" -#include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" - -#include "test_traits_common.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp index d80f75a43e..d225d45238 100644 --- a/opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_hw_1_tests.cpp @@ -17,7 +17,7 @@ #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_sharing_handler.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp index f03feaeb38..070ff06d60 100644 --- a/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp @@ -18,15 +18,16 @@ #include "shared/test/common/utilities/base_object_utils.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" -#include "opencl/source/helpers/dispatch_info_builder.h" +#include "opencl/source/command_queue/command_queue.h" +#include "opencl/source/event/event.h" +#include "opencl/source/event/user_event.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_builder.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp index bfe456e096..9814c085f7 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -31,9 +31,9 @@ #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/command_queue/csr_selection_args.h" #include "opencl/source/event/event.h" #include "opencl/source/event/user_event.h" -#include "opencl/source/helpers/cl_gfx_core_helper.h" #include "opencl/source/sharings/sharing.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" @@ -44,6 +44,7 @@ #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/fixtures/multi_tile_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_image.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp b/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp index 5f3b83bf5a..104641050d 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests_pvc_and_later.cpp @@ -5,7 +5,10 @@ * */ +#include "shared/source/helpers/append_operations.h" #include "shared/source/helpers/engine_node_helper.h" +#include "shared/source/helpers/gfx_core_helper.h" +#include "shared/source/memory_manager/surface.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_execution_environment.h" @@ -13,16 +16,26 @@ #include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/utilities/base_object_utils.h" +#include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/source/cl_device/cl_device_vector.h" +#include "opencl/source/command_queue/command_queue.h" +#include "opencl/source/command_queue/csr_selection_args.h" #include "opencl/source/command_queue/enqueue_common.h" +#include "opencl/source/context/context.h" #include "opencl/source/event/event.h" +#include "opencl/source/helpers/base_object.h" +#include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "CL/cl_ext.h" + using namespace NEO; using CommandQueuePvcAndLaterTests = ::testing::Test; diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp index 34a1b5470f..2593b0a690 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/command_container/encode_surface_state.h" -#include "shared/source/helpers/aligned_memory.h" +#include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/basic_math.h" -#include "shared/source/helpers/file_io.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/local_work_size.h" +#include "shared/source/helpers/vec.h" #include "shared/source/kernel/implicit_args_helper.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/utilities/hw_timestamps.h" @@ -31,6 +31,7 @@ #include "opencl/test/unit_test/command_queue/hardware_interface_helper.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp index 0e3d6f97a1..5130aecc32 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests_dg2_and_later.cpp @@ -19,6 +19,7 @@ #include "opencl/test/unit_test/command_queue/hardware_interface_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp index 4877e75ef5..49e19a6aec 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests_xehp_and_later.cpp @@ -5,21 +5,29 @@ * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/source/command_container/implicit_scaling.h" -#include "shared/source/command_container/walker_partition_xehp_and_later.h" +#include "shared/source/command_container/walker_partition_interface.h" #include "shared/source/command_stream/linear_stream.h" +#include "shared/source/debug_settings/debug_settings_manager.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/helpers/simd_helper.h" #include "shared/source/helpers/timestamp_packet.h" #include "shared/source/indirect_heap/indirect_heap.h" -#include "shared/source/memory_manager/unified_memory_manager.h" -#include "shared/source/os_interface/os_interface.h" +#include "shared/source/indirect_heap/indirect_heap_type.h" +#include "shared/source/kernel/kernel_descriptor.h" +#include "shared/source/memory_manager/graphics_allocation.h" +#include "shared/source/os_interface/product_helper.h" +#include "shared/source/program/heap_info.h" +#include "shared/source/program/kernel_info.h" #include "shared/source/utilities/hw_timestamps.h" +#include "shared/source/utilities/stackvec.h" #include "shared/source/utilities/tag_allocator.h" #include "shared/test/common/fixtures/linear_stream_fixture.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/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_allocation_properties.h" @@ -27,21 +35,21 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_timestamp_container.h" -#include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/source/helpers/dispatch_info_builder.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/source/program/program.h" #include "opencl/test/unit_test/command_queue/hardware_interface_helper.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "test_traits_common.h" - using namespace NEO; using WalkerDispatchTest = ::testing::Test; diff --git a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp index c7b8f5d64b..f692cb3c89 100644 --- a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp @@ -20,7 +20,7 @@ #include "opencl/test/unit_test/fixtures/dispatch_flags_fixture.h" #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp index 9cee23ab13..715728b257 100644 --- a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests_dg2_and_later.cpp @@ -5,22 +5,21 @@ * */ -#include "shared/source/os_interface/os_context.h" -#include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/source/command_stream/linear_stream.h" +#include "shared/source/command_stream/preemption_mode.h" +#include "shared/source/helpers/timestamp_packet_container.h" +#include "shared/source/indirect_heap/indirect_heap.h" +#include "shared/source/indirect_heap/indirect_heap_type.h" +#include "shared/source/memory_manager/allocation_type.h" +#include "shared/source/memory_manager/memory_manager.h" +#include "shared/source/memory_manager/surface.h" #include "shared/test/common/helpers/unit_test_helper.h" -#include "shared/test/common/mocks/mock_graphics_allocation.h" -#include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/test_macros/hw_test.h" -#include "opencl/source/command_queue/resource_barrier.h" #include "opencl/source/event/event_builder.h" -#include "opencl/source/event/user_event.h" #include "opencl/source/helpers/task_information.h" -#include "opencl/source/mem_obj/buffer.h" -#include "opencl/source/memory_manager/resource_surface.h" #include "opencl/test/unit_test/fixtures/dispatch_flags_fixture.h" -#include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp index dbd817b357..3131b240b3 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/basic_math.h" +#include "shared/source/helpers/compiler_product_helper.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_builtins.h" @@ -20,10 +20,6 @@ #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_builder.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" - -#include using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp index 051d84f2cb..06481eae94 100644 --- a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp @@ -1,28 +1,21 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/built_ins/sip.h" -#include "shared/source/helpers/gfx_core_helper.h" -#include "shared/source/os_interface/os_context.h" -#include "shared/test/common/helpers/kernel_binary_helper.h" -#include "shared/test/common/helpers/kernel_filename_helper.h" -#include "shared/test/common/helpers/unit_test_helper.h" +#include "shared/source/utilities/stackvec.h" #include "shared/test/common/test_macros/hw_test.h" -#include "shared/test/common/test_macros/mock_method_macros.h" -#include "shared/test/common/test_macros/test.h" -#include "opencl/source/command_queue/command_queue.h" -#include "opencl/source/program/program.h" +#include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" -#include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "opencl/test/unit_test/mocks/mock_debug_program.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "opencl/test/unit_test/program/program_from_binary.h" + +#include "gtest/gtest.h" + +#include using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp index 55fd1ad98a..62d6ea61c3 100644 --- a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp @@ -8,9 +8,12 @@ #include "shared/source/aub/aub_subcapture.h" #include "shared/source/command_stream/wait_status.h" #include "shared/source/helpers/compiler_product_helper.h" -#include "shared/source/program/sync_buffer_handler.h" +#include "shared/source/helpers/engine_node_helper.h" +#include "shared/source/kernel/kernel_descriptor.h" +#include "shared/source/program/heap_info.h" +#include "shared/source/program/kernel_info.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/test_traits.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_aub_subcapture_manager.h" @@ -24,18 +27,16 @@ #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/cl_gfx_core_helper.h" +#include "opencl/source/kernel/kernel.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.h" #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "opencl/test/unit_test/test_macros/test_checks_ocl.h" - -#include "test_traits_common.h" using namespace NEO; #include "shared/test/common/test_macros/heapless_matchers.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp index 17bd193e41..3478ec27b8 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp @@ -27,8 +27,10 @@ #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory_with_platform.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" + using namespace NEO; typedef HelloWorldFixture EnqueueKernelFixture; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp index 5bbf88c479..789b7f3cb2 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp @@ -9,29 +9,47 @@ #include "shared/source/command_container/implicit_scaling.h" #include "shared/source/command_stream/scratch_space_controller.h" #include "shared/source/command_stream/wait_status.h" -#include "shared/source/gen_common/reg_configs_common.h" +#include "shared/source/device_binary_format/device_binary_formats.h" #include "shared/source/helpers/gfx_core_helper.h" -#include "shared/source/kernel/implicit_args_helper.h" +#include "shared/source/helpers/preamble.h" +#include "shared/source/kernel/kernel_descriptor.h" #include "shared/source/memory_manager/allocations_list.h" +#include "shared/source/memory_manager/memory_manager.h" +#include "shared/source/program/kernel_info.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/relaxed_ordering_commands_helper.h" #include "shared/test/common/helpers/stream_capture.h" +#include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_direct_submission_hw.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/utilities/base_object_utils.h" +#include "opencl/source/cl_device/cl_device.h" +#include "opencl/source/command_queue/command_queue.h" +#include "opencl/source/command_queue/copy_engine_state.h" +#include "opencl/source/context/context.h" +#include "opencl/source/event/event.h" +#include "opencl/source/event/user_event.h" +#include "opencl/source/helpers/base_object.h" +#include "opencl/source/helpers/enqueue_properties.h" #include "opencl/source/helpers/task_information.h" -#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/source/kernel/kernel.h" +#include "opencl/source/kernel/kernel_objects_for_aux_translation.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/ult_cl_device_factory.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" +#include "implicit_args.h" + using namespace NEO; #include "shared/test/common/test_macros/heapless_matchers.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_event_tests.cpp index a2557a0d0f..cdadc0046f 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_event_tests.cpp @@ -11,7 +11,7 @@ #include "opencl/source/event/event.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp index 90daf5d2e3..8621ce6712 100644 --- a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp @@ -11,7 +11,7 @@ #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index f0b24823b7..9c1692eb51 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/basic_math.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/memory_manager/allocations_list.h" #include "shared/source/memory_manager/migration_sync_data.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" @@ -16,14 +16,13 @@ #include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/source/command_queue/csr_selection_args.h" #include "opencl/source/helpers/task_information.h" #include "opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h" #include "opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builder.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_image.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp index fc8a1cb015..fa550c3250 100644 --- a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests_xehp_and_later.cpp @@ -1,23 +1,21 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/os_interface/os_context.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/resource_barrier.h" -#include "opencl/source/event/event_builder.h" -#include "opencl/source/event/user_event.h" +#include "opencl/source/event/event.h" +#include "opencl/source/helpers/base_object.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/memory_manager/resource_surface.h" #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp index bb291a0bce..4967c8e215 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp @@ -10,21 +10,23 @@ #include "shared/source/memory_manager/allocations_list.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_align_malloc_memory_manager.h" #include "shared/test/common/mocks/mock_builtins.h" #include "shared/test/common/mocks/mock_svm_manager.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/source/command_queue/csr_selection_args.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_builder.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "gtest/gtest.h" + +#include + using namespace NEO; struct EnqueueSvmMemCopyTest : public ClDeviceFixture, diff --git a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp index 8b9162ea47..84ee629cd9 100644 --- a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/event/event.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp index bdf80a017e..d9689f35b6 100644 --- a/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_with_walker_partition_tests.cpp @@ -6,18 +6,18 @@ */ #include "shared/source/command_container/implicit_scaling.h" -#include "shared/source/os_interface/os_interface.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/unit_test_helper.h" #include "shared/test/common/test_macros/hw_test.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" +#include + struct EnqueueWithWalkerPartitionTests : public ::testing::Test { void SetUp() override { debugManager.flags.EnableWalkerPartition.set(1u); diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index c3c9cc2ef9..6b5235d5a8 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/command_stream/wait_status.h" -#include "shared/source/gen_common/reg_configs_common.h" #include "shared/source/helpers/basic_math.h" +#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/memory_manager/allocations_list.h" #include "shared/source/memory_manager/migration_sync_data.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" @@ -24,8 +24,6 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builder.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" -#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_image.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/finish_tests.cpp b/opencl/test/unit_test/command_queue/finish_tests.cpp index a2c9ba7176..5339dfb5e1 100644 --- a/opencl/test/unit_test/command_queue/finish_tests.cpp +++ b/opencl/test/unit_test/command_queue/finish_tests.cpp @@ -7,15 +7,16 @@ #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/cmd_parse/hw_parse.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 "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/command_queue/ooq_task_tests.cpp b/opencl/test/unit_test/command_queue/ooq_task_tests.cpp index 556ef86456..c04d838d2f 100644 --- a/opencl/test/unit_test/command_queue/ooq_task_tests.cpp +++ b/opencl/test/unit_test/command_queue/ooq_task_tests.cpp @@ -5,13 +5,16 @@ * */ +#include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/helpers/aligned_memory.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/mocks/mock_csr.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/utilities/base_object_utils.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp index bbd074cdc2..e1c23a4afb 100644 --- a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp @@ -14,6 +14,7 @@ #include "opencl/source/api/api.h" #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "aubstream/engine_node.h" diff --git a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp index 08e0285d39..4995b1934e 100644 --- a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/local_work_size.h" #include "shared/source/kernel/kernel_descriptor.h" +#include "shared/source/program/work_size_info.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/test_macros/hw_test.h" diff --git a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp index 3ca069f908..4523c10041 100644 --- a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp @@ -7,16 +7,16 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/test_macros/test.h" +#include "shared/test/common/test_macros/test_checks_shared.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "opencl/test/unit_test/test_macros/test_checks_ocl.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp index d86fd17bd4..e97b41d985 100644 --- a/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "shared/source/device/device.h" #include "shared/source/helpers/engine_control.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_tbx_csr.h" #include "shared/test/common/test_macros/hw_test.h" @@ -16,7 +16,7 @@ #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp index b7c8509aa6..31748dcf4c 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/preamble.h" #include "shared/source/os_interface/os_context.h" #include "shared/source/os_interface/product_helper.h" -#include "shared/source/release_helper/release_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/helpers/ult_gfx_core_helper.h" @@ -21,11 +20,12 @@ #include "shared/test/common/mocks/mock_submissions_aggregator.h" #include "shared/test/common/test_macros/hw_test.h" -#include "opencl/source/command_queue/gpgpu_walker.h" +#include "opencl/source/command_queue/command_queue.h" +#include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/helpers/base_object.h" +#include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" -#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp index bcfecc8f8b..dff99dcf96 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp @@ -8,33 +8,32 @@ #include "shared/source/command_stream/csr_definitions.h" #include "shared/source/command_stream/scratch_space_controller.h" #include "shared/source/gen_common/reg_configs_common.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/helpers/state_base_address.h" +#include "shared/source/kernel/kernel_descriptor.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/os_interface/os_context.h" +#include "shared/source/program/kernel_info.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/helpers/raii_gfx_core_helper.h" +#include "shared/test/common/helpers/test_traits.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_gfx_core_helper.h" #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" -#include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/cl_device/cl_device_vector.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "test_traits_common.h" - using namespace NEO; #include "shared/test/common/test_macros/heapless_matchers.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp index 89d460a15a..f0c3c84542 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp @@ -5,29 +5,41 @@ * */ +#include "shared/source/command_container/cmdcontainer.h" +#include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/command_stream/command_stream_receiver_hw.h" +#include "shared/source/command_stream/linear_stream.h" +#include "shared/source/command_stream/submissions_aggregator.h" #include "shared/source/command_stream/wait_status.h" +#include "shared/source/direct_submission/dispatchers/render_dispatcher.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/helpers/gfx_core_helper.h" +#include "shared/source/helpers/pipe_control_args.h" +#include "shared/source/indirect_heap/indirect_heap.h" +#include "shared/source/indirect_heap/indirect_heap_type.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_manager.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/source/memory_manager/surface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" #include "shared/test/common/helpers/engine_descriptor_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_allocation_properties.h" -#include "shared/test/common/mocks/mock_csr.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_direct_submission_hw.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" -#include "shared/test/common/mocks/mock_svm_manager.h" #include "shared/test/common/test_macros/hw_test.h" -#include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/helpers/task_information.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" @@ -35,6 +47,8 @@ #include "opencl/test/unit_test/mocks/mock_printf_handler.h" #include "opencl/test/unit_test/mocks/mock_program.h" +#include "CL/cl_ext.h" + using namespace NEO; using CommandStreamReceiverFlushTaskTests = UltCommandStreamReceiverTest; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp index 1077d347d6..ca71ec07d9 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp @@ -5,31 +5,28 @@ * */ -#include "shared/source/built_ins/sip.h" +#include "shared/source/command_stream/linear_stream.h" +#include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/gmm_helper/gmm_lib.h" -#include "shared/source/helpers/state_base_address.h" +#include "shared/source/memory_manager/graphics_allocation.h" +#include "shared/source/utilities/idlist.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/engine_descriptor_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_csr.h" -#include "shared/test/common/mocks/mock_debugger.h" #include "shared/test/common/mocks/mock_direct_submission_hw.h" -#include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.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" +#include typedef UltCommandStreamReceiverTest CommandStreamReceiverFlushTaskXeHPAndLaterTests; using CommandStreamReceiverFlushTaskXeHPAndLaterTestsWithMockCsrHw = UltCommandStreamReceiverTestWithCsrT; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp index 31d0f337df..6542342d8e 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp @@ -6,12 +6,10 @@ */ #include "shared/source/command_stream/scratch_space_controller.h" -#include "shared/source/command_stream/scratch_space_controller_base.h" #include "shared/source/command_stream/wait_status.h" #include "shared/source/helpers/blit_commands_helper.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/definitions/command_encoder_args.h" -#include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/product_helper.h" #include "shared/source/release_helper/release_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" @@ -29,12 +27,11 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/common/utilities/base_object_utils.h" -#include "opencl/source/event/user_event.h" +#include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/cl_blit_properties.h" +#include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "opencl/test/unit_test/mocks/mock_kernel.h" using namespace NEO; #include "shared/test/common/test_macros/heapless_matchers.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp index 1717a61178..2f9576702d 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp @@ -34,10 +34,9 @@ #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "opencl/test/unit_test/mocks/mock_platform.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp index a194f4b7b5..9d806534ba 100644 --- a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp +++ b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp @@ -5,16 +5,19 @@ * */ +#include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/submissions_aggregator.h" +#include "shared/source/device/device.h" #include "shared/source/helpers/flush_stamp.h" -#include "shared/test/common/mocks/mock_csr.h" +#include "shared/source/memory_manager/graphics_allocation.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/test_macros/hw_test.h" +#include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index 59672f5179..8c0ee01196 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -6,8 +6,6 @@ */ #include "shared/source/device/device.h" -#include "shared/source/helpers/blit_commands_helper.h" -#include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/source/memory_manager/unified_memory_manager.h" @@ -15,6 +13,7 @@ #include "shared/source/os_interface/device_factory.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/mocks/mock_deferred_deleter.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" @@ -23,9 +22,9 @@ #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.inl" -#include "opencl/source/gtpin/gtpin_defs.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/sharings/sharing.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" @@ -35,7 +34,6 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory_with_platform.h" -#include "opencl/test/unit_test/test_macros/test_checks_ocl.h" using namespace NEO; diff --git a/opencl/test/unit_test/debugger/ocl_with_l0_debugger_tests.cpp b/opencl/test/unit_test/debugger/ocl_with_l0_debugger_tests.cpp index 56471ac2b3..d914790c0d 100644 --- a/opencl/test/unit_test/debugger/ocl_with_l0_debugger_tests.cpp +++ b/opencl/test/unit_test/debugger/ocl_with_l0_debugger_tests.cpp @@ -5,20 +5,23 @@ * */ +#include "shared/source/device_binary_format/elf/elf.h" +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/kernel/kernel_descriptor.h" +#include "shared/source/program/kernel_info.h" #include "shared/test/common/device_binary_format/patchtokens_tests.h" #include "shared/test/common/mocks/mock_compiler_interface.h" #include "shared/test/common/mocks/mock_csr.h" -#include "shared/test/common/mocks/mock_elf.h" #include "shared/test/common/mocks/mock_l0_debugger.h" #include "shared/test/common/mocks/mock_modules_zebin.h" #include "shared/test/common/test_macros/hw_test.h" -#include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/event/event_builder_tests.cpp b/opencl/test/unit_test/event/event_builder_tests.cpp index bb7b4786b8..65a1cf07cf 100644 --- a/opencl/test/unit_test/event/event_builder_tests.cpp +++ b/opencl/test/unit_test/event/event_builder_tests.cpp @@ -5,13 +5,14 @@ * */ -#include "shared/source/memory_manager/allocation_properties.h" +#include "shared/source/memory_manager/allocation_type.h" #include "shared/source/utilities/arrayref.h" #include "shared/test/common/mocks/mock_device.h" #include "opencl/source/event/event_builder.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/task_information.h" +#include "opencl/source/program/printf_handler.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp index 170095a250..e5588118cb 100644 --- a/opencl/test/unit_test/event/event_tests.cpp +++ b/opencl/test/unit_test/event/event_tests.cpp @@ -26,6 +26,7 @@ #include "opencl/source/memory_manager/mem_obj_surface.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/fixtures/d3d_test_fixture.h b/opencl/test/unit_test/fixtures/d3d_test_fixture.h index bbc06c2d4d..0767630fd8 100644 --- a/opencl/test/unit_test/fixtures/d3d_test_fixture.h +++ b/opencl/test/unit_test/fixtures/d3d_test_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2024 Intel Corporation + * Copyright (C) 2019-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,15 +9,19 @@ #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/ult_hw_config.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_gmm_resource_info.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_d3d_objects.h" +#include "gtest/gtest.h" + +#include + namespace NEO { template <> uint32_t MockD3DSharingFunctions::getDxgiDescCalled = 0; diff --git a/opencl/test/unit_test/gen_common/gen_commands_common_validation.h b/opencl/test/unit_test/gen_common/gen_commands_common_validation.h index 2c12755e9d..2f7c48f7e0 100644 --- a/opencl/test/unit_test/gen_common/gen_commands_common_validation.h +++ b/opencl/test/unit_test/gen_common/gen_commands_common_validation.h @@ -13,6 +13,8 @@ #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/test/common/helpers/unit_test_helper.h" +#include "gtest/gtest.h" + #include namespace NEO { diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index dcaa0a5fef..7708582928 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -5,26 +5,28 @@ * */ -#include "shared/source/device/device.h" -#include "shared/source/device_binary_format/patchtokens_decoder.h" -#include "shared/source/helpers/basic_math.h" +#include "shared/source/command_stream/preemption_mode.h" +#include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/compiler_product_helper.h" -#include "shared/source/helpers/file_io.h" -#include "shared/source/helpers/hash.h" +#include "shared/source/helpers/string.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/memory_manager/memory_manager.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/memory_manager/surface.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/os_interface/os_context.h" -#include "shared/source/pin/pin.h" -#include "shared/test/common/device_binary_format/patchtokens_tests.h" +#include "shared/source/os_interface/os_library.h" #include "shared/test/common/fixtures/memory_management_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/helpers/kernel_binary_helper.h" -#include "shared/test/common/helpers/test_files.h" +#include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.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_io_functions.h" -#include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_modules_zebin.h" #include "shared/test/common/mocks/mock_os_library.h" #include "shared/test/common/mocks/mock_zebin_wrapper.h" @@ -41,16 +43,14 @@ #include "opencl/source/helpers/task_information.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" -#include "opencl/source/program/create.inl" +#include "opencl/source/platform/platform.h" +#include "opencl/source/program/program.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" -#include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "opencl/test/unit_test/program/program_tests.h" -#include "opencl/test/unit_test/test_macros/test_checks_ocl.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp index f0caaa67a5..3f01927abb 100644 --- a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp +++ b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_stream/wait_status.h" #include "shared/test/common/helpers/debug_manager_state_restore.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_kmd_notify_helper.h" #include "shared/test/common/test_macros/hw_test.h" diff --git a/opencl/test/unit_test/helpers/task_information_tests.cpp b/opencl/test/unit_test/helpers/task_information_tests.cpp index bb898f3732..6df7d19f1f 100644 --- a/opencl/test/unit_test/helpers/task_information_tests.cpp +++ b/opencl/test/unit_test/helpers/task_information_tests.cpp @@ -5,9 +5,12 @@ * */ +#include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/bcs_ccs_dependency_pair_container.h" -#include "shared/source/memory_manager/allocation_properties.h" +#include "shared/source/helpers/device_bitfield.h" +#include "shared/source/memory_manager/allocation_type.h" #include "shared/source/memory_manager/internal_allocation_storage.h" +#include "shared/source/utilities/idlist.h" #include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/event/user_event.h" @@ -15,6 +18,7 @@ #include "opencl/test/unit_test/fixtures/dispatch_flags_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include diff --git a/opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp b/opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp index 8e466134bb..03ca466c8f 100644 --- a/opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp +++ b/opencl/test/unit_test/helpers/timestamp_packet_1_tests.cpp @@ -5,27 +5,28 @@ * */ +#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/timestamp_packet.h" #include "shared/source/utilities/tag_allocator.h" #include "shared/source/utilities/wait_util.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/dispatch_flags_helper.h" -#include "shared/test/common/mocks/mock_csr.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_execution_environment.h" -#include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/utilities/base_object_utils.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/source/event/user_event.h" -#include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/command_queue/hardware_interface_helper.h" #include "opencl/test/unit_test/helpers/timestamp_packet_tests.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" -#include "opencl/test/unit_test/mocks/mock_platform.h" + +#include "CL/cl_ext.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/timestamp_packet_2_tests.cpp b/opencl/test/unit_test/helpers/timestamp_packet_2_tests.cpp index 653cc60e24..4a2d5ee56b 100644 --- a/opencl/test/unit_test/helpers/timestamp_packet_2_tests.cpp +++ b/opencl/test/unit_test/helpers/timestamp_packet_2_tests.cpp @@ -13,6 +13,7 @@ #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/helpers/timestamp_packet_tests.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_event.h" namespace NEO { diff --git a/opencl/test/unit_test/kernel/cache_flush_tests.inl b/opencl/test/unit_test/kernel/cache_flush_tests.inl index 3fbffa69f1..de4c4d6a35 100644 --- a/opencl/test/unit_test/kernel/cache_flush_tests.inl +++ b/opencl/test/unit_test/kernel/cache_flush_tests.inl @@ -22,7 +22,7 @@ #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp index 3d80c29243..8d3b3209fc 100644 --- a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "shared/source/command_stream/queue_throttle.h" #include "shared/source/command_stream/wait_status.h" #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/memory_manager/allocations_list.h" #include "shared/source/memory_manager/unified_memory_manager.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/engine_descriptor_helper.h" #include "shared/test/common/helpers/gtest_helpers.h" #include "shared/test/common/helpers/stream_capture.h" #include "shared/test/common/helpers/unit_test_helper.h" @@ -19,19 +19,20 @@ #include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/test_checks_shared.h" #include "shared/test/common/utilities/base_object_utils.h" -#include "opencl/source/api/api.h" +#include "opencl/source/command_queue/command_queue.h" +#include "opencl/source/context/context.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/cl_blit_properties.h" -#include "opencl/source/helpers/cl_gfx_core_helper.h" -#include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory_with_platform.h" -#include "opencl/test/unit_test/test_macros/test_checks_ocl.h" + +#include "CL/cl_ext.h" #include diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index e9cdc166f0..b8a0a94a92 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -35,6 +35,7 @@ #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_platform.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp index 35906e3d8a..7c2bb4e520 100644 --- a/opencl/test/unit_test/mem_obj/image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests.cpp @@ -33,11 +33,10 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mem_obj/image_compression_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_image.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "opencl/test/unit_test/mocks/ult_cl_device_factory_with_platform.h" #include "CL/cl.h" #include "memory_properties_flags.h" diff --git a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp index 8023ed8f37..b91623f8ad 100644 --- a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp @@ -6,9 +6,8 @@ */ #include "shared/source/gmm_helper/gmm.h" -#include "shared/source/helpers/aligned_memory.h" #include "shared/source/image/image_surface_state.h" -#include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/source/indirect_heap/indirect_heap_type.h" #include "shared/test/common/helpers/kernel_binary_helper.h" #include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/test_macros/test.h" @@ -16,13 +15,11 @@ #include "opencl/source/cl_device/cl_device_get_cap.inl" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/helpers/cl_validators.h" -#include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" diff --git a/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp b/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp index e3de01ecc6..4a2e5e14a5 100644 --- a/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp +++ b/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp @@ -9,6 +9,7 @@ #include "shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "opencl/source/command_queue/csr_selection_args.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index 1fac8a2b20..1d70313b8d 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/gmm_helper/gmm_helper.h" +#include "shared/source/helpers/gfx_core_helper.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/source/memory_manager/allocations_list.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" @@ -14,19 +15,19 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_svm_manager.h" -#include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/hw_test.h" -#include "opencl/source/api/api.h" +#include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/helpers/dispatch_info.h" +#include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/mem_obj_helper.h" -#include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "opencl/test/unit_test/test_macros/test_checks_ocl.h" +#include "CL/cl_ext.h" #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt index bb48c65e95..ec49630250 100644 --- a/opencl/test/unit_test/mocks/CMakeLists.txt +++ b/opencl/test/unit_test/mocks/CMakeLists.txt @@ -15,6 +15,7 @@ set(IGDRCL_SRCS_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_cl_execution_environment.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_command_queue.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_command_queue.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_command_queue_hw.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_context.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_context.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_debug_program.cpp diff --git a/opencl/test/unit_test/mocks/mock_command_queue.h b/opencl/test/unit_test/mocks/mock_command_queue.h index ffcf19d52c..51e95611b9 100644 --- a/opencl/test/unit_test/mocks/mock_command_queue.h +++ b/opencl/test/unit_test/mocks/mock_command_queue.h @@ -7,10 +7,34 @@ #pragma once -#include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/command_stream/linear_stream.h" +#include "shared/source/command_stream/task_count_helper.h" +#include "shared/source/command_stream/wait_status.h" +#include "shared/source/helpers/completion_stamp.h" +#include "shared/source/helpers/timestamp_packet_container.h" +#include "shared/source/indirect_heap/indirect_heap_type.h" +#include "shared/source/memory_manager/graphics_allocation.h" +#include "shared/source/os_interface/product_helper.h" -#include "opencl/source/command_queue/command_queue_hw.h" -#include "opencl/source/helpers/dispatch_info.h" +#include "opencl/source/cl_device/cl_device.h" +#include "opencl/source/command_queue/command_queue.h" +#include "opencl/source/command_queue/copy_engine_state.h" +#include "opencl/source/context/context.h" +#include "opencl/source/helpers/properties_helper.h" +#include "opencl/source/kernel/kernel.h" + +#include "CL/cl.h" +#include "CL/cl_platform.h" +#include "algorithm" +#include "aubstream/engine_node.h" + +#include +#include +#include +#include +#include +#include //////////////////////////////////////////////////////////////////////////////// // MockCommandQueue - Core implementation @@ -262,321 +286,4 @@ class MockCommandQueue : public CommandQueue { size_t enqueueReadBufferImplCalledCount = 0; }; -template -class MockCommandQueueHw : public CommandQueueHw { - using BaseClass = CommandQueueHw; - - public: - using BaseClass::bcsAllowed; - using BaseClass::bcsEngineCount; - using BaseClass::bcsEngines; - using BaseClass::bcsInitialized; - using BaseClass::bcsQueueEngineType; - using BaseClass::bcsSplitInitialized; - using BaseClass::bcsStates; - using BaseClass::bcsTimestampPacketContainers; - using BaseClass::blitEnqueueAllowed; - using BaseClass::commandQueueProperties; - using BaseClass::commandStream; - using BaseClass::deferredTimestampPackets; - using BaseClass::getDevice; - using BaseClass::gpgpuEngine; - using BaseClass::heaplessModeEnabled; - using BaseClass::heaplessStateInitEnabled; - using BaseClass::isBlitAuxTranslationRequired; - using BaseClass::isCacheFlushOnNextBcsWriteRequired; - using BaseClass::isCompleted; - using BaseClass::isForceStateless; - using BaseClass::isGpgpuSubmissionForBcsRequired; - using BaseClass::l3FlushAfterPostSyncEnabled; - using BaseClass::latestSentEnqueueType; - using BaseClass::minimalSizeForBcsSplit; - using BaseClass::obtainCommandStream; - using BaseClass::obtainNewTimestampPacketNodes; - using BaseClass::overrideEngine; - using BaseClass::prepareCsrDependency; - using BaseClass::processDispatchForKernels; - using BaseClass::relaxedOrderingForGpgpuAllowed; - using BaseClass::splitBarrierRequired; - using BaseClass::taskCount; - using BaseClass::throttle; - using BaseClass::timestampPacketContainer; - - MockCommandQueueHw(Context *context, - ClDevice *device, - cl_queue_properties *properties) : MockCommandQueueHw(context, device, properties, false) {} - - MockCommandQueueHw(Context *context, - ClDevice *device, - cl_queue_properties *properties, bool isInternal) : BaseClass(context, device, properties, isInternal) { - this->constructBcsEngine(false); - } - - void clearBcsStates() { - CopyEngineState unusedState{}; - std::fill(bcsStates.begin(), bcsStates.end(), unusedState); - } - - void clearBcsEngines() { - std::fill(bcsEngines.begin(), bcsEngines.end(), nullptr); - } - - void insertBcsEngine(aub_stream::EngineType bcsEngineType) { - const auto index = NEO::EngineHelpers::getBcsIndex(bcsEngineType); - const auto engine = &getDevice().getEngine(bcsEngineType, EngineUsage::regular); - bcsEngines[index] = engine; - bcsQueueEngineType = bcsEngineType; - } - - cl_int flush() override { - flushCalled = true; - return BaseClass::flush(); - } - - void setOoqEnabled() { - commandQueueProperties |= CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE; - } - - void setProfilingEnabled() { - commandQueueProperties |= CL_QUEUE_PROFILING_ENABLE; - } - - LinearStream &getCS(size_t minRequiredSize) override { - requestedCmdStreamSize = minRequiredSize; - return CommandQueue::getCS(minRequiredSize); - } - - UltCommandStreamReceiver &getUltCommandStreamReceiver() { - return reinterpret_cast &>(BaseClass::getGpgpuCommandStreamReceiver()); - } - - cl_int enqueueWriteImageImpl(Image *dstImage, - cl_bool blockingWrite, - const size_t *origin, - const size_t *region, - size_t inputRowPitch, - size_t inputSlicePitch, - const void *ptr, - GraphicsAllocation *mapAllocation, - cl_uint numEventsInWaitList, - const cl_event *eventWaitList, - cl_event *event, - CommandStreamReceiver &csr) override { - enqueueWriteImageCounter++; - if (enqueueWriteImageCallBase) { - return BaseClass::enqueueWriteImageImpl(dstImage, - blockingWrite, - origin, - region, - inputRowPitch, - inputSlicePitch, - ptr, - mapAllocation, - numEventsInWaitList, - eventWaitList, - event, - csr); - } - return CL_INVALID_OPERATION; - } - cl_int enqueueReadImageImpl(Image *srcImage, - cl_bool blockingRead, - const size_t *origin, - const size_t *region, - size_t rowPitch, - size_t slicePitch, - void *ptr, - GraphicsAllocation *mapAllocation, - cl_uint numEventsInWaitList, - const cl_event *eventWaitList, - cl_event *event, CommandStreamReceiver &csr) override { - enqueueReadImageCounter++; - if (enqueueReadImageCallBase) { - return BaseClass::enqueueReadImageImpl(srcImage, - blockingRead, - origin, - region, - rowPitch, - slicePitch, - ptr, - mapAllocation, - numEventsInWaitList, - eventWaitList, - event, - csr); - } - return CL_INVALID_OPERATION; - } - void *cpuDataTransferHandler(TransferProperties &transferProperties, EventsRequest &eventsRequest, cl_int &retVal) override { - cpuDataTransferHandlerCalled = true; - return BaseClass::cpuDataTransferHandler(transferProperties, eventsRequest, retVal); - } - cl_int enqueueWriteBufferImpl(Buffer *buffer, cl_bool blockingWrite, size_t offset, size_t size, const void *ptr, GraphicsAllocation *mapAllocation, - cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event, CommandStreamReceiver &csr) override { - enqueueWriteBufferCounter++; - blockingWriteBuffer = blockingWrite == CL_TRUE; - if (enqueueWriteBufferCallBase) { - return BaseClass::enqueueWriteBufferImpl(buffer, blockingWrite, offset, size, ptr, mapAllocation, numEventsInWaitList, eventWaitList, event, csr); - } - return CL_INVALID_OPERATION; - } - - cl_int enqueueReadBufferImpl(Buffer *buffer, cl_bool blockingRead, size_t offset, size_t size, void *ptr, GraphicsAllocation *mapAllocation, - cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event, CommandStreamReceiver &csr) override { - enqueueReadBufferCounter++; - blockingReadBuffer = blockingRead == CL_TRUE; - if (enqueueReadBufferCallBase) { - return BaseClass::enqueueReadBufferImpl(buffer, blockingRead, offset, size, ptr, mapAllocation, numEventsInWaitList, eventWaitList, event, csr); - } - return CL_INVALID_OPERATION; - } - - void enqueueHandlerHook(const unsigned int commandType, const MultiDispatchInfo &dispatchInfo) override { - kernelParams = dispatchInfo.peekBuiltinOpParams(); - lastCommandType = commandType; - - for (auto &di : dispatchInfo) { - lastEnqueuedKernels.push_back(di.getKernel()); - if (storeMultiDispatchInfo) { - storedMultiDispatchInfo.push(di); - } - } - } - - void notifyEnqueueReadBuffer(Buffer *buffer, bool blockingRead, bool notifyBcsCsr) override { - notifyEnqueueReadBufferCalled = true; - useBcsCsrOnNotifyEnabled = notifyBcsCsr; - } - void notifyEnqueueReadImage(Image *image, bool blockingRead, bool notifyBcsCsr) override { - notifyEnqueueReadImageCalled = true; - useBcsCsrOnNotifyEnabled = notifyBcsCsr; - } - void notifyEnqueueSVMMemcpy(GraphicsAllocation *gfxAllocation, bool blockingCopy, bool notifyBcsCsr) override { - notifyEnqueueSVMMemcpyCalled = true; - useBcsCsrOnNotifyEnabled = notifyBcsCsr; - } - - WaitStatus waitUntilComplete(TaskCountType gpgpuTaskCountToWait, std::span copyEnginesToWait, FlushStamp flushStampToWait, bool useQuickKmdSleep, bool cleanTemporaryAllocationList, bool skipWait) override { - this->recordedSkipWait = skipWait; - latestTaskCountWaited = gpgpuTaskCountToWait; - if (waitUntilCompleteReturnValue.has_value()) { - return *waitUntilCompleteReturnValue; - } - - return BaseClass::waitUntilComplete(gpgpuTaskCountToWait, copyEnginesToWait, flushStampToWait, useQuickKmdSleep, cleanTemporaryAllocationList, skipWait); - } - - WaitStatus waitForAllEngines(bool blockedQueue, PrintfHandler *printfHandler, bool cleanTemporaryAllocationsList, bool waitForTaskCountRequired) override { - waitForAllEnginesCalledCount++; - - if (waitForAllEnginesReturnValue.has_value()) { - return *waitForAllEnginesReturnValue; - } - - return BaseClass::waitForAllEngines(blockedQueue, printfHandler, cleanTemporaryAllocationsList, waitForTaskCountRequired); - } - - bool isCacheFlushForBcsRequired() const override { - if (overrideIsCacheFlushForBcsRequired.enabled) { - return overrideIsCacheFlushForBcsRequired.returnValue; - } - return BaseClass::isCacheFlushForBcsRequired(); - } - - bool blitEnqueueImageAllowed(const size_t *origin, const size_t *region, const Image &image) const override { - isBlitEnqueueImageAllowed = BaseClass::blitEnqueueImageAllowed(origin, region, image); - return isBlitEnqueueImageAllowed; - } - bool isQueueBlocked() override { - if (setQueueBlocked != -1) { - return setQueueBlocked; - } - return BaseClass::isQueueBlocked(); - } - bool isGpgpuSubmissionForBcsRequired(bool queueBlocked, TimestampPacketDependencies ×tampPacketDependencies, bool containsCrossEngineDependency, bool textureCacheFlushRequired) const override { - if (forceGpgpuSubmissionForBcsRequired != -1) { - return forceGpgpuSubmissionForBcsRequired; - } - return BaseClass::isGpgpuSubmissionForBcsRequired(queueBlocked, timestampPacketDependencies, containsCrossEngineDependency, textureCacheFlushRequired); - } - - bool waitForTimestamps(std::span copyEnginesToWait, WaitStatus &status, TimestampPacketContainer *mainContainer, TimestampPacketContainer *deferredContainer) override { - waitForTimestampsCalled = true; - - latestWaitForTimestampsStatus = BaseClass::waitForTimestamps(copyEnginesToWait, status, mainContainer, deferredContainer); - - return latestWaitForTimestampsStatus; - } - - bool isCompleted(TaskCountType gpgpuTaskCount, std::span bcsStates) override { - isCompletedCalled++; - - return CommandQueue::isCompleted(gpgpuTaskCount, bcsStates); - } - - cl_int enqueueMarkerWithWaitList(cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event) override { - enqueueMarkerWithWaitListCalledCount++; - return BaseClass::enqueueMarkerWithWaitList(numEventsInWaitList, eventWaitList, event); - } - - cl_int enqueueSVMMemcpy(cl_bool blockingCopy, void *dstPtr, const void *srcPtr, size_t size, - cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event, CommandStreamReceiver *csrParam) override { - enqueueSVMMemcpyCalledCount++; - return BaseClass::enqueueSVMMemcpy(blockingCopy, dstPtr, srcPtr, size, numEventsInWaitList, eventWaitList, event, csrParam); - } - - cl_int finish(bool resolvePendingL3Flushes) override { - finishCalledCount++; - return BaseClass::finish(resolvePendingL3Flushes); - } - - LinearStream *peekCommandStream() { - return this->commandStream; - } - - ADDMETHOD(processDispatchForBlitEnqueue, BlitProperties, true, {}, (CommandStreamReceiver & blitCommandStreamReceiver, const MultiDispatchInfo &multiDispatchInfo, TimestampPacketDependencies ×tampPacketDependencies, const EventsRequest &eventsRequest, LinearStream *commandStream, uint32_t commandType, bool queueBlocked, bool profilingEnabled, TagNodeBase *multiRootDeviceEventSync), (blitCommandStreamReceiver, multiDispatchInfo, timestampPacketDependencies, eventsRequest, commandStream, commandType, queueBlocked, profilingEnabled, multiRootDeviceEventSync)); - - ADDMETHOD(enqueueCommandWithoutKernel, CompletionStamp, true, {}, (Surface * *surfaces, size_t surfaceCount, LinearStream *commandStream, size_t commandStreamStart, bool &blocking, const EnqueueProperties &enqueueProperties, TimestampPacketDependencies ×tampPacketDependencies, EventsRequest &eventsRequest, EventBuilder &eventBuilder, TaskCountType taskLevel, CsrDependencies &csrDeps, CommandStreamReceiver *bcsCsr, bool hasRelaxedOrderingDependencies), (surfaces, surfaceCount, commandStream, commandStreamStart, blocking, enqueueProperties, timestampPacketDependencies, eventsRequest, eventBuilder, taskLevel, csrDeps, bcsCsr, hasRelaxedOrderingDependencies)); - - std::vector lastEnqueuedKernels; - MultiDispatchInfo storedMultiDispatchInfo; - BuiltinOpParams kernelParams; - size_t enqueueWriteImageCounter = 0; - size_t enqueueReadImageCounter = 0; - size_t enqueueWriteBufferCounter = 0; - size_t enqueueReadBufferCounter = 0; - size_t requestedCmdStreamSize = 0; - size_t enqueueSVMMemcpyCalledCount = 0; - size_t finishCalledCount = 0; - std::atomic latestTaskCountWaited{std::numeric_limits::max()}; - std::atomic isCompletedCalled = 0; - unsigned int lastCommandType; - int setQueueBlocked = -1; - int forceGpgpuSubmissionForBcsRequired = -1; - int waitForAllEnginesCalledCount = 0; - int enqueueMarkerWithWaitListCalledCount = 0; - std::optional waitForAllEnginesReturnValue{}; - std::optional waitUntilCompleteReturnValue{}; - struct OverrideReturnValue { - bool enabled = false; - bool returnValue = false; - } overrideIsCacheFlushForBcsRequired; - bool enqueueWriteImageCallBase = true; - bool enqueueReadImageCallBase = true; - bool enqueueWriteBufferCallBase = true; - bool enqueueReadBufferCallBase = true; - bool blockingWriteBuffer = false; - bool blockingReadBuffer = false; - bool storeMultiDispatchInfo = false; - bool notifyEnqueueReadBufferCalled = false; - bool notifyEnqueueReadImageCalled = false; - bool notifyEnqueueSVMMemcpyCalled = false; - bool cpuDataTransferHandlerCalled = false; - bool useBcsCsrOnNotifyEnabled = false; - bool waitForTimestampsCalled = false; - bool latestWaitForTimestampsStatus = false; - bool recordedSkipWait = false; - bool flushCalled = false; - mutable bool isBlitEnqueueImageAllowed = false; -}; } // namespace NEO diff --git a/opencl/test/unit_test/mocks/mock_command_queue_hw.h b/opencl/test/unit_test/mocks/mock_command_queue_hw.h new file mode 100644 index 0000000000..8c43fc228c --- /dev/null +++ b/opencl/test/unit_test/mocks/mock_command_queue_hw.h @@ -0,0 +1,334 @@ +/* + * Copyright (C) 2025 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#pragma once + +#include "shared/test/common/libult/ult_command_stream_receiver.h" + +#include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/source/helpers/dispatch_info.h" + +namespace NEO { + +template +class MockCommandQueueHw : public CommandQueueHw { + using BaseClass = CommandQueueHw; + + public: + using BaseClass::bcsAllowed; + using BaseClass::bcsEngineCount; + using BaseClass::bcsEngines; + using BaseClass::bcsInitialized; + using BaseClass::bcsQueueEngineType; + using BaseClass::bcsSplitInitialized; + using BaseClass::bcsStates; + using BaseClass::bcsTimestampPacketContainers; + using BaseClass::blitEnqueueAllowed; + using BaseClass::commandQueueProperties; + using BaseClass::commandStream; + using BaseClass::deferredTimestampPackets; + using BaseClass::getDevice; + using BaseClass::gpgpuEngine; + using BaseClass::heaplessModeEnabled; + using BaseClass::heaplessStateInitEnabled; + using BaseClass::isBlitAuxTranslationRequired; + using BaseClass::isCacheFlushOnNextBcsWriteRequired; + using BaseClass::isCompleted; + using BaseClass::isForceStateless; + using BaseClass::isGpgpuSubmissionForBcsRequired; + using BaseClass::l3FlushAfterPostSyncEnabled; + using BaseClass::latestSentEnqueueType; + using BaseClass::minimalSizeForBcsSplit; + using BaseClass::obtainCommandStream; + using BaseClass::obtainNewTimestampPacketNodes; + using BaseClass::overrideEngine; + using BaseClass::prepareCsrDependency; + using BaseClass::processDispatchForKernels; + using BaseClass::relaxedOrderingForGpgpuAllowed; + using BaseClass::splitBarrierRequired; + using BaseClass::taskCount; + using BaseClass::throttle; + using BaseClass::timestampPacketContainer; + + MockCommandQueueHw(Context *context, + ClDevice *device, + cl_queue_properties *properties) : MockCommandQueueHw(context, device, properties, false) {} + + MockCommandQueueHw(Context *context, + ClDevice *device, + cl_queue_properties *properties, bool isInternal) : BaseClass(context, device, properties, isInternal) { + this->constructBcsEngine(false); + } + + void clearBcsStates() { + CopyEngineState unusedState{}; + std::fill(bcsStates.begin(), bcsStates.end(), unusedState); + } + + void clearBcsEngines() { + std::fill(bcsEngines.begin(), bcsEngines.end(), nullptr); + } + + void insertBcsEngine(aub_stream::EngineType bcsEngineType) { + const auto index = NEO::EngineHelpers::getBcsIndex(bcsEngineType); + const auto engine = &getDevice().getEngine(bcsEngineType, EngineUsage::regular); + bcsEngines[index] = engine; + bcsQueueEngineType = bcsEngineType; + } + + cl_int flush() override { + flushCalled = true; + return BaseClass::flush(); + } + + void setOoqEnabled() { + commandQueueProperties |= CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE; + } + + void setProfilingEnabled() { + commandQueueProperties |= CL_QUEUE_PROFILING_ENABLE; + } + + LinearStream &getCS(size_t minRequiredSize) override { + requestedCmdStreamSize = minRequiredSize; + return CommandQueue::getCS(minRequiredSize); + } + + UltCommandStreamReceiver &getUltCommandStreamReceiver() { + return reinterpret_cast &>(BaseClass::getGpgpuCommandStreamReceiver()); + } + + cl_int enqueueWriteImageImpl(Image *dstImage, + cl_bool blockingWrite, + const size_t *origin, + const size_t *region, + size_t inputRowPitch, + size_t inputSlicePitch, + const void *ptr, + GraphicsAllocation *mapAllocation, + cl_uint numEventsInWaitList, + const cl_event *eventWaitList, + cl_event *event, + CommandStreamReceiver &csr) override { + enqueueWriteImageCounter++; + if (enqueueWriteImageCallBase) { + return BaseClass::enqueueWriteImageImpl(dstImage, + blockingWrite, + origin, + region, + inputRowPitch, + inputSlicePitch, + ptr, + mapAllocation, + numEventsInWaitList, + eventWaitList, + event, + csr); + } + return CL_INVALID_OPERATION; + } + cl_int enqueueReadImageImpl(Image *srcImage, + cl_bool blockingRead, + const size_t *origin, + const size_t *region, + size_t rowPitch, + size_t slicePitch, + void *ptr, + GraphicsAllocation *mapAllocation, + cl_uint numEventsInWaitList, + const cl_event *eventWaitList, + cl_event *event, CommandStreamReceiver &csr) override { + enqueueReadImageCounter++; + if (enqueueReadImageCallBase) { + return BaseClass::enqueueReadImageImpl(srcImage, + blockingRead, + origin, + region, + rowPitch, + slicePitch, + ptr, + mapAllocation, + numEventsInWaitList, + eventWaitList, + event, + csr); + } + return CL_INVALID_OPERATION; + } + void *cpuDataTransferHandler(TransferProperties &transferProperties, EventsRequest &eventsRequest, cl_int &retVal) override { + cpuDataTransferHandlerCalled = true; + return BaseClass::cpuDataTransferHandler(transferProperties, eventsRequest, retVal); + } + cl_int enqueueWriteBufferImpl(Buffer *buffer, cl_bool blockingWrite, size_t offset, size_t size, const void *ptr, GraphicsAllocation *mapAllocation, + cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event, CommandStreamReceiver &csr) override { + enqueueWriteBufferCounter++; + blockingWriteBuffer = blockingWrite == CL_TRUE; + if (enqueueWriteBufferCallBase) { + return BaseClass::enqueueWriteBufferImpl(buffer, blockingWrite, offset, size, ptr, mapAllocation, numEventsInWaitList, eventWaitList, event, csr); + } + return CL_INVALID_OPERATION; + } + + cl_int enqueueReadBufferImpl(Buffer *buffer, cl_bool blockingRead, size_t offset, size_t size, void *ptr, GraphicsAllocation *mapAllocation, + cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event, CommandStreamReceiver &csr) override { + enqueueReadBufferCounter++; + blockingReadBuffer = blockingRead == CL_TRUE; + if (enqueueReadBufferCallBase) { + return BaseClass::enqueueReadBufferImpl(buffer, blockingRead, offset, size, ptr, mapAllocation, numEventsInWaitList, eventWaitList, event, csr); + } + return CL_INVALID_OPERATION; + } + + void enqueueHandlerHook(const unsigned int commandType, const MultiDispatchInfo &dispatchInfo) override { + kernelParams = dispatchInfo.peekBuiltinOpParams(); + lastCommandType = commandType; + + for (auto &di : dispatchInfo) { + lastEnqueuedKernels.push_back(di.getKernel()); + if (storeMultiDispatchInfo) { + storedMultiDispatchInfo.push(di); + } + } + } + + void notifyEnqueueReadBuffer(Buffer *buffer, bool blockingRead, bool notifyBcsCsr) override { + notifyEnqueueReadBufferCalled = true; + useBcsCsrOnNotifyEnabled = notifyBcsCsr; + } + void notifyEnqueueReadImage(Image *image, bool blockingRead, bool notifyBcsCsr) override { + notifyEnqueueReadImageCalled = true; + useBcsCsrOnNotifyEnabled = notifyBcsCsr; + } + void notifyEnqueueSVMMemcpy(GraphicsAllocation *gfxAllocation, bool blockingCopy, bool notifyBcsCsr) override { + notifyEnqueueSVMMemcpyCalled = true; + useBcsCsrOnNotifyEnabled = notifyBcsCsr; + } + + WaitStatus waitUntilComplete(TaskCountType gpgpuTaskCountToWait, std::span copyEnginesToWait, FlushStamp flushStampToWait, bool useQuickKmdSleep, bool cleanTemporaryAllocationList, bool skipWait) override { + this->recordedSkipWait = skipWait; + latestTaskCountWaited = gpgpuTaskCountToWait; + if (waitUntilCompleteReturnValue.has_value()) { + return *waitUntilCompleteReturnValue; + } + + return BaseClass::waitUntilComplete(gpgpuTaskCountToWait, copyEnginesToWait, flushStampToWait, useQuickKmdSleep, cleanTemporaryAllocationList, skipWait); + } + + WaitStatus waitForAllEngines(bool blockedQueue, PrintfHandler *printfHandler, bool cleanTemporaryAllocationsList, bool waitForTaskCountRequired) override { + waitForAllEnginesCalledCount++; + + if (waitForAllEnginesReturnValue.has_value()) { + return *waitForAllEnginesReturnValue; + } + + return BaseClass::waitForAllEngines(blockedQueue, printfHandler, cleanTemporaryAllocationsList, waitForTaskCountRequired); + } + + bool isCacheFlushForBcsRequired() const override { + if (overrideIsCacheFlushForBcsRequired.enabled) { + return overrideIsCacheFlushForBcsRequired.returnValue; + } + return BaseClass::isCacheFlushForBcsRequired(); + } + + bool blitEnqueueImageAllowed(const size_t *origin, const size_t *region, const Image &image) const override { + isBlitEnqueueImageAllowed = BaseClass::blitEnqueueImageAllowed(origin, region, image); + return isBlitEnqueueImageAllowed; + } + bool isQueueBlocked() override { + if (setQueueBlocked != -1) { + return setQueueBlocked; + } + return BaseClass::isQueueBlocked(); + } + bool isGpgpuSubmissionForBcsRequired(bool queueBlocked, TimestampPacketDependencies ×tampPacketDependencies, bool containsCrossEngineDependency, bool textureCacheFlushRequired) const override { + if (forceGpgpuSubmissionForBcsRequired != -1) { + return forceGpgpuSubmissionForBcsRequired; + } + return BaseClass::isGpgpuSubmissionForBcsRequired(queueBlocked, timestampPacketDependencies, containsCrossEngineDependency, textureCacheFlushRequired); + } + + bool waitForTimestamps(std::span copyEnginesToWait, WaitStatus &status, TimestampPacketContainer *mainContainer, TimestampPacketContainer *deferredContainer) override { + waitForTimestampsCalled = true; + + latestWaitForTimestampsStatus = BaseClass::waitForTimestamps(copyEnginesToWait, status, mainContainer, deferredContainer); + + return latestWaitForTimestampsStatus; + } + + bool isCompleted(TaskCountType gpgpuTaskCount, std::span bcsStates) override { + isCompletedCalled++; + + return CommandQueue::isCompleted(gpgpuTaskCount, bcsStates); + } + + cl_int enqueueMarkerWithWaitList(cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event) override { + enqueueMarkerWithWaitListCalledCount++; + return BaseClass::enqueueMarkerWithWaitList(numEventsInWaitList, eventWaitList, event); + } + + cl_int enqueueSVMMemcpy(cl_bool blockingCopy, void *dstPtr, const void *srcPtr, size_t size, + cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event, CommandStreamReceiver *csrParam) override { + enqueueSVMMemcpyCalledCount++; + return BaseClass::enqueueSVMMemcpy(blockingCopy, dstPtr, srcPtr, size, numEventsInWaitList, eventWaitList, event, csrParam); + } + + cl_int finish(bool resolvePendingL3Flushes) override { + finishCalledCount++; + return BaseClass::finish(resolvePendingL3Flushes); + } + + LinearStream *peekCommandStream() { + return this->commandStream; + } + + ADDMETHOD(processDispatchForBlitEnqueue, BlitProperties, true, {}, (CommandStreamReceiver & blitCommandStreamReceiver, const MultiDispatchInfo &multiDispatchInfo, TimestampPacketDependencies ×tampPacketDependencies, const EventsRequest &eventsRequest, LinearStream *commandStream, uint32_t commandType, bool queueBlocked, bool profilingEnabled, TagNodeBase *multiRootDeviceEventSync), (blitCommandStreamReceiver, multiDispatchInfo, timestampPacketDependencies, eventsRequest, commandStream, commandType, queueBlocked, profilingEnabled, multiRootDeviceEventSync)); + + ADDMETHOD(enqueueCommandWithoutKernel, CompletionStamp, true, {}, (Surface * *surfaces, size_t surfaceCount, LinearStream *commandStream, size_t commandStreamStart, bool &blocking, const EnqueueProperties &enqueueProperties, TimestampPacketDependencies ×tampPacketDependencies, EventsRequest &eventsRequest, EventBuilder &eventBuilder, TaskCountType taskLevel, CsrDependencies &csrDeps, CommandStreamReceiver *bcsCsr, bool hasRelaxedOrderingDependencies), (surfaces, surfaceCount, commandStream, commandStreamStart, blocking, enqueueProperties, timestampPacketDependencies, eventsRequest, eventBuilder, taskLevel, csrDeps, bcsCsr, hasRelaxedOrderingDependencies)); + + std::vector lastEnqueuedKernels; + MultiDispatchInfo storedMultiDispatchInfo; + BuiltinOpParams kernelParams; + size_t enqueueWriteImageCounter = 0; + size_t enqueueReadImageCounter = 0; + size_t enqueueWriteBufferCounter = 0; + size_t enqueueReadBufferCounter = 0; + size_t requestedCmdStreamSize = 0; + size_t enqueueSVMMemcpyCalledCount = 0; + size_t finishCalledCount = 0; + std::atomic latestTaskCountWaited{std::numeric_limits::max()}; + std::atomic isCompletedCalled = 0; + unsigned int lastCommandType; + int setQueueBlocked = -1; + int forceGpgpuSubmissionForBcsRequired = -1; + int waitForAllEnginesCalledCount = 0; + int enqueueMarkerWithWaitListCalledCount = 0; + std::optional waitForAllEnginesReturnValue{}; + std::optional waitUntilCompleteReturnValue{}; + struct OverrideReturnValue { + bool enabled = false; + bool returnValue = false; + } overrideIsCacheFlushForBcsRequired; + bool enqueueWriteImageCallBase = true; + bool enqueueReadImageCallBase = true; + bool enqueueWriteBufferCallBase = true; + bool enqueueReadBufferCallBase = true; + bool blockingWriteBuffer = false; + bool blockingReadBuffer = false; + bool storeMultiDispatchInfo = false; + bool notifyEnqueueReadBufferCalled = false; + bool notifyEnqueueReadImageCalled = false; + bool notifyEnqueueSVMMemcpyCalled = false; + bool cpuDataTransferHandlerCalled = false; + bool useBcsCsrOnNotifyEnabled = false; + bool waitForTimestampsCalled = false; + bool latestWaitForTimestampsStatus = false; + bool recordedSkipWait = false; + bool flushCalled = false; + mutable bool isBlitEnqueueImageAllowed = false; +}; +} // namespace NEO diff --git a/opencl/test/unit_test/mt_tests/command_queue/command_queue_test_mt.cpp b/opencl/test/unit_test/mt_tests/command_queue/command_queue_test_mt.cpp index 76067241b3..4c4214a83f 100644 --- a/opencl/test/unit_test/mt_tests/command_queue/command_queue_test_mt.cpp +++ b/opencl/test/unit_test/mt_tests/command_queue/command_queue_test_mt.cpp @@ -5,12 +5,19 @@ * */ +#include "shared/source/command_stream/wait_status.h" +#include "shared/source/helpers/timestamp_packet_container.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/mocks/mock_device.h" -#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/source/command_queue/command_queue.h" +#include "opencl/source/helpers/base_object.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" + +#include "CL/cl.h" +#include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/mt_tests/command_queue/enqueue_kernel_mt_tests.cpp b/opencl/test/unit_test/mt_tests/command_queue/enqueue_kernel_mt_tests.cpp index 2bad7f16b4..f23e53270c 100644 --- a/opencl/test/unit_test/mt_tests/command_queue/enqueue_kernel_mt_tests.cpp +++ b/opencl/test/unit_test/mt_tests/command_queue/enqueue_kernel_mt_tests.cpp @@ -5,14 +5,32 @@ * */ +#include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/device/device.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/helpers/append_operations.h" +#include "shared/source/helpers/hw_info.h" #include "shared/test/common/helpers/kernel_binary_helper.h" -#include "shared/test/common/mocks/mock_csr.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_submissions_aggregator.h" +#include "shared/test/common/test_macros/hw_test.h" +#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" -#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" +#include "opencl/test/unit_test/mocks/mock_context.h" + +#include "CL/cl.h" +#include "aubstream/engine_node.h" +#include "gtest/gtest.h" + +#include +#include +#include +#include typedef HelloWorldFixture EnqueueKernelFixture; typedef Test EnqueueKernelTest; diff --git a/opencl/test/unit_test/mt_tests/event/user_events_tests_mt.cpp b/opencl/test/unit_test/mt_tests/event/user_events_tests_mt.cpp index f4c61a1303..47f4e1fbd1 100644 --- a/opencl/test/unit_test/mt_tests/event/user_events_tests_mt.cpp +++ b/opencl/test/unit_test/mt_tests/event/user_events_tests_mt.cpp @@ -5,15 +5,17 @@ * */ -#include "shared/source/memory_manager/memory_manager.h" - #include "opencl/source/event/async_events_handler.h" #include "opencl/test/unit_test/event/event_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/fixtures/scenario_test_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" +#include +#include #include +#include +#include typedef HelloWorldTest EventTests; diff --git a/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp index 894a713f5a..3c24cee379 100644 --- a/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp @@ -6,20 +6,21 @@ */ #include "shared/source/device/device.h" -#include "shared/source/helpers/get_info.h" #include "shared/source/os_interface/device_factory.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/gtest_helpers.h" +#include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/mocks/mock_device.h" -#include "opencl/source/api/api.h" -#include "opencl/source/platform/platform.h" +#include "opencl/source/api/cl_types.h" +#include "opencl/source/api/dispatch.h" +#include "opencl/source/context/context.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" +#include "CL/cl.h" #include "gtest/gtest.h" using namespace ::testing; diff --git a/opencl/test/unit_test/os_interface/windows/gl/cl_get_gl_context_info_khr_tests.cpp b/opencl/test/unit_test/os_interface/windows/gl/cl_get_gl_context_info_khr_tests.cpp index 77c8e8204a..a9e0bcad0f 100644 --- a/opencl/test/unit_test/os_interface/windows/gl/cl_get_gl_context_info_khr_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/gl/cl_get_gl_context_info_khr_tests.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/helpers/hw_info.h" -#include "shared/source/os_interface/device_factory.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/os_interface.h" -#include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/helpers/ult_hw_config.h" +#include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_wddm.h" #include "opencl/source/cl_device/cl_device.h" diff --git a/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp index 2ca619f324..0156a610ed 100644 --- a/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp +++ b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp @@ -1,17 +1,16 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/test_macros/hw_test.h" #include "shared/test/common/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/fixtures/scenario_test_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp index 7eb91bcef9..712b0aacde 100644 --- a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp +++ b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp @@ -7,18 +7,18 @@ #include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/memory_manager/internal_allocation_storage.h" -#include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/windows/wddm_device_command_stream.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/os_interface/windows/mock_wddm_memory_manager.h" #include "shared/test/common/test_macros/hw_test.h" -#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/helpers/cl_execution_environment_helper.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" +#include "opencl/test/unit_test/mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp index b9188f20bc..323c3ee55e 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp @@ -5,39 +5,43 @@ * */ -#include "shared/source/device/device.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/array_count.h" #include "shared/source/helpers/compiler_product_helper.h" +#include "shared/source/memory_manager/allocation_properties.h" +#include "shared/source/memory_manager/allocation_type.h" +#include "shared/source/memory_manager/definitions/storage_info.h" +#include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/libult/ult_command_stream_receiver.h" -#include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/mock_gmm.h" -#include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/test_macros/hw_test.h" +#include "opencl/extensions/public/cl_gl_private_intel_structures.h" #include "opencl/source/command_queue/command_queue.h" +#include "opencl/source/context/context.h" #include "opencl/source/event/user_event.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/sharings/gl/cl_gl_api_intel.h" #include "opencl/source/sharings/gl/gl_arb_sync_event.h" #include "opencl/source/sharings/gl/gl_buffer.h" #include "opencl/source/sharings/gl/gl_context_guard.h" #include "opencl/source/sharings/gl/gl_sync_event.h" -#include "opencl/source/sharings/gl/gl_texture.h" #include "opencl/source/sharings/gl/windows/gl_sharing_windows.h" #include "opencl/source/sharings/sharing.h" #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_arb_sync_event_windows.h" #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" #include "opencl/test/unit_test/mocks/mock_async_event_handler.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_event.h" +#include "CL/cl_ext.h" #include "gl_types.h" using namespace NEO; diff --git a/opencl/test/unit_test/xe2_hpg_core/command_stream_receiver_hw_tests_xe2_hpg_core.cpp b/opencl/test/unit_test/xe2_hpg_core/command_stream_receiver_hw_tests_xe2_hpg_core.cpp index 97cf36069c..4496ca396b 100644 --- a/opencl/test/unit_test/xe2_hpg_core/command_stream_receiver_hw_tests_xe2_hpg_core.cpp +++ b/opencl/test/unit_test/xe2_hpg_core/command_stream_receiver_hw_tests_xe2_hpg_core.cpp @@ -5,34 +5,47 @@ * */ +#include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/command_stream/csr_definitions.h" +#include "shared/source/command_stream/csr_deps.h" #include "shared/source/command_stream/linear_stream.h" +#include "shared/source/command_stream/thread_arbitration_policy.h" #include "shared/source/gmm_helper/client_context/gmm_client_context.h" +#include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/resource_info.h" +#include "shared/source/helpers/append_operations.h" #include "shared/source/helpers/blit_commands_helper.h" -#include "shared/source/os_interface/device_factory.h" +#include "shared/source/helpers/fence_type.h" +#include "shared/source/helpers/gfx_core_helper.h" +#include "shared/source/helpers/pipeline_select_args.h" +#include "shared/source/memory_manager/graphics_allocation.h" +#include "shared/source/memory_manager/memory_pool.h" +#include "shared/source/os_interface/os_context.h" #include "shared/source/xe2_hpg_core/hw_cmds.h" +#include "shared/source/xe2_hpg_core/hw_cmds_base.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/engine_descriptor_helper.h" -#include "shared/test/common/libult/ult_aub_command_stream_receiver.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" -#include "shared/test/common/test_macros/test.h" #include "shared/test/common/utilities/base_object_utils.h" -#include "opencl/source/command_queue/gpgpu_walker.h" +#include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/source/event/event.h" -#include "opencl/source/helpers/cl_memory_properties_helpers.h" +#include "opencl/source/helpers/base_object.h" #include "opencl/test/unit_test/command_queue/hardware_interface_helper.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" -#include "opencl/test/unit_test/mocks/mock_platform.h" -#include +#include "gtest/gtest.h" + +#include +#include using namespace NEO; diff --git a/opencl/test/unit_test/xe2_hpg_core/enqueue_tests_xe2_hpg_core.cpp b/opencl/test/unit_test/xe2_hpg_core/enqueue_tests_xe2_hpg_core.cpp index 25f3f8ba88..11137318af 100644 --- a/opencl/test/unit_test/xe2_hpg_core/enqueue_tests_xe2_hpg_core.cpp +++ b/opencl/test/unit_test/xe2_hpg_core/enqueue_tests_xe2_hpg_core.cpp @@ -8,22 +8,27 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/gfx_core_helper.h" +#include "shared/source/program/heap_info.h" +#include "shared/source/program/kernel_info.h" #include "shared/source/xe2_hpg_core/hw_cmds.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/mocks/mock_device.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/test/unit_test/command_queue/hardware_interface_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "gtest/gtest.h" + +#include +#include + using namespace NEO; struct EnqueueFixtureXe2HpgCore : public ::testing::Test { diff --git a/opencl/test/unit_test/xe3_core/command_stream_receiver_hw_tests_xe3_core.cpp b/opencl/test/unit_test/xe3_core/command_stream_receiver_hw_tests_xe3_core.cpp index 193146edc6..222956cb4e 100644 --- a/opencl/test/unit_test/xe3_core/command_stream_receiver_hw_tests_xe3_core.cpp +++ b/opencl/test/unit_test/xe3_core/command_stream_receiver_hw_tests_xe3_core.cpp @@ -5,34 +5,42 @@ * */ +#include "shared/source/command_stream/csr_definitions.h" #include "shared/source/command_stream/linear_stream.h" +#include "shared/source/command_stream/thread_arbitration_policy.h" #include "shared/source/gmm_helper/client_context/gmm_client_context.h" +#include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/resource_info.h" +#include "shared/source/helpers/append_operations.h" #include "shared/source/helpers/blit_commands_helper.h" -#include "shared/source/os_interface/device_factory.h" +#include "shared/source/helpers/blit_properties.h" +#include "shared/source/helpers/gfx_core_helper.h" +#include "shared/source/helpers/pipeline_select_args.h" +#include "shared/source/memory_manager/graphics_allocation.h" +#include "shared/source/memory_manager/memory_pool.h" +#include "shared/source/os_interface/os_context.h" +#include "shared/source/xe3_core/hw_cmds_base.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/engine_descriptor_helper.h" -#include "shared/test/common/libult/ult_aub_command_stream_receiver.h" +#include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" -#include "shared/test/common/test_macros/test.h" #include "shared/test/common/utilities/base_object_utils.h" -#include "opencl/source/command_queue/gpgpu_walker.h" -#include "opencl/source/command_queue/hardware_interface.h" -#include "opencl/source/helpers/cl_memory_properties_helpers.h" -#include "opencl/test/unit_test/command_queue/hardware_interface_helper.h" +#include "opencl/extensions/public/cl_ext_private.h" +#include "opencl/source/context/context.h" +#include "opencl/source/mem_obj/buffer.h" +#include "opencl/source/mem_obj/mem_obj.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "opencl/test/unit_test/mocks/mock_mdi.h" -#include "opencl/test/unit_test/mocks/mock_platform.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "gtest/gtest.h" #include "hw_cmds_xe3_core.h" -#include +#include +#include using namespace NEO; diff --git a/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp index 3a0e593f49..b71eee1e88 100644 --- a/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp @@ -6,7 +6,6 @@ */ #include "shared/source/command_stream/linear_stream.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/mocks/mock_timestamp_container.h" #include "shared/test/common/test_macros/hw_test.h" @@ -17,9 +16,13 @@ #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" +#include +#include + using namespace NEO; struct MemorySynchronizationViaMiSemaphoreWaitTest : public UltCommandStreamReceiverTest { diff --git a/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp index b8a25ece80..01b167414e 100644 --- a/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/enqueue_tests_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,22 +7,28 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/helpers/gfx_core_helper.h" +#include "shared/source/program/heap_info.h" +#include "shared/source/program/kernel_info.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/cmd_parse/hw_parse.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_graphics_allocation.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" -#include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/test/unit_test/command_queue/hardware_interface_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "gtest/gtest.h" + +#include +#include +#include + using namespace NEO; struct EnqueueFixtureXeHpcCore : public ::testing::Test { diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/command_queue_tests_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/command_queue_tests_dg2.cpp index 96a6c978c6..b7df13eaa1 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/command_queue_tests_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/command_queue_tests_dg2.cpp @@ -1,26 +1,35 @@ /* - * Copyright (C) 2023 Intel Corporation + * Copyright (C) 2023-2025 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/command_stream/scratch_space_controller_base.h" -#include "shared/source/os_interface/product_helper.h" +#include "shared/source/helpers/timestamp_packet_container.h" +#include "shared/source/kernel/kernel_descriptor.h" +#include "shared/source/os_interface/os_context.h" #include "shared/source/xe_hpg_core/hw_cmds_dg2.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_command_stream_receiver.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" -#include "shared/test/common/test_macros/test.h" -#include "opencl/source/command_queue/enqueue_common.h" +#include "opencl/source/cl_device/cl_device.h" +#include "opencl/source/context/context.h" #include "opencl/source/event/event_builder.h" -#include "opencl/source/helpers/task_information.h" +#include "opencl/source/helpers/dispatch_info.h" +#include "opencl/source/helpers/enqueue_properties.h" +#include "opencl/source/helpers/properties_helper.h" +#include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" -#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue_hw.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "gtest/gtest.h" + +#include + using namespace NEO; class MyMockCommandStreamReceiver : public MockCommandStreamReceiver {