Cleanup includes 10

Related-To: NEO-5548
Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>

level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl

@@ -10,6 +10,7 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/wait_status.h"
+#include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/completion_stamp.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"

level_zero/core/source/kernel/kernel_imp.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/kernel_helpers.h"

level_zero/core/test/unit_tests/mocks/mock_cmdqueue.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h"
 
 #include "shared/source/device/device.h"
+#include "shared/source/helpers/engine_control.h"
 
 namespace L0 {
 namespace ult {

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/helpers/api_specific_config.h"
+#include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/os_interface/hw_info_config.h"

level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device_binary_format/patchtokens_decoder.h"
+#include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/helpers/ray_tracing_helper.h"
 #include "shared/source/kernel/kernel_descriptor.h"

opencl/source/event/event_tracker.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,8 @@
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/helpers/cl_helper.h"
 
+#include <fstream>
+
 namespace NEO {
 
 std::unique_ptr<EventsTracker> EventsTracker::globalEvTracker = nullptr;

opencl/source/kernel/kernel.cpp

@@ -13,6 +13,7 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/hw_helper.h"

opencl/test/unit_test/api/cl_enqueue_verify_memory.inl

@@ -13,6 +13,10 @@
 
 using namespace NEO;
 
+namespace AubMemDump {
+#include "aub_services.h"
+}
+
 TEST(CheckVerifyMemoryRelatedApiConstants, givenVerifyMemoryRelatedApiConstantsWhenVerifyingTheirValueThenCorrectValuesAreReturned) {
     EXPECT_EQ(AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual, CL_MEM_COMPARE_EQUAL);
     EXPECT_EQ(AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareNotEqual, CL_MEM_COMPARE_NOT_EQUAL);

opencl/test/unit_test/event/event_tracker_tests.cpp

@@ -15,6 +15,7 @@
 #include "event_fixture.h"
 
 #include <array>
+#include <fstream>
 #include <functional>
 
 struct ClonedStream : std::stringstream {

shared/source/aub_mem_dump/aub_header.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <cstdint>
-#include <type_traits>
 
 #ifndef WIN32
 #pragma pack(4)

shared/source/built_ins/built_ins_storage.cpp

@@ -14,6 +14,7 @@
 #include "os_inc.h"
 
 #include <cstdint>
+#include <fstream>
 #include <sstream>
 
 namespace NEO {

shared/source/built_ins/sip.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/built_ins/built_ins.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/debugger/debugger.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/aligned_memory.h"

shared/source/command_container/cmdcontainer.h

@@ -7,7 +7,6 @@
 
 #pragma once
 #include "shared/source/command_stream/csr_definitions.h"
-#include "shared/source/helpers/heap_helper.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/indirect_heap/indirect_heap_type.h"
 
@@ -17,6 +16,7 @@
 #include <vector>
 
 namespace NEO {
+class HeapHelper;
 class CommandStreamReceiver;
 class Device;
 class GraphicsAllocation;

shared/source/command_stream/command_stream_receiver.cpp

@@ -39,6 +39,10 @@
 #include "shared/source/utilities/tag_allocator.h"
 #include "shared/source/utilities/wait_util.h"
 
+namespace AubMemDump {
+#include "aub_services.h"
+}
+
 namespace NEO {
 
 // Global table of CommandStreamReceiver factories for HW and tests

shared/source/command_stream/linear_stream.h

@@ -10,7 +10,6 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/ptr_math.h"
 
-#include <cstddef>
 #include <cstdint>
 
 namespace NEO {

shared/source/device/device.cpp

@@ -22,6 +22,7 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/os_time.h"
+#include "shared/source/program/sync_buffer_handler.h"
 #include "shared/source/source_level_debugger/source_level_debugger.h"
 #include "shared/source/utilities/software_tags_manager.h"
 

shared/source/device/device.h

@@ -6,21 +6,18 @@
  */
 
 #pragma once
-#include "shared/source/debugger/debugger.h"
 #include "shared/source/device/device_info.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
-#include "shared/source/helpers/bindless_heaps_helper.h"
-#include "shared/source/helpers/common_types.h"
-#include "shared/source/helpers/definitions/engine_group_types.h"
 #include "shared/source/helpers/engine_control.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/performance_counters.h"
-#include "shared/source/program/sync_buffer_handler.h"
 
 namespace NEO {
+class SyncBufferHandler;
+enum class EngineGroupType : uint32_t;
 class DebuggerL0;
 class OSTime;
 class SourceLevelDebugger;

shared/source/device/device_caps.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_container/implicit_scaling.h"
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/compiler_interface/compiler_interface.h"
 #include "shared/source/debugger/debugger.h"
 #include "shared/source/device/device.h"

shared/source/execution_environment/root_device_environment.cpp

@@ -18,6 +18,7 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
 #include "shared/source/helpers/api_specific_config.h"
+#include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/memory_operations_handler.h"

shared/source/helpers/hw_helper.h

@@ -6,7 +6,6 @@
  */
 
 #pragma once
-#include "shared/source/aub_mem_dump/aub_mem_dump.h"
 #include "shared/source/built_ins/sip_kernel_type.h"
 #include "shared/source/commands/bxml_generator_glue.h"
 #include "shared/source/helpers/aux_translation.h"
@@ -22,6 +21,10 @@
 #include <memory>
 #include <string>
 
+namespace AubMemDump {
+struct LrcaHelper;
+}
+
 namespace NEO {
 enum class PostSyncMode : uint32_t;
 enum class CachePolicy : uint32_t;

shared/source/memory_manager/host_ptr_defines.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <cinttypes>
-#include <cstdlib>
+#include <cstddef>
 #include <limits>
 
 namespace NEO {

shared/source/memory_manager/memory_manager.cpp

@@ -16,6 +16,7 @@
 #include "shared/source/gmm_helper/resource_info.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/api_specific_config.h"
+#include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/heap_assigner.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"

shared/source/os_interface/hw_info_config.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/aub_mem_dump/aub_mem_dump.h"
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/api_specific_config.h"

shared/source/os_interface/linux/drm_neo.cpp

@@ -43,6 +43,7 @@
 #include <cstdio>
 #include <cstring>
 #include <fcntl.h>
+#include <fstream>
 #include <map>
 
 namespace NEO {

shared/source/os_interface/os_context.h

@@ -6,13 +6,9 @@
  */
 
 #pragma once
-#include "shared/source/command_stream/preemption_mode.h"
-#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/utilities/reference_tracked_object.h"
 
-#include "aubstream/engine_node.h"
-
 #include <mutex>
 
 namespace NEO {

shared/source/os_interface/performance_counters.h

@@ -8,10 +8,12 @@
 #pragma once
 #include "shared/source/utilities/metrics_library.h"
 
-#include "aubstream/engine_node.h"
-
 #include <mutex>
 
+namespace aub_stream {
+enum EngineType : uint32_t;
+}
+
 namespace NEO {
 
 //////////////////////////////////////////////////////

shared/source/os_interface/windows/wddm/wddm_interface.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/os_interface/windows/wddm/wddm_interface.h"
 
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/os_interface/windows/gdi_interface.h"

shared/source/utilities/const_stringref.h

@@ -7,9 +7,6 @@
 
 #pragma once
 
-#include <cinttypes>
-#include <cstddef>
-#include <cstring>
 #include <string>
 
 namespace NEO {

shared/source/utilities/logger.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/timestamp_packet.h"
 
+#include <fstream>
 #include <memory>
 #include <string>
 

shared/test/unit_test/command_container/command_container_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_stream/linear_stream.h"
+#include "shared/source/helpers/heap_helper.h"
 #include "shared/source/memory_manager/allocations_list.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/test/common/fixtures/device_fixture.h"

shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/simd_helper.h"

shared/test/unit_test/encoders/test_encode_states.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/string.h"

shared/test/unit_test/helpers/hw_helper_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/test/common/helpers/hw_helper_tests.h"
 
+#include "shared/source/aub_mem_dump/aub_mem_dump.h"
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/logical_state_helper.h"

shared/test/unit_test/os_interface/hw_info_config_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/test/unit_test/os_interface/hw_info_config_tests.h"
 
+#include "shared/source/aub_mem_dump/aub_mem_dump.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/os_interface/hw_info_config.h"

shared/test/unit_test/utilities/logger_tests.cpp

@@ -19,6 +19,7 @@
 
 #include <array>
 #include <cstdio>
+#include <fstream>
 #include <memory>
 #include <sstream>
 #include <string>