Cleanup headers

Signed-off-by: Daniel Chabrowski <daniel.chabrowski@intel.com>

shared/source/command_stream/command_stream_receiver_hw_base.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/built_ins/sip.h"
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/experimental_command_buffer.h"

shared/source/debug_settings/debug_settings_manager.h

@@ -50,8 +50,6 @@ void printDebugString(bool showDebugLogs, Args &&...args) {
 #define NO_SANITIZE
 #endif
 
-class Kernel;
-class GraphicsAllocation;
 class SettingsReader;
 
 template <typename T>

shared/source/device_binary_format/device_binary_format_patchtokens.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/program/kernel_info.h"
+#include "shared/source/program/program_info.h"
 #include "shared/source/program/program_info_from_patchtokens.h"
 #include "shared/source/utilities/logger.h"
 

shared/source/dll/get_devices.cpp

@@ -9,6 +9,8 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 
+#include "hw_cmds.h"
+
 namespace NEO {
 
 bool prepareDeviceEnvironments(ExecutionEnvironment &executionEnvironment, std::string &osPciPath, const uint32_t rootDeviceIndex) {

shared/source/gen11/aub_mem_dump_gen11.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "shared/source/aub_mem_dump/aub_alloc_dump.inl"
 #include "shared/source/aub_mem_dump/aub_mem_dump.inl"
 #include "shared/source/gen11/aub_mapper.h"
+#include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/helpers/completion_stamp.h"
 #include "shared/source/helpers/hw_helper.h"
 

shared/source/gen11/hw_helper_gen11.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/gen11/aub_mapper.h"
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.inl"
 #include "shared/source/helpers/hw_helper_base.inl"
 #include "shared/source/helpers/hw_helper_bdw_and_later.inl"

shared/source/gen11/linux/hw_info_config_ehl.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen11/linux/hw_info_config_icllp.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen11/linux/hw_info_config_lkf.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen11/preemption_gen11.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
+#include "shared/source/gen11/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/gen11/windows/command_stream_receiver_gen11.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/os_interface/windows/device_command_stream.inl"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
 

shared/source/gen11/windows/direct_submission_gen11.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,8 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/windows/wddm_direct_submission.inl"
-
-#include "hw_cmds.h"
+#include "shared/source/gen11/hw_cmds_base.h"
 
 namespace NEO {
 using GfxFamily = ICLFamily;

shared/source/gen11/windows/gmm_callbacks_gen11.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen11/hw_cmds.h"
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"
 #include "shared/source/helpers/windows/gmm_callbacks.inl"
 

shared/source/gen11/windows/hw_info_config_ehl.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl"

shared/source/gen11/windows/hw_info_config_icllp.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl"

shared/source/gen11/windows/hw_info_config_lkf.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl"

shared/source/gen12lp/aub_mem_dump_gen12lp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "shared/source/aub_mem_dump/aub_alloc_dump.inl"
 #include "shared/source/aub_mem_dump/aub_mem_dump.inl"
 #include "shared/source/gen12lp/aub_mapper.h"
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/completion_stamp.h"
 #include "shared/source/helpers/hw_helper.h"
 

shared/source/gen12lp/linux/hw_info_config_adlp.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/pipeline_select_args.h"
 #include "shared/source/helpers/pipeline_select_helper.h"

shared/source/gen12lp/linux/hw_info_config_adls.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen12lp/linux/hw_info_config_dg1.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen12lp/linux/hw_info_config_rkl.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen12lp/linux/hw_info_config_tgllp.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen12lp/preemption_gen12lp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
+#include "shared/source/gen12lp/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/gen12lp/windows/command_stream_receiver_gen12lp.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/os_interface/windows/device_command_stream.inl"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
 

shared/source/gen12lp/windows/direct_submission_gen12lp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,8 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/windows/wddm_direct_submission.inl"
-
-#include "hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_base.h"
 
 namespace NEO {
 using GfxFamily = TGLLPFamily;

shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl"
 
 namespace NEO {

shared/source/gen12lp/windows/hw_info_config_adlp.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/pipeline_select_args.h"
 #include "shared/source/helpers/pipeline_select_helper.h"

shared/source/gen12lp/windows/hw_info_config_adls.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen12lp/windows/hw_info_config_dg1.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen12lp/windows/hw_info_config_rkl.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen12lp/windows/hw_info_config_tgllp.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen8/aub_mem_dump_gen8.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "shared/source/aub_mem_dump/aub_alloc_dump.inl"
 #include "shared/source/aub_mem_dump/aub_mem_dump.inl"
 #include "shared/source/gen8/aub_mapper.h"
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/helpers/hw_helper.h"
 
 namespace AubMemDump {

shared/source/gen8/hw_helper_gen8.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/gen8/aub_mapper.h"
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.inl"
 #include "shared/source/helpers/hw_helper_base.inl"

shared/source/gen8/linux/hw_info_config_bdw.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen8/preemption_gen8.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/helpers/register_offsets.h"
 
 namespace NEO {

shared/source/gen8/windows/command_stream_receiver_gen8.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/os_interface/windows/device_command_stream.inl"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
 

shared/source/gen8/windows/direct_submission_gen8.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,6 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/windows/wddm_direct_submission.inl"
+#include "shared/source/gen8/hw_cmds_base.h"
 
 #include "hw_cmds.h"
 

shared/source/gen8/windows/gmm_callbacks_gen8.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen8/hw_cmds.h"
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"
 #include "shared/source/helpers/windows/gmm_callbacks.inl"
 

shared/source/gen8/windows/hw_info_config_bdw.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen9/aub_mem_dump_gen9.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,6 +9,7 @@
 #include "shared/source/aub_mem_dump/aub_alloc_dump.inl"
 #include "shared/source/aub_mem_dump/aub_mem_dump.inl"
 #include "shared/source/gen9/aub_mapper.h"
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/hw_helper.h"
 
 namespace AubMemDump {

shared/source/gen9/hw_helper_gen9.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/gen9/aub_mapper.h"
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.inl"
 #include "shared/source/helpers/hw_helper_base.inl"
 #include "shared/source/helpers/hw_helper_bdw_and_later.inl"

shared/source/gen9/linux/hw_info_config_bxt.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen9/linux/hw_info_config_cfl.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen9/linux/hw_info_config_glk.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen9/linux/hw_info_config_kbl.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"

shared/source/gen9/preemption_gen9.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/register_offsets.h"
 
 #include <cstring>

shared/source/gen9/windows/command_stream_receiver_gen9.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/os_interface/windows/device_command_stream.inl"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
 

shared/source/gen9/windows/direct_submission_gen9.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,8 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/windows/wddm_direct_submission.inl"
-
-#include "hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_base.h"
 
 namespace NEO {
 using GfxFamily = SKLFamily;

shared/source/gen9/windows/gmm_callbacks_gen9.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"
 #include "shared/source/helpers/windows/gmm_callbacks.inl"
 

shared/source/gen9/windows/hw_info_config_bxt.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl"

shared/source/gen9/windows/hw_info_config_cfl.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl"

shared/source/gen9/windows/hw_info_config_glk.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl"

shared/source/gen9/windows/hw_info_config_kbl.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl"

shared/source/gen9/windows/hw_info_config_skl.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl"

shared/source/helpers/hw_helper.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "shared/source/helpers/hw_helper.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/hw_info.h"
 
 #include <algorithm>
 

shared/source/helpers/hw_helper.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
-#include "shared/source/built_ins/sip.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"
 #include "shared/source/helpers/definitions/engine_group_types.h"
@@ -15,12 +15,13 @@
 #include "shared/source/helpers/options.h"
 #include "shared/source/utilities/stackvec.h"
 
-#include "hw_cmds.h"
+#include "igfxfmid.h"
+#include "sku_info.h"
 #include "third_party/aub_stream/headers/aubstream.h"
 
 #include <cstdint>
+#include <memory>
 #include <string>
-#include <type_traits>
 
 namespace NEO {
 class GmmHelper;
@@ -28,10 +29,10 @@ class GraphicsAllocation;
 class TagAllocatorBase;
 class LinearStream;
 class Gmm;
+class MemoryManager;
 struct AllocationData;
 struct AllocationProperties;
 struct EncodeSurfaceStateArgs;
-struct EngineControl;
 struct RootDeviceEnvironment;
 struct PipeControlArgs;
 

shared/source/helpers/hw_helper_extended.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/hw_info.h"
 
 namespace NEO {
 

shared/source/os_interface/linux/memory_info.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 
 #include <iostream>

shared/source/utilities/logger.h

@@ -11,7 +11,6 @@
 #include <cinttypes>
 #include <cstddef>
 #include <iostream>
-#include <memory>
 #include <mutex>
 #include <sstream>
 #include <string>
@@ -20,6 +19,7 @@
 namespace NEO {
 class Kernel;
 struct MultiDispatchInfo;
+class GraphicsAllocation;
 
 const char *getAllocationTypeString(GraphicsAllocation const *graphicsAllocation);
 

shared/source/xe_hp_core/aub_mem_dump_xe_hp_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/aub/aub_helper_xehp_and_later.inl"
 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 
 namespace NEO {
 struct XeHpFamily;

shared/source/xe_hp_core/implicit_scaling_xe_hp_core.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_container/implicit_scaling_xehp_and_later.inl"
 #include "shared/source/helpers/api_specific_config.h"
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hp_core/linux/hw_info_config_xe_hp_sdv.cpp

@@ -17,6 +17,7 @@
 #include "shared/source/os_interface/linux/pmt_util.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 #include "shared/source/utilities/directory.h"
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 
 namespace NEO {
 constexpr static auto gfxProduct = IGFX_XE_HP_SDV;

shared/source/xe_hp_core/preemption_xe_hp_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hp_core/windows/command_stream_receiver_xe_hp_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "shared/source/os_interface/windows/device_command_stream.inl"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hp_core/windows/direct_submission_xe_hp_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,8 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/windows/wddm_direct_submission.inl"
-
-#include "hw_cmds.h"
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 
 namespace NEO {
 using GfxFamily = XeHpFamily;

shared/source/xe_hp_core/windows/gmm_callbacks_xe_hp_core.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl"
-#include "shared/source/xe_hp_core/hw_cmds.h"
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 
 namespace NEO {
 template struct DeviceCallbacks<XeHpFamily>;

shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl"
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 
 namespace NEO {
 constexpr static auto gfxProduct = IGFX_XE_HP_SDV;

shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/aub/aub_helper_xehp_and_later.inl"
 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
+#include "shared/source/xe_hpc_core/hw_cmds_base.h"
 
 namespace NEO {
 struct XE_HPC_COREFamily;

shared/source/xe_hpc_core/implicit_scaling_xe_hpc_core.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/command_container/implicit_scaling_xehp_and_later.inl"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/xe_hpc_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp

@@ -18,6 +18,7 @@
 #include "shared/source/os_interface/linux/pmt_util.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 #include "shared/source/utilities/directory.h"
+#include "shared/source/xe_hpc_core/hw_cmds.h"
 
 namespace NEO {
 constexpr static auto gfxProduct = IGFX_PVC;

shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
+#include "shared/source/xe_hpc_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/windows/command_stream_receiver_xe_hpc_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "shared/source/os_interface/windows/device_command_stream.inl"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
+#include "shared/source/xe_hpc_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/windows/direct_submission_xe_hpc_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,8 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/windows/wddm_direct_submission.inl"
-
-#include "hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_base.h"
 
 namespace NEO {
 using GfxFamily = XE_HPC_COREFamily;

shared/source/xe_hpc_core/windows/gmm_callbacks_xe_hpc_core.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl"
-#include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp

@@ -10,8 +10,7 @@
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_dg2_and_later.inl"
 #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl"
-
-#include "hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds.h"
 
 namespace NEO {
 constexpr static auto gfxProduct = IGFX_PVC;

shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/aub/aub_helper_xehp_and_later.inl"
 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
+#include "shared/source/xe_hpg_core/hw_cmds_base.h"
 
 namespace NEO {
 struct XE_HPG_COREFamily;

shared/source/xe_hpg_core/implicit_scaling_xe_hpg_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_container/implicit_scaling_xehp_and_later.inl"
+#include "shared/source/xe_hpg_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp

@@ -14,6 +14,7 @@
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_dg2_and_later.inl"
 #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl"
+#include "shared/source/xe_hpg_core/hw_cmds.h"
 
 namespace NEO {
 constexpr static auto gfxProduct = IGFX_DG2;

shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
+#include "shared/source/xe_hpg_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/windows/command_stream_receiver_xe_hpg_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "shared/source/os_interface/windows/device_command_stream.inl"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
+#include "shared/source/xe_hpg_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/windows/direct_submission_xe_hpg_core.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,8 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/windows/wddm_direct_submission.inl"
-
-#include "hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_base.h"
 
 namespace NEO {
 using GfxFamily = XE_HPG_COREFamily;

shared/source/xe_hpg_core/windows/gmm_callbacks_xe_hpg_core.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl"
-#include "shared/source/xe_hpg_core/hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp

@@ -13,6 +13,7 @@
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_dg2_and_later.inl"
 #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl"
+#include "shared/source/xe_hpg_core/hw_cmds.h"
 
 namespace NEO {
 constexpr static auto gfxProduct = IGFX_DG2;