per gen/per sku TEST_F/TEST_P refactor

In gen/sku specific tests include only required files to reduce
dependency on not related HW scpecific headers and improve build
performance.
This is achieved by reduce in usage of hw_test.h and related collateral,
like shared/source/helpers/definitions/hw_cmds.h which can be replaced
by sku specific hw_cmds_<sku>.h

Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>

shared/source/gen11/enable_hw_info_config_ehl.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen11/hw_cmds.h"
+#include "shared/source/gen11/hw_cmds_ehl.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen11/enable_hw_info_config_icllp.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen11/hw_cmds.h"
+#include "shared/source/gen11/hw_cmds_icllp.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen11/enable_hw_info_config_lkf.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen11/hw_cmds.h"
+#include "shared/source/gen11/hw_cmds_lkf.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen11/hw_info_ehl.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen11/hw_cmds.h"
+#include "shared/source/gen11/hw_cmds_ehl.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen11/hw_info_icllp.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen11/hw_cmds.h"
+#include "shared/source/gen11/hw_cmds_icllp.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen12lp/enable_hw_info_config_adln.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_adln.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen12lp/enable_hw_info_config_adlp.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_adlp.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen12lp/enable_hw_info_config_adls.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_adls.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen12lp/enable_hw_info_config_dg1.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_dg1.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen12lp/enable_hw_info_config_rkl.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_rkl.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen12lp/enable_hw_info_config_tgllp.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_tgllp.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen12lp/hw_info_adln.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_adln.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen12lp/hw_info_adlp.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_adlp.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen12lp/hw_info_adls.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_adls.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen12lp/hw_info_tgllp.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen12lp/hw_cmds.h"
+#include "shared/source/gen12lp/hw_cmds_tgllp.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen8/enable_hw_info_config_bdw.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen8/hw_cmds.h"
+#include "shared/source/gen8/hw_cmds_bdw.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen8/hw_info_bdw.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen8/hw_cmds.h"
+#include "shared/source/gen8/hw_cmds_bdw.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen9/enable_hw_info_config_bxt.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_bxt.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen9/enable_hw_info_config_cfl.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_cfl.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen9/enable_hw_info_config_glk.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_glk.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen9/enable_hw_info_config_kbl.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_kbl.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen9/enable_hw_info_config_skl.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_skl.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 namespace NEO {

shared/source/gen9/hw_info_bxt.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_bxt.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen9/hw_info_cfl.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_cfl.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen9/hw_info_glk.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_glk.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen9/hw_info_kbl.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_kbl.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen9/hw_info_skl.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_skl.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen9/linux/hw_info_config_skl.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_skl.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/xe_hpc_core/command_stream_receiver_hw_xe_hpc_core.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/source/xe_hpc_core/hw_info.h"
 
 using Family = NEO::XE_HPC_COREFamily;

shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
-#include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #include "create_command_stream_receiver.inl"
 

shared/source/xe_hpc_core/enable_family_full_core_xe_hpc_core.cpp

@@ -11,7 +11,7 @@
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/populate_factory.h"
-#include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/enable_hw_info_config_pvc.cpp

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

shared/source/xe_hpc_core/experimental_command_buffer_xe_hpc_core.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/command_stream/experimental_command_buffer.inl"
-#include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 using GfxFamily = XE_HPC_COREFamily;

shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/xe_hpc_core/aub_mapper.h"
-#include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 using Family = NEO::XE_HPC_COREFamily;
 

shared/source/xe_hpc_core/hw_info_pvc.cpp

@@ -9,7 +9,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/constants.h"
 #include "shared/source/unified_memory/usm_memory_support.h"
-#include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_pvc.h"
 
 #include "engine_node.h"
 

shared/source/xe_hpc_core/linux/command_stream_receiver_xe_hpc_core.cpp

@@ -9,7 +9,7 @@
 #include "shared/source/os_interface/linux/device_command_stream.inl"
 #include "shared/source/os_interface/linux/drm_command_stream.inl"
 #include "shared/source/os_interface/linux/drm_command_stream_xehp_and_later.inl"
-#include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/linux/direct_submission_xe_hpc_core.cpp

@@ -13,7 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/linux/drm_direct_submission.inl"
-#include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 using GfxFamily = XE_HPC_COREFamily;

shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp

@@ -18,7 +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"
+#include "shared/source/xe_hpc_core/hw_cmds_pvc.h"
 
 #include "platforms.h"
 

shared/source/xe_hpc_core/tbx_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
  *
@@ -12,7 +12,7 @@
 #include "shared/source/helpers/populate_factory.h"
 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/source/memory_manager/memory_pool.h"
-#include "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 using Family = XE_HPC_COREFamily;

shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp

@@ -10,7 +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 "shared/source/xe_hpc_core/hw_cmds.h"
+#include "shared/source/xe_hpc_core/hw_cmds_pvc.h"
 
 #include "platforms.h"
 

shared/source/xe_hpg_core/command_stream_receiver_hw_xe_hpg_core.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/xe_hpg_core/hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 #include "shared/source/xe_hpg_core/hw_info.h"
 
 using Family = NEO::XE_HPG_COREFamily;

shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
-#include "shared/source/xe_hpg_core/hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 #include "create_command_stream_receiver.inl"
 

shared/source/xe_hpg_core/enable_family_full_core_xe_hpg_core.cpp

@@ -11,7 +11,7 @@
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/populate_factory.h"
-#include "shared/source/xe_hpg_core/hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/enable_hw_info_config_dg2.cpp

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

shared/source/xe_hpg_core/experimental_command_buffer_xe_hpg_core.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/command_stream/experimental_command_buffer.inl"
-#include "shared/source/xe_hpg_core/hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 typedef XE_HPG_COREFamily GfxFamily;

shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/xe_hpg_core/aub_mapper.h"
-#include "shared/source/xe_hpg_core/hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 using Family = NEO::XE_HPG_COREFamily;
 

shared/source/xe_hpg_core/hw_info_dg2.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/aub_mem_dump/definitions/aub_services.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/constants.h"
-#include "shared/source/xe_hpg_core/hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_dg2.h"
 
 #include "engine_node.h"
 

shared/source/xe_hpg_core/linux/command_stream_receiver_xe_hpg_core.cpp

@@ -9,7 +9,7 @@
 #include "shared/source/os_interface/linux/device_command_stream.inl"
 #include "shared/source/os_interface/linux/drm_command_stream.inl"
 #include "shared/source/os_interface/linux/drm_command_stream_xehp_and_later.inl"
-#include "shared/source/xe_hpg_core/hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/linux/direct_submission_xe_hpg_core.cpp

@@ -13,7 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/linux/drm_direct_submission.inl"
-#include "shared/source/xe_hpg_core/hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 using GfxFamily = XE_HPG_COREFamily;

shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp

@@ -14,7 +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"
+#include "shared/source/xe_hpg_core/hw_cmds_dg2.h"
 
 #include "platforms.h"
 

shared/source/xe_hpg_core/tbx_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
  *
@@ -12,7 +12,7 @@
 #include "shared/source/helpers/populate_factory.h"
 #include "shared/source/memory_manager/memory_banks.h"
 #include "shared/source/memory_manager/memory_pool.h"
-#include "shared/source/xe_hpg_core/hw_cmds.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 typedef XE_HPG_COREFamily Family;

shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp

@@ -13,7 +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"
+#include "shared/source/xe_hpg_core/hw_cmds_dg2.h"
 
 #include "platforms.h"