Cleanup headers

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

level_zero/core/source/gen11/cmdlist_gen11.cpp

@@ -7,6 +7,8 @@
 
 #include "level_zero/core/source/gen11/cmdlist_gen11.inl"
 
+#include "shared/source/gen11/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"

level_zero/core/source/gen11/cmdlist_gen11.h

@@ -6,6 +6,8 @@
  */
 
 #pragma once
+#include "shared/source/gen11/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 

level_zero/core/source/gen11/icllp/cmdlist_icllp.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/gen11/hw_cmds_base.h"
+
 #include "level_zero/core/source/gen11/cmdlist_gen11.h"
 
 namespace L0 {

level_zero/core/source/gen11/icllp/kernel_icllp.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen11/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {

level_zero/core/source/gen12lp/adlp/cmdlist_adlp.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h"
 
 namespace L0 {
@@ -14,4 +16,4 @@ static CommandListPopulateFactory<IGFX_ALDERLAKE_P, CommandListProductFamily<IGF
 static CommandListImmediatePopulateFactory<IGFX_ALDERLAKE_P, CommandListImmediateProductFamily<IGFX_ALDERLAKE_P>>
     populateADLPImmediate;
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/gen12lp/adlp/image_adlp.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/image/image_hw.inl"
 
 namespace L0 {

level_zero/core/source/gen12lp/adlp/kernel_adlp.cpp

@@ -1,14 +1,16 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {
 
 static KernelPopulateFactory<IGFX_ALDERLAKE_P, KernelHw<IGFX_GEN12LP_CORE>> populateADLP;
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/gen12lp/adlp/sampler_adlp.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/sampler/sampler_hw.inl"
 
 namespace L0 {

level_zero/core/source/gen12lp/adls/cmdlist_adls.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h"
 
 namespace L0 {
@@ -15,4 +17,4 @@ static CommandListPopulateFactory<IGFX_ALDERLAKE_S, CommandListProductFamily<IGF
 static CommandListImmediatePopulateFactory<IGFX_ALDERLAKE_S, CommandListImmediateProductFamily<IGFX_ALDERLAKE_S>>
     populateADLSImmediate;
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/gen12lp/adls/image_adls.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/image/image_hw.inl"
 
 namespace L0 {

level_zero/core/source/gen12lp/adls/kernel_adls.cpp

@@ -1,14 +1,16 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {
 
 static KernelPopulateFactory<IGFX_ALDERLAKE_S, KernelHw<IGFX_GEN12LP_CORE>> populateADLS;
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/gen12lp/adls/sampler_adls.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/sampler/sampler_hw.inl"
 
 namespace L0 {

level_zero/core/source/gen12lp/cmdlist_gen12lp.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"
@@ -19,4 +21,4 @@ namespace L0 {
 template struct CommandListCoreFamily<IGFX_GEN12LP_CORE>;
 template struct CommandListCoreFamilyImmediate<IGFX_GEN12LP_CORE>;
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/gen12lp/cmdlist_gen12lp.h

@@ -1,11 +1,13 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 
@@ -19,4 +21,4 @@ template <PRODUCT_FAMILY gfxProductFamily>
 struct CommandListImmediateProductFamily : public CommandListCoreFamilyImmediate<IGFX_GEN12LP_CORE> {
     using CommandListCoreFamilyImmediate::CommandListCoreFamilyImmediate;
 };
-} // namespace L0
+} // namespace L0

level_zero/core/source/gen12lp/dg1/cmdlist_dg1.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h"
 
 namespace L0 {

level_zero/core/source/gen12lp/dg1/kernel_dg1.cpp

@@ -1,14 +1,16 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {
 
 static KernelPopulateFactory<IGFX_DG1, KernelHw<IGFX_GEN12LP_CORE>> populateDG1;
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/gen12lp/rkl/cmdlist_rkl.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h"
 
 namespace L0 {
@@ -14,4 +16,4 @@ static CommandListPopulateFactory<IGFX_ROCKETLAKE, CommandListProductFamily<IGFX
 static CommandListImmediatePopulateFactory<IGFX_ROCKETLAKE, CommandListImmediateProductFamily<IGFX_ROCKETLAKE>>
     populateRKLImmediate;
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/gen12lp/rkl/image_rkl.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/image/image_hw.inl"
 
 namespace L0 {

level_zero/core/source/gen12lp/rkl/kernel_rkl.cpp

@@ -1,14 +1,16 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {
 
 static KernelPopulateFactory<IGFX_ROCKETLAKE, KernelHw<IGFX_GEN12LP_CORE>> populateRKL;
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/gen12lp/rkl/sampler_rkl.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/sampler/sampler_hw.inl"
 
 namespace L0 {

level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h"
 
 namespace L0 {

level_zero/core/source/gen12lp/tgllp/kernel_tgllp.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {

level_zero/core/source/gen9/cfl/kernel_cfl.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {

level_zero/core/source/gen9/cmdlist_gen9.cpp

@@ -7,6 +7,8 @@
 
 #include "level_zero/core/source/gen9/cmdlist_gen9.inl"
 
+#include "shared/source/gen9/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"

level_zero/core/source/gen9/kbl/kernel_kbl.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {

level_zero/core/source/gen9/skl/kernel_skl.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {

level_zero/core/source/xe_hp_core/cmdlist_xe_hp_core.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"

level_zero/core/source/xe_hp_core/cmdlist_xe_hp_core.h

@@ -6,6 +6,8 @@
  */
 
 #pragma once
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 

level_zero/core/source/xe_hp_core/xehp/cmdlist_xehp.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/xe_hp_core/cmdlist_xe_hp_core.h"
 
 namespace L0 {

level_zero/core/source/xe_hp_core/xehp/kernel_xehp.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {

level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"

level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.h

@@ -6,6 +6,8 @@
  */
 
 #pragma once
+#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 

level_zero/core/source/xe_hpc_core/pvc/cmdlist_pvc.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.h"
 
 namespace L0 {

level_zero/core/source/xe_hpc_core/pvc/cmdqueue_pvc.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,6 +12,7 @@
 #include "level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl"
 
 #include "cmdqueue_extended.inl"
+
 namespace L0 {
 template struct CommandQueueHw<IGFX_XE_HPC_CORE>;
 static CommandQueuePopulateFactory<IGFX_PVC, CommandQueueHw<IGFX_XE_HPC_CORE>>

level_zero/core/source/xe_hpc_core/pvc/kernel_pvc.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {

level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.cpp

@@ -5,6 +5,8 @@
  *
  */
 
+#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
@@ -18,4 +20,4 @@ namespace L0 {
 template struct CommandListCoreFamily<IGFX_XE_HPG_CORE>;
 template struct CommandListCoreFamilyImmediate<IGFX_XE_HPG_CORE>;
 
-} // namespace L0
+} // namespace L0

level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 

level_zero/core/source/xe_hpg_core/dg2/kernel_dg2.cpp

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+
 #include "level_zero/core/source/kernel/kernel_hw.h"
 
 namespace L0 {

level_zero/core/test/unit_tests/main.cpp

@@ -28,6 +28,7 @@
 #include "level_zero/core/source/compiler_interface/l0_reg_path.h"
 
 #include "gmock/gmock.h"
+#include "hw_cmds.h"
 #include "igfxfmid.h"
 
 #include <fstream>

level_zero/tools/source/debug/debug_session_imp.cpp

@@ -7,6 +7,7 @@
 
 #include "level_zero/tools/source/debug/debug_session_imp.h"
 
+#include "shared/source/built_ins/sip.h"
 #include "shared/source/helpers/hw_helper.h"
 
 #include "level_zero/core/source/device/device_imp.h"

opencl/source/context/context.h

@@ -9,7 +9,6 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/string.h"
-#include "shared/source/helpers/vec.h"
 #include "shared/source/unified_memory/unified_memory.h"
 
 #include "opencl/source/cl_device/cl_device_vector.h"
@@ -20,17 +19,14 @@
 #include "opencl/source/helpers/destructor_callbacks.h"
 #include "opencl/source/mem_obj/map_operations_handler.h"
 
-#include <list>
 #include <map>
-#include <set>
 
 namespace NEO {
 
 class AsyncEventsHandler;
-struct BuiltInKernel;
 class CommandQueue;
 class Device;
-class MemObj;
+class Kernel;
 class MemoryManager;
 class SharingFunctions;
 class SVMAllocsManager;

opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp

@@ -22,6 +22,7 @@
 #include "shared/source/os_interface/windows/wddm_allocation.h"
 #include "shared/source/os_interface/windows/wddm_engine_mapper.h"
 #include "shared/source/os_interface/windows/wddm_memory_manager.h"
+#include "shared/source/utilities/debug_settings_reader.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"

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 "shared/source/gen11/hw_cmds_base.h"
-#include "hw_cmds.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 "shared/source/gen12lp/hw_cmds_base.h"
-#include "hw_cmds.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 "shared/source/gen9/hw_cmds_base.h"
-#include "hw_cmds.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>