From fe0c857f1a3edeb8ce78135bbe29906f97649ed1 Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Thu, 28 Jul 2022 01:30:59 +0000 Subject: [PATCH] Cleanup includes 5/n Signed-off-by: Kamil Kopryk --- opencl/source/accelerators/intel_accelerator.cpp | 3 +-- opencl/source/gtpin/gtpin_init.cpp | 7 +------ .../aub_inline_data_local_id_tests_xehp_and_later.cpp | 1 - .../aub_multicontext_tests_xehp_and_later.cpp | 1 - .../aub_scratch_space_tests_xehp_and_later.cpp | 2 -- .../command_queue/enqueue_copy_image_aub_tests.cpp | 1 - .../command_queue/enqueue_fill_image_aub_tests.cpp | 3 +-- .../command_queue/enqueue_map_image_aub_tests.cpp | 1 - .../command_queue/enqueue_read_image_aub_tests.cpp | 1 - .../enqueue_verify_memory_image_aub_tests.cpp | 3 +-- .../command_queue/enqueue_write_image_aub_tests.cpp | 1 - .../multi_tile_buffers_aub_tests_xehp_and_later.cpp | 2 -- .../command_stream/aub_command_stream_fixture.cpp | 6 +----- .../aub_tests/command_stream/aub_command_stream_tests.cpp | 1 - .../batch_buffer/aub_batch_buffer_tests_gen12lp.cpp | 8 +------- .../aub_tests_stateless_compression_in_sba_xe_hp_core.cpp | 1 - ...aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp | 1 - shared/source/dll/create_command_stream.cpp | 5 +---- shared/source/dll/create_memory_manager_wddm.cpp | 3 +-- shared/source/dll/windows/options_windows.cpp | 3 +-- shared/source/dll/windows/os_interface.cpp | 4 +--- 21 files changed, 10 insertions(+), 48 deletions(-) diff --git a/opencl/source/accelerators/intel_accelerator.cpp b/opencl/source/accelerators/intel_accelerator.cpp index c5e30c0060..67a7ed332d 100644 --- a/opencl/source/accelerators/intel_accelerator.cpp +++ b/opencl/source/accelerators/intel_accelerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,6 @@ #include "opencl/source/accelerators/intel_accelerator.h" #include "shared/source/helpers/get_info.h" -#include "shared/source/helpers/string.h" #include "opencl/source/context/context.h" #include "opencl/source/helpers/get_info_status_mapper.h" diff --git a/opencl/source/gtpin/gtpin_init.cpp b/opencl/source/gtpin/gtpin_init.cpp index a2429d273b..7846b864de 100644 --- a/opencl/source/gtpin/gtpin_init.cpp +++ b/opencl/source/gtpin/gtpin_init.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,11 +7,6 @@ #include "gtpin_init.h" -#include "shared/source/device/device.h" - -#include "opencl/source/platform/platform.h" - -#include "CL/cl.h" #include "gtpin_helpers.h" using namespace gtpin; diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp index 122a6d5c05..b9cd4c5b27 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp @@ -15,7 +15,6 @@ #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" -#include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h" #include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp index 5171ef954e..e09ebe460c 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp @@ -17,7 +17,6 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/test_macros/hw_test.h" -#include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp index 85ee105fc4..6d7eff8fe3 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp @@ -8,7 +8,6 @@ #include "shared/source/helpers/array_count.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" -#include "shared/test/common/mocks/mock_scratch_space_controller_xehp_and_later.h" #include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/helpers/hardware_commands_helper.h" @@ -16,7 +15,6 @@ #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" -#include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h" #include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h" #include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp index d7e3a98f88..2f905d9eb9 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp @@ -7,7 +7,6 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/ptr_math.h" -#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp index 44fbcc9953..c690d6d887 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,6 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" -#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp index d994da2518..a7f6b56cff 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp @@ -8,7 +8,6 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" -#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp index 4ef3726eba..5c8b3d8e32 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp @@ -9,7 +9,6 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" -#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp index 73a533c754..ace7935d3f 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,6 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" -#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/test_macros/test.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp index 68b31512ca..0abe730e7c 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp @@ -8,7 +8,6 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" -#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp index 301b49cf68..2cfeaa92dd 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp @@ -6,10 +6,8 @@ */ #include "shared/source/helpers/constants.h" -#include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/hw_test.h" -#include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp index 59afcd2075..bdd3221fb7 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,15 +8,11 @@ #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" #include "shared/source/command_stream/command_stream_receiver.h" -#include "shared/source/command_stream/tbx_command_stream_receiver.h" #include "shared/source/device/device.h" #include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_context.h" -#include "shared/test/common/cmd_parse/gen_cmd_parse.h" -#include "shared/test/common/helpers/memory_management.h" #include "shared/test/common/mocks/mock_device.h" -#include "shared/test/unit_test/tests_configuration.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp index 6fb16a02a9..2eaa771096 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp @@ -8,7 +8,6 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/command_stream/aub_command_stream_receiver_hw.h" #include "shared/source/command_stream/command_stream_receiver_hw.h" -#include "shared/source/helpers/ptr_math.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/common/cmd_parse/gen_cmd_parse.h" #include "shared/test/common/mocks/mock_os_context.h" diff --git a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp index 547d4a564c..2147f9c62c 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,20 +7,14 @@ #include "aub_batch_buffer_tests_gen12lp.h" -#include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/utilities/tag_allocator.h" -#include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/command_queue/command_queue_hw.h" -#include "opencl/source/event/event.h" -#include "opencl/source/helpers/hardware_commands_helper.h" -#include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" #include "opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_context.h" using Gen12LPAubBatchBufferTests = Test; using Gen12LPTimestampTests = Test>; diff --git a/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp b/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp index e38fbedfe9..12c82d1594 100644 --- a/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp @@ -9,7 +9,6 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/hw_test.h" -#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/api/api.h" diff --git a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp index 417f2485ed..e3ab840b4f 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp @@ -10,7 +10,6 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/header/per_product_test_definitions.h" #include "shared/test/common/test_macros/test.h" -#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/extensions/public/cl_ext_private.h" #include "opencl/source/api/api.h" diff --git a/shared/source/dll/create_command_stream.cpp b/shared/source/dll/create_command_stream.cpp index 1c1182472a..0791a4044a 100644 --- a/shared/source/dll/create_command_stream.cpp +++ b/shared/source/dll/create_command_stream.cpp @@ -1,16 +1,13 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "shared/source/command_stream/aub_command_stream_receiver.h" -#include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "shared/source/command_stream/create_command_stream_impl.h" -#include "shared/source/command_stream/device_command_stream.h" #include "shared/source/command_stream/tbx_command_stream_receiver.h" -#include "shared/source/helpers/hw_info.h" namespace NEO { diff --git a/shared/source/dll/create_memory_manager_wddm.cpp b/shared/source/dll/create_memory_manager_wddm.cpp index c7b0d9ac2e..ecbcb0775c 100644 --- a/shared/source/dll/create_memory_manager_wddm.cpp +++ b/shared/source/dll/create_memory_manager_wddm.cpp @@ -1,11 +1,10 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/os_interface.h" diff --git a/shared/source/dll/windows/options_windows.cpp b/shared/source/dll/windows/options_windows.cpp index a9dc7be82f..18c6d99181 100644 --- a/shared/source/dll/windows/options_windows.cpp +++ b/shared/source/dll/windows/options_windows.cpp @@ -1,11 +1,10 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "External/Common/GmmLibDllName.h" #include "igc.opencl.h" namespace Os { diff --git a/shared/source/dll/windows/os_interface.cpp b/shared/source/dll/windows/os_interface.cpp index 0a945ec800..c4a11b05db 100644 --- a/shared/source/dll/windows/os_interface.cpp +++ b/shared/source/dll/windows/os_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,6 @@ #include "shared/source/os_interface/os_interface.h" -#include "shared/source/helpers/constants.h" - namespace NEO { bool OSInterface::osEnableLocalMemory = true;