From 6fd7ae7142324236d552e4c777d43791f74251a8 Mon Sep 17 00:00:00 2001 From: Daniel Chabrowski Date: Wed, 25 May 2022 14:39:35 +0000 Subject: [PATCH] Cleanup headers Signed-off-by: Daniel Chabrowski --- .../core/source/gen11/cmdlist_gen11.cpp | 2 ++ level_zero/core/source/gen11/cmdlist_gen11.h | 2 ++ .../core/source/gen11/icllp/cmdlist_icllp.cpp | 2 ++ .../core/source/gen11/icllp/kernel_icllp.cpp | 4 ++- .../core/source/gen12lp/adlp/cmdlist_adlp.cpp | 6 ++-- .../core/source/gen12lp/adlp/image_adlp.cpp | 4 ++- .../core/source/gen12lp/adlp/kernel_adlp.cpp | 6 ++-- .../core/source/gen12lp/adlp/sampler_adlp.cpp | 4 ++- .../core/source/gen12lp/adls/cmdlist_adls.cpp | 6 ++-- .../core/source/gen12lp/adls/image_adls.cpp | 4 ++- .../core/source/gen12lp/adls/kernel_adls.cpp | 6 ++-- .../core/source/gen12lp/adls/sampler_adls.cpp | 4 ++- .../core/source/gen12lp/cmdlist_gen12lp.cpp | 4 ++- .../core/source/gen12lp/cmdlist_gen12lp.h | 6 ++-- .../core/source/gen12lp/dg1/cmdlist_dg1.cpp | 4 ++- .../core/source/gen12lp/dg1/kernel_dg1.cpp | 6 ++-- .../core/source/gen12lp/rkl/cmdlist_rkl.cpp | 6 ++-- .../core/source/gen12lp/rkl/image_rkl.cpp | 4 ++- .../core/source/gen12lp/rkl/kernel_rkl.cpp | 6 ++-- .../core/source/gen12lp/rkl/sampler_rkl.cpp | 4 ++- .../source/gen12lp/tgllp/cmdlist_tgllp.cpp | 4 ++- .../source/gen12lp/tgllp/kernel_tgllp.cpp | 4 ++- .../core/source/gen9/cfl/kernel_cfl.cpp | 4 ++- level_zero/core/source/gen9/cmdlist_gen9.cpp | 2 ++ .../core/source/gen9/kbl/kernel_kbl.cpp | 4 ++- .../core/source/gen9/skl/kernel_skl.cpp | 4 ++- .../source/xe_hp_core/cmdlist_xe_hp_core.cpp | 2 ++ .../source/xe_hp_core/cmdlist_xe_hp_core.h | 2 ++ .../source/xe_hp_core/xehp/cmdlist_xehp.cpp | 2 ++ .../source/xe_hp_core/xehp/kernel_xehp.cpp | 4 ++- .../xe_hpc_core/cmdlist_xe_hpc_core.cpp | 2 ++ .../source/xe_hpc_core/cmdlist_xe_hpc_core.h | 2 ++ .../source/xe_hpc_core/pvc/cmdlist_pvc.cpp | 2 ++ .../source/xe_hpc_core/pvc/cmdqueue_pvc.cpp | 3 +- .../source/xe_hpc_core/pvc/kernel_pvc.cpp | 4 ++- .../xe_hpg_core/cmdlist_xe_hpg_core.cpp | 4 ++- .../source/xe_hpg_core/cmdlist_xe_hpg_core.h | 2 ++ .../source/xe_hpg_core/dg2/kernel_dg2.cpp | 4 ++- level_zero/core/test/unit_tests/main.cpp | 1 + .../tools/source/debug/debug_session_imp.cpp | 1 + opencl/source/context/context.h | 6 +--- .../os_interface/windows/wddm20_tests.cpp | 1 + .../command_stream_receiver_hw_base.inl | 1 + .../debug_settings/debug_settings_manager.h | 2 -- .../device_binary_format_patchtokens.cpp | 1 + shared/source/dll/get_devices.cpp | 2 ++ shared/source/gen11/aub_mem_dump_gen11.cpp | 3 +- shared/source/gen11/hw_helper_gen11.cpp | 1 + .../source/gen11/linux/hw_info_config_ehl.cpp | 1 + .../gen11/linux/hw_info_config_icllp.cpp | 1 + .../source/gen11/linux/hw_info_config_lkf.cpp | 1 + shared/source/gen11/preemption_gen11.cpp | 3 +- .../windows/command_stream_receiver_gen11.cpp | 3 +- .../gen11/windows/direct_submission_gen11.cpp | 5 ++- .../gen11/windows/gmm_callbacks_gen11.cpp | 4 +-- .../gen11/windows/hw_info_config_ehl.cpp | 1 + .../gen11/windows/hw_info_config_icllp.cpp | 1 + .../gen11/windows/hw_info_config_lkf.cpp | 1 + .../source/gen12lp/aub_mem_dump_gen12lp.cpp | 3 +- .../gen12lp/linux/hw_info_config_adlp.cpp | 1 + .../gen12lp/linux/hw_info_config_adls.cpp | 1 + .../gen12lp/linux/hw_info_config_dg1.cpp | 1 + .../gen12lp/linux/hw_info_config_rkl.cpp | 1 + .../gen12lp/linux/hw_info_config_tgllp.cpp | 1 + shared/source/gen12lp/preemption_gen12lp.cpp | 3 +- .../command_stream_receiver_gen12lp.cpp | 3 +- .../windows/direct_submission_gen12lp.cpp | 5 ++- .../gen12lp/windows/gmm_callbacks_gen12lp.cpp | 4 +-- .../gen12lp/windows/hw_info_config_adlp.cpp | 1 + .../gen12lp/windows/hw_info_config_adls.cpp | 1 + .../gen12lp/windows/hw_info_config_dg1.cpp | 1 + .../gen12lp/windows/hw_info_config_rkl.cpp | 1 + .../gen12lp/windows/hw_info_config_tgllp.cpp | 1 + shared/source/gen8/aub_mem_dump_gen8.cpp | 3 +- shared/source/gen8/hw_helper_gen8.cpp | 3 +- .../source/gen8/linux/hw_info_config_bdw.cpp | 1 + shared/source/gen8/preemption_gen8.cpp | 1 + .../windows/command_stream_receiver_gen8.cpp | 3 +- .../gen8/windows/direct_submission_gen8.cpp | 3 +- .../gen8/windows/gmm_callbacks_gen8.cpp | 4 +-- .../gen8/windows/hw_info_config_bdw.cpp | 1 + shared/source/gen9/aub_mem_dump_gen9.cpp | 3 +- shared/source/gen9/hw_helper_gen9.cpp | 1 + .../source/gen9/linux/hw_info_config_bxt.cpp | 1 + .../source/gen9/linux/hw_info_config_cfl.cpp | 1 + .../source/gen9/linux/hw_info_config_glk.cpp | 1 + .../source/gen9/linux/hw_info_config_kbl.cpp | 1 + shared/source/gen9/preemption_gen9.cpp | 1 + .../windows/command_stream_receiver_gen9.cpp | 3 +- .../gen9/windows/direct_submission_gen9.cpp | 5 ++- .../gen9/windows/gmm_callbacks_gen9.cpp | 4 +-- .../gen9/windows/hw_info_config_bxt.cpp | 1 + .../gen9/windows/hw_info_config_cfl.cpp | 1 + .../gen9/windows/hw_info_config_glk.cpp | 1 + .../gen9/windows/hw_info_config_kbl.cpp | 1 + .../gen9/windows/hw_info_config_skl.cpp | 1 + shared/source/helpers/hw_helper.cpp | 3 +- shared/source/helpers/hw_helper.h | 9 +++--- shared/source/helpers/hw_helper_extended.cpp | 3 +- .../source/os_interface/linux/memory_info.cpp | 1 + shared/source/utilities/logger.h | 2 +- .../xe_hp_core/aub_mem_dump_xe_hp_core.cpp | 3 +- .../implicit_scaling_xe_hp_core.cpp | 1 + .../linux/hw_info_config_xe_hp_sdv.cpp | 1 + .../xe_hp_core/preemption_xe_hp_core.cpp | 3 +- .../command_stream_receiver_xe_hp_core.cpp | 3 +- .../windows/direct_submission_xe_hp_core.cpp | 5 ++- .../windows/gmm_callbacks_xe_hp_core.cpp | 4 +-- .../windows/hw_info_config_xe_hp_sdv.cpp | 1 + .../xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp | 3 +- .../implicit_scaling_xe_hpc_core.cpp | 1 + .../xe_hpc_core/linux/hw_info_config_pvc.cpp | 1 + .../xe_hpc_core/preemption_xe_hpc_core.cpp | 3 +- .../command_stream_receiver_xe_hpc_core.cpp | 3 +- .../windows/direct_submission_xe_hpc_core.cpp | 5 ++- .../windows/gmm_callbacks_xe_hpc_core.cpp | 4 +-- .../windows/hw_info_config_pvc.cpp | 3 +- .../xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp | 3 +- .../implicit_scaling_xe_hpg_core.cpp | 3 +- .../xe_hpg_core/linux/hw_info_config_dg2.cpp | 1 + .../xe_hpg_core/preemption_xe_hpg_core.cpp | 3 +- .../command_stream_receiver_xe_hpg_core.cpp | 3 +- .../windows/direct_submission_xe_hpg_core.cpp | 5 ++- .../windows/gmm_callbacks_xe_hpg_core.cpp | 4 +-- .../windows/hw_info_config_dg2.cpp | 1 + shared/test/common/cmd_parse/hw_parse.h | 2 ++ .../common/gen11/test_preemption_gen11.cpp | 1 + .../test/common/gen9/test_preemption_gen9.cpp | 1 + .../helpers/debug_manager_state_restore.h | 31 +------------------ .../xe_hp_core/xehp/test_preemption_xehp.cpp | 4 ++- shared/test/unit_test/main.cpp | 1 + .../test_preemption_xehp_and_later.cpp | 3 +- .../source_level_debugger_preamble_test.h | 3 +- 133 files changed, 251 insertions(+), 138 deletions(-) diff --git a/level_zero/core/source/gen11/cmdlist_gen11.cpp b/level_zero/core/source/gen11/cmdlist_gen11.cpp index 1c7a7ea1ca..88cec978e3 100644 --- a/level_zero/core/source/gen11/cmdlist_gen11.cpp +++ b/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" diff --git a/level_zero/core/source/gen11/cmdlist_gen11.h b/level_zero/core/source/gen11/cmdlist_gen11.h index 76cb1bedcf..c8dbf7bf12 100644 --- a/level_zero/core/source/gen11/cmdlist_gen11.h +++ b/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" diff --git a/level_zero/core/source/gen11/icllp/cmdlist_icllp.cpp b/level_zero/core/source/gen11/icllp/cmdlist_icllp.cpp index 5198076e9c..625484658a 100644 --- a/level_zero/core/source/gen11/icllp/cmdlist_icllp.cpp +++ b/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 { diff --git a/level_zero/core/source/gen11/icllp/kernel_icllp.cpp b/level_zero/core/source/gen11/icllp/kernel_icllp.cpp index cd510b1c79..e743dc2da7 100644 --- a/level_zero/core/source/gen11/icllp/kernel_icllp.cpp +++ b/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 { diff --git a/level_zero/core/source/gen12lp/adlp/cmdlist_adlp.cpp b/level_zero/core/source/gen12lp/adlp/cmdlist_adlp.cpp index 8fda993d1f..58fdfcafbf 100644 --- a/level_zero/core/source/gen12lp/adlp/cmdlist_adlp.cpp +++ b/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> populateADLPImmediate; -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/source/gen12lp/adlp/image_adlp.cpp b/level_zero/core/source/gen12lp/adlp/image_adlp.cpp index ecd743c0da..f1beeea89f 100644 --- a/level_zero/core/source/gen12lp/adlp/image_adlp.cpp +++ b/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 { diff --git a/level_zero/core/source/gen12lp/adlp/kernel_adlp.cpp b/level_zero/core/source/gen12lp/adlp/kernel_adlp.cpp index e443545053..8d69525f5d 100644 --- a/level_zero/core/source/gen12lp/adlp/kernel_adlp.cpp +++ b/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> populateADLP; -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/source/gen12lp/adlp/sampler_adlp.cpp b/level_zero/core/source/gen12lp/adlp/sampler_adlp.cpp index 5abffbe3b3..3298cb81a3 100644 --- a/level_zero/core/source/gen12lp/adlp/sampler_adlp.cpp +++ b/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 { diff --git a/level_zero/core/source/gen12lp/adls/cmdlist_adls.cpp b/level_zero/core/source/gen12lp/adls/cmdlist_adls.cpp index 80c200bd82..0db3314c01 100644 --- a/level_zero/core/source/gen12lp/adls/cmdlist_adls.cpp +++ b/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> populateADLSImmediate; -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/source/gen12lp/adls/image_adls.cpp b/level_zero/core/source/gen12lp/adls/image_adls.cpp index 292b1ab9bc..b9ea4c4f1a 100644 --- a/level_zero/core/source/gen12lp/adls/image_adls.cpp +++ b/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 { diff --git a/level_zero/core/source/gen12lp/adls/kernel_adls.cpp b/level_zero/core/source/gen12lp/adls/kernel_adls.cpp index 09a8b51c04..70f4bb05ae 100644 --- a/level_zero/core/source/gen12lp/adls/kernel_adls.cpp +++ b/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> populateADLS; -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/source/gen12lp/adls/sampler_adls.cpp b/level_zero/core/source/gen12lp/adls/sampler_adls.cpp index 5ae5131cdf..a91a31a45b 100644 --- a/level_zero/core/source/gen12lp/adls/sampler_adls.cpp +++ b/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 { diff --git a/level_zero/core/source/gen12lp/cmdlist_gen12lp.cpp b/level_zero/core/source/gen12lp/cmdlist_gen12lp.cpp index 068c642590..10a3d08793 100644 --- a/level_zero/core/source/gen12lp/cmdlist_gen12lp.cpp +++ b/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; template struct CommandListCoreFamilyImmediate; -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/source/gen12lp/cmdlist_gen12lp.h b/level_zero/core/source/gen12lp/cmdlist_gen12lp.h index ddeb70d3b7..08ec54ca44 100644 --- a/level_zero/core/source/gen12lp/cmdlist_gen12lp.h +++ b/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 struct CommandListImmediateProductFamily : public CommandListCoreFamilyImmediate { using CommandListCoreFamilyImmediate::CommandListCoreFamilyImmediate; }; -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/source/gen12lp/dg1/cmdlist_dg1.cpp b/level_zero/core/source/gen12lp/dg1/cmdlist_dg1.cpp index ffde1e407a..a5688e1b48 100644 --- a/level_zero/core/source/gen12lp/dg1/cmdlist_dg1.cpp +++ b/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 { diff --git a/level_zero/core/source/gen12lp/dg1/kernel_dg1.cpp b/level_zero/core/source/gen12lp/dg1/kernel_dg1.cpp index 5c571fa21a..0d9115ea38 100644 --- a/level_zero/core/source/gen12lp/dg1/kernel_dg1.cpp +++ b/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> populateDG1; -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/source/gen12lp/rkl/cmdlist_rkl.cpp b/level_zero/core/source/gen12lp/rkl/cmdlist_rkl.cpp index e3fc7dd925..79919ff8e9 100644 --- a/level_zero/core/source/gen12lp/rkl/cmdlist_rkl.cpp +++ b/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> populateRKLImmediate; -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/source/gen12lp/rkl/image_rkl.cpp b/level_zero/core/source/gen12lp/rkl/image_rkl.cpp index acd6e13579..2fa0020382 100644 --- a/level_zero/core/source/gen12lp/rkl/image_rkl.cpp +++ b/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 { diff --git a/level_zero/core/source/gen12lp/rkl/kernel_rkl.cpp b/level_zero/core/source/gen12lp/rkl/kernel_rkl.cpp index e1b869a4ae..aab69243c3 100644 --- a/level_zero/core/source/gen12lp/rkl/kernel_rkl.cpp +++ b/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> populateRKL; -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/source/gen12lp/rkl/sampler_rkl.cpp b/level_zero/core/source/gen12lp/rkl/sampler_rkl.cpp index 7d8bdc00d4..a3f19041c2 100644 --- a/level_zero/core/source/gen12lp/rkl/sampler_rkl.cpp +++ b/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 { diff --git a/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp index 7fe6a16882..ff5576f4c0 100644 --- a/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp +++ b/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 { diff --git a/level_zero/core/source/gen12lp/tgllp/kernel_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/kernel_tgllp.cpp index 3914343694..986e4ca5c8 100644 --- a/level_zero/core/source/gen12lp/tgllp/kernel_tgllp.cpp +++ b/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 { diff --git a/level_zero/core/source/gen9/cfl/kernel_cfl.cpp b/level_zero/core/source/gen9/cfl/kernel_cfl.cpp index 0f3ba21a22..1752f86721 100644 --- a/level_zero/core/source/gen9/cfl/kernel_cfl.cpp +++ b/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 { diff --git a/level_zero/core/source/gen9/cmdlist_gen9.cpp b/level_zero/core/source/gen9/cmdlist_gen9.cpp index 6dc90db941..43c1db1a7d 100644 --- a/level_zero/core/source/gen9/cmdlist_gen9.cpp +++ b/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" diff --git a/level_zero/core/source/gen9/kbl/kernel_kbl.cpp b/level_zero/core/source/gen9/kbl/kernel_kbl.cpp index c9fa862200..045318e7cd 100644 --- a/level_zero/core/source/gen9/kbl/kernel_kbl.cpp +++ b/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 { diff --git a/level_zero/core/source/gen9/skl/kernel_skl.cpp b/level_zero/core/source/gen9/skl/kernel_skl.cpp index e966715d78..72a7cc6564 100644 --- a/level_zero/core/source/gen9/skl/kernel_skl.cpp +++ b/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 { diff --git a/level_zero/core/source/xe_hp_core/cmdlist_xe_hp_core.cpp b/level_zero/core/source/xe_hp_core/cmdlist_xe_hp_core.cpp index d77e1cb681..11289b7b3c 100644 --- a/level_zero/core/source/xe_hp_core/cmdlist_xe_hp_core.cpp +++ b/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" diff --git a/level_zero/core/source/xe_hp_core/cmdlist_xe_hp_core.h b/level_zero/core/source/xe_hp_core/cmdlist_xe_hp_core.h index 077321a8ed..21d12e5826 100644 --- a/level_zero/core/source/xe_hp_core/cmdlist_xe_hp_core.h +++ b/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" diff --git a/level_zero/core/source/xe_hp_core/xehp/cmdlist_xehp.cpp b/level_zero/core/source/xe_hp_core/xehp/cmdlist_xehp.cpp index 167dfc6de8..f2af438d48 100644 --- a/level_zero/core/source/xe_hp_core/xehp/cmdlist_xehp.cpp +++ b/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 { diff --git a/level_zero/core/source/xe_hp_core/xehp/kernel_xehp.cpp b/level_zero/core/source/xe_hp_core/xehp/kernel_xehp.cpp index c179d2d8d2..f6ab0489bc 100644 --- a/level_zero/core/source/xe_hp_core/xehp/kernel_xehp.cpp +++ b/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 { diff --git a/level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.cpp b/level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.cpp index 78da0e3525..947c342a8f 100644 --- a/level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.cpp +++ b/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" diff --git a/level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.h b/level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.h index 3f72e9696c..1a3936c63f 100644 --- a/level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.h +++ b/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" diff --git a/level_zero/core/source/xe_hpc_core/pvc/cmdlist_pvc.cpp b/level_zero/core/source/xe_hpc_core/pvc/cmdlist_pvc.cpp index adfb2ae0f7..8ccda32bf2 100644 --- a/level_zero/core/source/xe_hpc_core/pvc/cmdlist_pvc.cpp +++ b/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 { diff --git a/level_zero/core/source/xe_hpc_core/pvc/cmdqueue_pvc.cpp b/level_zero/core/source/xe_hpc_core/pvc/cmdqueue_pvc.cpp index a2be0520bb..cc11c3fe4b 100644 --- a/level_zero/core/source/xe_hpc_core/pvc/cmdqueue_pvc.cpp +++ b/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; static CommandQueuePopulateFactory> diff --git a/level_zero/core/source/xe_hpc_core/pvc/kernel_pvc.cpp b/level_zero/core/source/xe_hpc_core/pvc/kernel_pvc.cpp index 6f43f546c4..6bb34902e9 100644 --- a/level_zero/core/source/xe_hpc_core/pvc/kernel_pvc.cpp +++ b/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 { diff --git a/level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.cpp b/level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.cpp index 4ee65e9eec..0860a0459e 100644 --- a/level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.cpp +++ b/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; template struct CommandListCoreFamilyImmediate; -} // namespace L0 \ No newline at end of file +} // namespace L0 diff --git a/level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.h b/level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.h index dd791ee0c0..d336e2b04b 100644 --- a/level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.h +++ b/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" diff --git a/level_zero/core/source/xe_hpg_core/dg2/kernel_dg2.cpp b/level_zero/core/source/xe_hpg_core/dg2/kernel_dg2.cpp index 91cabf5dfb..99f897287c 100644 --- a/level_zero/core/source/xe_hpg_core/dg2/kernel_dg2.cpp +++ b/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 { diff --git a/level_zero/core/test/unit_tests/main.cpp b/level_zero/core/test/unit_tests/main.cpp index a9ef03c9c1..2174ca06a0 100644 --- a/level_zero/core/test/unit_tests/main.cpp +++ b/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 diff --git a/level_zero/tools/source/debug/debug_session_imp.cpp b/level_zero/tools/source/debug/debug_session_imp.cpp index 5315b5483d..9744d6e50e 100644 --- a/level_zero/tools/source/debug/debug_session_imp.cpp +++ b/level_zero/tools/source/debug/debug_session_imp.cpp @@ -7,6 +7,7 @@ #include "level_zero/tools/source/debug/debug_session_imp.h" +#include "shared/source/built_ins/sip.h" #include "shared/source/helpers/hw_helper.h" #include "level_zero/core/source/device/device_imp.h" diff --git a/opencl/source/context/context.h b/opencl/source/context/context.h index a4b7df7ecf..84625e3608 100644 --- a/opencl/source/context/context.h +++ b/opencl/source/context/context.h @@ -9,7 +9,6 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/common_types.h" #include "shared/source/helpers/string.h" -#include "shared/source/helpers/vec.h" #include "shared/source/unified_memory/unified_memory.h" #include "opencl/source/cl_device/cl_device_vector.h" @@ -20,17 +19,14 @@ #include "opencl/source/helpers/destructor_callbacks.h" #include "opencl/source/mem_obj/map_operations_handler.h" -#include #include -#include namespace NEO { class AsyncEventsHandler; -struct BuiltInKernel; class CommandQueue; class Device; -class MemObj; +class Kernel; class MemoryManager; class SharingFunctions; class SVMAllocsManager; diff --git a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp index 9b481b9946..701ff15522 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp @@ -22,6 +22,7 @@ #include "shared/source/os_interface/windows/wddm_allocation.h" #include "shared/source/os_interface/windows/wddm_engine_mapper.h" #include "shared/source/os_interface/windows/wddm_memory_manager.h" +#include "shared/source/utilities/debug_settings_reader.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_execution_environment.h" diff --git a/shared/source/command_stream/command_stream_receiver_hw_base.inl b/shared/source/command_stream/command_stream_receiver_hw_base.inl index 4c4b3be36d..2a89830fc7 100644 --- a/shared/source/command_stream/command_stream_receiver_hw_base.inl +++ b/shared/source/command_stream/command_stream_receiver_hw_base.inl @@ -5,6 +5,7 @@ * */ +#include "shared/source/built_ins/sip.h" #include "shared/source/command_container/command_encoder.h" #include "shared/source/command_stream/command_stream_receiver_hw.h" #include "shared/source/command_stream/experimental_command_buffer.h" diff --git a/shared/source/debug_settings/debug_settings_manager.h b/shared/source/debug_settings/debug_settings_manager.h index 49d2799d79..6525341626 100644 --- a/shared/source/debug_settings/debug_settings_manager.h +++ b/shared/source/debug_settings/debug_settings_manager.h @@ -50,8 +50,6 @@ void printDebugString(bool showDebugLogs, Args &&...args) { #define NO_SANITIZE #endif -class Kernel; -class GraphicsAllocation; class SettingsReader; template diff --git a/shared/source/device_binary_format/device_binary_format_patchtokens.cpp b/shared/source/device_binary_format/device_binary_format_patchtokens.cpp index d5d40dec11..e6f7ec43ae 100644 --- a/shared/source/device_binary_format/device_binary_format_patchtokens.cpp +++ b/shared/source/device_binary_format/device_binary_format_patchtokens.cpp @@ -12,6 +12,7 @@ #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/program/kernel_info.h" +#include "shared/source/program/program_info.h" #include "shared/source/program/program_info_from_patchtokens.h" #include "shared/source/utilities/logger.h" diff --git a/shared/source/dll/get_devices.cpp b/shared/source/dll/get_devices.cpp index 0a873cb0d7..5f9099b0c8 100644 --- a/shared/source/dll/get_devices.cpp +++ b/shared/source/dll/get_devices.cpp @@ -9,6 +9,8 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" +#include "hw_cmds.h" + namespace NEO { bool prepareDeviceEnvironments(ExecutionEnvironment &executionEnvironment, std::string &osPciPath, const uint32_t rootDeviceIndex) { diff --git a/shared/source/gen11/aub_mem_dump_gen11.cpp b/shared/source/gen11/aub_mem_dump_gen11.cpp index b3ac00df33..f949f50d56 100644 --- a/shared/source/gen11/aub_mem_dump_gen11.cpp +++ b/shared/source/gen11/aub_mem_dump_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "shared/source/aub_mem_dump/aub_alloc_dump.inl" #include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/gen11/aub_mapper.h" +#include "shared/source/gen11/hw_cmds.h" #include "shared/source/helpers/completion_stamp.h" #include "shared/source/helpers/hw_helper.h" diff --git a/shared/source/gen11/hw_helper_gen11.cpp b/shared/source/gen11/hw_helper_gen11.cpp index a1fecf4c4d..306018147f 100644 --- a/shared/source/gen11/hw_helper_gen11.cpp +++ b/shared/source/gen11/hw_helper_gen11.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/gen11/aub_mapper.h" +#include "shared/source/gen11/hw_cmds_base.h" #include "shared/source/helpers/flat_batch_buffer_helper_hw.inl" #include "shared/source/helpers/hw_helper_base.inl" #include "shared/source/helpers/hw_helper_bdw_and_later.inl" diff --git a/shared/source/gen11/linux/hw_info_config_ehl.cpp b/shared/source/gen11/linux/hw_info_config_ehl.cpp index e18dce67f3..bca5444ada 100644 --- a/shared/source/gen11/linux/hw_info_config_ehl.cpp +++ b/shared/source/gen11/linux/hw_info_config_ehl.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen11/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen11/linux/hw_info_config_icllp.cpp b/shared/source/gen11/linux/hw_info_config_icllp.cpp index e9d693b443..3b9f9b0e46 100644 --- a/shared/source/gen11/linux/hw_info_config_icllp.cpp +++ b/shared/source/gen11/linux/hw_info_config_icllp.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen11/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen11/linux/hw_info_config_lkf.cpp b/shared/source/gen11/linux/hw_info_config_lkf.cpp index 38eac85a6b..2be32b41c9 100644 --- a/shared/source/gen11/linux/hw_info_config_lkf.cpp +++ b/shared/source/gen11/linux/hw_info_config_lkf.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen11/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen11/preemption_gen11.cpp b/shared/source/gen11/preemption_gen11.cpp index fc1e10c750..16a4427261 100644 --- a/shared/source/gen11/preemption_gen11.cpp +++ b/shared/source/gen11/preemption_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/preemption.h" #include "shared/source/command_stream/preemption.inl" +#include "shared/source/gen11/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/gen11/windows/command_stream_receiver_gen11.cpp b/shared/source/gen11/windows/command_stream_receiver_gen11.cpp index 0a4478bb64..2d2713432f 100644 --- a/shared/source/gen11/windows/command_stream_receiver_gen11.cpp +++ b/shared/source/gen11/windows/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_base.h" #include "shared/source/os_interface/windows/device_command_stream.inl" #include "shared/source/os_interface/windows/wddm_device_command_stream.inl" diff --git a/shared/source/gen11/windows/direct_submission_gen11.cpp b/shared/source/gen11/windows/direct_submission_gen11.cpp index 40e696f856..99da9935e3 100644 --- a/shared/source/gen11/windows/direct_submission_gen11.cpp +++ b/shared/source/gen11/windows/direct_submission_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,7 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" - -#include "hw_cmds.h" +#include "shared/source/gen11/hw_cmds_base.h" namespace NEO { using GfxFamily = ICLFamily; diff --git a/shared/source/gen11/windows/gmm_callbacks_gen11.cpp b/shared/source/gen11/windows/gmm_callbacks_gen11.cpp index 54a79860a1..d07eae3c89 100644 --- a/shared/source/gen11/windows/gmm_callbacks_gen11.cpp +++ b/shared/source/gen11/windows/gmm_callbacks_gen11.cpp @@ -1,11 +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/gen11/hw_cmds_base.h" #include "shared/source/helpers/windows/gmm_callbacks.h" #include "shared/source/helpers/windows/gmm_callbacks.inl" diff --git a/shared/source/gen11/windows/hw_info_config_ehl.cpp b/shared/source/gen11/windows/hw_info_config_ehl.cpp index ec2f0914fb..5c386c30a9 100644 --- a/shared/source/gen11/windows/hw_info_config_ehl.cpp +++ b/shared/source/gen11/windows/hw_info_config_ehl.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen11/hw_cmds_base.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" diff --git a/shared/source/gen11/windows/hw_info_config_icllp.cpp b/shared/source/gen11/windows/hw_info_config_icllp.cpp index 3d0e5768dc..dc57123071 100644 --- a/shared/source/gen11/windows/hw_info_config_icllp.cpp +++ b/shared/source/gen11/windows/hw_info_config_icllp.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen11/hw_cmds_base.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" diff --git a/shared/source/gen11/windows/hw_info_config_lkf.cpp b/shared/source/gen11/windows/hw_info_config_lkf.cpp index fbd069dc06..5493bcac2a 100644 --- a/shared/source/gen11/windows/hw_info_config_lkf.cpp +++ b/shared/source/gen11/windows/hw_info_config_lkf.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen11/hw_cmds_base.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" diff --git a/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp b/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp index 9bbf122fc9..9c4822742a 100644 --- a/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp +++ b/shared/source/gen12lp/aub_mem_dump_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "shared/source/aub_mem_dump/aub_alloc_dump.inl" #include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/gen12lp/aub_mapper.h" +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/completion_stamp.h" #include "shared/source/helpers/hw_helper.h" diff --git a/shared/source/gen12lp/linux/hw_info_config_adlp.cpp b/shared/source/gen12lp/linux/hw_info_config_adlp.cpp index 57d4cd586d..8a484991ff 100644 --- a/shared/source/gen12lp/linux/hw_info_config_adlp.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_adlp.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/pipeline_select_args.h" #include "shared/source/helpers/pipeline_select_helper.h" diff --git a/shared/source/gen12lp/linux/hw_info_config_adls.cpp b/shared/source/gen12lp/linux/hw_info_config_adls.cpp index 5c2be79f79..43dd992ce0 100644 --- a/shared/source/gen12lp/linux/hw_info_config_adls.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_adls.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen12lp/linux/hw_info_config_dg1.cpp b/shared/source/gen12lp/linux/hw_info_config_dg1.cpp index 537dcb876d..afc450447e 100644 --- a/shared/source/gen12lp/linux/hw_info_config_dg1.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_dg1.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen12lp/linux/hw_info_config_rkl.cpp b/shared/source/gen12lp/linux/hw_info_config_rkl.cpp index 4d037bb0a6..17a8673344 100644 --- a/shared/source/gen12lp/linux/hw_info_config_rkl.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_rkl.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp b/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp index a3f8757670..646179c330 100644 --- a/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_tgllp.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen12lp/preemption_gen12lp.cpp b/shared/source/gen12lp/preemption_gen12lp.cpp index d8c46eacf2..59d11fc89e 100644 --- a/shared/source/gen12lp/preemption_gen12lp.cpp +++ b/shared/source/gen12lp/preemption_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/preemption.h" #include "shared/source/command_stream/preemption.inl" +#include "shared/source/gen12lp/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/gen12lp/windows/command_stream_receiver_gen12lp.cpp b/shared/source/gen12lp/windows/command_stream_receiver_gen12lp.cpp index 01ac2e3956..b0bb18fc4f 100644 --- a/shared/source/gen12lp/windows/command_stream_receiver_gen12lp.cpp +++ b/shared/source/gen12lp/windows/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_base.h" #include "shared/source/os_interface/windows/device_command_stream.inl" #include "shared/source/os_interface/windows/wddm_device_command_stream.inl" diff --git a/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp b/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp index 5bc972994e..947f8b0b1f 100644 --- a/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp +++ b/shared/source/gen12lp/windows/direct_submission_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,7 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" - -#include "hw_cmds.h" +#include "shared/source/gen12lp/hw_cmds_base.h" namespace NEO { using GfxFamily = TGLLPFamily; diff --git a/shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp b/shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp index 0e79b414fd..25f58d2a1c 100644 --- a/shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp +++ b/shared/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp @@ -1,11 +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/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl" namespace NEO { diff --git a/shared/source/gen12lp/windows/hw_info_config_adlp.cpp b/shared/source/gen12lp/windows/hw_info_config_adlp.cpp index e9b8ea01b2..359064b1dc 100644 --- a/shared/source/gen12lp/windows/hw_info_config_adlp.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_adlp.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/pipeline_select_args.h" #include "shared/source/helpers/pipeline_select_helper.h" diff --git a/shared/source/gen12lp/windows/hw_info_config_adls.cpp b/shared/source/gen12lp/windows/hw_info_config_adls.cpp index 5c2be79f79..43dd992ce0 100644 --- a/shared/source/gen12lp/windows/hw_info_config_adls.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_adls.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen12lp/windows/hw_info_config_dg1.cpp b/shared/source/gen12lp/windows/hw_info_config_dg1.cpp index b592b6699c..cfe33be51f 100644 --- a/shared/source/gen12lp/windows/hw_info_config_dg1.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_dg1.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen12lp/windows/hw_info_config_rkl.cpp b/shared/source/gen12lp/windows/hw_info_config_rkl.cpp index 93337e03df..899c3b7409 100644 --- a/shared/source/gen12lp/windows/hw_info_config_rkl.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_rkl.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp b/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp index 177c128aef..e04b7d8625 100644 --- a/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_tgllp.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen8/aub_mem_dump_gen8.cpp b/shared/source/gen8/aub_mem_dump_gen8.cpp index 0ed21685e9..ebd23d3b92 100644 --- a/shared/source/gen8/aub_mem_dump_gen8.cpp +++ b/shared/source/gen8/aub_mem_dump_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "shared/source/aub_mem_dump/aub_alloc_dump.inl" #include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/gen8/aub_mapper.h" +#include "shared/source/gen8/hw_cmds_base.h" #include "shared/source/helpers/hw_helper.h" namespace AubMemDump { diff --git a/shared/source/gen8/hw_helper_gen8.cpp b/shared/source/gen8/hw_helper_gen8.cpp index 9e6a29aa86..e13201d876 100644 --- a/shared/source/gen8/hw_helper_gen8.cpp +++ b/shared/source/gen8/hw_helper_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/gen8/aub_mapper.h" +#include "shared/source/gen8/hw_cmds_base.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/flat_batch_buffer_helper_hw.inl" #include "shared/source/helpers/hw_helper_base.inl" diff --git a/shared/source/gen8/linux/hw_info_config_bdw.cpp b/shared/source/gen8/linux/hw_info_config_bdw.cpp index e5c65fc5c3..6ac51a4770 100644 --- a/shared/source/gen8/linux/hw_info_config_bdw.cpp +++ b/shared/source/gen8/linux/hw_info_config_bdw.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen8/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen8/preemption_gen8.cpp b/shared/source/gen8/preemption_gen8.cpp index 039829fd5f..bb926649b8 100644 --- a/shared/source/gen8/preemption_gen8.cpp +++ b/shared/source/gen8/preemption_gen8.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption.inl" +#include "shared/source/gen8/hw_cmds_base.h" #include "shared/source/helpers/register_offsets.h" namespace NEO { diff --git a/shared/source/gen8/windows/command_stream_receiver_gen8.cpp b/shared/source/gen8/windows/command_stream_receiver_gen8.cpp index cd5037cf2b..275bc8f2e9 100644 --- a/shared/source/gen8/windows/command_stream_receiver_gen8.cpp +++ b/shared/source/gen8/windows/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_base.h" #include "shared/source/os_interface/windows/device_command_stream.inl" #include "shared/source/os_interface/windows/wddm_device_command_stream.inl" diff --git a/shared/source/gen8/windows/direct_submission_gen8.cpp b/shared/source/gen8/windows/direct_submission_gen8.cpp index 4d9f311a23..26c6f35515 100644 --- a/shared/source/gen8/windows/direct_submission_gen8.cpp +++ b/shared/source/gen8/windows/direct_submission_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,6 +13,7 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" +#include "shared/source/gen8/hw_cmds_base.h" #include "hw_cmds.h" diff --git a/shared/source/gen8/windows/gmm_callbacks_gen8.cpp b/shared/source/gen8/windows/gmm_callbacks_gen8.cpp index 5fea2599bc..c8759ca0bd 100644 --- a/shared/source/gen8/windows/gmm_callbacks_gen8.cpp +++ b/shared/source/gen8/windows/gmm_callbacks_gen8.cpp @@ -1,11 +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/gen8/hw_cmds_base.h" #include "shared/source/helpers/windows/gmm_callbacks.h" #include "shared/source/helpers/windows/gmm_callbacks.inl" diff --git a/shared/source/gen8/windows/hw_info_config_bdw.cpp b/shared/source/gen8/windows/hw_info_config_bdw.cpp index 28be0f37b4..c092ccca71 100644 --- a/shared/source/gen8/windows/hw_info_config_bdw.cpp +++ b/shared/source/gen8/windows/hw_info_config_bdw.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen8/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen9/aub_mem_dump_gen9.cpp b/shared/source/gen9/aub_mem_dump_gen9.cpp index 3a664d3b09..5e9081739d 100644 --- a/shared/source/gen9/aub_mem_dump_gen9.cpp +++ b/shared/source/gen9/aub_mem_dump_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "shared/source/aub_mem_dump/aub_alloc_dump.inl" #include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/gen9/aub_mapper.h" +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/helpers/hw_helper.h" namespace AubMemDump { diff --git a/shared/source/gen9/hw_helper_gen9.cpp b/shared/source/gen9/hw_helper_gen9.cpp index b26dc01af2..54a131e563 100644 --- a/shared/source/gen9/hw_helper_gen9.cpp +++ b/shared/source/gen9/hw_helper_gen9.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/gen9/aub_mapper.h" +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/helpers/flat_batch_buffer_helper_hw.inl" #include "shared/source/helpers/hw_helper_base.inl" #include "shared/source/helpers/hw_helper_bdw_and_later.inl" diff --git a/shared/source/gen9/linux/hw_info_config_bxt.cpp b/shared/source/gen9/linux/hw_info_config_bxt.cpp index 6e59cecdbd..9d946a5470 100644 --- a/shared/source/gen9/linux/hw_info_config_bxt.cpp +++ b/shared/source/gen9/linux/hw_info_config_bxt.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen9/linux/hw_info_config_cfl.cpp b/shared/source/gen9/linux/hw_info_config_cfl.cpp index bfaad90004..50db36a17b 100644 --- a/shared/source/gen9/linux/hw_info_config_cfl.cpp +++ b/shared/source/gen9/linux/hw_info_config_cfl.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen9/linux/hw_info_config_glk.cpp b/shared/source/gen9/linux/hw_info_config_glk.cpp index bcc4bd93c8..a5b96513a6 100644 --- a/shared/source/gen9/linux/hw_info_config_glk.cpp +++ b/shared/source/gen9/linux/hw_info_config_glk.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen9/linux/hw_info_config_kbl.cpp b/shared/source/gen9/linux/hw_info_config_kbl.cpp index 5b6389a6a6..a2e8bb026c 100644 --- a/shared/source/gen9/linux/hw_info_config_kbl.cpp +++ b/shared/source/gen9/linux/hw_info_config_kbl.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" diff --git a/shared/source/gen9/preemption_gen9.cpp b/shared/source/gen9/preemption_gen9.cpp index 2650a3b893..f3b54d106b 100644 --- a/shared/source/gen9/preemption_gen9.cpp +++ b/shared/source/gen9/preemption_gen9.cpp @@ -9,6 +9,7 @@ #include "shared/source/command_stream/csr_definitions.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption.inl" +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/helpers/register_offsets.h" #include diff --git a/shared/source/gen9/windows/command_stream_receiver_gen9.cpp b/shared/source/gen9/windows/command_stream_receiver_gen9.cpp index 5eedbc679b..a63c9926c7 100644 --- a/shared/source/gen9/windows/command_stream_receiver_gen9.cpp +++ b/shared/source/gen9/windows/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_base.h" #include "shared/source/os_interface/windows/device_command_stream.inl" #include "shared/source/os_interface/windows/wddm_device_command_stream.inl" diff --git a/shared/source/gen9/windows/direct_submission_gen9.cpp b/shared/source/gen9/windows/direct_submission_gen9.cpp index 666cdd2384..78e433f70a 100644 --- a/shared/source/gen9/windows/direct_submission_gen9.cpp +++ b/shared/source/gen9/windows/direct_submission_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,7 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" - -#include "hw_cmds.h" +#include "shared/source/gen9/hw_cmds_base.h" namespace NEO { using GfxFamily = SKLFamily; diff --git a/shared/source/gen9/windows/gmm_callbacks_gen9.cpp b/shared/source/gen9/windows/gmm_callbacks_gen9.cpp index 6db273dbca..700ae2dca8 100644 --- a/shared/source/gen9/windows/gmm_callbacks_gen9.cpp +++ b/shared/source/gen9/windows/gmm_callbacks_gen9.cpp @@ -1,11 +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/gen9/hw_cmds_base.h" #include "shared/source/helpers/windows/gmm_callbacks.h" #include "shared/source/helpers/windows/gmm_callbacks.inl" diff --git a/shared/source/gen9/windows/hw_info_config_bxt.cpp b/shared/source/gen9/windows/hw_info_config_bxt.cpp index 15c1fedf99..3d9dd0d4f2 100644 --- a/shared/source/gen9/windows/hw_info_config_bxt.cpp +++ b/shared/source/gen9/windows/hw_info_config_bxt.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" diff --git a/shared/source/gen9/windows/hw_info_config_cfl.cpp b/shared/source/gen9/windows/hw_info_config_cfl.cpp index 81c675e7e8..9bc177e23c 100644 --- a/shared/source/gen9/windows/hw_info_config_cfl.cpp +++ b/shared/source/gen9/windows/hw_info_config_cfl.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" diff --git a/shared/source/gen9/windows/hw_info_config_glk.cpp b/shared/source/gen9/windows/hw_info_config_glk.cpp index d1568c7709..3493e291a8 100644 --- a/shared/source/gen9/windows/hw_info_config_glk.cpp +++ b/shared/source/gen9/windows/hw_info_config_glk.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" diff --git a/shared/source/gen9/windows/hw_info_config_kbl.cpp b/shared/source/gen9/windows/hw_info_config_kbl.cpp index ebba6ee194..8308711f9d 100644 --- a/shared/source/gen9/windows/hw_info_config_kbl.cpp +++ b/shared/source/gen9/windows/hw_info_config_kbl.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" diff --git a/shared/source/gen9/windows/hw_info_config_skl.cpp b/shared/source/gen9/windows/hw_info_config_skl.cpp index a22e8cc97a..3faaf5f6fd 100644 --- a/shared/source/gen9/windows/hw_info_config_skl.cpp +++ b/shared/source/gen9/windows/hw_info_config_skl.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/gen9/hw_cmds_base.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_bdw_and_later.inl" diff --git a/shared/source/helpers/hw_helper.cpp b/shared/source/helpers/hw_helper.cpp index 084aa3ce18..35f6de721b 100644 --- a/shared/source/helpers/hw_helper.cpp +++ b/shared/source/helpers/hw_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/helpers/hw_info.h" #include diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h index 010db20975..6363b0d9ea 100644 --- a/shared/source/helpers/hw_helper.h +++ b/shared/source/helpers/hw_helper.h @@ -7,7 +7,7 @@ #pragma once #include "shared/source/aub_mem_dump/aub_mem_dump.h" -#include "shared/source/built_ins/sip.h" +#include "shared/source/built_ins/sip_kernel_type.h" #include "shared/source/commands/bxml_generator_glue.h" #include "shared/source/helpers/aux_translation.h" #include "shared/source/helpers/definitions/engine_group_types.h" @@ -15,12 +15,13 @@ #include "shared/source/helpers/options.h" #include "shared/source/utilities/stackvec.h" -#include "hw_cmds.h" +#include "igfxfmid.h" +#include "sku_info.h" #include "third_party/aub_stream/headers/aubstream.h" #include +#include #include -#include namespace NEO { class GmmHelper; @@ -28,10 +29,10 @@ class GraphicsAllocation; class TagAllocatorBase; class LinearStream; class Gmm; +class MemoryManager; struct AllocationData; struct AllocationProperties; struct EncodeSurfaceStateArgs; -struct EngineControl; struct RootDeviceEnvironment; struct PipeControlArgs; diff --git a/shared/source/helpers/hw_helper_extended.cpp b/shared/source/helpers/hw_helper_extended.cpp index ac9a44fcb5..49e7a46cca 100644 --- a/shared/source/helpers/hw_helper_extended.cpp +++ b/shared/source/helpers/hw_helper_extended.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/hw_helper.h" +#include "shared/source/helpers/hw_info.h" namespace NEO { diff --git a/shared/source/os_interface/linux/memory_info.cpp b/shared/source/os_interface/linux/memory_info.cpp index 752dc73d69..aad80bb8db 100644 --- a/shared/source/os_interface/linux/memory_info.cpp +++ b/shared/source/os_interface/linux/memory_info.cpp @@ -12,6 +12,7 @@ #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/hw_helper.h" +#include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/linux/drm_neo.h" #include diff --git a/shared/source/utilities/logger.h b/shared/source/utilities/logger.h index 58820e01f4..7f9fbdb7d5 100644 --- a/shared/source/utilities/logger.h +++ b/shared/source/utilities/logger.h @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -20,6 +19,7 @@ namespace NEO { class Kernel; struct MultiDispatchInfo; +class GraphicsAllocation; const char *getAllocationTypeString(GraphicsAllocation const *graphicsAllocation); diff --git a/shared/source/xe_hp_core/aub_mem_dump_xe_hp_core.cpp b/shared/source/xe_hp_core/aub_mem_dump_xe_hp_core.cpp index 4f931602f6..78ac3112cc 100644 --- a/shared/source/xe_hp_core/aub_mem_dump_xe_hp_core.cpp +++ b/shared/source/xe_hp_core/aub_mem_dump_xe_hp_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/aub/aub_helper_xehp_and_later.inl" #include "shared/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/xe_hp_core/hw_cmds_base.h" namespace NEO { struct XeHpFamily; diff --git a/shared/source/xe_hp_core/implicit_scaling_xe_hp_core.cpp b/shared/source/xe_hp_core/implicit_scaling_xe_hp_core.cpp index b6bfb9d234..37cae34823 100644 --- a/shared/source/xe_hp_core/implicit_scaling_xe_hp_core.cpp +++ b/shared/source/xe_hp_core/implicit_scaling_xe_hp_core.cpp @@ -8,6 +8,7 @@ #include "shared/source/command_container/implicit_scaling.h" #include "shared/source/command_container/implicit_scaling_xehp_and_later.inl" #include "shared/source/helpers/api_specific_config.h" +#include "shared/source/xe_hp_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_sdv.cpp b/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_sdv.cpp index 05824b8297..3313cbc5b7 100644 --- a/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_sdv.cpp +++ b/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_sdv.cpp @@ -17,6 +17,7 @@ #include "shared/source/os_interface/linux/pmt_util.h" #include "shared/source/os_interface/linux/sys_calls.h" #include "shared/source/utilities/directory.h" +#include "shared/source/xe_hp_core/hw_cmds_base.h" namespace NEO { constexpr static auto gfxProduct = IGFX_XE_HP_SDV; diff --git a/shared/source/xe_hp_core/preemption_xe_hp_core.cpp b/shared/source/xe_hp_core/preemption_xe_hp_core.cpp index 36406450f5..a298b4b743 100644 --- a/shared/source/xe_hp_core/preemption_xe_hp_core.cpp +++ b/shared/source/xe_hp_core/preemption_xe_hp_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption.inl" +#include "shared/source/xe_hp_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hp_core/windows/command_stream_receiver_xe_hp_core.cpp b/shared/source/xe_hp_core/windows/command_stream_receiver_xe_hp_core.cpp index cf4f50482f..dfea953bca 100644 --- a/shared/source/xe_hp_core/windows/command_stream_receiver_xe_hp_core.cpp +++ b/shared/source/xe_hp_core/windows/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 * @@ -8,6 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl" #include "shared/source/os_interface/windows/device_command_stream.inl" #include "shared/source/os_interface/windows/wddm_device_command_stream.inl" +#include "shared/source/xe_hp_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hp_core/windows/direct_submission_xe_hp_core.cpp b/shared/source/xe_hp_core/windows/direct_submission_xe_hp_core.cpp index 789742dcf2..cd006d21b9 100644 --- a/shared/source/xe_hp_core/windows/direct_submission_xe_hp_core.cpp +++ b/shared/source/xe_hp_core/windows/direct_submission_xe_hp_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,7 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" - -#include "hw_cmds.h" +#include "shared/source/xe_hp_core/hw_cmds_base.h" namespace NEO { using GfxFamily = XeHpFamily; diff --git a/shared/source/xe_hp_core/windows/gmm_callbacks_xe_hp_core.cpp b/shared/source/xe_hp_core/windows/gmm_callbacks_xe_hp_core.cpp index 12023d7f2b..02097c8406 100644 --- a/shared/source/xe_hp_core/windows/gmm_callbacks_xe_hp_core.cpp +++ b/shared/source/xe_hp_core/windows/gmm_callbacks_xe_hp_core.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl" -#include "shared/source/xe_hp_core/hw_cmds.h" +#include "shared/source/xe_hp_core/hw_cmds_base.h" namespace NEO { template struct DeviceCallbacks; diff --git a/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp b/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp index 43cbede5db..6801e003f3 100644 --- a/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp +++ b/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_sdv.cpp @@ -12,6 +12,7 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl" +#include "shared/source/xe_hp_core/hw_cmds_base.h" namespace NEO { constexpr static auto gfxProduct = IGFX_XE_HP_SDV; diff --git a/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp b/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp index 4872611dee..e09b064e84 100644 --- a/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/aub/aub_helper_xehp_and_later.inl" #include "shared/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/xe_hpc_core/hw_cmds_base.h" namespace NEO { struct XE_HPC_COREFamily; diff --git a/shared/source/xe_hpc_core/implicit_scaling_xe_hpc_core.cpp b/shared/source/xe_hpc_core/implicit_scaling_xe_hpc_core.cpp index 3c151938ed..f966d746d8 100644 --- a/shared/source/xe_hpc_core/implicit_scaling_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/implicit_scaling_xe_hpc_core.cpp @@ -9,6 +9,7 @@ #include "shared/source/command_container/implicit_scaling_xehp_and_later.inl" #include "shared/source/helpers/api_specific_config.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/xe_hpc_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp b/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp index ecc4808219..9eb021f45e 100644 --- a/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp +++ b/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp @@ -18,6 +18,7 @@ #include "shared/source/os_interface/linux/pmt_util.h" #include "shared/source/os_interface/linux/sys_calls.h" #include "shared/source/utilities/directory.h" +#include "shared/source/xe_hpc_core/hw_cmds.h" namespace NEO { constexpr static auto gfxProduct = IGFX_PVC; diff --git a/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp b/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp index 9674df7ccb..8ed75b0cc1 100644 --- a/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption.inl" +#include "shared/source/xe_hpc_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hpc_core/windows/command_stream_receiver_xe_hpc_core.cpp b/shared/source/xe_hpc_core/windows/command_stream_receiver_xe_hpc_core.cpp index f94bcbd52a..3e849c10f6 100644 --- a/shared/source/xe_hpc_core/windows/command_stream_receiver_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/windows/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 * @@ -8,6 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl" #include "shared/source/os_interface/windows/device_command_stream.inl" #include "shared/source/os_interface/windows/wddm_device_command_stream.inl" +#include "shared/source/xe_hpc_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hpc_core/windows/direct_submission_xe_hpc_core.cpp b/shared/source/xe_hpc_core/windows/direct_submission_xe_hpc_core.cpp index e0aa091aaa..f80f8335c6 100644 --- a/shared/source/xe_hpc_core/windows/direct_submission_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/windows/direct_submission_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,7 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" - -#include "hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_base.h" namespace NEO { using GfxFamily = XE_HPC_COREFamily; diff --git a/shared/source/xe_hpc_core/windows/gmm_callbacks_xe_hpc_core.cpp b/shared/source/xe_hpc_core/windows/gmm_callbacks_xe_hpc_core.cpp index 877ca89ede..6686edd903 100644 --- a/shared/source/xe_hpc_core/windows/gmm_callbacks_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/windows/gmm_callbacks_xe_hpc_core.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl" -#include "shared/source/xe_hpc_core/hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp b/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp index 49a1111e08..5ab12db695 100644 --- a/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp +++ b/shared/source/xe_hpc_core/windows/hw_info_config_pvc.cpp @@ -10,8 +10,7 @@ #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_dg2_and_later.inl" #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl" - -#include "hw_cmds.h" +#include "shared/source/xe_hpc_core/hw_cmds.h" namespace NEO { constexpr static auto gfxProduct = IGFX_PVC; diff --git a/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp b/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp index cb654b0b8a..cd335d019a 100644 --- a/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/aub/aub_helper_xehp_and_later.inl" #include "shared/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/xe_hpg_core/hw_cmds_base.h" namespace NEO { struct XE_HPG_COREFamily; diff --git a/shared/source/xe_hpg_core/implicit_scaling_xe_hpg_core.cpp b/shared/source/xe_hpg_core/implicit_scaling_xe_hpg_core.cpp index 70a3637458..fed4520074 100644 --- a/shared/source/xe_hpg_core/implicit_scaling_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/implicit_scaling_xe_hpg_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/command_container/implicit_scaling.h" #include "shared/source/command_container/implicit_scaling_xehp_and_later.inl" +#include "shared/source/xe_hpg_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp b/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp index 15c1d6ddd5..7cfaa3a725 100644 --- a/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp +++ b/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp @@ -14,6 +14,7 @@ #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_dg2_and_later.inl" #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl" +#include "shared/source/xe_hpg_core/hw_cmds.h" namespace NEO { constexpr static auto gfxProduct = IGFX_DG2; diff --git a/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp b/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp index 8eea6d9259..bb253c3b00 100644 --- a/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption.inl" +#include "shared/source/xe_hpg_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hpg_core/windows/command_stream_receiver_xe_hpg_core.cpp b/shared/source/xe_hpg_core/windows/command_stream_receiver_xe_hpg_core.cpp index 04f9d7efd1..9067fbebc4 100644 --- a/shared/source/xe_hpg_core/windows/command_stream_receiver_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/windows/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 * @@ -8,6 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl" #include "shared/source/os_interface/windows/device_command_stream.inl" #include "shared/source/os_interface/windows/wddm_device_command_stream.inl" +#include "shared/source/xe_hpg_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hpg_core/windows/direct_submission_xe_hpg_core.cpp b/shared/source/xe_hpg_core/windows/direct_submission_xe_hpg_core.cpp index 49b619d6a2..5080207b2a 100644 --- a/shared/source/xe_hpg_core/windows/direct_submission_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/windows/direct_submission_xe_hpg_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,7 @@ #include "shared/source/direct_submission/dispatchers/dispatcher.inl" #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl" #include "shared/source/direct_submission/windows/wddm_direct_submission.inl" - -#include "hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_base.h" namespace NEO { using GfxFamily = XE_HPG_COREFamily; diff --git a/shared/source/xe_hpg_core/windows/gmm_callbacks_xe_hpg_core.cpp b/shared/source/xe_hpg_core/windows/gmm_callbacks_xe_hpg_core.cpp index 0b6bd6e4e8..fe41d562ce 100644 --- a/shared/source/xe_hpg_core/windows/gmm_callbacks_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/windows/gmm_callbacks_xe_hpg_core.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl" -#include "shared/source/xe_hpg_core/hw_cmds.h" +#include "shared/source/xe_hpg_core/hw_cmds_base.h" namespace NEO { diff --git a/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp b/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp index 738c56d4ed..ae278ae8be 100644 --- a/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp +++ b/shared/source/xe_hpg_core/windows/hw_info_config_dg2.cpp @@ -13,6 +13,7 @@ #include "shared/source/os_interface/hw_info_config.inl" #include "shared/source/os_interface/hw_info_config_dg2_and_later.inl" #include "shared/source/os_interface/hw_info_config_xehp_and_later.inl" +#include "shared/source/xe_hpg_core/hw_cmds.h" namespace NEO { constexpr static auto gfxProduct = IGFX_DG2; diff --git a/shared/test/common/cmd_parse/hw_parse.h b/shared/test/common/cmd_parse/hw_parse.h index 7e8e09e1fd..2f78283f75 100644 --- a/shared/test/common/cmd_parse/hw_parse.h +++ b/shared/test/common/cmd_parse/hw_parse.h @@ -18,6 +18,8 @@ namespace NEO { +struct KernelInfo; + struct HardwareParse { HardwareParse() { itorMediaInterfaceDescriptorLoad = cmdList.end(); diff --git a/shared/test/common/gen11/test_preemption_gen11.cpp b/shared/test/common/gen11/test_preemption_gen11.cpp index ab7dda2093..dad417c018 100644 --- a/shared/test/common/gen11/test_preemption_gen11.cpp +++ b/shared/test/common/gen11/test_preemption_gen11.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/built_ins/built_ins.h" +#include "shared/source/built_ins/sip.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/cmd_parse/hw_parse.h" diff --git a/shared/test/common/gen9/test_preemption_gen9.cpp b/shared/test/common/gen9/test_preemption_gen9.cpp index 1d0ce1c173..05ed35dd74 100644 --- a/shared/test/common/gen9/test_preemption_gen9.cpp +++ b/shared/test/common/gen9/test_preemption_gen9.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/built_ins/built_ins.h" +#include "shared/source/built_ins/sip.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/cmd_parse/hw_parse.h" diff --git a/shared/test/common/helpers/debug_manager_state_restore.h b/shared/test/common/helpers/debug_manager_state_restore.h index b5fc5eb59f..88762a1d39 100644 --- a/shared/test/common/helpers/debug_manager_state_restore.h +++ b/shared/test/common/helpers/debug_manager_state_restore.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,6 @@ #pragma once #include "shared/source/debug_settings/debug_settings_manager.h" -#include "shared/source/utilities/debug_settings_reader.h" using namespace NEO; @@ -38,31 +37,3 @@ class DebugManagerStateRestore { void shrink(int32_t &flag) {} void shrink(bool &flag) {} }; - -class RegistryReaderMock : public SettingsReader { - public: - RegistryReaderMock() {} - ~RegistryReaderMock() override {} - - uint64_t forceRetValue = 1; - - int32_t getSetting(const char *settingName, int32_t defaultValue) override { - return static_cast(forceRetValue); - } - - int64_t getSetting(const char *settingName, int64_t defaultValue) override { - return forceRetValue; - } - - bool getSetting(const char *settingName, bool defaultValue) override { - return true; - } - - std::string getSetting(const char *settingName, const std::string &value) override { - return ""; - } - - const char *appSpecificLocation(const std::string &name) override { - return name.c_str(); - } -}; diff --git a/shared/test/common/xe_hp_core/xehp/test_preemption_xehp.cpp b/shared/test/common/xe_hp_core/xehp/test_preemption_xehp.cpp index acc6a6317b..42212e54ad 100644 --- a/shared/test/common/xe_hp_core/xehp/test_preemption_xehp.cpp +++ b/shared/test/common/xe_hp_core/xehp/test_preemption_xehp.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/built_ins/sip.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" @@ -14,6 +15,7 @@ #include "shared/test/common/test_macros/test.h" #include + using namespace NEO; using PreemptionXeHPTest = ::testing::Test; diff --git a/shared/test/unit_test/main.cpp b/shared/test/unit_test/main.cpp index 578ec1879b..02fc2a70b7 100644 --- a/shared/test/unit_test/main.cpp +++ b/shared/test/unit_test/main.cpp @@ -29,6 +29,7 @@ #include "shared/test/unit_test/tests_configuration.h" #include "gmock/gmock.h" +#include "hw_cmds.h" #include "test_files_setup.h" #include diff --git a/shared/test/unit_test/preemption/test_preemption_xehp_and_later.cpp b/shared/test/unit_test/preemption/test_preemption_xehp_and_later.cpp index ed5e7391ac..08c8ea37b3 100644 --- a/shared/test/unit_test/preemption/test_preemption_xehp_and_later.cpp +++ b/shared/test/unit_test/preemption/test_preemption_xehp_and_later.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/built_ins/sip.h" #include "shared/source/command_stream/preemption.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/preemption_fixture.h" diff --git a/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h b/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h index cbb46d0072..3ebd97da1c 100644 --- a/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h +++ b/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.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/built_ins/built_ins.h" +#include "shared/source/built_ins/sip.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/preamble.h" #include "shared/test/common/cmd_parse/hw_parse.h"