From 3682e29ddc3b064bc09ee4aec166711da5548f8b Mon Sep 17 00:00:00 2001 From: Mateusz Hoppe Date: Wed, 5 Feb 2020 16:07:52 +0100 Subject: [PATCH] Move blit_commands_helper files to core Change-Id: I29fb4e6a91e9fc32f5017eb966d478f51b3b3487 Signed-off-by: Mateusz Hoppe --- core/helpers/CMakeLists.txt | 4 ++ .../helpers/blit_commands_helper.cpp | 4 +- .../helpers/blit_commands_helper.h | 0 .../helpers/blit_commands_helper_base.inl | 5 ++- .../helpers/blit_commands_helper_bdw_plus.inl | 4 +- core/memory_manager/CMakeLists.txt | 1 + {runtime => core}/memory_manager/surface.h | 24 ------------ .../command_queue/command_queue_hw_base.inl | 4 +- runtime/command_queue/enqueue_barrier.h | 4 +- runtime/command_queue/enqueue_common.h | 2 +- runtime/command_queue/enqueue_copy_buffer.h | 4 +- .../command_queue/enqueue_copy_buffer_rect.h | 4 +- .../enqueue_copy_buffer_to_image.h | 2 +- runtime/command_queue/enqueue_copy_image.h | 4 +- .../enqueue_copy_image_to_buffer.h | 2 +- runtime/command_queue/enqueue_fill_buffer.h | 2 +- runtime/command_queue/enqueue_fill_image.h | 2 +- runtime/command_queue/enqueue_kernel.h | 4 +- runtime/command_queue/enqueue_marker.h | 4 +- .../enqueue_migrate_mem_objects.h | 4 +- runtime/command_queue/enqueue_read_buffer.h | 2 +- .../command_queue/enqueue_read_buffer_rect.h | 4 +- runtime/command_queue/enqueue_read_image.h | 2 +- runtime/command_queue/enqueue_svm.h | 4 +- runtime/command_queue/enqueue_write_buffer.h | 2 +- .../command_queue/enqueue_write_buffer_rect.h | 4 +- .../command_stream_receiver.cpp | 2 +- .../command_stream/command_stream_receiver.h | 2 +- .../command_stream_receiver_hw_base.inl | 2 +- .../command_stream_receiver_hw_gen11.cpp | 4 +- .../command_stream_receiver_hw_gen12lp.cpp | 4 +- .../gen8/command_stream_receiver_hw_gen8.cpp | 4 +- .../gen9/command_stream_receiver_hw_gen9.cpp | 4 +- runtime/gtpin/gtpin_callbacks.cpp | 2 +- runtime/helpers/CMakeLists.txt | 4 -- runtime/helpers/cl_blit_properties.h | 2 +- runtime/helpers/dispatch_info.h | 4 +- runtime/helpers/enqueue_properties.h | 4 +- runtime/helpers/task_information.cpp | 2 +- runtime/helpers/task_information.h | 2 +- runtime/kernel/kernel.cpp | 2 +- runtime/memory_manager/CMakeLists.txt | 1 - runtime/memory_manager/mem_obj_surface.h | 37 +++++++++++++++++++ .../accelerators/media_image_arg_tests.cpp | 2 +- .../enqueue_command_without_kernel_tests.cpp | 2 +- .../command_queue/enqueue_handler_tests.cpp | 1 - .../command_queue/enqueue_svm_tests.cpp | 2 +- .../command_stream_receiver_tests.cpp | 2 +- unit_tests/event/event_tests.cpp | 2 +- .../scheduler_dispatch_tests.cpp | 1 - unit_tests/gtpin/gtpin_tests.cpp | 2 +- unit_tests/mem_obj/buffer_set_arg_tests.cpp | 2 +- unit_tests/mem_obj/image_set_arg_tests.cpp | 2 +- unit_tests/memory_manager/surface_tests.cpp | 2 +- unit_tests/profiling/profiling_tests.cpp | 1 - unit_tests/program/program_nonuniform.cpp | 1 - unit_tests/program/program_tests.cpp | 2 +- 57 files changed, 109 insertions(+), 99 deletions(-) rename {runtime => core}/helpers/blit_commands_helper.cpp (98%) rename {runtime => core}/helpers/blit_commands_helper.h (100%) rename {runtime => core}/helpers/blit_commands_helper_base.inl (96%) rename {runtime => core}/helpers/blit_commands_helper_bdw_plus.inl (72%) rename {runtime => core}/memory_manager/surface.h (82%) create mode 100644 runtime/memory_manager/mem_obj_surface.h diff --git a/core/helpers/CMakeLists.txt b/core/helpers/CMakeLists.txt index b87cddee21..997c18a3a6 100644 --- a/core/helpers/CMakeLists.txt +++ b/core/helpers/CMakeLists.txt @@ -12,6 +12,10 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/array_count.h ${CMAKE_CURRENT_SOURCE_DIR}/aux_translation.h ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h + ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_base.inl + ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_bdw_plus.inl + ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/cache_policy.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cache_policy.h ${CMAKE_CURRENT_SOURCE_DIR}/common_types.h diff --git a/runtime/helpers/blit_commands_helper.cpp b/core/helpers/blit_commands_helper.cpp similarity index 98% rename from runtime/helpers/blit_commands_helper.cpp rename to core/helpers/blit_commands_helper.cpp index 714b87f735..3870c56b2d 100644 --- a/runtime/helpers/blit_commands_helper.cpp +++ b/core/helpers/blit_commands_helper.cpp @@ -5,10 +5,10 @@ * */ -#include "runtime/helpers/blit_commands_helper.h" +#include "core/helpers/blit_commands_helper.h" #include "core/helpers/timestamp_packet.h" -#include "runtime/memory_manager/surface.h" +#include "core/memory_manager/surface.h" namespace NEO { BlitProperties BlitProperties::constructPropertiesForReadWriteBuffer(BlitterConstants::BlitDirection blitDirection, diff --git a/runtime/helpers/blit_commands_helper.h b/core/helpers/blit_commands_helper.h similarity index 100% rename from runtime/helpers/blit_commands_helper.h rename to core/helpers/blit_commands_helper.h diff --git a/runtime/helpers/blit_commands_helper_base.inl b/core/helpers/blit_commands_helper_base.inl similarity index 96% rename from runtime/helpers/blit_commands_helper_base.inl rename to core/helpers/blit_commands_helper_base.inl index 279c6839b4..b4607d0c68 100644 --- a/runtime/helpers/blit_commands_helper_base.inl +++ b/core/helpers/blit_commands_helper_base.inl @@ -1,11 +1,12 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/helpers/blit_commands_helper.h" +#include "core/helpers/blit_commands_helper.h" +#include "core/helpers/timestamp_packet.h" namespace NEO { diff --git a/runtime/helpers/blit_commands_helper_bdw_plus.inl b/core/helpers/blit_commands_helper_bdw_plus.inl similarity index 72% rename from runtime/helpers/blit_commands_helper_bdw_plus.inl rename to core/helpers/blit_commands_helper_bdw_plus.inl index 49d46276e6..49a5ecf2d7 100644 --- a/runtime/helpers/blit_commands_helper_bdw_plus.inl +++ b/core/helpers/blit_commands_helper_bdw_plus.inl @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/helpers/blit_commands_helper_base.inl" +#include "core/helpers/blit_commands_helper_base.inl" namespace NEO { diff --git a/core/memory_manager/CMakeLists.txt b/core/memory_manager/CMakeLists.txt index bd386be83e..c5b3840505 100644 --- a/core/memory_manager/CMakeLists.txt +++ b/core/memory_manager/CMakeLists.txt @@ -37,6 +37,7 @@ set(NEO_CORE_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/residency.cpp ${CMAKE_CURRENT_SOURCE_DIR}/residency.h ${CMAKE_CURRENT_SOURCE_DIR}/residency_container.h + ${CMAKE_CURRENT_SOURCE_DIR}/surface.h ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_manager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_manager.h ) diff --git a/runtime/memory_manager/surface.h b/core/memory_manager/surface.h similarity index 82% rename from runtime/memory_manager/surface.h rename to core/memory_manager/surface.h index 90265b2d41..113000a442 100644 --- a/runtime/memory_manager/surface.h +++ b/core/memory_manager/surface.h @@ -9,7 +9,6 @@ #include "core/helpers/cache_policy.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/mem_obj/mem_obj.h" namespace NEO { @@ -86,29 +85,6 @@ class HostPtrSurface : public Surface { bool isPtrCopyAllowed = false; }; -class MemObjSurface : public Surface { - public: - MemObjSurface(MemObj *memObj) : Surface(memObj->getGraphicsAllocation()->isCoherent()), memObj(memObj) { - memObj->incRefInternal(); - } - ~MemObjSurface() override { - memObj->decRefInternal(); - memObj = nullptr; - }; - - void makeResident(CommandStreamReceiver &csr) override { - DEBUG_BREAK_IF(!memObj); - csr.makeResident(*memObj->getGraphicsAllocation()); - } - - Surface *duplicate() override { - return new MemObjSurface(this->memObj); - }; - - protected: - class MemObj *memObj; -}; - class GeneralSurface : public Surface { public: GeneralSurface() : Surface(false) { diff --git a/runtime/command_queue/command_queue_hw_base.inl b/runtime/command_queue/command_queue_hw_base.inl index 9080da35bb..d9a3e5f73f 100644 --- a/runtime/command_queue/command_queue_hw_base.inl +++ b/runtime/command_queue/command_queue_hw_base.inl @@ -1,10 +1,11 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/helpers/blit_commands_helper.h" #include "runtime/built_ins/aux_translation_builtin.h" #include "runtime/command_queue/enqueue_barrier.h" #include "runtime/command_queue/enqueue_copy_buffer.h" @@ -27,7 +28,6 @@ #include "runtime/command_queue/finish.h" #include "runtime/command_queue/flush.h" #include "runtime/command_queue/gpgpu_walker.h" -#include "runtime/helpers/blit_commands_helper.h" namespace NEO { template diff --git a/runtime/command_queue/enqueue_barrier.h b/runtime/command_queue/enqueue_barrier.h index 9c077a3553..f5005db3f3 100644 --- a/runtime/command_queue/enqueue_barrier.h +++ b/runtime/command_queue/enqueue_barrier.h @@ -1,16 +1,16 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once +#include "core/memory_manager/surface.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/device.h" #include "runtime/event/event.h" -#include "runtime/memory_manager/surface.h" #include diff --git a/runtime/command_queue/enqueue_common.h b/runtime/command_queue/enqueue_common.h index 5f7fc5c7e3..c584278190 100644 --- a/runtime/command_queue/enqueue_common.h +++ b/runtime/command_queue/enqueue_common.h @@ -9,6 +9,7 @@ #include "core/helpers/array_count.h" #include "core/helpers/engine_node_helper.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/surface.h" #include "core/os_interface/os_context.h" #include "core/program/sync_buffer_handler.h" #include "core/utilities/range.h" @@ -31,7 +32,6 @@ #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/memory_manager/surface.h" #include "runtime/program/block_kernel_manager.h" #include "runtime/program/printf_handler.h" diff --git a/runtime/command_queue/enqueue_copy_buffer.h b/runtime/command_queue/enqueue_copy_buffer.h index 2debe3b30f..42f9ef1a9d 100644 --- a/runtime/command_queue/enqueue_copy_buffer.h +++ b/runtime/command_queue/enqueue_copy_buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include diff --git a/runtime/command_queue/enqueue_copy_buffer_rect.h b/runtime/command_queue/enqueue_copy_buffer_rect.h index 6e030126ee..eae46e251b 100644 --- a/runtime/command_queue/enqueue_copy_buffer_rect.h +++ b/runtime/command_queue/enqueue_copy_buffer_rect.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include diff --git a/runtime/command_queue/enqueue_copy_buffer_to_image.h b/runtime/command_queue/enqueue_copy_buffer_to_image.h index d365d9ba0d..bb4478e9f7 100644 --- a/runtime/command_queue/enqueue_copy_buffer_to_image.h +++ b/runtime/command_queue/enqueue_copy_buffer_to_image.h @@ -13,7 +13,7 @@ #include "runtime/helpers/mipmap.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include diff --git a/runtime/command_queue/enqueue_copy_image.h b/runtime/command_queue/enqueue_copy_image.h index f119aa67bc..a6fab24f6c 100644 --- a/runtime/command_queue/enqueue_copy_image.h +++ b/runtime/command_queue/enqueue_copy_image.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/mipmap.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include #include diff --git a/runtime/command_queue/enqueue_copy_image_to_buffer.h b/runtime/command_queue/enqueue_copy_image_to_buffer.h index 18d5e1c136..c9eb3fe975 100644 --- a/runtime/command_queue/enqueue_copy_image_to_buffer.h +++ b/runtime/command_queue/enqueue_copy_image_to_buffer.h @@ -13,7 +13,7 @@ #include "runtime/helpers/mipmap.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include diff --git a/runtime/command_queue/enqueue_fill_buffer.h b/runtime/command_queue/enqueue_fill_buffer.h index cc8afc2233..3c1d4f02c1 100644 --- a/runtime/command_queue/enqueue_fill_buffer.h +++ b/runtime/command_queue/enqueue_fill_buffer.h @@ -12,8 +12,8 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/buffer.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/memory_manager/surface.h" #include diff --git a/runtime/command_queue/enqueue_fill_image.h b/runtime/command_queue/enqueue_fill_image.h index f89ac2e005..fa4baa9076 100644 --- a/runtime/command_queue/enqueue_fill_image.h +++ b/runtime/command_queue/enqueue_fill_image.h @@ -12,7 +12,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include #include diff --git a/runtime/command_queue/enqueue_kernel.h b/runtime/command_queue/enqueue_kernel.h index abeef0be3b..c787a5520c 100644 --- a/runtime/command_queue/enqueue_kernel.h +++ b/runtime/command_queue/enqueue_kernel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/task_information.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include diff --git a/runtime/command_queue/enqueue_marker.h b/runtime/command_queue/enqueue_marker.h index 5db3e49b93..b113d8aafa 100644 --- a/runtime/command_queue/enqueue_marker.h +++ b/runtime/command_queue/enqueue_marker.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/device.h" #include "runtime/event/event.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include diff --git a/runtime/command_queue/enqueue_migrate_mem_objects.h b/runtime/command_queue/enqueue_migrate_mem_objects.h index 857098fe83..66b20b092a 100644 --- a/runtime/command_queue/enqueue_migrate_mem_objects.h +++ b/runtime/command_queue/enqueue_migrate_mem_objects.h @@ -1,17 +1,17 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once +#include "core/memory_manager/surface.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/device.h" #include "runtime/event/event.h" -#include "runtime/memory_manager/surface.h" namespace NEO { diff --git a/runtime/command_queue/enqueue_read_buffer.h b/runtime/command_queue/enqueue_read_buffer.h index b44dcd4ec9..bc8f83dd06 100644 --- a/runtime/command_queue/enqueue_read_buffer.h +++ b/runtime/command_queue/enqueue_read_buffer.h @@ -14,7 +14,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include diff --git a/runtime/command_queue/enqueue_read_buffer_rect.h b/runtime/command_queue/enqueue_read_buffer_rect.h index dc73c42ff5..8e7686a193 100644 --- a/runtime/command_queue/enqueue_read_buffer_rect.h +++ b/runtime/command_queue/enqueue_read_buffer_rect.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include diff --git a/runtime/command_queue/enqueue_read_image.h b/runtime/command_queue/enqueue_read_image.h index e1ed8e2c63..ad6252fa23 100644 --- a/runtime/command_queue/enqueue_read_image.h +++ b/runtime/command_queue/enqueue_read_image.h @@ -17,7 +17,7 @@ #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/mipmap.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include #include diff --git a/runtime/command_queue/enqueue_svm.h b/runtime/command_queue/enqueue_svm.h index c8a4165dbc..9d1296df3c 100644 --- a/runtime/command_queue/enqueue_svm.h +++ b/runtime/command_queue/enqueue_svm.h @@ -1,17 +1,17 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once +#include "core/memory_manager/surface.h" #include "core/memory_manager/unified_memory_manager.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/enqueue_common.h" #include "runtime/event/event.h" -#include "runtime/memory_manager/surface.h" #include diff --git a/runtime/command_queue/enqueue_write_buffer.h b/runtime/command_queue/enqueue_write_buffer.h index 21dbdee0ce..3a5fc6d3da 100644 --- a/runtime/command_queue/enqueue_write_buffer.h +++ b/runtime/command_queue/enqueue_write_buffer.h @@ -13,7 +13,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include diff --git a/runtime/command_queue/enqueue_write_buffer_rect.h b/runtime/command_queue/enqueue_write_buffer_rect.h index 38eb621367..777b6c2aa8 100644 --- a/runtime/command_queue/enqueue_write_buffer_rect.h +++ b/runtime/command_queue/enqueue_write_buffer_rect.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include diff --git a/runtime/command_stream/command_stream_receiver.cpp b/runtime/command_stream/command_stream_receiver.cpp index 5c38270b1c..c11701d028 100644 --- a/runtime/command_stream/command_stream_receiver.cpp +++ b/runtime/command_stream/command_stream_receiver.cpp @@ -17,6 +17,7 @@ #include "core/helpers/string.h" #include "core/helpers/timestamp_packet.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/surface.h" #include "core/os_interface/os_context.h" #include "core/os_interface/os_interface.h" #include "core/utilities/cpuintrinsics.h" @@ -26,7 +27,6 @@ #include "runtime/device/device.h" #include "runtime/gtpin/gtpin_notify.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/memory_manager/surface.h" #include "runtime/platform/platform.h" namespace NEO { diff --git a/runtime/command_stream/command_stream_receiver.h b/runtime/command_stream/command_stream_receiver.h index 52ba5ba331..91722bccd0 100644 --- a/runtime/command_stream/command_stream_receiver.h +++ b/runtime/command_stream/command_stream_receiver.h @@ -12,11 +12,11 @@ #include "core/command_stream/submissions_aggregator.h" #include "core/command_stream/thread_arbitration_policy.h" #include "core/helpers/aligned_memory.h" +#include "core/helpers/blit_commands_helper.h" #include "core/helpers/completion_stamp.h" #include "core/helpers/options.h" #include "core/indirect_heap/indirect_heap.h" #include "core/kernel/grf_config.h" -#include "runtime/helpers/blit_commands_helper.h" #include "runtime/helpers/flat_batch_buffer_helper.h" #include diff --git a/runtime/command_stream/command_stream_receiver_hw_base.inl b/runtime/command_stream/command_stream_receiver_hw_base.inl index 93f94246e9..06ced5d277 100644 --- a/runtime/command_stream/command_stream_receiver_hw_base.inl +++ b/runtime/command_stream/command_stream_receiver_hw_base.inl @@ -11,6 +11,7 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/execution_environment/root_device_environment.h" #include "core/gmm_helper/page_table_mngr.h" +#include "core/helpers/blit_commands_helper.h" #include "core/helpers/cache_policy.h" #include "core/helpers/flush_stamp.h" #include "core/helpers/hw_helper.h" @@ -26,7 +27,6 @@ #include "runtime/command_stream/experimental_command_buffer.h" #include "runtime/device/device.h" #include "runtime/gtpin/gtpin_notify.h" -#include "runtime/helpers/blit_commands_helper.h" #include "runtime/helpers/flat_batch_buffer_helper_hw.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/runtime/gen11/command_stream_receiver_hw_gen11.cpp b/runtime/gen11/command_stream_receiver_hw_gen11.cpp index 7977467738..b38f049412 100644 --- a/runtime/gen11/command_stream_receiver_hw_gen11.cpp +++ b/runtime/gen11/command_stream_receiver_hw_gen11.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/debug_settings/debug_settings_manager.h" +#include "core/helpers/blit_commands_helper_bdw_plus.inl" #include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl" #include "runtime/command_stream/device_command_stream.h" #include "runtime/gen11/reg_configs.h" -#include "runtime/helpers/blit_commands_helper_bdw_plus.inl" namespace NEO { typedef ICLFamily Family; diff --git a/runtime/gen12lp/command_stream_receiver_hw_gen12lp.cpp b/runtime/gen12lp/command_stream_receiver_hw_gen12lp.cpp index 69b6219130..f7ae36aa83 100644 --- a/runtime/gen12lp/command_stream_receiver_hw_gen12lp.cpp +++ b/runtime/gen12lp/command_stream_receiver_hw_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,11 +9,11 @@ using Family = NEO::TGLLPFamily; +#include "core/helpers/blit_commands_helper_bdw_plus.inl" #include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl" #include "runtime/command_stream/command_stream_receiver_hw_tgllp_plus.inl" #include "runtime/command_stream/device_command_stream.h" #include "runtime/gen12lp/helpers_gen12lp.h" -#include "runtime/helpers/blit_commands_helper_bdw_plus.inl" namespace NEO { static auto gfxCore = IGFX_GEN12LP_CORE; diff --git a/runtime/gen8/command_stream_receiver_hw_gen8.cpp b/runtime/gen8/command_stream_receiver_hw_gen8.cpp index d69040e033..2139320b2a 100644 --- a/runtime/gen8/command_stream_receiver_hw_gen8.cpp +++ b/runtime/gen8/command_stream_receiver_hw_gen8.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/gen8/hw_cmds.h" +#include "core/helpers/blit_commands_helper_bdw_plus.inl" #include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl" #include "runtime/command_stream/device_command_stream.h" -#include "runtime/helpers/blit_commands_helper_bdw_plus.inl" namespace NEO { typedef BDWFamily Family; diff --git a/runtime/gen9/command_stream_receiver_hw_gen9.cpp b/runtime/gen9/command_stream_receiver_hw_gen9.cpp index c29d3eda0a..7105fbf472 100644 --- a/runtime/gen9/command_stream_receiver_hw_gen9.cpp +++ b/runtime/gen9/command_stream_receiver_hw_gen9.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/gen9/hw_cmds.h" +#include "core/helpers/blit_commands_helper_bdw_plus.inl" #include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl" #include "runtime/command_stream/device_command_stream.h" -#include "runtime/helpers/blit_commands_helper_bdw_plus.inl" namespace NEO { typedef SKLFamily Family; diff --git a/runtime/gtpin/gtpin_callbacks.cpp b/runtime/gtpin/gtpin_callbacks.cpp index 7f2466ef0b..32e1cdafbb 100644 --- a/runtime/gtpin/gtpin_callbacks.cpp +++ b/runtime/gtpin/gtpin_callbacks.cpp @@ -5,6 +5,7 @@ * */ +#include "core/memory_manager/surface.h" #include "core/utilities/spinlock.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" @@ -16,7 +17,6 @@ #include "runtime/gtpin/gtpin_notify.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/surface.h" #include "runtime/program/program.h" #include "CL/cl.h" diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt index 6fb9627cb5..2d7e5e476e 100644 --- a/runtime/helpers/CMakeLists.txt +++ b/runtime/helpers/CMakeLists.txt @@ -8,10 +8,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/base_object.cpp ${CMAKE_CURRENT_SOURCE_DIR}/base_object.h - ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_base.inl - ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_bdw_plus.inl - ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/built_ins_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/cl_blit_properties.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/cl_device_helpers.cpp diff --git a/runtime/helpers/cl_blit_properties.h b/runtime/helpers/cl_blit_properties.h index 4d7b1c7ba2..34eac58bb5 100644 --- a/runtime/helpers/cl_blit_properties.h +++ b/runtime/helpers/cl_blit_properties.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/blit_commands_helper.h" #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/helpers/blit_commands_helper.h" #include "CL/cl.h" diff --git a/runtime/helpers/dispatch_info.h b/runtime/helpers/dispatch_info.h index 9fa429b9b4..22b497ee34 100644 --- a/runtime/helpers/dispatch_info.h +++ b/runtime/helpers/dispatch_info.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,10 +9,10 @@ #include "core/helpers/registered_method_dispatcher.h" #include "core/helpers/vec.h" +#include "core/memory_manager/surface.h" #include "core/utilities/stackvec.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/mem_obj/mem_obj.h" -#include "runtime/memory_manager/surface.h" #include #include diff --git a/runtime/helpers/enqueue_properties.h b/runtime/helpers/enqueue_properties.h index e934e8f4df..b7c59b80b2 100644 --- a/runtime/helpers/enqueue_properties.h +++ b/runtime/helpers/enqueue_properties.h @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "runtime/helpers/blit_commands_helper.h" +#include "core/helpers/blit_commands_helper.h" namespace NEO { diff --git a/runtime/helpers/task_information.cpp b/runtime/helpers/task_information.cpp index 831a5643a6..68b40f567f 100644 --- a/runtime/helpers/task_information.cpp +++ b/runtime/helpers/task_information.cpp @@ -14,6 +14,7 @@ #include "core/helpers/engine_node_helper.h" #include "core/helpers/string.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/surface.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_queue/enqueue_common.h" @@ -24,7 +25,6 @@ #include "runtime/helpers/enqueue_properties.h" #include "runtime/helpers/task_information.inl" #include "runtime/mem_obj/mem_obj.h" -#include "runtime/memory_manager/surface.h" namespace NEO { template void KernelOperation::ResourceCleaner::operator()(LinearStream *); diff --git a/runtime/helpers/task_information.h b/runtime/helpers/task_information.h index 24c4ce87e0..8a9e8311ce 100644 --- a/runtime/helpers/task_information.h +++ b/runtime/helpers/task_information.h @@ -7,12 +7,12 @@ #pragma once #include "core/command_stream/linear_stream.h" +#include "core/helpers/blit_commands_helper.h" #include "core/helpers/completion_stamp.h" #include "core/helpers/hw_info.h" #include "core/helpers/timestamp_packet.h" #include "core/indirect_heap/indirect_heap.h" #include "core/utilities/iflist.h" -#include "runtime/helpers/blit_commands_helper.h" #include "runtime/helpers/properties_helper.h" #include diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp index 0ccde41276..c60da30b97 100644 --- a/runtime/kernel/kernel.cpp +++ b/runtime/kernel/kernel.cpp @@ -39,8 +39,8 @@ #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/pipe.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/memory_manager/surface.h" #include "runtime/platform/platform.h" #include "runtime/program/block_kernel_manager.h" #include "runtime/program/kernel_info.h" diff --git a/runtime/memory_manager/CMakeLists.txt b/runtime/memory_manager/CMakeLists.txt index 9516a49a9b..d540b4cd6c 100644 --- a/runtime/memory_manager/CMakeLists.txt +++ b/runtime/memory_manager/CMakeLists.txt @@ -20,7 +20,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/page_table.h ${CMAKE_CURRENT_SOURCE_DIR}/page_table.inl ${CMAKE_CURRENT_SOURCE_DIR}/physical_address_allocator.h - ${CMAKE_CURRENT_SOURCE_DIR}/surface.h ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_MEMORY_MANAGER}) diff --git a/runtime/memory_manager/mem_obj_surface.h b/runtime/memory_manager/mem_obj_surface.h new file mode 100644 index 0000000000..6ac0ac7478 --- /dev/null +++ b/runtime/memory_manager/mem_obj_surface.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2020 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#pragma once +#include "core/memory_manager/surface.h" +#include "runtime/mem_obj/mem_obj.h" + +namespace NEO { + +class MemObjSurface : public Surface { + public: + MemObjSurface(MemObj *memObj) : Surface(memObj->getGraphicsAllocation()->isCoherent()), memObj(memObj) { + memObj->incRefInternal(); + } + ~MemObjSurface() override { + memObj->decRefInternal(); + memObj = nullptr; + }; + + void makeResident(CommandStreamReceiver &csr) override { + DEBUG_BREAK_IF(!memObj); + csr.makeResident(*memObj->getGraphicsAllocation()); + } + + Surface *duplicate() override { + return new MemObjSurface(this->memObj); + }; + + protected: + class MemObj *memObj; +}; + +} // namespace NEO diff --git a/unit_tests/accelerators/media_image_arg_tests.cpp b/unit_tests/accelerators/media_image_arg_tests.cpp index b09394a0d0..54ba7038d4 100644 --- a/unit_tests/accelerators/media_image_arg_tests.cpp +++ b/unit_tests/accelerators/media_image_arg_tests.cpp @@ -7,10 +7,10 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" +#include "core/memory_manager/surface.h" #include "runtime/helpers/surface_formats.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/surface.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/image_fixture.h" diff --git a/unit_tests/command_queue/enqueue_command_without_kernel_tests.cpp b/unit_tests/command_queue/enqueue_command_without_kernel_tests.cpp index fdd3e4f0aa..f5e7407715 100644 --- a/unit_tests/command_queue/enqueue_command_without_kernel_tests.cpp +++ b/unit_tests/command_queue/enqueue_command_without_kernel_tests.cpp @@ -6,11 +6,11 @@ */ #include "core/helpers/timestamp_packet.h" +#include "core/memory_manager/surface.h" #include "core/os_interface/os_context.h" #include "runtime/event/event_builder.h" #include "runtime/event/user_event.h" #include "runtime/helpers/enqueue_properties.h" -#include "runtime/memory_manager/surface.h" #include "test.h" #include "unit_tests/fixtures/dispatch_flags_fixture.h" #include "unit_tests/fixtures/enqueue_handler_fixture.h" diff --git a/unit_tests/command_queue/enqueue_handler_tests.cpp b/unit_tests/command_queue/enqueue_handler_tests.cpp index cdb8287d74..b646625281 100644 --- a/unit_tests/command_queue/enqueue_handler_tests.cpp +++ b/unit_tests/command_queue/enqueue_handler_tests.cpp @@ -8,7 +8,6 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/aub_subcapture.h" #include "runtime/event/user_event.h" -#include "runtime/memory_manager/surface.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/command_stream/thread_arbitration_policy_helper.h" diff --git a/unit_tests/command_queue/enqueue_svm_tests.cpp b/unit_tests/command_queue/enqueue_svm_tests.cpp index faf2209f75..0644e45d8a 100644 --- a/unit_tests/command_queue/enqueue_svm_tests.cpp +++ b/unit_tests/command_queue/enqueue_svm_tests.cpp @@ -8,13 +8,13 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/helpers/aligned_memory.h" #include "core/memory_manager/allocations_list.h" +#include "core/memory_manager/surface.h" #include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/user_event.h" -#include "runtime/memory_manager/surface.h" #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/command_queue/enqueue_map_buffer_fixture.h" diff --git a/unit_tests/command_stream/command_stream_receiver_tests.cpp b/unit_tests/command_stream/command_stream_receiver_tests.cpp index 905cb97553..cb99954184 100644 --- a/unit_tests/command_stream/command_stream_receiver_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_tests.cpp @@ -14,12 +14,12 @@ #include "core/helpers/timestamp_packet.h" #include "core/memory_manager/graphics_allocation.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/surface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/utilities/tag_allocator.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/mem_obj/buffer.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/memory_manager/surface.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/event/event_tests.cpp b/unit_tests/event/event_tests.cpp index da998a572e..fa7f88acdc 100644 --- a/unit_tests/event/event_tests.cpp +++ b/unit_tests/event/event_tests.cpp @@ -14,7 +14,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/perf_counter.h" #include "runtime/helpers/task_information.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include "test.h" #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/execution_model/scheduler_dispatch_tests.cpp b/unit_tests/execution_model/scheduler_dispatch_tests.cpp index fa02770b23..f923037c31 100644 --- a/unit_tests/execution_model/scheduler_dispatch_tests.cpp +++ b/unit_tests/execution_model/scheduler_dispatch_tests.cpp @@ -9,7 +9,6 @@ #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/enqueue_kernel.h" #include "runtime/device_queue/device_queue.h" -#include "runtime/memory_manager/surface.h" #include "runtime/scheduler/scheduler_kernel.h" #include "unit_tests/fixtures/execution_model_fixture.h" #include "unit_tests/helpers/hw_parse.h" diff --git a/unit_tests/gtpin/gtpin_tests.cpp b/unit_tests/gtpin/gtpin_tests.cpp index d6339bd94d..5db4f3f960 100644 --- a/unit_tests/gtpin/gtpin_tests.cpp +++ b/unit_tests/gtpin/gtpin_tests.cpp @@ -9,6 +9,7 @@ #include "core/helpers/basic_math.h" #include "core/helpers/file_io.h" #include "core/helpers/hash.h" +#include "core/memory_manager/surface.h" #include "core/os_interface/os_context.h" #include "core/unit_tests/device_binary_format/patchtokens_tests.h" #include "runtime/api/api.h" @@ -21,7 +22,6 @@ #include "runtime/gtpin/gtpin_notify.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/surface.h" #include "runtime/program/create.inl" #include "test.h" #include "unit_tests/fixtures/context_fixture.h" diff --git a/unit_tests/mem_obj/buffer_set_arg_tests.cpp b/unit_tests/mem_obj/buffer_set_arg_tests.cpp index 7821df4876..38231a9f4c 100644 --- a/unit_tests/mem_obj/buffer_set_arg_tests.cpp +++ b/unit_tests/mem_obj/buffer_set_arg_tests.cpp @@ -8,10 +8,10 @@ #include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/ptr_math.h" +#include "core/memory_manager/surface.h" #include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/kernel/kernel.h" -#include "runtime/memory_manager/surface.h" #include "test.h" #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/fixtures/context_fixture.h" diff --git a/unit_tests/mem_obj/image_set_arg_tests.cpp b/unit_tests/mem_obj/image_set_arg_tests.cpp index c0e14a2d20..bc96010229 100644 --- a/unit_tests/mem_obj/image_set_arg_tests.cpp +++ b/unit_tests/mem_obj/image_set_arg_tests.cpp @@ -11,10 +11,10 @@ #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/graphics_allocation.h" +#include "core/memory_manager/surface.h" #include "runtime/helpers/surface_formats.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/surface.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/image_fixture.h" diff --git a/unit_tests/memory_manager/surface_tests.cpp b/unit_tests/memory_manager/surface_tests.cpp index 04fc64f7d0..8aa3ab86de 100644 --- a/unit_tests/memory_manager/surface_tests.cpp +++ b/unit_tests/memory_manager/surface_tests.cpp @@ -8,7 +8,7 @@ #include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/graphics_allocation.h" -#include "runtime/memory_manager/surface.h" +#include "runtime/memory_manager/mem_obj_surface.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/mocks/mock_buffer.h" diff --git a/unit_tests/profiling/profiling_tests.cpp b/unit_tests/profiling/profiling_tests.cpp index 5376ff45b9..3823e3f470 100644 --- a/unit_tests/profiling/profiling_tests.cpp +++ b/unit_tests/profiling/profiling_tests.cpp @@ -15,7 +15,6 @@ #include "runtime/command_queue/enqueue_marker.h" #include "runtime/command_queue/enqueue_migrate_mem_objects.h" #include "runtime/helpers/dispatch_info.h" -#include "runtime/memory_manager/surface.h" #include "test.h" #include "unit_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/event/event_fixture.h" diff --git a/unit_tests/program/program_nonuniform.cpp b/unit_tests/program/program_nonuniform.cpp index 7da1def9e6..b464de0faa 100644 --- a/unit_tests/program/program_nonuniform.cpp +++ b/unit_tests/program/program_nonuniform.cpp @@ -12,7 +12,6 @@ #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/kernel/kernel.h" -#include "runtime/memory_manager/surface.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/helpers/kernel_binary_helper.h" diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index 6479e9ceff..21841e9c70 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -17,6 +17,7 @@ #include "core/helpers/string.h" #include "core/memory_manager/allocations_list.h" #include "core/memory_manager/graphics_allocation.h" +#include "core/memory_manager/surface.h" #include "core/os_interface/os_context.h" #include "core/unit_tests/device_binary_format/patchtokens_tests.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" @@ -24,7 +25,6 @@ #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/kernel/kernel.h" -#include "runtime/memory_manager/surface.h" #include "runtime/program/create.inl" #include "test.h" #include "unit_tests/fixtures/device_fixture.h"