includes cleanup

Signed-off-by: Artur Harasimiuk <[email protected]>

Author: ArturHarasimiuk

shared/test/common/cmd_parse/cmd_parse_base.inl

@@ -7,6 +7,8 @@
 
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 
+#include "gtest/gtest.h"
+
 // clang-format off
 using namespace NEO;
 using MI_ARB_CHECK                    = GenStruct::MI_ARB_CHECK;

shared/test/common/cmd_parse/gen_cmd_parse.h

@@ -6,8 +6,9 @@
  */
 
 #pragma once
-#include "hw_cmds.h"
 
+#include <cstddef>
+#include <cstdint>
 #include <list>
 #include <vector>
 

shared/test/common/gen11/cmd_parse_gen11.cpp

@@ -5,15 +5,15 @@
  *
  */
 
-#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
-
-#include "gtest/gtest.h"
+#include "shared/source/gen11/hw_cmds_base.h"
 using GenStruct = NEO::GEN11;
 using GenGfxFamily = NEO::ICLFamily;
+
 #include "shared/test/common/cmd_parse/cmd_parse_base.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_base_mi_arb.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_gpgpu_walker.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_sip.inl"
+#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.inl"
 

shared/test/common/gen12lp/cmd_parse_gen12lp.cpp

@@ -5,17 +5,17 @@
  *
  */
 
-#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
-
-#include "gtest/gtest.h"
+#include "shared/source/gen12lp/hw_cmds_base.h"
 using GenStruct = NEO::GEN12LP;
 using GenGfxFamily = NEO::TGLLPFamily;
+
 #include "shared/test/common/cmd_parse/cmd_parse_base.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_compute_mode.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_gpgpu_walker.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_l3_control.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_mi_arb.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_sip.inl"
+#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.inl"
 

shared/test/common/gen8/cmd_parse_gen8.cpp

@@ -5,15 +5,15 @@
  *
  */
 
-#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
-
-#include "gtest/gtest.h"
+#include "shared/source/gen8/hw_cmds_base.h"
 using GenStruct = NEO::GEN8;
 using GenGfxFamily = NEO::BDWFamily;
+
 #include "shared/test/common/cmd_parse/cmd_parse_base.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_base_mi_arb.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_gpgpu_walker.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_sip.inl"
+#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.inl"
 

shared/test/common/gen9/cmd_parse_gen9.cpp

@@ -5,15 +5,15 @@
  *
  */
 
-#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
-
-#include "gtest/gtest.h"
+#include "shared/source/gen9/hw_cmds_base.h"
 using GenStruct = NEO::GEN9;
 using GenGfxFamily = NEO::SKLFamily;
+
 #include "shared/test/common/cmd_parse/cmd_parse_base.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_base_mi_arb.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_gpgpu_walker.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_sip.inl"
+#include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.inl"
 

shared/test/common/xe_hp_core/unit_test_helper_xe_hp_core.cpp

@@ -5,10 +5,12 @@
  *
  */
 
+#include "shared/source/xe_hp_core/hw_cmds_base.h"
 #include "shared/source/xe_hp_core/hw_info.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/helpers/unit_test_helper.inl"
 #include "shared/test/common/helpers/unit_test_helper_xehp_and_later.inl"
+
 using Family = NEO::XeHpFamily;
 
 namespace NEO {

shared/test/common/xe_hpc_core/cmd_parse_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"
 using GenStruct = NEO::XE_HPC_CORE;
 using GenGfxFamily = NEO::XE_HPC_COREFamily;
 
@@ -111,4 +111,4 @@ const char *CmdParse<GenGfxFamily>::getAdditionalCommandName(void *cmd) {
 
 #include "shared/test/common/cmd_parse/cmd_parse_pvc_and_later.inl"
 
-template const typename GenGfxFamily::RENDER_SURFACE_STATE *NEO::HardwareParse::getSurfaceState<GenGfxFamily>(IndirectHeap *ssh, uint32_t index);
+template const typename GenGfxFamily::RENDER_SURFACE_STATE *NEO::HardwareParse::getSurfaceState<GenGfxFamily>(IndirectHeap *ssh, uint32_t index);

shared/test/common/xe_hpc_core/unit_test_helper_xe_hpc_core.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/source/xe_hpc_core/hw_info.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/helpers/unit_test_helper.inl"

shared/test/common/xe_hpg_core/unit_test_helper_xe_hpg_core.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 #include "shared/source/xe_hpg_core/hw_info.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/helpers/unit_test_helper.inl"