From 3bd4baeba311798461ee1e19250ce0411690ffb5 Mon Sep 17 00:00:00 2001 From: "Jobczyk, Lukasz" Date: Thu, 26 Sep 2019 12:10:38 +0200 Subject: [PATCH] Move a unified memory manager to the core dir Related-To: NEO-3677 Change-Id: Ib60dea2bcaaf5feea97d61cb9f54baee4c6b4b64 Signed-off-by: Jobczyk, Lukasz --- core/memory_manager/CMakeLists.txt | 2 ++ {runtime => core}/memory_manager/unified_memory_manager.cpp | 2 +- {runtime => core}/memory_manager/unified_memory_manager.h | 1 - runtime/api/api.cpp | 2 +- runtime/command_queue/enqueue_svm.h | 2 +- runtime/context/context.cpp | 2 +- runtime/gen11/command_queue_gen11.cpp | 2 +- runtime/gen8/command_queue_gen8.cpp | 2 +- runtime/gen9/command_queue_gen9.cpp | 2 +- runtime/kernel/kernel.cpp | 2 +- runtime/mem_obj/buffer.cpp | 2 +- runtime/mem_obj/mem_obj_helper.h | 2 +- runtime/memory_manager/CMakeLists.txt | 2 -- runtime/memory_manager/cpu_page_fault_manager_memory_sync.cpp | 2 +- runtime/program/process_gen_binary.cpp | 2 +- runtime/program/program.cpp | 2 +- unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp | 2 +- unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl | 2 +- unit_tests/api/cl_unified_shared_memory_tests.inl | 2 +- unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp | 2 +- unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp | 2 +- unit_tests/command_queue/enqueue_svm_tests.cpp | 2 +- unit_tests/command_queue/zero_size_enqueue_tests.cpp | 2 +- unit_tests/context/driver_diagnostics_enqueue_tests.cpp | 2 +- unit_tests/helpers/hardware_commands_helper_tests.cpp | 2 +- unit_tests/kernel/clone_kernel_tests.cpp | 2 +- unit_tests/kernel/kernel_tests.cpp | 2 +- unit_tests/mem_obj/buffer_set_arg_tests.cpp | 2 +- unit_tests/mem_obj/buffer_tests.cpp | 2 +- unit_tests/mocks/mock_context.cpp | 2 +- unit_tests/mocks/mock_svm_manager.h | 2 +- unit_tests/program/program_data_tests.cpp | 2 +- 32 files changed, 31 insertions(+), 32 deletions(-) rename {runtime => core}/memory_manager/unified_memory_manager.cpp (99%) rename {runtime => core}/memory_manager/unified_memory_manager.h (99%) diff --git a/core/memory_manager/CMakeLists.txt b/core/memory_manager/CMakeLists.txt index 409860823f..c378d0146d 100644 --- a/core/memory_manager/CMakeLists.txt +++ b/core/memory_manager/CMakeLists.txt @@ -23,6 +23,8 @@ set(NEO_CORE_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/memory_pool.h ${CMAKE_CURRENT_SOURCE_DIR}/residency.cpp ${CMAKE_CURRENT_SOURCE_DIR}/residency.h + ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_manager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/unified_memory_manager.h ) set_property(GLOBAL PROPERTY NEO_CORE_MEMORY_MANAGER ${NEO_CORE_MEMORY_MANAGER}) diff --git a/runtime/memory_manager/unified_memory_manager.cpp b/core/memory_manager/unified_memory_manager.cpp similarity index 99% rename from runtime/memory_manager/unified_memory_manager.cpp rename to core/memory_manager/unified_memory_manager.cpp index 7d44907c8f..7876d9146c 100644 --- a/runtime/memory_manager/unified_memory_manager.cpp +++ b/core/memory_manager/unified_memory_manager.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/memory_manager/unified_memory_manager.h" +#include "core/memory_manager/unified_memory_manager.h" #include "core/helpers/aligned_memory.h" #include "runtime/command_stream/command_stream_receiver.h" diff --git a/runtime/memory_manager/unified_memory_manager.h b/core/memory_manager/unified_memory_manager.h similarity index 99% rename from runtime/memory_manager/unified_memory_manager.h rename to core/memory_manager/unified_memory_manager.h index 2c24efeaf7..d4740cd68d 100644 --- a/runtime/memory_manager/unified_memory_manager.h +++ b/core/memory_manager/unified_memory_manager.h @@ -15,7 +15,6 @@ namespace NEO { class CommandStreamReceiver; -class Device; class GraphicsAllocation; class MemoryManager; diff --git a/runtime/api/api.cpp b/runtime/api/api.cpp index 7b48e76bf8..04e0259eaf 100644 --- a/runtime/api/api.cpp +++ b/runtime/api/api.cpp @@ -8,6 +8,7 @@ #include "api.h" #include "core/helpers/aligned_memory.h" +#include "core/memory_manager/unified_memory_manager.h" #include "core/utilities/stackvec.h" #include "runtime/accelerators/intel_motion_estimation.h" #include "runtime/api/additional_extensions.h" @@ -33,7 +34,6 @@ #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/mem_obj_helper.h" #include "runtime/mem_obj/pipe.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/platform/platform.h" #include "runtime/program/program.h" diff --git a/runtime/command_queue/enqueue_svm.h b/runtime/command_queue/enqueue_svm.h index 7ea1c8cc32..ff08f0c2ae 100644 --- a/runtime/command_queue/enqueue_svm.h +++ b/runtime/command_queue/enqueue_svm.h @@ -6,12 +6,12 @@ */ #pragma once +#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 "runtime/memory_manager/unified_memory_manager.h" #include diff --git a/runtime/context/context.cpp b/runtime/context/context.cpp index 68c885754b..8749573908 100644 --- a/runtime/context/context.cpp +++ b/runtime/context/context.cpp @@ -9,6 +9,7 @@ #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" @@ -21,7 +22,6 @@ #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/deferred_deleter.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/platform/platform.h" #include "runtime/sharings/sharing.h" diff --git a/runtime/gen11/command_queue_gen11.cpp b/runtime/gen11/command_queue_gen11.cpp index 2d8502db61..f32c9273ea 100644 --- a/runtime/gen11/command_queue_gen11.cpp +++ b/runtime/gen11/command_queue_gen11.cpp @@ -5,10 +5,10 @@ * */ +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/command_queue_hw_bdw_plus.inl" #include "runtime/command_queue/enqueue_resource_barrier.h" -#include "runtime/memory_manager/unified_memory_manager.h" namespace NEO { diff --git a/runtime/gen8/command_queue_gen8.cpp b/runtime/gen8/command_queue_gen8.cpp index 5a13765057..aff659a474 100644 --- a/runtime/gen8/command_queue_gen8.cpp +++ b/runtime/gen8/command_queue_gen8.cpp @@ -5,10 +5,10 @@ * */ +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/command_queue_hw_bdw_plus.inl" #include "runtime/command_queue/enqueue_resource_barrier.h" -#include "runtime/memory_manager/unified_memory_manager.h" namespace NEO { diff --git a/runtime/gen9/command_queue_gen9.cpp b/runtime/gen9/command_queue_gen9.cpp index 93f8e863e1..6f1cae9c48 100644 --- a/runtime/gen9/command_queue_gen9.cpp +++ b/runtime/gen9/command_queue_gen9.cpp @@ -5,10 +5,10 @@ * */ +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/command_queue_hw_bdw_plus.inl" #include "runtime/command_queue/enqueue_resource_barrier.h" -#include "runtime/memory_manager/unified_memory_manager.h" namespace NEO { diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp index 1528c714ad..071438dca0 100644 --- a/runtime/kernel/kernel.cpp +++ b/runtime/kernel/kernel.cpp @@ -11,6 +11,7 @@ #include "core/helpers/basic_math.h" #include "core/helpers/debug_helpers.h" #include "core/helpers/ptr_math.h" +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/accelerators/intel_accelerator.h" #include "runtime/accelerators/intel_motion_estimation.h" #include "runtime/built_ins/built_ins.h" @@ -34,7 +35,6 @@ #include "runtime/mem_obj/pipe.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/memory_manager/surface.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/platform/platform.h" #include "runtime/program/kernel_info.h" diff --git a/runtime/mem_obj/buffer.cpp b/runtime/mem_obj/buffer.cpp index 1d589f3a8e..146156d57e 100644 --- a/runtime/mem_obj/buffer.cpp +++ b/runtime/mem_obj/buffer.cpp @@ -10,6 +10,7 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" @@ -24,7 +25,6 @@ #include "runtime/mem_obj/mem_obj_helper.h" #include "runtime/memory_manager/host_ptr_manager.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" namespace NEO { diff --git a/runtime/mem_obj/mem_obj_helper.h b/runtime/mem_obj/mem_obj_helper.h index cea134f71d..3b171ff6be 100644 --- a/runtime/mem_obj/mem_obj_helper.h +++ b/runtime/mem_obj/mem_obj_helper.h @@ -7,12 +7,12 @@ #pragma once #include "common/helpers/bit_helpers.h" +#include "core/memory_manager/unified_memory_manager.h" #include "public/cl_ext_private.h" #include "runtime/context/context_type.h" #include "runtime/helpers/mem_properties_parser_helper.h" #include "runtime/mem_obj/mem_obj.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "CL/cl.h" #include "mem_obj_types.h" diff --git a/runtime/memory_manager/CMakeLists.txt b/runtime/memory_manager/CMakeLists.txt index 9ec80aadfb..9e5cc4cb0f 100644 --- a/runtime/memory_manager/CMakeLists.txt +++ b/runtime/memory_manager/CMakeLists.txt @@ -35,8 +35,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/physical_address_allocator.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 ) get_property(NEO_UNIFIED_MEMORY GLOBAL PROPERTY NEO_UNIFIED_MEMORY) diff --git a/runtime/memory_manager/cpu_page_fault_manager_memory_sync.cpp b/runtime/memory_manager/cpu_page_fault_manager_memory_sync.cpp index 264e6ec176..b9df7e4685 100644 --- a/runtime/memory_manager/cpu_page_fault_manager_memory_sync.cpp +++ b/runtime/memory_manager/cpu_page_fault_manager_memory_sync.cpp @@ -6,9 +6,9 @@ */ #include "core/helpers/debug_helpers.h" +#include "core/memory_manager/unified_memory_manager.h" #include "core/page_fault_manager/cpu_page_fault_manager.h" #include "runtime/command_queue/command_queue.h" -#include "runtime/memory_manager/unified_memory_manager.h" namespace NEO { void PageFaultManager::transferToCpu(void *ptr, size_t size, void *cmdQ) { diff --git a/runtime/program/process_gen_binary.cpp b/runtime/program/process_gen_binary.cpp index fde3fb34a8..70ee2a6c0f 100644 --- a/runtime/program/process_gen_binary.cpp +++ b/runtime/program/process_gen_binary.cpp @@ -9,12 +9,12 @@ #include "core/helpers/debug_helpers.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/gtpin/gtpin_notify.h" #include "runtime/helpers/hash.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/program/program.h" #include "patch_list.h" diff --git a/runtime/program/program.cpp b/runtime/program/program.cpp index 049cdec4a4..98d6120b65 100644 --- a/runtime/program/program.cpp +++ b/runtime/program/program.cpp @@ -9,6 +9,7 @@ #include "core/helpers/debug_helpers.h" #include "core/helpers/string.h" +#include "core/memory_manager/unified_memory_manager.h" #include "elf/writer.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/compiler_interface/compiler_interface.h" @@ -16,7 +17,6 @@ #include "runtime/device/device.h" #include "runtime/helpers/hw_helper.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/os_interface/os_context.h" #include diff --git a/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp b/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp index 3bb3b21532..91f2d878cd 100644 --- a/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp +++ b/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp @@ -6,10 +6,10 @@ */ #include "core/memory_manager/graphics_allocation.h" +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/command_queue/command_queue.h" #include "runtime/device/device.h" #include "runtime/event/user_event.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "unit_tests/mocks/mock_context.h" #include "cl_api_tests.h" diff --git a/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl b/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl index 3deb6cd150..2df8bfe131 100644 --- a/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl +++ b/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/memory_manager/unified_memory_manager.h" +#include "core/memory_manager/unified_memory_manager.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_kernel.h" diff --git a/unit_tests/api/cl_unified_shared_memory_tests.inl b/unit_tests/api/cl_unified_shared_memory_tests.inl index 423f27a5d2..a0476c4123 100644 --- a/unit_tests/api/cl_unified_shared_memory_tests.inl +++ b/unit_tests/api/cl_unified_shared_memory_tests.inl @@ -5,9 +5,9 @@ * */ +#include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/api/api.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_kernel.h" diff --git a/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp b/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp index 9e18aedbb2..05da475f37 100644 --- a/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp +++ b/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp b/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp index 9b90a4db16..3dfe05236c 100644 --- a/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp +++ b/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/command_queue/enqueue_svm_tests.cpp b/unit_tests/command_queue/enqueue_svm_tests.cpp index 23e85ce118..8c20a21d59 100644 --- a/unit_tests/command_queue/enqueue_svm_tests.cpp +++ b/unit_tests/command_queue/enqueue_svm_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/helpers/aligned_memory.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" @@ -13,7 +14,6 @@ #include "runtime/event/user_event.h" #include "runtime/memory_manager/allocations_list.h" #include "runtime/memory_manager/surface.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" diff --git a/unit_tests/command_queue/zero_size_enqueue_tests.cpp b/unit_tests/command_queue/zero_size_enqueue_tests.cpp index f678e8bce5..9665d7991d 100644 --- a/unit_tests/command_queue/zero_size_enqueue_tests.cpp +++ b/unit_tests/command_queue/zero_size_enqueue_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/event/event.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/image_fixture.h" diff --git a/unit_tests/context/driver_diagnostics_enqueue_tests.cpp b/unit_tests/context/driver_diagnostics_enqueue_tests.cpp index bfe66b8413..f0b55a4d5d 100644 --- a/unit_tests/context/driver_diagnostics_enqueue_tests.cpp +++ b/unit_tests/context/driver_diagnostics_enqueue_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/event/user_event.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "unit_tests/context/driver_diagnostics_tests.h" #include "unit_tests/fixtures/buffer_fixture.h" diff --git a/unit_tests/helpers/hardware_commands_helper_tests.cpp b/unit_tests/helpers/hardware_commands_helper_tests.cpp index 2aecd7c8b4..10a917427b 100644 --- a/unit_tests/helpers/hardware_commands_helper_tests.cpp +++ b/unit_tests/helpers/hardware_commands_helper_tests.cpp @@ -8,13 +8,13 @@ #include "unit_tests/helpers/hardware_commands_helper_tests.h" #include "core/helpers/basic_math.h" +#include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/api/api.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "unit_tests/fixtures/execution_model_kernel_fixture.h" #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/fixtures/image_fixture.h" diff --git a/unit_tests/kernel/clone_kernel_tests.cpp b/unit_tests/kernel/clone_kernel_tests.cpp index 3acc055a0b..40344b8a4f 100644 --- a/unit_tests/kernel/clone_kernel_tests.cpp +++ b/unit_tests/kernel/clone_kernel_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/accelerators/intel_accelerator.h" #include "runtime/accelerators/intel_motion_estimation.h" #include "runtime/helpers/sampler_helpers.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/pipe.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "test.h" #include "unit_tests/fixtures/context_fixture.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/kernel/kernel_tests.cpp b/unit_tests/kernel/kernel_tests.cpp index 316193a8b9..cb7af1fe29 100644 --- a/unit_tests/kernel/kernel_tests.cpp +++ b/unit_tests/kernel/kernel_tests.cpp @@ -5,6 +5,7 @@ * */ +#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" @@ -19,7 +20,6 @@ #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/allocations_list.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/os_context.h" #include "test.h" diff --git a/unit_tests/mem_obj/buffer_set_arg_tests.cpp b/unit_tests/mem_obj/buffer_set_arg_tests.cpp index 899f17a7e2..8a5ee87056 100644 --- a/unit_tests/mem_obj/buffer_set_arg_tests.cpp +++ b/unit_tests/mem_obj/buffer_set_arg_tests.cpp @@ -6,12 +6,12 @@ */ #include "core/helpers/ptr_math.h" +#include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/kernel/kernel.h" #include "runtime/memory_manager/surface.h" -#include "runtime/memory_manager/unified_memory_manager.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/buffer_tests.cpp b/unit_tests/mem_obj/buffer_tests.cpp index 9587a1aba9..c2f2c2efc2 100644 --- a/unit_tests/mem_obj/buffer_tests.cpp +++ b/unit_tests/mem_obj/buffer_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/command_queue/command_queue_hw.h" @@ -19,7 +20,6 @@ #include "runtime/helpers/options.h" #include "runtime/mem_obj/buffer.h" #include "runtime/memory_manager/allocations_list.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/os_interface/os_context.h" #include "runtime/platform/platform.h" #include "test.h" diff --git a/unit_tests/mocks/mock_context.cpp b/unit_tests/mocks/mock_context.cpp index 9254aa0af0..134a2fb891 100644 --- a/unit_tests/mocks/mock_context.cpp +++ b/unit_tests/mocks/mock_context.cpp @@ -7,12 +7,12 @@ #include "unit_tests/mocks/mock_context.h" +#include "core/memory_manager/unified_memory_manager.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/memory_manager/deferred_deleter.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/sharings/sharing.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/mocks/mock_svm_manager.h b/unit_tests/mocks/mock_svm_manager.h index e94beaed46..0856f44b73 100644 --- a/unit_tests/mocks/mock_svm_manager.h +++ b/unit_tests/mocks/mock_svm_manager.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/memory_manager/unified_memory_manager.h" +#include "core/memory_manager/unified_memory_manager.h" namespace NEO { struct MockSVMAllocsManager : SVMAllocsManager { diff --git a/unit_tests/program/program_data_tests.cpp b/unit_tests/program/program_data_tests.cpp index 43fccc763f..dc4b8b3fd5 100644 --- a/unit_tests/program/program_data_tests.cpp +++ b/unit_tests/program/program_data_tests.cpp @@ -7,9 +7,9 @@ #include "core/helpers/string.h" #include "core/memory_manager/graphics_allocation.h" +#include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/compiler_interface/linker_mock.h" #include "runtime/memory_manager/allocations_list.h" -#include "runtime/memory_manager/unified_memory_manager.h" #include "runtime/platform/platform.h" #include "runtime/program/program.h" #include "test.h"