includes refactor

ArturHarasimiuk · Compute-Runtime-Automation · commit 6cb44ae0d9cf · 2022-07-08T17:02:19.000+02:00
use gen specific hw_cmds instead of all-in-one

Signed-off-by: Artur Harasimiuk &lt;artur.harasimiuk@intel.com&gt;
diff --git a/level_zero/core/source/gen12lp/cmdlist_gen12lp.cpp b/level_zero/core/source/gen12lp/cmdlist_gen12lp.cpp
@@ -12,8 +12,8 @@
 #include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl"
+#include "level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl"
 
-#include "cache_flush_gen12lp.inl"
 #include "cmdlist_extended.inl"
 
 namespace L0 {
diff --git a/level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp b/level_zero/core/test/unit_tests/gen12lp/test_cache_flush.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/cache_flush.inl"
 #include "shared/source/helpers/l3_range.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
diff --git a/level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp b/level_zero/core/test/unit_tests/gen12lp/test_events_gen12lp.cpp
@@ -5,10 +5,10 @@
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/test/common/mocks/mock_timestamp_packet.h"
-#include "shared/test/common/test_macros/hw_test.h"
+#include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 
-#include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/event/event.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_event.h"
diff --git a/opencl/source/gen11/gtpin_setup_gen11.cpp b/opencl/source/gen11/gtpin_setup_gen11.cpp
@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen11/hw_cmds_base.h"
+
 #include "opencl/source/gtpin/gtpin_hw_helper.h"
 #include "opencl/source/gtpin/gtpin_hw_helper.inl"
 #include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl"
diff --git a/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp b/opencl/source/gen12lp/gtpin_setup_gen12lp.cpp
@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen12lp/hw_cmds_base.h"
+
 #include "opencl/source/gtpin/gtpin_hw_helper.h"
 #include "opencl/source/gtpin/gtpin_hw_helper.inl"
 #include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl"
diff --git a/opencl/source/gen8/gtpin_setup_gen8.cpp b/opencl/source/gen8/gtpin_setup_gen8.cpp
@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen8/hw_cmds_base.h"
+
 #include "opencl/source/gtpin/gtpin_hw_helper.h"
 #include "opencl/source/gtpin/gtpin_hw_helper.inl"
 #include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl"
diff --git a/opencl/source/gen9/gtpin_setup_gen9.cpp b/opencl/source/gen9/gtpin_setup_gen9.cpp
@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/gen9/hw_cmds_base.h"
+
 #include "opencl/source/gtpin/gtpin_hw_helper.h"
 #include "opencl/source/gtpin/gtpin_hw_helper.inl"
 #include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl"
diff --git a/opencl/source/gtpin/gtpin_hw_helper.inl b/opencl/source/gtpin/gtpin_hw_helper.inl
@@ -10,8 +10,6 @@
 #include "opencl/source/gtpin/gtpin_hw_helper.h"
 #include "opencl/source/kernel/kernel.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/opencl/source/xe_hp_core/gtpin_setup_xe_hp_core.cpp b/opencl/source/xe_hp_core/gtpin_setup_xe_hp_core.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 "opencl/source/gtpin/gtpin_hw_helper.h"
 #include "opencl/source/gtpin/gtpin_hw_helper.inl"
 #include "opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl"
diff --git a/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/gtpin_setup_xe_hpc_core.cpp
@@ -9,6 +9,7 @@
 #include "opencl/source/gtpin/gtpin_hw_helper.inl"
 #include "opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl"
 
+#include "hw_cmds_xe_hpc_core_base.h"
 #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
 
 namespace NEO {
diff --git a/opencl/source/xe_hpg_core/gtpin_setup_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/gtpin_setup_xe_hpg_core.cpp
@@ -9,6 +9,7 @@
 #include "opencl/source/gtpin/gtpin_hw_helper.inl"
 #include "opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl"
 
+#include "hw_cmds_xe_hpg_core_base.h"
 #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h"
 
 namespace NEO {
diff --git a/shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl b/shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl
@@ -8,8 +8,6 @@
 #include "shared/source/command_stream/command_stream_receiver_hw_base.inl"
 #include "shared/source/helpers/address_patch.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/shared/source/debugger/debugger_l0.inl b/shared/source/debugger/debugger_l0.inl
@@ -11,8 +11,6 @@
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
@@ -134,4 +132,4 @@ void DebuggerL0Hw<GfxFamily>::programSbaAddressLoad(NEO::LinearStream &cmdStream
                                        true);
 }
 
-} // namespace NEO
+} // namespace NEO
diff --git a/shared/source/gen11/command_stream_receiver_hw_gen11.cpp b/shared/source/gen11/command_stream_receiver_hw_gen11.cpp
@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl"
 #include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/gen11/reg_configs.h"
 #include "shared/source/helpers/blit_commands_helper_bdw_and_later.inl"
 #include "shared/source/helpers/populate_factory.h"
diff --git a/shared/source/gen11/debugger_gen11.cpp b/shared/source/gen11/debugger_gen11.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/source/debugger/debugger_l0.inl"
 #include "shared/source/debugger/debugger_l0_base.inl"
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/helpers/populate_factory.h"
 
 namespace NEO {
@@ -20,4 +21,4 @@ void populateFactoryTable<DebuggerL0Hw<GfxFamily>>() {
     debuggerL0Factory[coreFamily] = DebuggerL0Hw<GfxFamily>::allocate;
 }
 template class DebuggerL0Hw<GfxFamily>;
-} // namespace NEO
+} // namespace NEO
diff --git a/shared/source/gen11/preamble_gen11.cpp b/shared/source/gen11/preamble_gen11.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/csr_definitions.h"
+#include "shared/source/gen11/hw_cmds_base.h"
 #include "shared/source/helpers/pipeline_select_helper.h"
 #include "shared/source/helpers/preamble_bdw_and_later.inl"
 
diff --git a/shared/source/gen11/state_base_address_gen11.cpp b/shared/source/gen11/state_base_address_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_base.h"
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/source/helpers/state_base_address_bdw_and_later.inl"
 #include "shared/source/helpers/state_base_address_icllp_and_later.inl"
diff --git a/shared/source/gen12lp/debugger_gen12lp.cpp b/shared/source/gen12lp/debugger_gen12lp.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/source/debugger/debugger_l0.inl"
 #include "shared/source/debugger/debugger_l0_tgllp_and_later.inl"
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/populate_factory.h"
 
 namespace NEO {
@@ -21,4 +22,4 @@ void populateFactoryTable<DebuggerL0Hw<Family>>() {
     debuggerL0Factory[coreFamily] = DebuggerL0Hw<Family>::allocate;
 }
 template class DebuggerL0Hw<Family>;
-} // namespace NEO
+} // namespace NEO
diff --git a/shared/source/gen12lp/preamble_gen12lp.cpp b/shared/source/gen12lp/preamble_gen12lp.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/csr_definitions.h"
+#include "shared/source/gen12lp/hw_cmds_base.h"
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/pipe_control_args.h"
 #include "shared/source/helpers/preamble_bdw_and_later.inl"
diff --git a/shared/source/gen12lp/state_base_address_gen12lp.cpp b/shared/source/gen12lp/state_base_address_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_base.h"
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/source/helpers/state_base_address_bdw_and_later.inl"
 #include "shared/source/helpers/state_base_address_icllp_and_later.inl"
diff --git a/shared/source/gen8/command_stream_receiver_hw_gen8.cpp b/shared/source/gen8/command_stream_receiver_hw_gen8.cpp
@@ -7,7 +7,7 @@
 
 #include "shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl"
 #include "shared/source/command_stream/device_command_stream.h"
-#include "shared/source/gen8/hw_cmds.h"
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/helpers/blit_commands_helper_bdw_and_later.inl"
 #include "shared/source/helpers/populate_factory.h"
 
diff --git a/shared/source/gen8/debugger_gen8.cpp b/shared/source/gen8/debugger_gen8.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/source/debugger/debugger_l0.inl"
 #include "shared/source/debugger/debugger_l0_base.inl"
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/helpers/populate_factory.h"
 
 namespace NEO {
@@ -21,4 +22,4 @@ void populateFactoryTable<DebuggerL0Hw<GfxFamily>>() {
     debuggerL0Factory[coreFamily] = DebuggerL0Hw<GfxFamily>::allocate;
 }
 template class DebuggerL0Hw<GfxFamily>;
-} // namespace NEO
+} // namespace NEO
diff --git a/shared/source/gen8/preamble_gen8.cpp b/shared/source/gen8/preamble_gen8.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/helpers/preamble_bdw_and_later.inl"
 
 namespace NEO {
diff --git a/shared/source/gen8/state_base_address_gen8.cpp b/shared/source/gen8/state_base_address_gen8.cpp
@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/gen8/hw_cmds_base.h"
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/source/helpers/state_base_address_bdw.inl"
 #include "shared/source/helpers/state_base_address_bdw_and_later.inl"
diff --git a/shared/source/gen9/command_stream_receiver_hw_gen9.cpp b/shared/source/gen9/command_stream_receiver_hw_gen9.cpp
@@ -7,7 +7,7 @@
 
 #include "shared/source/command_stream/command_stream_receiver_hw_bdw_and_later.inl"
 #include "shared/source/command_stream/device_command_stream.h"
-#include "shared/source/gen9/hw_cmds.h"
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/blit_commands_helper_bdw_and_later.inl"
 #include "shared/source/helpers/populate_factory.h"
 
diff --git a/shared/source/gen9/debugger_gen9.cpp b/shared/source/gen9/debugger_gen9.cpp
@@ -7,6 +7,7 @@
 
 #include "shared/source/debugger/debugger_l0.inl"
 #include "shared/source/debugger/debugger_l0_base.inl"
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/populate_factory.h"
 
 namespace NEO {
@@ -21,4 +22,4 @@ void populateFactoryTable<DebuggerL0Hw<GfxFamily>>() {
     debuggerL0Factory[coreFamily] = DebuggerL0Hw<GfxFamily>::allocate;
 }
 template class DebuggerL0Hw<GfxFamily>;
-} // namespace NEO
+} // namespace NEO
diff --git a/shared/source/gen9/preamble_gen9.cpp b/shared/source/gen9/preamble_gen9.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/csr_definitions.h"
+#include "shared/source/gen9/hw_cmds_base.h"
 #include "shared/source/helpers/preamble_bdw_and_later.inl"
 
 namespace NEO {
diff --git a/shared/source/gen9/state_base_address_gen9.cpp b/shared/source/gen9/state_base_address_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_base.h"
 #include "shared/source/helpers/state_base_address.h"
 #include "shared/source/helpers/state_base_address_bdw_and_later.inl"
 #include "shared/source/helpers/state_base_address_skl.inl"
diff --git a/shared/source/helpers/cache_flush.inl b/shared/source/helpers/cache_flush.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,8 +10,6 @@
 #include "shared/source/helpers/l3_range.h"
 #include "shared/source/utilities/range.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 
 template <typename GfxFamily>
diff --git a/shared/source/helpers/preamble_base.inl b/shared/source/helpers/preamble_base.inl
@@ -13,7 +13,6 @@
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/helpers/register_offsets.h"
 
-#include "hw_cmds.h"
 #include "reg_configs_common.h"
 
 #include <cstddef>
diff --git a/shared/source/helpers/state_base_address_base.inl b/shared/source/helpers/state_base_address_base.inl
@@ -14,8 +14,6 @@
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "hw_cmds.h"
-
 namespace NEO {
 template <typename GfxFamily>
 void StateBaseAddressHelper<GfxFamily>::programStateBaseAddress(
diff --git a/shared/source/os_interface/windows/device_command_stream.inl b/shared/source/os_interface/windows/device_command_stream.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,6 @@
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.h"
 
-#include "hw_cmds.h"
 #pragma warning(pop)
 
 namespace NEO {
diff --git a/shared/source/os_interface/windows/wddm_device_command_stream.inl b/shared/source/os_interface/windows/wddm_device_command_stream.inl
@@ -22,7 +22,6 @@
 #include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.h"
 
-#include "hw_cmds.h"
 #pragma warning(pop)
 
 #include "shared/source/os_interface/windows/gdi_interface.h"
diff --git a/shared/source/xe_hp_core/debugger_xe_hp_core.cpp b/shared/source/xe_hp_core/debugger_xe_hp_core.cpp
@@ -8,6 +8,7 @@
 #include "shared/source/debugger/debugger_l0.inl"
 #include "shared/source/debugger/debugger_l0_tgllp_and_later.inl"
 #include "shared/source/helpers/populate_factory.h"
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 
 namespace NEO {
 
diff --git a/shared/source/xe_hp_core/state_base_address_xe_hp_core.cpp b/shared/source/xe_hp_core/state_base_address_xe_hp_core.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/helpers/state_base_address_xehp_and_later.inl"
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 
 namespace NEO {
 
diff --git a/shared/source/xe_hpc_core/debugger_xe_hpc_core.cpp b/shared/source/xe_hpc_core/debugger_xe_hpc_core.cpp
diff --git a/shared/source/xe_hpc_core/preamble_xe_hpc_core.cpp b/shared/source/xe_hpc_core/preamble_xe_hpc_core.cpp
diff --git a/shared/source/xe_hpc_core/state_base_address_xe_hpc_core.cpp b/shared/source/xe_hpc_core/state_base_address_xe_hpc_core.cpp
diff --git a/shared/source/xe_hpg_core/debugger_xe_hpg_core.cpp b/shared/source/xe_hpg_core/debugger_xe_hpg_core.cpp
diff --git a/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp b/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp
diff --git a/shared/source/xe_hpg_core/state_base_address_xe_hpg_core.cpp b/shared/source/xe_hpg_core/state_base_address_xe_hpg_core.cpp

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
	`8`	`+#include "shared/source/gen12lp/hw_cmds_base.h"`
`8`	`9`	`#include "shared/source/helpers/cache_flush.inl"`
`9`	`10`	`#include "shared/source/helpers/l3_range.h"`
`10`	`11`	`#include "shared/test/common/cmd_parse/gen_cmd_parse.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2019-2021 Intel Corporation`
	`2`	`+ * Copyright (C) 2019-2022 Intel Corporation`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: MIT`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
	`8`	`+#include "shared/source/gen11/hw_cmds_base.h"`
	`9`	`+`
`8`	`10`	`#include "opencl/source/gtpin/gtpin_hw_helper.h"`
`9`	`11`	`#include "opencl/source/gtpin/gtpin_hw_helper.inl"`
`10`	`12`	`#include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl"`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2018-2021 Intel Corporation`
	`2`	`+ * Copyright (C) 2018-2022 Intel Corporation`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: MIT`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
	`8`	`+#include "shared/source/gen8/hw_cmds_base.h"`
	`9`	`+`
`8`	`10`	`#include "opencl/source/gtpin/gtpin_hw_helper.h"`
`9`	`11`	`#include "opencl/source/gtpin/gtpin_hw_helper.inl"`
`10`	`12`	`#include "opencl/source/gtpin/gtpin_hw_helper_bdw_and_later.inl"`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2021 Intel Corporation`
	`2`	`+ * Copyright (C) 2021-2022 Intel Corporation`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: MIT`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
	`8`	`+#include "shared/source/xe_hp_core/hw_cmds_base.h"`
	`9`	`+`
`8`	`10`	`#include "opencl/source/gtpin/gtpin_hw_helper.h"`
`9`	`11`	`#include "opencl/source/gtpin/gtpin_hw_helper.inl"`
`10`	`12`	`#include "opencl/source/gtpin/gtpin_hw_helper_xehp_and_later.inl"`