From 586e8510def4930713ed68bd6e7b983ebd0a6f31 Mon Sep 17 00:00:00 2001 From: Filip Hazubski Date: Fri, 25 Mar 2022 21:04:08 +0000 Subject: [PATCH] Remove unneeded include Signed-off-by: Filip Hazubski --- level_zero/core/source/image/image_hw.inl | 1 + opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp | 1 + .../command_stream_receiver_hw_dg2_and_later.inl | 1 + shared/source/gen12lp/linux/hw_info_config_adlp.cpp | 3 ++- shared/source/gen12lp/windows/hw_info_config_adlp.cpp | 3 ++- shared/source/gen8/preemption_gen8.cpp | 3 ++- shared/source/gen9/preemption_gen9.cpp | 3 ++- shared/source/helpers/hw_helper.h | 3 +-- shared/source/helpers/hw_info.cpp | 1 + shared/test/common/gen11/image_surface_state_tests_gen11.cpp | 3 ++- shared/test/common/gen11/test_preamble_gen11.cpp | 1 + .../test/common/gen12lp/image_surface_state_tests_gen12lp.cpp | 3 ++- shared/test/common/gen8/image_surface_state_tests_gen8.cpp | 3 ++- shared/test/common/gen8/test_preamble_gen8.cpp | 1 + shared/test/common/gen9/image_surface_state_tests_gen9.cpp | 3 ++- shared/test/common/gen9/preamble_tests_gen9.cpp | 1 + .../test/common/helpers/blit_commands_helper_tests_gen12lp.cpp | 1 + shared/test/common/libult/create_command_stream.cpp | 1 + .../common/xe_hp_core/image_surface_state_tests_xe_hp_core.cpp | 3 ++- .../xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp | 3 ++- .../xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp | 3 ++- .../command_stream/stream_properties_tests_common.cpp | 1 + .../unit_test/direct_submission/direct_submission_tests_1.cpp | 1 + shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp | 3 ++- shared/test/unit_test/encoders/test_command_encoder.cpp | 3 ++- shared/test/unit_test/image/image_surface_state_tests.cpp | 1 + 26 files changed, 39 insertions(+), 15 deletions(-) diff --git a/level_zero/core/source/image/image_hw.inl b/level_zero/core/source/image/image_hw.inl index 2ddfd64a85..dab6ce281d 100644 --- a/level_zero/core/source/image/image_hw.inl +++ b/level_zero/core/source/image/image_hw.inl @@ -7,6 +7,7 @@ #pragma once +#include "shared/source/command_container/command_encoder.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/helpers/string.h" diff --git a/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp index a317fe66ca..6ac1384992 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/source/gmm_helper/client_context/gmm_client_context.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_gmm.h" diff --git a/shared/source/command_stream/command_stream_receiver_hw_dg2_and_later.inl b/shared/source/command_stream/command_stream_receiver_hw_dg2_and_later.inl index a9d8d3da5c..7b8c26066a 100644 --- a/shared/source/command_stream/command_stream_receiver_hw_dg2_and_later.inl +++ b/shared/source/command_stream/command_stream_receiver_hw_dg2_and_later.inl @@ -5,6 +5,7 @@ * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/source/command_stream/command_stream_receiver_hw.h" #include "shared/source/command_stream/device_command_stream.h" #include "shared/source/helpers/ray_tracing_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 21846c7b23..4691458566 100644 --- a/shared/source/gen12lp/linux/hw_info_config_adlp.cpp +++ b/shared/source/gen12lp/linux/hw_info_config_adlp.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/hw_info.h" +#include "shared/source/helpers/pipeline_select_args.h" #include "shared/source/helpers/pipeline_select_helper.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_adlp.cpp b/shared/source/gen12lp/windows/hw_info_config_adlp.cpp index 91d331f01f..d98a943d0a 100644 --- a/shared/source/gen12lp/windows/hw_info_config_adlp.cpp +++ b/shared/source/gen12lp/windows/hw_info_config_adlp.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/helpers/hw_info.h" +#include "shared/source/helpers/pipeline_select_args.h" #include "shared/source/helpers/pipeline_select_helper.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 463c5c961f..039829fd5f 100644 --- a/shared/source/gen8/preemption_gen8.cpp +++ b/shared/source/gen8/preemption_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-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/helpers/register_offsets.h" namespace NEO { diff --git a/shared/source/gen9/preemption_gen9.cpp b/shared/source/gen9/preemption_gen9.cpp index 1cc17b5138..2650a3b893 100644 --- a/shared/source/gen9/preemption_gen9.cpp +++ b/shared/source/gen9/preemption_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/command_stream/csr_definitions.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption.inl" +#include "shared/source/helpers/register_offsets.h" #include diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h index f03802c2a8..b4a0ee7cb3 100644 --- a/shared/source/helpers/hw_helper.h +++ b/shared/source/helpers/hw_helper.h @@ -8,7 +8,6 @@ #pragma once #include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/built_ins/sip.h" -#include "shared/source/command_container/command_encoder.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" @@ -27,7 +26,7 @@ namespace NEO { class GmmHelper; class GraphicsAllocation; class TagAllocatorBase; -class LinearSteram; +class LinearStream; class Gmm; struct AllocationData; struct AllocationProperties; diff --git a/shared/source/helpers/hw_info.cpp b/shared/source/helpers/hw_info.cpp index ff5640ec04..545ed3c593 100644 --- a/shared/source/helpers/hw_info.cpp +++ b/shared/source/helpers/hw_info.cpp @@ -7,6 +7,7 @@ #include "shared/source/helpers/hw_info.h" +#include "shared/source/command_stream/linear_stream.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/hw_helper.h" diff --git a/shared/test/common/gen11/image_surface_state_tests_gen11.cpp b/shared/test/common/gen11/image_surface_state_tests_gen11.cpp index def43de685..4e6bcc67a9 100644 --- a/shared/test/common/gen11/image_surface_state_tests_gen11.cpp +++ b/shared/test/common/gen11/image_surface_state_tests_gen11.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/gen11/test_preamble_gen11.cpp b/shared/test/common/gen11/test_preamble_gen11.cpp index 0126e1757e..37e3f3a814 100644 --- a/shared/test/common/gen11/test_preamble_gen11.cpp +++ b/shared/test/common/gen11/test_preamble_gen11.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/stream_properties.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" diff --git a/shared/test/common/gen12lp/image_surface_state_tests_gen12lp.cpp b/shared/test/common/gen12lp/image_surface_state_tests_gen12lp.cpp index 9c31c124b3..d142fba9c0 100644 --- a/shared/test/common/gen12lp/image_surface_state_tests_gen12lp.cpp +++ b/shared/test/common/gen12lp/image_surface_state_tests_gen12lp.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/gen8/image_surface_state_tests_gen8.cpp b/shared/test/common/gen8/image_surface_state_tests_gen8.cpp index 3626b7ca0a..aa79a7b3aa 100644 --- a/shared/test/common/gen8/image_surface_state_tests_gen8.cpp +++ b/shared/test/common/gen8/image_surface_state_tests_gen8.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/gen8/test_preamble_gen8.cpp b/shared/test/common/gen8/test_preamble_gen8.cpp index b8c5ff4e6f..4818d7e602 100644 --- a/shared/test/common/gen8/test_preamble_gen8.cpp +++ b/shared/test/common/gen8/test_preamble_gen8.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/source/command_stream/stream_properties.h" #include "shared/source/command_stream/thread_arbitration_policy.h" #include "shared/source/gen8/reg_configs.h" diff --git a/shared/test/common/gen9/image_surface_state_tests_gen9.cpp b/shared/test/common/gen9/image_surface_state_tests_gen9.cpp index 7f0fb91324..225184bb98 100644 --- a/shared/test/common/gen9/image_surface_state_tests_gen9.cpp +++ b/shared/test/common/gen9/image_surface_state_tests_gen9.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/gen9/preamble_tests_gen9.cpp b/shared/test/common/gen9/preamble_tests_gen9.cpp index a237bab759..ed1dd21574 100644 --- a/shared/test/common/gen9/preamble_tests_gen9.cpp +++ b/shared/test/common/gen9/preamble_tests_gen9.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/preamble/preamble_fixture.h" #include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h" diff --git a/shared/test/common/helpers/blit_commands_helper_tests_gen12lp.cpp b/shared/test/common/helpers/blit_commands_helper_tests_gen12lp.cpp index 9530d6c97b..f95db05029 100644 --- a/shared/test/common/helpers/blit_commands_helper_tests_gen12lp.cpp +++ b/shared/test/common/helpers/blit_commands_helper_tests_gen12lp.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/source/helpers/blit_commands_helper.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/fixtures/device_fixture.h" diff --git a/shared/test/common/libult/create_command_stream.cpp b/shared/test/common/libult/create_command_stream.cpp index 87e10e8e28..c378c55d21 100644 --- a/shared/test/common/libult/create_command_stream.cpp +++ b/shared/test/common/libult/create_command_stream.cpp @@ -8,6 +8,7 @@ #include "shared/test/common/libult/create_command_stream.h" #include "shared/source/command_stream/create_command_stream_impl.h" +#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/ult_hw_config.h" diff --git a/shared/test/common/xe_hp_core/image_surface_state_tests_xe_hp_core.cpp b/shared/test/common/xe_hp_core/image_surface_state_tests_xe_hp_core.cpp index 50fde8a616..741e0fd01c 100644 --- a/shared/test/common/xe_hp_core/image_surface_state_tests_xe_hp_core.cpp +++ b/shared/test/common/xe_hp_core/image_surface_state_tests_xe_hp_core.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp b/shared/test/common/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp index 11f9defaef..19fe0b0314 100644 --- a/shared/test/common/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp +++ b/shared/test/common/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp b/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp index a758afd894..84697a2274 100644 --- a/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp +++ b/shared/test/common/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h" using namespace NEO; diff --git a/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp b/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp index ca4986d93a..2507f9d94a 100644 --- a/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp +++ b/shared/test/unit_test/command_stream/stream_properties_tests_common.cpp @@ -8,6 +8,7 @@ #include "shared/test/unit_test/command_stream/stream_properties_tests_common.h" #include "shared/source/command_stream/stream_properties.h" +#include "shared/source/command_stream/thread_arbitration_policy.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/test_macros/test.h" diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp index 648b4c715c..da056f1879 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/source/command_stream/submissions_aggregator.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/direct_submission/dispatchers/render_dispatcher.h" diff --git a/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp b/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp index b528181804..2ee1ab498a 100644 --- a/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp +++ b/shared/test/unit_test/encoders/command_encoder_tests_dg2.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/command_container/cmdcontainer.h" +#include "shared/source/command_container/command_encoder.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" diff --git a/shared/test/unit_test/encoders/test_command_encoder.cpp b/shared/test/unit_test/encoders/test_command_encoder.cpp index 0920ebb47d..6dcb0b39ea 100644 --- a/shared/test/unit_test/encoders/test_command_encoder.cpp +++ b/shared/test/unit_test/encoders/test_command_encoder.cpp @@ -1,11 +1,12 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/command_container/cmdcontainer.h" +#include "shared/source/command_container/command_encoder.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/test_macros/test.h" diff --git a/shared/test/unit_test/image/image_surface_state_tests.cpp b/shared/test/unit_test/image/image_surface_state_tests.cpp index 2b1bf954ff..0002e0ee73 100644 --- a/shared/test/unit_test/image/image_surface_state_tests.cpp +++ b/shared/test/unit_test/image/image_surface_state_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/command_container/command_encoder.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/image/image_surface_state_fixture.h"