From 77b88f19a136a0b8817b04001f322bd4a03cee6c Mon Sep 17 00:00:00 2001 From: "Warchulski, Jaroslaw" Date: Mon, 9 Jan 2023 11:05:21 +0000 Subject: [PATCH] Cleanup includes 23 Cleaned up files: opencl/source/execution_environment/cl_execution_environment.h opencl/source/helpers/cl_validators.h opencl/test/unit_test/mocks/mock_cl_device.h opencl/test/unit_test/mocks/mock_context.h shared/source/helpers/cache_policy.h shared/source/image/image_surface_state.h Related-To: NEO-5548 Signed-off-by: Warchulski, Jaroslaw --- opencl/source/built_ins/vme_dispatch_builder.h | 1 + opencl/source/command_queue/command_queue.cpp | 2 ++ opencl/source/context/context.cpp | 1 + opencl/source/context/context.h | 1 + .../cl_execution_environment.h | 8 +++++--- opencl/source/helpers/cl_validators.h | 3 +-- opencl/source/kernel/kernel.cpp | 3 +++ opencl/source/mem_obj/buffer.cpp | 2 ++ opencl/source/mem_obj/image.cpp | 3 ++- opencl/source/mem_obj/image.inl | 4 +++- opencl/source/os_interface/windows/api_win.cpp | 3 ++- .../test/unit_test/built_ins/built_in_tests.cpp | 1 + .../command_queue/command_queue_hw_2_tests.cpp | 1 + .../enqueue_copy_buffer_to_image_tests.cpp | 3 ++- .../command_queue/enqueue_copy_image_tests.cpp | 1 + .../enqueue_copy_image_to_buffer_tests.cpp | 3 ++- .../command_queue/enqueue_read_image_tests.cpp | 3 ++- .../command_queue/enqueue_svm_mem_copy_tests.cpp | 3 ++- .../command_queue/enqueue_svm_mem_fill_tests.cpp | 3 ++- .../command_queue/enqueue_write_image_tests.cpp | 3 ++- .../debugger/ocl_with_l0_debugger_tests.cpp | 3 ++- .../test/unit_test/device/device_caps_tests.cpp | 1 + .../unit_test/fixtures/cl_device_fixture.cpp | 3 ++- .../test/unit_test/fixtures/cl_device_fixture.h | 3 ++- .../test/unit_test/helpers/base_object_tests.cpp | 1 + .../mem_obj/linux/buffer_linux_tests.cpp | 1 + .../mem_obj/windows/buffer_windows_tests.cpp | 1 + opencl/test/unit_test/mocks/mock_cl_device.cpp | 16 +++++++++++++++- opencl/test/unit_test/mocks/mock_cl_device.h | 16 +++------------- opencl/test/unit_test/mocks/mock_context.cpp | 1 + opencl/test/unit_test/mocks/mock_context.h | 1 - .../unit_test/mocks/ult_cl_device_factory.cpp | 3 ++- .../test/unit_test/program/program_with_zebin.h | 3 ++- .../xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp | 1 + shared/source/helpers/cache_policy.h | 6 ++---- shared/source/helpers/cache_policy_base.inl | 3 ++- shared/source/image/image_surface_state.h | 1 - 37 files changed, 76 insertions(+), 40 deletions(-) diff --git a/opencl/source/built_ins/vme_dispatch_builder.h b/opencl/source/built_ins/vme_dispatch_builder.h index 5646cfcc61..a096efc10e 100644 --- a/opencl/source/built_ins/vme_dispatch_builder.h +++ b/opencl/source/built_ins/vme_dispatch_builder.h @@ -8,6 +8,7 @@ #pragma once #include "shared/source/built_ins/built_ins.h" +#include "shared/source/helpers/basic_math.h" #include "opencl/source/accelerators/intel_accelerator.h" #include "opencl/source/accelerators/intel_motion_estimation.h" diff --git a/opencl/source/command_queue/command_queue.cpp b/opencl/source/command_queue/command_queue.cpp index 4b63f477e8..f02275230e 100644 --- a/opencl/source/command_queue/command_queue.cpp +++ b/opencl/source/command_queue/command_queue.cpp @@ -11,6 +11,8 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/debugger/debugger_l0.h" #include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/gmm_helper/gmm.h" +#include "shared/source/gmm_helper/resource_info.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/bit_helpers.h" diff --git a/opencl/source/context/context.cpp b/opencl/source/context/context.cpp index a2d6766987..76c88d5580 100644 --- a/opencl/source/context/context.cpp +++ b/opencl/source/context/context.cpp @@ -23,6 +23,7 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/execution_environment/cl_execution_environment.h" #include "opencl/source/gtpin/gtpin_notify.h" +#include "opencl/source/helpers/cl_validators.h" #include "opencl/source/helpers/get_info_status_mapper.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/context/context.h b/opencl/source/context/context.h index ebbe714640..f59630cd4f 100644 --- a/opencl/source/context/context.h +++ b/opencl/source/context/context.h @@ -15,6 +15,7 @@ #include "opencl/source/cl_device/cl_device_vector.h" #include "opencl/source/context/context_type.h" #include "opencl/source/context/driver_diagnostics.h" +#include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/helpers/base_object.h" #include "opencl/source/helpers/destructor_callbacks.h" #include "opencl/source/mem_obj/map_operations_handler.h" diff --git a/opencl/source/execution_environment/cl_execution_environment.h b/opencl/source/execution_environment/cl_execution_environment.h index f2e991d120..dd044c79eb 100644 --- a/opencl/source/execution_environment/cl_execution_environment.h +++ b/opencl/source/execution_environment/cl_execution_environment.h @@ -1,18 +1,20 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "shared/source/built_ins/builtinops/built_in_ops.h" #include "shared/source/execution_environment/execution_environment.h" -#include #include #include +namespace std { +struct once_flag; +} + namespace NEO { class AsyncEventsHandler; diff --git a/opencl/source/helpers/cl_validators.h b/opencl/source/helpers/cl_validators.h index abc267507d..d5aac33ccb 100644 --- a/opencl/source/helpers/cl_validators.h +++ b/opencl/source/helpers/cl_validators.h @@ -1,12 +1,11 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "opencl/source/api/cl_types.h" #include "opencl/source/helpers/base_object.h" #include "opencl/source/helpers/error_mappers.h" diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp index af196207c6..ae6d3f3d54 100644 --- a/opencl/source/kernel/kernel.cpp +++ b/opencl/source/kernel/kernel.cpp @@ -12,7 +12,9 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" +#include "shared/source/gmm_helper/resource_info.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/bindless_heaps_helper.h" @@ -42,6 +44,7 @@ #include "opencl/source/context/context.h" #include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/helpers/cl_hw_helper.h" +#include "opencl/source/helpers/cl_validators.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/get_info_status_mapper.h" #include "opencl/source/helpers/sampler_helpers.h" diff --git a/opencl/source/mem_obj/buffer.cpp b/opencl/source/mem_obj/buffer.cpp index 353f4d9685..043cd33ef6 100644 --- a/opencl/source/mem_obj/buffer.cpp +++ b/opencl/source/mem_obj/buffer.cpp @@ -8,6 +8,7 @@ #include "shared/source/command_container/implicit_scaling.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/source/memory_manager/host_ptr_manager.h" #include "shared/source/memory_manager/memory_operations_handler.h" @@ -16,6 +17,7 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" +#include "opencl/source/helpers/cl_validators.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/source/sharings/unified/unified_buffer.h" diff --git a/opencl/source/mem_obj/image.cpp b/opencl/source/mem_obj/image.cpp index e1d4cf5bfe..5c972e3bbc 100644 --- a/opencl/source/mem_obj/image.cpp +++ b/opencl/source/mem_obj/image.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -27,6 +27,7 @@ #include "opencl/source/context/context.h" #include "opencl/source/helpers/cl_hw_helper.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" +#include "opencl/source/helpers/cl_validators.h" #include "opencl/source/helpers/get_info_status_mapper.h" #include "opencl/source/helpers/gmm_types_converter.h" #include "opencl/source/helpers/mipmap.h" diff --git a/opencl/source/mem_obj/image.inl b/opencl/source/mem_obj/image.inl index ee6ac09c57..a04db3c2f8 100644 --- a/opencl/source/mem_obj/image.inl +++ b/opencl/source/mem_obj/image.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,8 +13,10 @@ #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/populate_factory.h" +#include "shared/source/image/image_surface_state.h" #include "shared/source/os_interface/hw_info_config.h" +#include "opencl/source/helpers/cl_validators.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/os_interface/windows/api_win.cpp b/opencl/source/os_interface/windows/api_win.cpp index a935147b27..54982d72e1 100644 --- a/opencl/source/os_interface/windows/api_win.cpp +++ b/opencl/source/os_interface/windows/api_win.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -17,6 +17,7 @@ #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" +#include "opencl/source/helpers/cl_validators.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/d3d/d3d_buffer.h" diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp index c47e0f2f37..2007f3639c 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -40,6 +40,7 @@ #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/fixtures/run_kernel_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp index fcbb69e408..d0f03f32a6 100644 --- a/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_hw_2_tests.cpp @@ -17,6 +17,7 @@ #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/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp index bc22d4404b..61aa4f6544 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,6 +19,7 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp index 3a5600f27a..b3575ff4d5 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp @@ -17,6 +17,7 @@ #include "opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp index 00613b3840..e4bd891ea6 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,6 +18,7 @@ #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index 3cad7a7789..ee5ca186a7 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,6 +18,7 @@ #include "opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp index bfd19488b9..d8ec5f9353 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,6 +18,7 @@ #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp index cc6ffba8b9..37f13d2acc 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,6 +14,7 @@ #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index 2b472ca9a9..008ddf4d0e 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,6 +21,7 @@ #include "opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" #include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/debugger/ocl_with_l0_debugger_tests.cpp b/opencl/test/unit_test/debugger/ocl_with_l0_debugger_tests.cpp index 858f5d9eb0..8d60be8628 100644 --- a/opencl/test/unit_test/debugger/ocl_with_l0_debugger_tests.cpp +++ b/opencl/test/unit_test/debugger/ocl_with_l0_debugger_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -17,6 +17,7 @@ #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index 40e31e39c5..e7f7862eae 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/compiler_interface/oclc_extensions.h" +#include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/bit_helpers.h" #include "shared/source/helpers/hw_helper.h" diff --git a/opencl/test/unit_test/fixtures/cl_device_fixture.cpp b/opencl/test/unit_test/fixtures/cl_device_fixture.cpp index d7f50d027c..1118ec169e 100644 --- a/opencl/test/unit_test/fixtures/cl_device_fixture.cpp +++ b/opencl/test/unit_test/fixtures/cl_device_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,6 +10,7 @@ #include "shared/source/built_ins/sip.h" #include "opencl/source/helpers/cl_hw_helper.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/fixtures/cl_device_fixture.h b/opencl/test/unit_test/fixtures/cl_device_fixture.h index c3014e3587..98f3c6e129 100644 --- a/opencl/test/unit_test/fixtures/cl_device_fixture.h +++ b/opencl/test/unit_test/fixtures/cl_device_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,6 +11,7 @@ #include "opencl/test/unit_test/mocks/mock_cl_device.h" namespace NEO { +class MockClExecutionEnvironment; struct HardwareInfo; struct ClDeviceFixture { diff --git a/opencl/test/unit_test/helpers/base_object_tests.cpp b/opencl/test/unit_test/helpers/base_object_tests.cpp index 79400ce9f3..f22960d53d 100644 --- a/opencl/test/unit_test/helpers/base_object_tests.cpp +++ b/opencl/test/unit_test/helpers/base_object_tests.cpp @@ -16,6 +16,7 @@ #include "opencl/source/platform/platform.h" #include "opencl/source/program/program.h" #include "opencl/source/sampler/sampler.h" +#include "opencl/source/sharings/sharing_factory.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/image_fixture.h" diff --git a/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp b/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp index 30b8a2d8bd..7607f8ee29 100644 --- a/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp +++ b/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp @@ -32,6 +32,7 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp index bc0940bb0a..f2c0190db6 100644 --- a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp +++ b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp @@ -31,6 +31,7 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_cl_device.cpp b/opencl/test/unit_test/mocks/mock_cl_device.cpp index a51136b79c..2a140cdf75 100644 --- a/opencl/test/unit_test/mocks/mock_cl_device.cpp +++ b/opencl/test/unit_test/mocks/mock_cl_device.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "shared/test/common/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_platform.h" using namespace NEO; @@ -22,6 +23,19 @@ MockClDevice::MockClDevice(MockDevice *pMockDevice) executionEnvironment(pMockDevice->executionEnvironment), allEngines(pMockDevice->allEngines) { } +ExecutionEnvironment *MockClDevice::prepareExecutionEnvironment(const HardwareInfo *pHwInfo, uint32_t rootDeviceIndex) { + auto executionEnvironment = new MockClExecutionEnvironment(); + auto numRootDevices = DebugManager.flags.CreateMultipleRootDevices.get() ? DebugManager.flags.CreateMultipleRootDevices.get() : rootDeviceIndex + 1; + executionEnvironment->prepareRootDeviceEnvironments(numRootDevices); + pHwInfo = pHwInfo ? pHwInfo : defaultHwInfo.get(); + for (auto i = 0u; i < executionEnvironment->rootDeviceEnvironments.size(); i++) { + executionEnvironment->rootDeviceEnvironments[i]->setHwInfoAndInitHelpers(pHwInfo); + executionEnvironment->rootDeviceEnvironments[i]->initGmm(); + } + executionEnvironment->calculateMaxOsContextCount(); + return executionEnvironment; +} + bool MockClDevice::areOcl21FeaturesSupported() const { return device.getHardwareInfo().capabilityTable.supportsOcl21Features; } diff --git a/opencl/test/unit_test/mocks/mock_cl_device.h b/opencl/test/unit_test/mocks/mock_cl_device.h index 1ffd9afd5c..38740ba157 100644 --- a/opencl/test/unit_test/mocks/mock_cl_device.h +++ b/opencl/test/unit_test/mocks/mock_cl_device.h @@ -10,7 +10,6 @@ #include "shared/test/common/mocks/mock_device.h" #include "opencl/source/cl_device/cl_device.h" -#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" namespace NEO { class FailMemoryManager; @@ -68,18 +67,9 @@ class MockClDevice : public ClDevice { auto executionEnvironment = prepareExecutionEnvironment(pHwInfo, rootDeviceIndex); return MockDevice::createWithExecutionEnvironment(pHwInfo, executionEnvironment, rootDeviceIndex); } - static ExecutionEnvironment *prepareExecutionEnvironment(const HardwareInfo *pHwInfo, uint32_t rootDeviceIndex) { - auto executionEnvironment = new MockClExecutionEnvironment(); - auto numRootDevices = DebugManager.flags.CreateMultipleRootDevices.get() ? DebugManager.flags.CreateMultipleRootDevices.get() : rootDeviceIndex + 1; - executionEnvironment->prepareRootDeviceEnvironments(numRootDevices); - pHwInfo = pHwInfo ? pHwInfo : defaultHwInfo.get(); - for (auto i = 0u; i < executionEnvironment->rootDeviceEnvironments.size(); i++) { - executionEnvironment->rootDeviceEnvironments[i]->setHwInfoAndInitHelpers(pHwInfo); - executionEnvironment->rootDeviceEnvironments[i]->initGmm(); - } - executionEnvironment->calculateMaxOsContextCount(); - return executionEnvironment; - } + + static ExecutionEnvironment *prepareExecutionEnvironment(const HardwareInfo *pHwInfo, uint32_t rootDeviceIndex); + SubDevice *createSubDevice(uint32_t subDeviceIndex) { return device.createSubDevice(subDeviceIndex); } std::unique_ptr createCommandStreamReceiver() const { return device.createCommandStreamReceiver(); } BuiltIns *getBuiltIns() const { return getDevice().getBuiltIns(); } diff --git a/opencl/test/unit_test/mocks/mock_context.cpp b/opencl/test/unit_test/mocks/mock_context.cpp index 9574b37fda..60ecb71630 100644 --- a/opencl/test/unit_test/mocks/mock_context.cpp +++ b/opencl/test/unit_test/mocks/mock_context.cpp @@ -19,6 +19,7 @@ #include "opencl/source/sharings/sharing.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" +#include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "d3d_sharing_functions.h" diff --git a/opencl/test/unit_test/mocks/mock_context.h b/opencl/test/unit_test/mocks/mock_context.h index 769fca5901..c60547a342 100644 --- a/opencl/test/unit_test/mocks/mock_context.h +++ b/opencl/test/unit_test/mocks/mock_context.h @@ -10,7 +10,6 @@ #include "shared/test/common/helpers/variable_backup.h" #include "opencl/source/context/context.h" -#include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/sharings/sharing_factory.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory.h" diff --git a/opencl/test/unit_test/mocks/ult_cl_device_factory.cpp b/opencl/test/unit_test/mocks/ult_cl_device_factory.cpp index 7939e2333a..acff4f5cbc 100644 --- a/opencl/test/unit_test/mocks/ult_cl_device_factory.cpp +++ b/opencl/test/unit_test/mocks/ult_cl_device_factory.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,6 +13,7 @@ #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/ult_device_factory.h" +#include "opencl/source/execution_environment/cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" using namespace NEO; diff --git a/opencl/test/unit_test/program/program_with_zebin.h b/opencl/test/unit_test/program/program_with_zebin.h index 57bd16b96c..43ccc1fe99 100644 --- a/opencl/test/unit_test/program/program_with_zebin.h +++ b/opencl/test/unit_test/program/program_with_zebin.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "opencl/test/unit_test/program/program_tests.h" namespace NEO { +struct KernelInfo; class MockGraphicsAllocation; class MockProgram; } // namespace NEO diff --git a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp index 17e861cdcd..c80545d015 100644 --- a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp @@ -8,6 +8,7 @@ #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/hw_info_config.h" +#include "shared/source/program/kernel_info.h" #include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" diff --git a/shared/source/helpers/cache_policy.h b/shared/source/helpers/cache_policy.h index fea12fbdea..65777cfc73 100644 --- a/shared/source/helpers/cache_policy.h +++ b/shared/source/helpers/cache_policy.h @@ -1,17 +1,15 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "shared/source/debug_settings/debug_settings_manager.h" - #include "igfxfmid.h" +#include #include -#include namespace NEO { class GraphicsAllocation; diff --git a/shared/source/helpers/cache_policy_base.inl b/shared/source/helpers/cache_policy_base.inl index 61b1b028f0..3ea07e3666 100644 --- a/shared/source/helpers/cache_policy_base.inl +++ b/shared/source/helpers/cache_policy_base.inl @@ -1,10 +1,11 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/cache_policy.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/xe_hpg_core/hw_cmds.h" diff --git a/shared/source/image/image_surface_state.h b/shared/source/image/image_surface_state.h index c2cdf9763b..ebdc60d6a5 100644 --- a/shared/source/image/image_surface_state.h +++ b/shared/source/image/image_surface_state.h @@ -13,7 +13,6 @@ #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/surface_format_info.h" -#include "shared/source/memory_manager/graphics_allocation.h" namespace NEO { template