refactor: cleanup includes

Signed-off-by: Jaroslaw Warchulski <jaroslaw.warchulski@intel.com>

level_zero/core/source/image/image_hw.inl

@@ -9,17 +9,16 @@
 #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/helpers/api_specific_config.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
-#include "shared/source/helpers/image_helper.h"
 #include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/image/image_surface_state.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_pooling.h"
+#include "shared/source/utilities/arrayref.h"
 
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/core/source/driver/driver_handle.h"
@@ -28,7 +27,7 @@
 #include "level_zero/core/source/image/image_format_desc_helper.h"
 #include "level_zero/core/source/image/image_formats.h"
 #include "level_zero/core/source/image/image_hw.h"
-#include "level_zero/core/source/sampler/sampler_imp.h"
+#include "level_zero/core/source/sampler/sampler.h"
 
 #include "encode_surface_state_args.h"
 

level_zero/core/source/kernel/kernel.h

@@ -7,15 +7,16 @@
 
 #pragma once
 
+#include "shared/source/helpers/definitions/engine_group_types.h"
+#include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/kernel/dispatch_kernel_encoder_interface.h"
-#include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
-#include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/unified_memory/unified_memory.h"
 
 #include "level_zero/core/source/helpers/api_handle_helper.h"
 
 #include <memory>
+#include <mutex>
 #include <vector>
 
 struct _ze_kernel_handle_t : BaseHandleWithLoaderTranslation<ZEL_HANDLE_KERNEL> {};

level_zero/core/source/kernel/kernel_imp.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include "shared/source/kernel/dispatch_kernel_encoder_interface.h"
+#include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/unified_memory/unified_memory.h"
 
 #include "level_zero/core/source/kernel/kernel.h"

level_zero/core/source/mutable_cmdlist/mutable_command_walker_hw.inl

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/ptr_math.h"
 
 #include "level_zero/core/source/mutable_cmdlist/mutable_command_walker_hw.h"

level_zero/core/source/mutable_cmdlist/mutable_kernel.cpp

@@ -8,7 +8,7 @@
 #include "level_zero/core/source/mutable_cmdlist/mutable_kernel.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/helpers/string.h"
+#include "shared/source/helpers/ptr_math.h"
 
 #include "level_zero/core/source/kernel/kernel_imp.h"
 #include "level_zero/core/source/module/module.h"
@@ -16,7 +16,7 @@
 #include "level_zero/core/source/mutable_cmdlist/mutable_kernel_dispatch.h"
 #include <level_zero/ze_api.h>
 
-#include "implicit_args.h"
+#include <iterator>
 
 namespace L0::MCL {
 

level_zero/core/source/printf_handler/printf_handler.cpp

@@ -8,14 +8,14 @@
 #include "level_zero/core/source/printf_handler/printf_handler.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
-#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/blit_properties.h"
 #include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/program/print_formatter.h"
 
-#include "level_zero/core/source/device/device_imp.h"
+#include "level_zero/core/source/device/device.h"
 
 namespace L0 {
 

level_zero/core/test/unit_tests/fixtures/device_fixture.h

@@ -9,7 +9,6 @@
 
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/os_time.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/variable_backup.h"
@@ -24,6 +23,7 @@ class MockPageFaultManager;
 
 namespace NEO {
 struct UltDeviceFactory;
+class MemoryManager;
 class MockMemoryManager;
 class OsAgnosticMemoryManager;
 class MemoryManagerMemHandleMock;

level_zero/experimental/source/graph/graph_captured_apis.h

@@ -13,7 +13,6 @@
 
 #include "level_zero/core/source/kernel/kernel_imp.h"
 #include "level_zero/ze_api.h"
-#include "level_zero/ze_intel_gpu.h"
 
 #include <memory>
 #include <span>

level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper_hw.h

@@ -6,9 +6,6 @@
  */
 
 #pragma once
-
-#include "shared/source/debug_settings/debug_settings_manager.h"
-
 #include "level_zero/sysman/source/shared/windows/product_helper/sysman_product_helper.h"
 
 namespace L0 {

opencl/source/command_queue/command_queue_hw.h

@@ -6,20 +6,26 @@
  */
 
 #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"
+#include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/os_interface/os_context.h"
 
 #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/dispatch_info.h"
 #include "opencl/source/helpers/queue_helpers.h"
+#include "opencl/source/kernel/kernel.h"
 #include "opencl/source/program/printf_handler.h"
 
 #include <memory>
@@ -29,6 +35,7 @@ namespace NEO {
 class EventBuilder;
 struct EnqueueProperties;
 struct KernelOperation;
+struct MultiDispatchInfo;
 
 template <typename GfxFamily>
 class CommandQueueHw : public CommandQueue {

opencl/source/command_queue/enqueue_copy_buffer.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #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/mem_obj/buffer.h"
 #include "opencl/source/memory_manager/mem_obj_surface.h"

opencl/source/command_queue/enqueue_copy_buffer_rect.h

@@ -8,6 +8,7 @@
 #pragma once
 #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/mem_obj/buffer.h"
 #include "opencl/source/memory_manager/mem_obj_surface.h"

opencl/source/command_queue/enqueue_copy_buffer_to_image.h

@@ -6,6 +6,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/mipmap.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/source/command_queue/enqueue_copy_image.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/helpers/basic_math.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/mipmap.h"

opencl/source/command_queue/enqueue_copy_image_to_buffer.h

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+#include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/mipmap.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/source/command_queue/enqueue_fill_buffer.h

@@ -11,6 +11,7 @@
 #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/mem_obj/buffer.h"
 #include "opencl/source/memory_manager/mem_obj_surface.h"

opencl/source/command_queue/enqueue_fill_image.h

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/helpers/basic_math.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/mem_obj/image.h"

opencl/source/command_queue/enqueue_read_buffer_rect.h

@@ -9,6 +9,7 @@
 #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/mem_obj/buffer.h"
 #include "opencl/source/memory_manager/mem_obj_surface.h"

opencl/source/command_queue/enqueue_read_image.h

@@ -14,6 +14,7 @@
 #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/context/context.h"
 #include "opencl/source/helpers/mipmap.h"

opencl/source/command_queue/enqueue_resource_barrier.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,7 @@
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/event/event.h"
+#include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/memory_manager/resource_surface.h"
 
 #include "resource_barrier.h"

opencl/source/command_queue/enqueue_write_buffer.h

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 
+#include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/memory_manager/mem_obj_surface.h"

opencl/source/command_queue/enqueue_write_buffer_rect.h

@@ -9,13 +9,13 @@
 #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/mem_obj/buffer.h"
 #include "opencl/source/memory_manager/mem_obj_surface.h"
 
 #include <new>
-
 namespace NEO {
 
 template <typename GfxFamily>

opencl/source/command_queue/enqueue_write_image.h

@@ -12,6 +12,7 @@
 #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/helpers/mipmap.h"

opencl/source/command_queue/gpgpu_walker_base.inl

@@ -18,6 +18,7 @@
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/event/user_event.h"
+#include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/helpers/queue_helpers.h"
 
 namespace NEO {

opencl/source/command_queue/hardware_interface_base.inl

@@ -15,6 +15,7 @@
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/command_queue/hardware_interface.h"
 #include "opencl/source/helpers/cl_preemption_helper.h"
+#include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/helpers/task_information.h"
 #include "opencl/source/mem_obj/buffer.h"

opencl/source/context/context.cpp

@@ -14,15 +14,14 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/get_info.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/memory_manager/deferred_deleter.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
+#include "shared/source/memory_manager/usm_pool_params.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/utilities/buffer_pool_allocator.inl"
 #include "shared/source/utilities/heap_allocator.h"
-#include "shared/source/utilities/staging_buffer_manager.h"
 #include "shared/source/utilities/tag_allocator.h"
 
 #include "opencl/source/cl_device/cl_device.h"

opencl/source/context/context.h

@@ -7,10 +7,7 @@
 
 #pragma once
 #include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/helpers/constants.h"
-#include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/unified_memory_pooling.h"
-#include "shared/source/memory_manager/usm_pool_params.h"
 #include "shared/source/utilities/buffer_pool_allocator.h"
 #include "shared/source/utilities/stackvec.h"
 

opencl/test/unit_test/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl

@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/kernel/grf_config.h"
 
 #include "opencl/source/command_queue/command_queue.h"

opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp

@@ -16,6 +16,7 @@
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
+#include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"

opencl/test/unit_test/command_queue/oom_image_tests.cpp

@@ -5,11 +5,13 @@
  *
  */
 
+#include "shared/source/indirect_heap/indirect_heap.h"
+#include "shared/test/common/helpers/default_hw_info.h"
+
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
-#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 
 using namespace NEO;
 

opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_4_tests.cpp

@@ -15,6 +15,7 @@
 #include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
+#include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"

opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h

@@ -10,6 +10,7 @@
 #include "shared/test/common/test_macros/test_checks_shared.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
+#include "opencl/source/helpers/dispatch_info.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_context.h"

opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp

@@ -9,27 +9,29 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_container/encode_surface_state.h"
+#include "shared/source/device/device.h"
 #include "shared/source/helpers/address_patch.h"
-#include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/compiler_product_helper.h"
+#include "shared/source/helpers/engine_control.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/kernel/implicit_args_helper.h"
-#include "shared/source/memory_manager/unified_memory_manager.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/memory_pool.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_graphics_allocation.h"
-#include "shared/test/common/utilities/base_object_utils.h"
+#include "shared/test/common/test_macros/test_checks_shared.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/helpers/hardware_commands_helper.h"
-#include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
+#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 
-#include <iostream>
 using namespace NEO;
 #include "shared/test/common/test_macros/heapless_matchers.h"
 

opencl/test/unit_test/mem_obj/usm_memory_pool_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/memory_manager/usm_pool_params.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/raii_product_helper.h"
 #include "shared/test/common/mocks/mock_product_helper.h"

opencl/test/unit_test/mocks/mock_command_queue.h

@@ -10,6 +10,7 @@
 #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"
 
 ////////////////////////////////////////////////////////////////////////////////
 // MockCommandQueue - Core implementation

opencl/test/unit_test/os_interface/performance_counters_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/command_stream/preemption.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/utilities/perf_counter.h"
@@ -15,7 +16,6 @@
 
 #include "opencl/source/event/event.h"
 #include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h"
-#include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/os_interface/mock_performance_counters.h"
 
 #include "gtest/gtest.h"

shared/source/command_container/command_encoder.h

@@ -7,14 +7,12 @@
 
 #pragma once
 
-#include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/encode_alu_helper.h"
 #include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/command_stream/thread_arbitration_policy.h"
 #include "shared/source/debugger/debugger.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/definitions/command_encoder_args.h"
-#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/helpers/state_base_address_helper.h"
 #include "shared/source/kernel/kernel_arg_descriptor.h"
@@ -27,6 +25,7 @@ namespace NEO {
 enum class SlmPolicy;
 
 class BindlessHeapsHelper;
+class CommandContainer;
 class Gmm;
 class GmmHelper;
 class IndirectHeap;