From c648a941ec4f5a3bc4baf269a02e392291d97276 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Wed, 29 Jun 2022 19:17:47 +0000 Subject: [PATCH] includes cleanup Signed-off-by: Artur Harasimiuk --- shared/test/common/cmd_parse/cmd_parse_base.inl | 2 ++ shared/test/common/cmd_parse/gen_cmd_parse.h | 3 ++- shared/test/common/gen11/cmd_parse_gen11.cpp | 6 +++--- shared/test/common/gen12lp/cmd_parse_gen12lp.cpp | 6 +++--- shared/test/common/gen8/cmd_parse_gen8.cpp | 6 +++--- shared/test/common/gen9/cmd_parse_gen9.cpp | 6 +++--- .../test/common/xe_hp_core/unit_test_helper_xe_hp_core.cpp | 2 ++ shared/test/common/xe_hpc_core/cmd_parse_xe_hpc_core.cpp | 4 ++-- .../common/xe_hpc_core/unit_test_helper_xe_hpc_core.cpp | 1 + .../common/xe_hpg_core/unit_test_helper_xe_hpg_core.cpp | 1 + .../unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp | 1 + 11 files changed, 23 insertions(+), 15 deletions(-) diff --git a/shared/test/common/cmd_parse/cmd_parse_base.inl b/shared/test/common/cmd_parse/cmd_parse_base.inl index ba2af758e0..69d74f7b3f 100644 --- a/shared/test/common/cmd_parse/cmd_parse_base.inl +++ b/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; diff --git a/shared/test/common/cmd_parse/gen_cmd_parse.h b/shared/test/common/cmd_parse/gen_cmd_parse.h index c5ad515b12..52da4353eb 100644 --- a/shared/test/common/cmd_parse/gen_cmd_parse.h +++ b/shared/test/common/cmd_parse/gen_cmd_parse.h @@ -6,8 +6,9 @@ */ #pragma once -#include "hw_cmds.h" +#include +#include #include #include diff --git a/shared/test/common/gen11/cmd_parse_gen11.cpp b/shared/test/common/gen11/cmd_parse_gen11.cpp index 181b278959..f8b1d49ae0 100644 --- a/shared/test/common/gen11/cmd_parse_gen11.cpp +++ b/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" diff --git a/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp b/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp index f9e9ae78a2..ddb62080c9 100644 --- a/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp +++ b/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" diff --git a/shared/test/common/gen8/cmd_parse_gen8.cpp b/shared/test/common/gen8/cmd_parse_gen8.cpp index 56eeb38d26..9dc553e51f 100644 --- a/shared/test/common/gen8/cmd_parse_gen8.cpp +++ b/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" diff --git a/shared/test/common/gen9/cmd_parse_gen9.cpp b/shared/test/common/gen9/cmd_parse_gen9.cpp index 13ba8dda96..290970e8f7 100644 --- a/shared/test/common/gen9/cmd_parse_gen9.cpp +++ b/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" diff --git a/shared/test/common/xe_hp_core/unit_test_helper_xe_hp_core.cpp b/shared/test/common/xe_hp_core/unit_test_helper_xe_hp_core.cpp index 3cc68a36ea..e9d3dc6a46 100644 --- a/shared/test/common/xe_hp_core/unit_test_helper_xe_hp_core.cpp +++ b/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 { diff --git a/shared/test/common/xe_hpc_core/cmd_parse_xe_hpc_core.cpp b/shared/test/common/xe_hpc_core/cmd_parse_xe_hpc_core.cpp index ac4327f11a..72a486846e 100644 --- a/shared/test/common/xe_hpc_core/cmd_parse_xe_hpc_core.cpp +++ b/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::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(IndirectHeap *ssh, uint32_t index); \ No newline at end of file +template const typename GenGfxFamily::RENDER_SURFACE_STATE *NEO::HardwareParse::getSurfaceState(IndirectHeap *ssh, uint32_t index); diff --git a/shared/test/common/xe_hpc_core/unit_test_helper_xe_hpc_core.cpp b/shared/test/common/xe_hpc_core/unit_test_helper_xe_hpc_core.cpp index 894c10a9c0..8d98dca234 100644 --- a/shared/test/common/xe_hpc_core/unit_test_helper_xe_hpc_core.cpp +++ b/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" diff --git a/shared/test/common/xe_hpg_core/unit_test_helper_xe_hpg_core.cpp b/shared/test/common/xe_hpg_core/unit_test_helper_xe_hpg_core.cpp index 6210c3c594..bc2a94c41f 100644 --- a/shared/test/common/xe_hpg_core/unit_test_helper_xe_hpg_core.cpp +++ b/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" diff --git a/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp index b639164554..15588ecd5b 100644 --- a/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/cmd_parse_tests_xe_hpc_core.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/test_macros/test.h"