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>