includes simplification

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

shared/offline_compiler/source/ocloc_arg_helper.h

@@ -13,7 +13,6 @@
 #include "shared/source/utilities/const_stringref.h"
 
 #include "device_ids_configs.h"
-#include "hw_cmds.h"
 #include "platforms.h"
 
 #include <cctype>

shared/offline_compiler/source/ocloc_fcl_facade.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
+#include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/os_inc_base.h"
 #include "shared/source/os_interface/os_library.h"
@@ -127,4 +128,4 @@ bool OclocFclFacade::isInitialized() const {
     return initialized;
 }
 
-} // namespace NEO
+} // namespace NEO

shared/offline_compiler/source/ocloc_igc_facade.cpp

@@ -10,6 +10,7 @@
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
 #include "shared/source/helpers/compiler_hw_info_config.h"
+#include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/os_inc_base.h"
 #include "shared/source/os_interface/os_library.h"
@@ -165,4 +166,4 @@ bool OclocIgcFacade::isInitialized() const {
     return initialized;
 }
 
-} // namespace NEO
+} // namespace NEO

shared/source/command_stream/command_stream_receiver_hw.h

@@ -16,8 +16,6 @@
 #include "shared/source/helpers/dirty_state_helpers.h"
 #include "shared/source/helpers/hw_info.h"
 
-#include "hw_cmds.h"
-
 #include <optional>
 
 namespace NEO {

shared/source/gen11/aub_mapper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/aub/aub_mapper_base.h"
+#include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen11/create_device_command_stream_receiver_gen11.cpp

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

shared/source/gen11/experimental_command_buffer_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/experimental_command_buffer.h"
 #include "shared/source/command_stream/experimental_command_buffer.inl"
+#include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/helpers/hw_helper.h"
 
 namespace NEO {

shared/source/gen11/linux/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.h"
 #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_bdw_and_later.inl"

shared/source/gen12lp/aub_mapper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/aub/aub_mapper_base.h"
+#include "shared/source/gen12lp/hw_cmds.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen12lp/create_device_command_stream_receiver_gen12lp.cpp

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

shared/source/gen12lp/experimental_command_buffer_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/experimental_command_buffer.h"
 #include "shared/source/command_stream/experimental_command_buffer.inl"
+#include "shared/source/gen12lp/hw_cmds.h"
 #include "shared/source/helpers/hw_helper.h"
 
 namespace NEO {

shared/source/gen12lp/linux/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.h"
 #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_bdw_and_later.inl"

shared/source/gen8/aub_mapper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/aub/aub_mapper_base.h"
+#include "shared/source/gen8/hw_cmds.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen8/create_device_command_stream_receiver_gen8.cpp

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

shared/source/gen8/experimental_command_buffer_gen8.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/experimental_command_buffer.h"
 #include "shared/source/command_stream/experimental_command_buffer.inl"
+#include "shared/source/gen8/hw_cmds.h"
 #include "shared/source/helpers/hw_helper.h"
 
 namespace NEO {

shared/source/gen8/linux/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.h"
 #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_bdw_and_later.inl"

shared/source/gen9/aub_mapper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/aub/aub_mapper_base.h"
+#include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/helpers/constants.h"
 
 #include "engine_node.h"

shared/source/gen9/create_device_command_stream_receiver_gen9.cpp

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

shared/source/gen9/experimental_command_buffer_gen9.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/command_stream/experimental_command_buffer.h"
 #include "shared/source/command_stream/experimental_command_buffer.inl"
+#include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/helpers/hw_helper.h"
 
 namespace NEO {

shared/source/gen9/linux/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.h"
 #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_bdw_and_later.inl"

shared/source/xe_hp_core/aub_mapper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #pragma once
 #include "shared/source/aub/aub_mapper_base.h"
 #include "shared/source/helpers/constants.h"
+#include "shared/source/xe_hp_core/hw_cmds.h"
 
 #include "engine_node.h"
 

shared/source/xe_hp_core/create_device_command_stream_receiver_xe_hp_core.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/xe_hp_core/hw_cmds.h"
 
 #include "create_command_stream_receiver.inl"
 

shared/source/xe_hp_core/experimental_command_buffer_xe_hp_core.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/experimental_command_buffer.inl"
+#include "shared/source/xe_hp_core/hw_cmds.h"
 
 namespace NEO {
 typedef XeHpFamily GfxFamily;

shared/source/xe_hp_core/linux/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
  *
@@ -9,6 +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_hp_core/hw_cmds.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/aub_mapper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #pragma once
 #include "shared/source/aub/aub_mapper_base.h"
 #include "shared/source/helpers/constants.h"
+#include "shared/source/xe_hpc_core/hw_cmds.h"
 
 #include "engine_node.h"
 

shared/source/xe_hpc_core/create_device_command_stream_receiver_xe_hpc_core.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/xe_hpc_core/hw_cmds.h"
 
 #include "create_command_stream_receiver.inl"
 

shared/source/xe_hpc_core/experimental_command_buffer_xe_hpc_core.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/experimental_command_buffer.inl"
+#include "shared/source/xe_hpc_core/hw_cmds.h"
 
 namespace NEO {
 using GfxFamily = XE_HPC_COREFamily;

shared/source/xe_hpc_core/linux/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
  *
@@ -9,6 +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"
 
 namespace NEO {
 

shared/source/xe_hpg_core/aub_mapper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #pragma once
 #include "shared/source/aub/aub_mapper_base.h"
 #include "shared/source/helpers/constants.h"
+#include "shared/source/xe_hpg_core/hw_cmds.h"
 
 #include "engine_node.h"
 

shared/source/xe_hpg_core/create_device_command_stream_receiver_xe_hpg_core.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/device_command_stream.h"
+#include "shared/source/xe_hpg_core/hw_cmds.h"
 
 #include "create_command_stream_receiver.inl"
 

shared/source/xe_hpg_core/experimental_command_buffer_xe_hpg_core.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/command_stream/experimental_command_buffer.inl"
+#include "shared/source/xe_hpg_core/hw_cmds.h"
 
 namespace NEO {
 typedef XE_HPG_COREFamily GfxFamily;

shared/source/xe_hpg_core/linux/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
  *
@@ -9,6 +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"
 
 namespace NEO {
 

shared/test/common/libult/gen11.cpp

@@ -1,10 +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/helpers/populate_factory.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 

shared/test/common/libult/gen12lp.cpp

@@ -1,10 +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/helpers/populate_factory.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 

shared/test/common/libult/gen8.cpp

@@ -1,10 +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/helpers/populate_factory.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 

shared/test/common/libult/gen9.cpp

@@ -1,10 +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/helpers/populate_factory.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 

shared/test/common/libult/xe_hp_core.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/populate_factory.h"
+#include "shared/source/xe_hp_core/hw_cmds.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 
 namespace NEO {

shared/test/common/libult/xe_hpc_core.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/populate_factory.h"
+#include "shared/source/xe_hpc_core/hw_cmds.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 
 namespace NEO {

shared/test/common/libult/xe_hpg_core.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/helpers/populate_factory.h"
+#include "shared/source/xe_hpg_core/hw_cmds.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 
 namespace NEO {

shared/test/common/os_interface/linux/drm_memory_manager_tests.h

@@ -20,6 +20,8 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
 
+#include "hw_cmds.h"
+
 #include <memory>
 
 namespace NEO {