Cleanup includes 16

Cleaned up files:
shared/source/built_ins/built_ins.h
shared/source/command_container/command_encoder.h
shared/source/helpers/hw_helper.h
shared/source/memory_manager/allocation_properties.h
shared/source/xe_hpc_core/hw_cmds.h
shared/test/common/test_macros/test_excludes.h

Related-To: NEO-5548

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

shared/source/built_ins/built_ins.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "shared/source/built_ins/builtinops/built_in_ops.h"
+#include "shared/source/built_ins/built_in_ops_base.h"
 #include "shared/source/built_ins/sip_kernel_type.h"
 #include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/helpers/debug_helpers.h"

shared/source/command_container/command_encoder.h

@@ -10,19 +10,19 @@
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/encode_alu_helper.h"
 #include "shared/source/debugger/debugger.h"
-#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/gmm_helper/gmm_lib.h"
-#include "shared/source/helpers/definitions/mi_flush_args.h"
-#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/register_offsets.h"
-#include "shared/source/kernel/dispatch_kernel_encoder_interface.h"
 #include "shared/source/kernel/kernel_arg_descriptor.h"
 
-#include "encode_surface_state_args.h"
-
 #include <list>
 
 namespace NEO {
+struct EncodeSurfaceStateArgs;
+struct MiFlushArgs;
+struct PipeControlArgs;
+enum class SlmPolicy;
+struct DispatchKernelEncoderI;
+struct RootDeviceEnvironment;
 
 class BindlessHeapsHelper;
 class GmmHelper;

shared/source/command_container/command_encoder.inl

@@ -16,6 +16,7 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
+#include "shared/source/helpers/definitions/mi_flush_args.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/local_id_gen.h"
 #include "shared/source/helpers/preamble.h"
@@ -31,6 +32,7 @@
 #include "shared/source/program/kernel_info.h"
 
 #include "encode_surface_state.inl"
+#include "encode_surface_state_args.h"
 
 #include <algorithm>
 

shared/source/command_container/command_encoder_xe_hpg_core_and_later.inl

@@ -10,6 +10,8 @@
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/xe_hpg_core/hw_cmds.h"
 
+#include "encode_surface_state_args.h"
+
 namespace NEO {
 
 template <>

shared/source/command_stream/command_stream_receiver.cpp

@@ -17,6 +17,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/direct_submission/direct_submission_controller.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/cache_settings_helper.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"

shared/source/command_stream/command_stream_receiver_hw_base.inl

@@ -19,10 +19,12 @@
 #include "shared/source/device/device.h"
 #include "shared/source/direct_submission/direct_submission_controller.h"
 #include "shared/source/direct_submission/direct_submission_hw.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/page_table_mngr.h"
 #include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/source/helpers/cache_policy.h"
+#include "shared/source/helpers/definitions/mi_flush_args.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.h"
 #include "shared/source/helpers/flush_stamp.h"

shared/source/device/device.cpp

@@ -13,6 +13,8 @@
 #include "shared/source/command_stream/submission_status.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/debugger/debugger_l0.h"
+#include "shared/source/device/sub_device.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"

shared/source/device/root_device.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/sub_device.h"
+#include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/hw_helper.h"

shared/source/direct_submission/dispatchers/blitter_dispatcher.inl

@@ -8,6 +8,7 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/direct_submission/dispatchers/blitter_dispatcher.h"
+#include "shared/source/helpers/definitions/mi_flush_args.h"
 #include "shared/source/helpers/hw_info.h"
 
 namespace NEO {

shared/source/gen12lp/command_encoder_gen12lp.cpp

@@ -12,6 +12,8 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/preamble.h"
 
+#include "encode_surface_state_args.h"
+
 using Family = NEO::Gen12LpFamily;
 
 #include "shared/source/command_container/command_encoder.inl"

shared/source/helpers/hw_helper.h

@@ -8,14 +8,12 @@
 #pragma once
 #include "shared/source/built_ins/sip_kernel_type.h"
 #include "shared/source/commands/bxml_generator_glue.h"
-#include "shared/source/helpers/aux_translation.h"
 #include "shared/source/helpers/definitions/engine_group_types.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/options.h"
 
 #include "aubstream/aubstream.h"
 #include "igfxfmid.h"
-#include "sku_info.h"
 
 #include <cstdint>
 #include <memory>
@@ -26,6 +24,8 @@ struct LrcaHelper;
 }
 
 namespace NEO {
+enum class AuxTranslationMode;
+struct FeatureTable;
 enum class PostSyncMode : uint32_t;
 enum class CachePolicy : uint32_t;
 enum class CacheRegion : uint16_t;

shared/source/helpers/memory_properties_helpers.h

@@ -13,6 +13,8 @@
 
 namespace NEO {
 
+struct HardwareInfo;
+
 class MemoryPropertiesHelper {
   public:
     enum class ObjType {

shared/source/helpers/memory_properties_helpers_base.inl

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/device/device.h"
 #include "shared/source/helpers/bit_helpers.h"
 #include "shared/source/helpers/memory_properties_helpers.h"
 

shared/source/memory_manager/allocation_properties.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
-#include "shared/source/device/sub_device.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 
 namespace NEO {
+class OsContext;
 struct ImageInfo;
 struct AllocationProperties {
     union {

shared/source/memory_manager/memory_manager.cpp

@@ -9,6 +9,7 @@
 
 #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/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"

shared/source/memory_manager/unified_memory_manager.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/memory_manager/unified_memory_manager.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/sub_device.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/aligned_memory.h"

shared/source/program/sync_buffer_handler.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/program/sync_buffer_handler.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/device/device.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/memory_manager.h"

shared/source/xe_hpc_core/hw_cmds.h

@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
-
 #ifdef SUPPORT_PVC
 #include "hw_cmds_pvc.h"
 #endif

shared/source/xe_hpg_core/hw_cmds_dg2.h

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "shared/source/xe_hpg_core/dg2/definitions/device_ids_configs_dg2_base.h"
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 #include "device_ids_configs_dg2.h"

shared/test/common/mocks/mock_svm_manager.h

@@ -6,9 +6,11 @@
  */
 
 #pragma once
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
+
 namespace NEO {
 struct MockSVMAllocsManager : public SVMAllocsManager {
   public:

shared/test/common/test_macros/test_excludes.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,8 +8,6 @@
 #pragma once
 #include "igfxfmid.h"
 
-#include <cstdint>
-
 namespace NEO {
 namespace TestExcludes {
 

shared/test/unit_test/command_container/command_encoder_tests.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/gmm_lib.h"
+#include "shared/source/helpers/definitions/mi_flush_args.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/memory_manager.h"

shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp

@@ -13,6 +13,8 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
+#include "encode_surface_state_args.h"
+
 using namespace NEO;
 using CommandEncoderXeHpgCorePlusTests = Test<DeviceFixture>;
 

shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp

@@ -14,6 +14,7 @@
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/unit_test/helpers/state_base_address_tests.h"
 
+#include "encode_surface_state_args.h"
 #include "test_traits_common.h"
 
 using namespace NEO;

shared/test/unit_test/encoders/test_encode_mi_flush_dw.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/helpers/blit_commands_helper.h"
+#include "shared/source/helpers/definitions/mi_flush_args.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"

shared/test/unit_test/encoders/test_encode_mi_flush_dw_xehp_and_later.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/helpers/definitions/mi_flush_args.h"
 #include "shared/test/unit_test/fixtures/command_container_fixture.h"
 
 using namespace NEO;

shared/test/unit_test/encoders/test_encode_states.cpp

@@ -20,6 +20,7 @@
 #include "shared/test/unit_test/fixtures/command_container_fixture.h"
 #include "shared/test/unit_test/fixtures/front_window_fixture.h"
 
+#include "encode_surface_state_args.h"
 #include "test_traits_common.h"
 
 using namespace NEO;

shared/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"

shared/test/unit_test/helpers/state_base_address_tests.cpp

@@ -12,6 +12,8 @@
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
+#include "encode_surface_state_args.h"
+
 using IsBetweenSklAndTgllp = IsWithinProducts<IGFX_SKYLAKE, IGFX_TIGERLAKE_LP>;
 
 HWTEST2_F(SbaTest, WhenAppendStateBaseAddressParametersIsCalledThenSBACmdHasBindingSurfaceStateProgrammed, IsBetweenSklAndTgllp) {

shared/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/device/device.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/graphics_allocation.h"

shared/test/unit_test/os_interface/linux/drm_debug_prelim_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/linux/drm_debug.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"

shared/test/unit_test/xe_hpc_core/test_encode_xe_hpc_core.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/definitions/mi_flush_args.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/os_interface/hw_info_config.h"

shared/test/unit_test/xe_hpg_core/dg2/test_encode_dispatch_kernel_dg2.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/kernel/dispatch_kernel_encoder_interface.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/xe_hpg_core/hw_cmds_dg2.h"
 #include "shared/test/common/helpers/default_hw_info.h"