diff --git a/core/command_container/cmdcontainer.cpp b/core/command_container/cmdcontainer.cpp index 54ca380bbf..266e4d5600 100644 --- a/core/command_container/cmdcontainer.cpp +++ b/core/command_container/cmdcontainer.cpp @@ -13,8 +13,8 @@ #include "core/helpers/debug_helpers.h" #include "core/helpers/heap_helper.h" #include "core/indirect_heap/indirect_heap.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/core/command_stream/scratch_space_controller.cpp b/core/command_stream/scratch_space_controller.cpp index 7745eb3817..60616576e5 100644 --- a/core/command_stream/scratch_space_controller.cpp +++ b/core/command_stream/scratch_space_controller.cpp @@ -11,7 +11,7 @@ #include "core/helpers/hw_helper.h" #include "core/memory_manager/graphics_allocation.h" #include "core/memory_manager/internal_allocation_storage.h" -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" namespace NEO { ScratchSpaceController::ScratchSpaceController(uint32_t rootDeviceIndex, ExecutionEnvironment &environment, InternalAllocationStorage &allocationStorage) diff --git a/core/command_stream/scratch_space_controller_base.cpp b/core/command_stream/scratch_space_controller_base.cpp index 8f3c365092..3a4ec43cf3 100644 --- a/core/command_stream/scratch_space_controller_base.cpp +++ b/core/command_stream/scratch_space_controller_base.cpp @@ -14,8 +14,8 @@ #include "core/memory_manager/graphics_allocation.h" #include "core/memory_manager/internal_allocation_storage.h" #include "core/memory_manager/memory_constants.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { ScratchSpaceControllerBase::ScratchSpaceControllerBase(uint32_t rootDeviceIndex, ExecutionEnvironment &environment, InternalAllocationStorage &allocationStorage) diff --git a/core/device/device.cpp b/core/device/device.cpp index cab6f52f1b..f23b48d28e 100644 --- a/core/device/device.cpp +++ b/core/device/device.cpp @@ -10,13 +10,13 @@ #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" #include "core/helpers/hw_helper.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" #include "core/os_interface/os_interface.h" #include "core/os_interface/os_time.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/experimental_command_buffer.h" #include "runtime/device/driver_info.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/source_level_debugger/source_level_debugger.h" namespace NEO { diff --git a/core/device/root_device.cpp b/core/device/root_device.cpp index 1689d57fd5..94597a114d 100644 --- a/core/device/root_device.cpp +++ b/core/device/root_device.cpp @@ -11,8 +11,8 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/device/sub_device.h" #include "core/helpers/hw_helper.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { extern CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnvironment, uint32_t rootDeviceIndex); diff --git a/core/helpers/heap_helper.cpp b/core/helpers/heap_helper.cpp index 8a7dca2ea3..5104f9b3d2 100644 --- a/core/helpers/heap_helper.cpp +++ b/core/helpers/heap_helper.cpp @@ -10,7 +10,7 @@ #include "core/indirect_heap/indirect_heap.h" #include "core/memory_manager/graphics_allocation.h" #include "core/memory_manager/internal_allocation_storage.h" -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" namespace NEO { diff --git a/core/memory_manager/CMakeLists.txt b/core/memory_manager/CMakeLists.txt index c5b3840505..a7e69860b0 100644 --- a/core/memory_manager/CMakeLists.txt +++ b/core/memory_manager/CMakeLists.txt @@ -31,6 +31,8 @@ set(NEO_CORE_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.cpp ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.h ${CMAKE_CURRENT_SOURCE_DIR}/memory_constants.h + ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/memory_operations_handler.h ${CMAKE_CURRENT_SOURCE_DIR}/memory_operations_status.h ${CMAKE_CURRENT_SOURCE_DIR}/memory_pool.h diff --git a/core/memory_manager/deferrable_allocation_deletion.cpp b/core/memory_manager/deferrable_allocation_deletion.cpp index 965c1a3baf..e6770559c8 100644 --- a/core/memory_manager/deferrable_allocation_deletion.cpp +++ b/core/memory_manager/deferrable_allocation_deletion.cpp @@ -8,9 +8,9 @@ #include "core/memory_manager/deferrable_allocation_deletion.h" #include "core/helpers/engine_control.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/core/memory_manager/definitions/storage_info.cpp b/core/memory_manager/definitions/storage_info.cpp index e2080d9828..8cb871f395 100644 --- a/core/memory_manager/definitions/storage_info.cpp +++ b/core/memory_manager/definitions/storage_info.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" namespace NEO { StorageInfo MemoryManager::createStorageInfoFromProperties(const AllocationProperties &properties) { diff --git a/core/memory_manager/graphics_allocation.cpp b/core/memory_manager/graphics_allocation.cpp index ab8796895f..f546bc3de4 100644 --- a/core/memory_manager/graphics_allocation.cpp +++ b/core/memory_manager/graphics_allocation.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "graphics_allocation.h" #include "core/helpers/aligned_memory.h" -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/utilities/logger.h" namespace NEO { diff --git a/core/memory_manager/host_ptr_manager.cpp b/core/memory_manager/host_ptr_manager.cpp index 3bda231c34..fbf6b6e761 100644 --- a/core/memory_manager/host_ptr_manager.cpp +++ b/core/memory_manager/host_ptr_manager.cpp @@ -7,7 +7,7 @@ #include "core/memory_manager/host_ptr_manager.h" -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" using namespace NEO; diff --git a/core/memory_manager/internal_allocation_storage.cpp b/core/memory_manager/internal_allocation_storage.cpp index 47df18e08b..58ab3485c8 100644 --- a/core/memory_manager/internal_allocation_storage.cpp +++ b/core/memory_manager/internal_allocation_storage.cpp @@ -8,9 +8,9 @@ #include "core/memory_manager/internal_allocation_storage.h" #include "core/memory_manager/host_ptr_manager.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { InternalAllocationStorage::InternalAllocationStorage(CommandStreamReceiver &commandStreamReceiver) : commandStreamReceiver(commandStreamReceiver){}; diff --git a/runtime/memory_manager/memory_manager.cpp b/core/memory_manager/memory_manager.cpp similarity index 99% rename from runtime/memory_manager/memory_manager.cpp rename to core/memory_manager/memory_manager.cpp index babc2ecc0a..ad6e22f567 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/core/memory_manager/memory_manager.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" #include "common/compiler_support.h" #include "core/execution_environment/root_device_environment.h" diff --git a/runtime/memory_manager/memory_manager.h b/core/memory_manager/memory_manager.h similarity index 100% rename from runtime/memory_manager/memory_manager.h rename to core/memory_manager/memory_manager.h diff --git a/core/memory_manager/residency.h b/core/memory_manager/residency.h index 1c2165f8a1..41255c6e5b 100644 --- a/core/memory_manager/residency.h +++ b/core/memory_manager/residency.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/memory_manager/memory_manager.h" #include "core/utilities/stackvec.h" -#include "runtime/memory_manager/memory_manager.h" #include diff --git a/core/memory_manager/unified_memory_manager.cpp b/core/memory_manager/unified_memory_manager.cpp index d531827ae5..c8eeefdad0 100644 --- a/core/memory_manager/unified_memory_manager.cpp +++ b/core/memory_manager/unified_memory_manager.cpp @@ -8,9 +8,9 @@ #include "core/memory_manager/unified_memory_manager.h" #include "core/helpers/aligned_memory.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/mem_obj/mem_obj_helper.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/core/os_interface/linux/CMakeLists.txt b/core/os_interface/linux/CMakeLists.txt index d23e290ee4..6306de9a9d 100644 --- a/core/os_interface/linux/CMakeLists.txt +++ b/core/os_interface/linux/CMakeLists.txt @@ -14,6 +14,11 @@ set(NEO_CORE_OS_INTERFACE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/drm_allocation.h ${CMAKE_CURRENT_SOURCE_DIR}/drm_buffer_object.cpp ${CMAKE_CURRENT_SOURCE_DIR}/drm_buffer_object.h + ${CMAKE_CURRENT_SOURCE_DIR}/drm_gem_close_worker.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/drm_gem_close_worker.h + ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager.h + ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_manager_allocate_in_device_pool.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_engine_mapper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/drm_engine_mapper.h ${CMAKE_CURRENT_SOURCE_DIR}/drm_neo.cpp diff --git a/core/os_interface/linux/drm_allocation.cpp b/core/os_interface/linux/drm_allocation.cpp index 895b115a34..93e9108384 100644 --- a/core/os_interface/linux/drm_allocation.cpp +++ b/core/os_interface/linux/drm_allocation.cpp @@ -8,7 +8,7 @@ #include "core/os_interface/linux/drm_allocation.h" #include "core/os_interface/linux/drm_buffer_object.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include diff --git a/core/os_interface/linux/drm_buffer_object.cpp b/core/os_interface/linux/drm_buffer_object.cpp index a97c16e676..7c39f14b17 100644 --- a/core/os_interface/linux/drm_buffer_object.cpp +++ b/core/os_interface/linux/drm_buffer_object.cpp @@ -9,10 +9,10 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/debug_helpers.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/drm_neo.h" #include "core/os_interface/linux/os_time_linux.h" #include "core/utilities/stackvec.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" #include "drm/i915_drm.h" diff --git a/runtime/os_interface/linux/drm_gem_close_worker.cpp b/core/os_interface/linux/drm_gem_close_worker.cpp similarity index 95% rename from runtime/os_interface/linux/drm_gem_close_worker.cpp rename to core/os_interface/linux/drm_gem_close_worker.cpp index 21c8a11fd3..663f787725 100644 --- a/runtime/os_interface/linux/drm_gem_close_worker.cpp +++ b/core/os_interface/linux/drm_gem_close_worker.cpp @@ -5,13 +5,13 @@ * */ -#include "runtime/os_interface/linux/drm_gem_close_worker.h" +#include "core/os_interface/linux/drm_gem_close_worker.h" #include "core/helpers/aligned_memory.h" #include "core/os_interface/linux/drm_buffer_object.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/os_thread.h" #include "runtime/os_interface/linux/drm_command_stream.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" #include #include diff --git a/runtime/os_interface/linux/drm_gem_close_worker.h b/core/os_interface/linux/drm_gem_close_worker.h similarity index 96% rename from runtime/os_interface/linux/drm_gem_close_worker.h rename to core/os_interface/linux/drm_gem_close_worker.h index a137fa3e6a..bdfee59f69 100644 --- a/runtime/os_interface/linux/drm_gem_close_worker.h +++ b/core/os_interface/linux/drm_gem_close_worker.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/os_interface/linux/drm_memory_manager.cpp b/core/os_interface/linux/drm_memory_manager.cpp similarity index 99% rename from runtime/os_interface/linux/drm_memory_manager.cpp rename to core/os_interface/linux/drm_memory_manager.cpp index ccdfb7b533..f56d294f02 100644 --- a/runtime/os_interface/linux/drm_memory_manager.cpp +++ b/core/os_interface/linux/drm_memory_manager.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/os_interface/linux/drm_memory_manager.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/execution_environment/execution_environment.h" #include "core/execution_environment/root_device_environment.h" diff --git a/runtime/os_interface/linux/drm_memory_manager.h b/core/os_interface/linux/drm_memory_manager.h similarity index 98% rename from runtime/os_interface/linux/drm_memory_manager.h rename to core/os_interface/linux/drm_memory_manager.h index ee11171294..27ab9da05d 100644 --- a/runtime/os_interface/linux/drm_memory_manager.h +++ b/core/os_interface/linux/drm_memory_manager.h @@ -6,10 +6,10 @@ */ #pragma once +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/linux/drm_allocation.h" #include "core/os_interface/linux/drm_buffer_object.h" #include "core/os_interface/linux/drm_neo.h" -#include "runtime/memory_manager/memory_manager.h" #include "drm_gem_close_worker.h" diff --git a/runtime/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp b/core/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp similarity index 94% rename from runtime/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp rename to core/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp index e7733ffd93..1c41598de4 100644 --- a/runtime/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp +++ b/core/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp @@ -6,7 +6,7 @@ */ #include "core/helpers/basic_math.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" +#include "core/os_interface/linux/drm_memory_manager.h" namespace NEO { GraphicsAllocation *DrmMemoryManager::allocateGraphicsMemoryInDevicePool(const AllocationData &allocationData, AllocationStatus &status) { diff --git a/core/os_interface/windows/CMakeLists.txt b/core/os_interface/windows/CMakeLists.txt index 4e1541f9ee..d46c8a8b8b 100644 --- a/core/os_interface/windows/CMakeLists.txt +++ b/core/os_interface/windows/CMakeLists.txt @@ -47,6 +47,9 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/thk_wrapper.h ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.h + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.h + ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_memory_manager_allocate_in_device_pool.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm_interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/wddm_allocation.h diff --git a/runtime/os_interface/windows/wddm_memory_manager.cpp b/core/os_interface/windows/wddm_memory_manager.cpp similarity index 99% rename from runtime/os_interface/windows/wddm_memory_manager.cpp rename to core/os_interface/windows/wddm_memory_manager.cpp index 8c0168d603..7c276d7078 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.cpp +++ b/core/os_interface/windows/wddm_memory_manager.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/os_interface/windows/wddm_memory_manager.h" +#include "core/os_interface/windows/wddm_memory_manager.h" #include "core/execution_environment/root_device_environment.h" #include "core/gmm_helper/gmm.h" diff --git a/runtime/os_interface/windows/wddm_memory_manager.h b/core/os_interface/windows/wddm_memory_manager.h similarity index 98% rename from runtime/os_interface/windows/wddm_memory_manager.h rename to core/os_interface/windows/wddm_memory_manager.h index 20ff2ab4df..a8d1ec962b 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.h +++ b/core/os_interface/windows/wddm_memory_manager.h @@ -7,10 +7,10 @@ #pragma once #include "core/helpers/aligned_memory.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" #include "core/os_interface/windows/wddm_allocation.h" #include "core/os_interface/windows/windows_wrapper.h" -#include "runtime/memory_manager/memory_manager.h" #include diff --git a/runtime/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp b/core/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp similarity index 93% rename from runtime/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp rename to core/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp index 7b3d0e09a8..5325fee665 100644 --- a/runtime/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp +++ b/core/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp @@ -6,7 +6,7 @@ */ #include "core/helpers/basic_math.h" -#include "runtime/os_interface/windows/wddm_memory_manager.h" +#include "core/os_interface/windows/wddm_memory_manager.h" namespace NEO { GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemoryInDevicePool(const AllocationData &allocationData, AllocationStatus &status) { diff --git a/core/program/program_initialization.cpp b/core/program/program_initialization.cpp index e56d0b6c98..1de1e9b854 100644 --- a/core/program/program_initialization.cpp +++ b/core/program/program_initialization.cpp @@ -11,9 +11,9 @@ #include "core/device/device.h" #include "core/helpers/string.h" #include "core/memory_manager/graphics_allocation.h" +#include "core/memory_manager/memory_manager.h" #include "core/memory_manager/unified_memory_manager.h" #include "core/program/program_info.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/core/program/sync_buffer_handler.cpp b/core/program/sync_buffer_handler.cpp index c18a205c96..e3e7d1bd44 100644 --- a/core/program/sync_buffer_handler.cpp +++ b/core/program/sync_buffer_handler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,9 +8,9 @@ #include "core/program/sync_buffer_handler.h" #include "core/memory_manager/graphics_allocation.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/kernel/kernel.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/core/utilities/tag_allocator.h b/core/utilities/tag_allocator.h index 85ba7f951c..0184015705 100644 --- a/core/utilities/tag_allocator.h +++ b/core/utilities/tag_allocator.h @@ -8,8 +8,8 @@ #pragma once #include "core/helpers/aligned_memory.h" #include "core/helpers/debug_helpers.h" +#include "core/memory_manager/memory_manager.h" #include "core/utilities/idlist.h" -#include "runtime/memory_manager/memory_manager.h" #include #include diff --git a/runtime/command_queue/enqueue_common.h b/runtime/command_queue/enqueue_common.h index c584278190..dbec75b920 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/memory_manager.h" #include "core/memory_manager/surface.h" #include "core/os_interface/os_context.h" #include "core/program/sync_buffer_handler.h" @@ -31,7 +32,6 @@ #include "runtime/helpers/task_information.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/program/block_kernel_manager.h" #include "runtime/program/printf_handler.h" diff --git a/runtime/command_queue/enqueue_fill_buffer.h b/runtime/command_queue/enqueue_fill_buffer.h index 3c1d4f02c1..59377123d2 100644 --- a/runtime/command_queue/enqueue_fill_buffer.h +++ b/runtime/command_queue/enqueue_fill_buffer.h @@ -7,13 +7,13 @@ #pragma once #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue_hw.h" #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 diff --git a/runtime/command_stream/command_stream_receiver.cpp b/runtime/command_stream/command_stream_receiver.cpp index 53e72adf49..fbddc08149 100644 --- a/runtime/command_stream/command_stream_receiver.cpp +++ b/runtime/command_stream/command_stream_receiver.cpp @@ -18,6 +18,7 @@ #include "core/helpers/string.h" #include "core/helpers/timestamp_packet.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/memory_manager.h" #include "core/memory_manager/surface.h" #include "core/os_interface/os_context.h" #include "core/os_interface/os_interface.h" @@ -26,7 +27,6 @@ #include "runtime/built_ins/built_ins.h" #include "runtime/command_stream/experimental_command_buffer.h" #include "runtime/gtpin/gtpin_notify.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/platform/platform.h" namespace NEO { diff --git a/runtime/command_stream/command_stream_receiver_hw_base.inl b/runtime/command_stream/command_stream_receiver_hw_base.inl index 67bd63d03b..3dd9d992b4 100644 --- a/runtime/command_stream/command_stream_receiver_hw_base.inl +++ b/runtime/command_stream/command_stream_receiver_hw_base.inl @@ -22,6 +22,7 @@ #include "core/helpers/timestamp_packet.h" #include "core/indirect_heap/indirect_heap.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" #include "core/utilities/tag_allocator.h" #include "runtime/command_stream/command_stream_receiver_hw.h" @@ -29,7 +30,6 @@ #include "runtime/gtpin/gtpin_notify.h" #include "runtime/helpers/flat_batch_buffer_helper_hw.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/memory_manager/memory_manager.h" #include "command_stream_receiver_hw_ext.inl" diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl b/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl index ab93b17b87..beb7e730ac 100644 --- a/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl +++ b/runtime/command_stream/command_stream_receiver_simulated_common_hw_base.inl @@ -9,13 +9,13 @@ #include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/gmm_helper/resource_info.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" #include "runtime/aub/aub_helper.h" #include "runtime/aub_mem_dump/page_table_entry_bits.h" #include "runtime/command_stream/command_stream_receiver_simulated_common_hw.h" #include "runtime/helpers/hardware_context_controller.h" #include "runtime/memory_manager/address_mapper.h" -#include "runtime/memory_manager/memory_manager.h" #include "third_party/aub_stream/headers/aub_manager.h" diff --git a/runtime/command_stream/experimental_command_buffer.cpp b/runtime/command_stream/experimental_command_buffer.cpp index fbf7b0f5bf..c6a70d7fc6 100644 --- a/runtime/command_stream/experimental_command_buffer.cpp +++ b/runtime/command_stream/experimental_command_buffer.cpp @@ -10,8 +10,8 @@ #include "core/command_stream/linear_stream.h" #include "core/memory_manager/internal_allocation_storage.h" #include "core/memory_manager/memory_constants.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/memory_manager/memory_manager.h" #include #include diff --git a/runtime/context/context.cpp b/runtime/context/context.cpp index 0671ea9f1f..32c5421706 100644 --- a/runtime/context/context.cpp +++ b/runtime/context/context.cpp @@ -13,6 +13,7 @@ #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "core/memory_manager/deferred_deleter.h" +#include "core/memory_manager/memory_manager.h" #include "core/memory_manager/unified_memory_manager.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue.h" @@ -22,7 +23,6 @@ #include "runtime/gtpin/gtpin_notify.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/platform/platform.h" #include "runtime/sharings/sharing.h" #include "runtime/sharings/sharing_factory.h" diff --git a/runtime/device/device_caps.cpp b/runtime/device/device_caps.cpp index af1ee6ab6b..8ac16c18e3 100644 --- a/runtime/device/device_caps.cpp +++ b/runtime/device/device_caps.cpp @@ -8,11 +8,11 @@ #include "core/device/device.h" #include "core/helpers/basic_math.h" #include "core/helpers/hw_helper.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/hw_info_config.h" #include "core/os_interface/os_interface.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/driver_info.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/platform/extensions.h" #include "runtime/sharings/sharing_factory.h" #include "runtime/source_level_debugger/source_level_debugger.h" diff --git a/runtime/device_queue/device_queue.cpp b/runtime/device_queue/device_queue.cpp index c6b09d1e59..0dde82910a 100644 --- a/runtime/device_queue/device_queue.cpp +++ b/runtime/device_queue/device_queue.cpp @@ -8,12 +8,12 @@ #include "runtime/device_queue/device_queue.h" #include "core/helpers/hw_helper.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/helpers/queue_helpers.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { DeviceQueueCreateFunc deviceQueueFactory[IGFX_MAX_CORE] = {}; diff --git a/runtime/device_queue/device_queue_hw_base.inl b/runtime/device_queue/device_queue_hw_base.inl index f681e7e327..0437d5541c 100644 --- a/runtime/device_queue/device_queue_hw_base.inl +++ b/runtime/device_queue/device_queue_hw_base.inl @@ -9,11 +9,11 @@ #include "core/helpers/hw_helper.h" #include "core/helpers/preamble.h" #include "core/helpers/string.h" +#include "core/memory_manager/memory_manager.h" #include "core/utilities/tag_allocator.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { template diff --git a/runtime/dll/linux/create_drm_memory_manager.cpp b/runtime/dll/linux/create_drm_memory_manager.cpp index 80eb8ee689..277de635f3 100644 --- a/runtime/dll/linux/create_drm_memory_manager.cpp +++ b/runtime/dll/linux/create_drm_memory_manager.cpp @@ -6,10 +6,10 @@ */ #include "core/execution_environment/execution_environment.h" +#include "core/memory_manager/memory_manager.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/os_interface.h" #include "core/os_interface/os_interface.h" -#include "runtime/memory_manager/memory_manager.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" namespace NEO { std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) { diff --git a/runtime/dll/windows/create_wddm_memory_manager.cpp b/runtime/dll/windows/create_wddm_memory_manager.cpp index ec99f27400..5995633644 100644 --- a/runtime/dll/windows/create_wddm_memory_manager.cpp +++ b/runtime/dll/windows/create_wddm_memory_manager.cpp @@ -7,10 +7,10 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/execution_environment/execution_environment.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_interface.h" #include "core/os_interface/windows/os_interface.h" -#include "runtime/memory_manager/memory_manager.h" -#include "runtime/os_interface/windows/wddm_memory_manager.h" +#include "core/os_interface/windows/wddm_memory_manager.h" namespace NEO { std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) { diff --git a/runtime/gtpin/gtpin_helpers.cpp b/runtime/gtpin/gtpin_helpers.cpp index 15f13e1e03..ee949d6add 100644 --- a/runtime/gtpin/gtpin_helpers.cpp +++ b/runtime/gtpin/gtpin_helpers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,10 @@ #include "gtpin_helpers.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/context/context.h" #include "runtime/helpers/validators.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/memory_manager.h" #include "CL/cl.h" #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" diff --git a/runtime/helpers/flat_batch_buffer_helper_hw.inl b/runtime/helpers/flat_batch_buffer_helper_hw.inl index ae4ad60c5c..d63059a685 100644 --- a/runtime/helpers/flat_batch_buffer_helper_hw.inl +++ b/runtime/helpers/flat_batch_buffer_helper_hw.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,9 +7,9 @@ #include "core/helpers/string.h" #include "core/memory_manager/graphics_allocation.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/flat_batch_buffer_helper_hw.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/runtime/helpers/properties_helper.cpp b/runtime/helpers/properties_helper.cpp index 92a9a79817..02a3de8aa4 100644 --- a/runtime/helpers/properties_helper.cpp +++ b/runtime/helpers/properties_helper.cpp @@ -8,11 +8,11 @@ #include "runtime/helpers/properties_helper.h" #include "core/helpers/timestamp_packet.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/command_queue/command_queue.h" #include "runtime/helpers/mipmap.h" #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/mem_obj.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp index c60da30b97..74600e2a45 100644 --- a/runtime/kernel/kernel.cpp +++ b/runtime/kernel/kernel.cpp @@ -16,6 +16,7 @@ #include "core/helpers/hw_helper.h" #include "core/helpers/kernel_helpers.h" #include "core/helpers/ptr_math.h" +#include "core/memory_manager/memory_manager.h" #include "core/memory_manager/unified_memory_manager.h" #include "runtime/accelerators/intel_accelerator.h" #include "runtime/accelerators/intel_motion_estimation.h" @@ -40,7 +41,6 @@ #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/platform/platform.h" #include "runtime/program/block_kernel_manager.h" #include "runtime/program/kernel_info.h" diff --git a/runtime/mem_obj/buffer.cpp b/runtime/mem_obj/buffer.cpp index 7c8b68cce2..aaf6936840 100644 --- a/runtime/mem_obj/buffer.cpp +++ b/runtime/mem_obj/buffer.cpp @@ -17,6 +17,7 @@ #include "core/helpers/string.h" #include "core/helpers/timestamp_packet.h" #include "core/memory_manager/host_ptr_manager.h" +#include "core/memory_manager/memory_manager.h" #include "core/memory_manager/unified_memory_manager.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" @@ -25,7 +26,6 @@ #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/helpers/validators.h" #include "runtime/mem_obj/mem_obj_helper.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/runtime/mem_obj/image.cpp b/runtime/mem_obj/image.cpp index 9c9c11fb6e..fc29574ff8 100644 --- a/runtime/mem_obj/image.cpp +++ b/runtime/mem_obj/image.cpp @@ -19,6 +19,7 @@ #include "core/helpers/hw_info.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/command_queue/command_queue.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" @@ -27,7 +28,6 @@ #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/mem_obj_helper.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/platform/platform.h" #include "igfxfmid.h" diff --git a/runtime/mem_obj/mem_obj.cpp b/runtime/mem_obj/mem_obj.cpp index 5c89d4f37e..da13ab1248 100644 --- a/runtime/mem_obj/mem_obj.cpp +++ b/runtime/mem_obj/mem_obj.cpp @@ -14,12 +14,12 @@ #include "core/helpers/get_info.h" #include "core/memory_manager/deferred_deleter.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" -#include "runtime/memory_manager/memory_manager.h" #include diff --git a/runtime/mem_obj/mem_obj_helper.h b/runtime/mem_obj/mem_obj_helper.h index 30188d3abb..c13ebb93da 100644 --- a/runtime/mem_obj/mem_obj_helper.h +++ b/runtime/mem_obj/mem_obj_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,11 +7,11 @@ #pragma once #include "common/helpers/bit_helpers.h" +#include "core/memory_manager/memory_manager.h" #include "core/memory_manager/unified_memory_manager.h" #include "public/cl_ext_private.h" #include "runtime/helpers/mem_properties_parser_helper.h" #include "runtime/mem_obj/mem_obj.h" -#include "runtime/memory_manager/memory_manager.h" #include "CL/cl.h" #include "memory_properties_flags.h" diff --git a/runtime/mem_obj/pipe.cpp b/runtime/mem_obj/pipe.cpp index 08d0cf16ea..b546530cc1 100644 --- a/runtime/mem_obj/pipe.cpp +++ b/runtime/mem_obj/pipe.cpp @@ -8,11 +8,11 @@ #include "runtime/mem_obj/pipe.h" #include "core/helpers/get_info.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/mem_obj/mem_obj_helper.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/runtime/memory_manager/CMakeLists.txt b/runtime/memory_manager/CMakeLists.txt index d540b4cd6c..e86aa163b0 100644 --- a/runtime/memory_manager/CMakeLists.txt +++ b/runtime/memory_manager/CMakeLists.txt @@ -10,8 +10,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/address_mapper.h ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_memory_sync.cpp ${CMAKE_CURRENT_SOURCE_DIR}/memory_banks.h - ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/memory_manager_banks_count.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_agnostic_memory_manager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_agnostic_memory_manager.h diff --git a/runtime/memory_manager/memory_manager_banks_count.cpp b/runtime/memory_manager/memory_manager_banks_count.cpp index cc4dee2b00..1a2f8999a7 100644 --- a/runtime/memory_manager/memory_manager_banks_count.cpp +++ b/runtime/memory_manager/memory_manager_banks_count.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" namespace NEO { uint32_t MemoryManager::getBanksCount() { diff --git a/runtime/memory_manager/os_agnostic_memory_manager.h b/runtime/memory_manager/os_agnostic_memory_manager.h index 76fc5d495b..32127e1138 100644 --- a/runtime/memory_manager/os_agnostic_memory_manager.h +++ b/runtime/memory_manager/os_agnostic_memory_manager.h @@ -7,7 +7,7 @@ #pragma once #include "core/helpers/basic_math.h" -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" namespace NEO { constexpr size_t bigAllocation = 1 * MB; diff --git a/runtime/os_interface/linux/CMakeLists.txt b/runtime/os_interface/linux/CMakeLists.txt index 3abce8257a..a1e9c27b9b 100644 --- a/runtime/os_interface/linux/CMakeLists.txt +++ b/runtime/os_interface/linux/CMakeLists.txt @@ -14,11 +14,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream.inl ${CMAKE_CURRENT_SOURCE_DIR}/drm_command_stream_bdw_plus.inl - ${CMAKE_CURRENT_SOURCE_DIR}/drm_gem_close_worker.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/drm_gem_close_worker.h - ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager.h - ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_manager_allocate_in_device_pool.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.cpp diff --git a/runtime/os_interface/linux/drm_command_stream.h b/runtime/os_interface/linux/drm_command_stream.h index 01db313cde..e4385cc825 100644 --- a/runtime/os_interface/linux/drm_command_stream.h +++ b/runtime/os_interface/linux/drm_command_stream.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/os_interface/linux/drm_gem_close_worker.h" #include "runtime/command_stream/device_command_stream.h" -#include "runtime/os_interface/linux/drm_gem_close_worker.h" #include "drm/i915_drm.h" diff --git a/runtime/os_interface/linux/drm_command_stream.inl b/runtime/os_interface/linux/drm_command_stream.inl index eb3375b398..8c4e5fc991 100644 --- a/runtime/os_interface/linux/drm_command_stream.inl +++ b/runtime/os_interface/linux/drm_command_stream.inl @@ -16,11 +16,11 @@ #include "core/os_interface/linux/drm_allocation.h" #include "core/os_interface/linux/drm_buffer_object.h" #include "core/os_interface/linux/drm_engine_mapper.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/drm_neo.h" #include "core/os_interface/linux/os_context_linux.h" #include "core/os_interface/linux/os_interface.h" #include "runtime/os_interface/linux/drm_command_stream.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" #include #include diff --git a/runtime/os_interface/windows/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt index 0f1ab7ec3f..ee4ba43859 100644 --- a/runtime/os_interface/windows/CMakeLists.txt +++ b/runtime/os_interface/windows/CMakeLists.txt @@ -21,9 +21,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.h ${CMAKE_CURRENT_SOURCE_DIR}/wddm_device_command_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/wddm_device_command_stream.inl - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.h - ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_memory_manager_allocate_in_device_pool.cpp ) if(WIN32) diff --git a/runtime/os_interface/windows/wddm_device_command_stream.inl b/runtime/os_interface/windows/wddm_device_command_stream.inl index fcf63463a4..61ffd7c435 100644 --- a/runtime/os_interface/windows/wddm_device_command_stream.inl +++ b/runtime/os_interface/windows/wddm_device_command_stream.inl @@ -23,7 +23,7 @@ #include "core/os_interface/windows/gdi_interface.h" #include "core/os_interface/windows/os_context_win.h" #include "core/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/wddm_memory_manager.h" +#include "core/os_interface/windows/wddm_memory_manager.h" namespace NEO { diff --git a/runtime/program/kernel_info.cpp b/runtime/program/kernel_info.cpp index ecb45236c3..4adf136de9 100644 --- a/runtime/program/kernel_info.cpp +++ b/runtime/program/kernel_info.cpp @@ -10,12 +10,12 @@ #include "core/helpers/hw_cmds.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/device/cl_device.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/sampler/sampler.h" #include diff --git a/runtime/program/printf_handler.cpp b/runtime/program/printf_handler.cpp index c6d7890c30..48780c51ff 100644 --- a/runtime/program/printf_handler.cpp +++ b/runtime/program/printf_handler.cpp @@ -9,12 +9,12 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" +#include "core/memory_manager/memory_manager.h" #include "core/program/print_formatter.h" #include "runtime/device/cl_device.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/runtime/program/process_device_binary.cpp b/runtime/program/process_device_binary.cpp index 6bf32e7111..e9f0e25116 100644 --- a/runtime/program/process_device_binary.cpp +++ b/runtime/program/process_device_binary.cpp @@ -10,13 +10,13 @@ #include "core/helpers/debug_helpers.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" +#include "core/memory_manager/memory_manager.h" #include "core/memory_manager/unified_memory_manager.h" #include "core/program/program_info.h" #include "core/program/program_initialization.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" #include "runtime/gtpin/gtpin_notify.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/program/kernel_info.h" #include "runtime/program/program.h" diff --git a/runtime/program/program.cpp b/runtime/program/program.cpp index d864098e86..fa7e7cc2ba 100644 --- a/runtime/program/program.cpp +++ b/runtime/program/program.cpp @@ -15,12 +15,12 @@ #include "core/helpers/debug_helpers.h" #include "core/helpers/hw_helper.h" #include "core/helpers/string.h" +#include "core/memory_manager/memory_manager.h" #include "core/memory_manager/unified_memory_manager.h" #include "core/os_interface/os_context.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/platform/platform.h" #include "runtime/program/block_kernel_manager.h" #include "runtime/program/kernel_info.h" diff --git a/runtime/sharings/d3d/d3d_buffer.h b/runtime/sharings/d3d/d3d_buffer.h index d0048d2950..1e92e4e59f 100644 --- a/runtime/sharings/d3d/d3d_buffer.h +++ b/runtime/sharings/d3d/d3d_buffer.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/memory_manager/memory_manager.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/sharings/d3d/d3d_sharing.h" namespace NEO { diff --git a/runtime/sharings/d3d/d3d_surface.cpp b/runtime/sharings/d3d/d3d_surface.cpp index f4f35b655c..14710a45c0 100644 --- a/runtime/sharings/d3d/d3d_surface.cpp +++ b/runtime/sharings/d3d/d3d_surface.cpp @@ -10,12 +10,12 @@ #include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_types_converter.h" #include "core/helpers/get_info.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/mem_obj_helper.h" -#include "runtime/memory_manager/memory_manager.h" #include "mmsystem.h" diff --git a/runtime/sharings/d3d/d3d_texture.cpp b/runtime/sharings/d3d/d3d_texture.cpp index d15f7a5bc1..3cdf445c81 100644 --- a/runtime/sharings/d3d/d3d_texture.cpp +++ b/runtime/sharings/d3d/d3d_texture.cpp @@ -12,10 +12,10 @@ #include "core/gmm_helper/resource_info.h" #include "core/helpers/get_info.h" #include "core/helpers/hw_helper.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/memory_manager.h" using namespace NEO; diff --git a/runtime/sharings/gl/windows/gl_buffer_windows.cpp b/runtime/sharings/gl/windows/gl_buffer_windows.cpp index 8e18824cc7..a6ebc4569e 100644 --- a/runtime/sharings/gl/windows/gl_buffer_windows.cpp +++ b/runtime/sharings/gl/windows/gl_buffer_windows.cpp @@ -7,11 +7,11 @@ #include "core/gmm_helper/gmm.h" #include "core/helpers/get_info.h" +#include "core/memory_manager/memory_manager.h" #include "public/cl_gl_private_intel.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/sharings/gl/gl_buffer.h" #include "runtime/sharings/gl/windows/gl_sharing_windows.h" diff --git a/runtime/sharings/gl/windows/gl_texture_windows.cpp b/runtime/sharings/gl/windows/gl_texture_windows.cpp index 47546a6c20..b581634d9c 100644 --- a/runtime/sharings/gl/windows/gl_texture_windows.cpp +++ b/runtime/sharings/gl/windows/gl_texture_windows.cpp @@ -12,11 +12,11 @@ #include "core/helpers/get_info.h" #include "core/helpers/hw_helper.h" #include "core/helpers/hw_info.h" +#include "core/memory_manager/memory_manager.h" #include "public/cl_gl_private_intel.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/sharings/gl/gl_texture.h" #include "runtime/sharings/gl/windows/gl_sharing_windows.h" diff --git a/runtime/sharings/unified/unified_buffer.cpp b/runtime/sharings/unified/unified_buffer.cpp index 1dd69ea9c4..8cc451ed5b 100644 --- a/runtime/sharings/unified/unified_buffer.cpp +++ b/runtime/sharings/unified/unified_buffer.cpp @@ -9,9 +9,9 @@ #include "core/gmm_helper/gmm.h" #include "core/helpers/get_info.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/context/context.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/memory_manager.h" #include "config.h" diff --git a/runtime/sharings/unified/unified_image.cpp b/runtime/sharings/unified/unified_image.cpp index abd4184582..8f03562603 100644 --- a/runtime/sharings/unified/unified_image.cpp +++ b/runtime/sharings/unified/unified_image.cpp @@ -13,10 +13,10 @@ #include "core/helpers/get_info.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/graphics_allocation.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { diff --git a/runtime/sharings/va/va_surface.cpp b/runtime/sharings/va/va_surface.cpp index 7ec81cdfb8..59ae9e46bd 100644 --- a/runtime/sharings/va/va_surface.cpp +++ b/runtime/sharings/va/va_surface.cpp @@ -9,10 +9,10 @@ #include "core/gmm_helper/gmm.h" #include "core/helpers/get_info.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/context/context.h" #include "runtime/device/cl_device.h" #include "runtime/mem_obj/image.h" -#include "runtime/memory_manager/memory_manager.h" namespace NEO { Image *VASurface::createSharedVaSurface(Context *context, VASharingFunctions *sharingFunctions, diff --git a/unit_tests/aub_tests/fixtures/aub_fixture.cpp b/unit_tests/aub_tests/fixtures/aub_fixture.cpp index 80dbc313ec..32f960c2ac 100644 --- a/unit_tests/aub_tests/fixtures/aub_fixture.cpp +++ b/unit_tests/aub_tests/fixtures/aub_fixture.cpp @@ -9,7 +9,7 @@ #include "core/memory_manager/graphics_allocation.h" #include "core/memory_manager/internal_allocation_storage.h" -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" namespace NEO { diff --git a/unit_tests/command_queue/command_queue_tests.cpp b/unit_tests/command_queue/command_queue_tests.cpp index e7a32096ff..8801ef86fe 100644 --- a/unit_tests/command_queue/command_queue_tests.cpp +++ b/unit_tests/command_queue/command_queue_tests.cpp @@ -8,12 +8,12 @@ #include "core/helpers/basic_math.h" #include "core/helpers/timestamp_packet.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/event.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/command_stream/command_stream_fixture.h" diff --git a/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp index a40526b755..2ac2379e25 100644 --- a/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp @@ -8,13 +8,13 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/allocations_list.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/dispatch_info.h" -#include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/command_queue/enqueue_fill_buffer_fixture.h" #include "unit_tests/command_queue/enqueue_fixture.h" diff --git a/unit_tests/command_queue/enqueue_write_image_tests.cpp b/unit_tests/command_queue/enqueue_write_image_tests.cpp index ce097d0456..4bb15acbbe 100644 --- a/unit_tests/command_queue/enqueue_write_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_image_tests.cpp @@ -6,8 +6,8 @@ */ #include "core/memory_manager/allocations_list.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/built_ins/builtins_dispatch_builder.h" -#include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/command_queue/enqueue_write_image_fixture.h" #include "unit_tests/gen_common/gen_commands_common_validation.h" diff --git a/unit_tests/command_queue/oom_buffer_tests.cpp b/unit_tests/command_queue/oom_buffer_tests.cpp index 7bf7b60484..69c36dcff6 100644 --- a/unit_tests/command_queue/oom_buffer_tests.cpp +++ b/unit_tests/command_queue/oom_buffer_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/memory_manager/memory_manager.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/event/event.h" -#include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/command_queue/enqueue_fixture.h" diff --git a/unit_tests/command_queue/oom_image_tests.cpp b/unit_tests/command_queue/oom_image_tests.cpp index 1b0242136b..a3daeedf96 100644 --- a/unit_tests/command_queue/oom_image_tests.cpp +++ b/unit_tests/command_queue/oom_image_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/memory_manager/memory_manager.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/event/event.h" -#include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/command_queue/enqueue_fixture.h" diff --git a/unit_tests/command_queue/oom_tests.cpp b/unit_tests/command_queue/oom_tests.cpp index 027a0c3a78..19074de3fb 100644 --- a/unit_tests/command_queue/oom_tests.cpp +++ b/unit_tests/command_queue/oom_tests.cpp @@ -6,8 +6,8 @@ */ #include "core/indirect_heap/indirect_heap.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/event/event.h" -#include "runtime/memory_manager/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_stream/command_stream_receiver_flush_task_3_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp index 16a457cc51..443656d509 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp @@ -6,10 +6,10 @@ */ #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp index d1ef365bef..00cfa6be7c 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp @@ -14,6 +14,7 @@ #include "core/helpers/preamble.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/graphics_allocation.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/linux/debug_env_reader.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/ult_hw_helper.h" @@ -23,7 +24,6 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/user_event.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/fixtures/built_in_fixture.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp index 88dcc6a67e..535ff9b568 100644 --- a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp @@ -15,6 +15,7 @@ #include "core/helpers/preamble.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/graphics_allocation.h" +#include "core/memory_manager/memory_manager.h" #include "core/memory_manager/unified_memory_manager.h" #include "core/os_interface/linux/debug_env_reader.h" #include "core/os_interface/os_context.h" @@ -28,7 +29,6 @@ #include "runtime/helpers/cl_blit_properties.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/mem_obj_helper.h" -#include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/fixtures/built_in_fixture.h" #include "unit_tests/fixtures/device_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 84176809aa..565fd0c8b3 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/memory_manager.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/platform/platform.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/command_stream/experimental_command_buffer_tests.cpp b/unit_tests/command_stream/experimental_command_buffer_tests.cpp index 55d9bdfff8..ef819d3c4f 100644 --- a/unit_tests/command_stream/experimental_command_buffer_tests.cpp +++ b/unit_tests/command_stream/experimental_command_buffer_tests.cpp @@ -7,9 +7,9 @@ #include "core/memory_manager/internal_allocation_storage.h" #include "core/memory_manager/memory_constants.h" +#include "core/memory_manager/memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/fixtures/multi_root_device_fixture.h" #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/unit_tests/event/user_events_tests.cpp b/unit_tests/event/user_events_tests.cpp index a89bd3285d..24f2e2cec5 100644 --- a/unit_tests/event/user_events_tests.cpp +++ b/unit_tests/event/user_events_tests.cpp @@ -6,9 +6,9 @@ */ #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/memory_manager/memory_manager.h" #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/mocks/mock_event.h" diff --git a/unit_tests/event/user_events_tests_mt.cpp b/unit_tests/event/user_events_tests_mt.cpp index aef8c22822..9ae56768c9 100644 --- a/unit_tests/event/user_events_tests_mt.cpp +++ b/unit_tests/event/user_events_tests_mt.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/mocks/mock_command_queue.h" diff --git a/unit_tests/fixtures/hello_world_fixture.h b/unit_tests/fixtures/hello_world_fixture.h index b81b65f634..90b816492f 100644 --- a/unit_tests/fixtures/hello_world_fixture.h +++ b/unit_tests/fixtures/hello_world_fixture.h @@ -7,8 +7,8 @@ #pragma once #include "core/helpers/aligned_memory.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/command_stream/command_stream_fixture.h" diff --git a/unit_tests/fixtures/kernel_data_fixture.h b/unit_tests/fixtures/kernel_data_fixture.h index d38cc83928..72c0606de3 100644 --- a/unit_tests/fixtures/kernel_data_fixture.h +++ b/unit_tests/fixtures/kernel_data_fixture.h @@ -7,8 +7,8 @@ #pragma once +#include "core/memory_manager/memory_manager.h" #include "runtime/device/cl_device.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/program/kernel_info.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_program.h" diff --git a/unit_tests/gen12lp/image_tests_gen12lp.inl b/unit_tests/gen12lp/image_tests_gen12lp.inl index 9809e58d1e..bfd49d9f26 100644 --- a/unit_tests/gen12lp/image_tests_gen12lp.inl +++ b/unit_tests/gen12lp/image_tests_gen12lp.inl @@ -6,7 +6,7 @@ */ #include "core/gmm_helper/gmm_helper.h" -#include "runtime/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/fixtures/image_fixture.h" diff --git a/unit_tests/linux/main_linux_dll.cpp b/unit_tests/linux/main_linux_dll.cpp index e4f0bfa94c..9f8ef2fcfe 100644 --- a/unit_tests/linux/main_linux_dll.cpp +++ b/unit_tests/linux/main_linux_dll.cpp @@ -8,12 +8,12 @@ #include "core/execution_environment/execution_environment.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/linux/allocator_helper.h" #include "core/os_interface/linux/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/default_hw_info.inl" #include "core/unit_tests/helpers/ult_hw_config.inl" -#include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/custom_event_listener.h" #include "unit_tests/helpers/variable_backup.h" diff --git a/unit_tests/mocks/linux/mock_drm_memory_manager.h b/unit_tests/mocks/linux/mock_drm_memory_manager.h index 03ccc8f3c9..0115fbede8 100644 --- a/unit_tests/mocks/linux/mock_drm_memory_manager.h +++ b/unit_tests/mocks/linux/mock_drm_memory_manager.h @@ -7,7 +7,7 @@ #pragma once #include "core/os_interface/linux/allocator_helper.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "unit_tests/mocks/mock_allocation_properties.h" #include "unit_tests/mocks/mock_host_ptr_manager.h" #include "unit_tests/mocks/mock_memory_manager.h" diff --git a/unit_tests/mocks/mock_allocation_properties.h b/unit_tests/mocks/mock_allocation_properties.h index 01cdfe5df0..4588cb810e 100644 --- a/unit_tests/mocks/mock_allocation_properties.h +++ b/unit_tests/mocks/mock_allocation_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/memory_manager/memory_manager.h" +#include "core/memory_manager/memory_manager.h" namespace NEO { struct MockAllocationProperties : public AllocationProperties { diff --git a/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp b/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp index 3064aac2d5..d088d52368 100644 --- a/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp +++ b/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp @@ -6,8 +6,8 @@ */ #include "core/execution_environment/execution_environment.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/os_interface.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" #include "unit_tests/mocks/linux/mock_drm_memory_manager.h" #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/os_interface/linux/device_command_stream_fixture.h" diff --git a/unit_tests/os_interface/linux/create_drm_memory_manager.cpp b/unit_tests/os_interface/linux/create_drm_memory_manager.cpp index c0fcdb5736..ec6289aaf5 100644 --- a/unit_tests/os_interface/linux/create_drm_memory_manager.cpp +++ b/unit_tests/os_interface/linux/create_drm_memory_manager.cpp @@ -6,11 +6,11 @@ */ #include "core/execution_environment/execution_environment.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/os_interface.h" #include "core/os_interface/os_interface.h" #include "core/unit_tests/helpers/ult_hw_config.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" namespace NEO { diff --git a/unit_tests/os_interface/linux/device_command_stream_fixture.h b/unit_tests/os_interface/linux/device_command_stream_fixture.h index 699e2c741e..ccb0437bf3 100644 --- a/unit_tests/os_interface/linux/device_command_stream_fixture.h +++ b/unit_tests/os_interface/linux/device_command_stream_fixture.h @@ -8,9 +8,9 @@ #pragma once #include "core/helpers/aligned_memory.h" #include "core/helpers/hw_helper.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/drm_neo.h" #include "core/unit_tests/helpers/default_hw_info.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" #include "runtime/platform/platform.h" #include "unit_tests/helpers/gtest_helpers.h" diff --git a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp b/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp index ae381f0659..21b68c72a6 100644 --- a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp +++ b/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp @@ -6,11 +6,11 @@ */ #include "core/execution_environment/root_device_environment.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/drm_memory_operations_handler.h" #include "core/os_interface/linux/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/os_interface/linux/drm_command_stream.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/mocks/mock_execution_environment.h" diff --git a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp index 58f2ecae27..e430a57a90 100644 --- a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp +++ b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp @@ -8,13 +8,13 @@ #include "core/execution_environment/execution_environment.h" #include "core/helpers/aligned_memory.h" #include "core/os_interface/linux/drm_buffer_object.h" +#include "core/os_interface/linux/drm_gem_close_worker.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/drm_memory_operations_handler.h" #include "core/os_interface/linux/os_interface.h" #include "runtime/command_stream/device_command_stream.h" #include "runtime/mem_obj/buffer.h" #include "runtime/os_interface/linux/drm_command_stream.h" -#include "runtime/os_interface/linux/drm_gem_close_worker.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" #include "test.h" #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/os_interface/linux/device_command_stream_fixture.h" diff --git a/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp index cc3dabb48d..81b0dd5358 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp @@ -6,8 +6,8 @@ */ #include "core/execution_environment/execution_environment.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/os_interface.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" #include "test.h" #include "unit_tests/mocks/linux/mock_drm_memory_manager.h" #include "unit_tests/mocks/mock_execution_environment.h" diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp index 0fb698bcb3..bdcb22c96b 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp @@ -19,6 +19,7 @@ #include "core/os_interface/linux/allocator_helper.h" #include "core/os_interface/linux/drm_allocation.h" #include "core/os_interface/linux/drm_buffer_object.h" +#include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/os_context_linux.h" #include "core/os_interface/os_context.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" @@ -30,7 +31,6 @@ #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" #include "runtime/os_interface/linux/drm_command_stream.h" -#include "runtime/os_interface/linux/drm_memory_manager.h" #include "test.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/linux/mock_drm_command_stream_receiver.h" diff --git a/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp b/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp index deb4e3a0c9..3411c280ff 100644 --- a/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp +++ b/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp @@ -8,9 +8,9 @@ #include "core/execution_environment/execution_environment.h" #include "core/os_interface/os_interface.h" #include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm_memory_manager.h" #include "core/unit_tests/helpers/ult_hw_config.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" -#include "runtime/os_interface/windows/wddm_memory_manager.h" namespace NEO { diff --git a/unit_tests/os_interface/windows/device_command_stream_tests.cpp b/unit_tests/os_interface/windows/device_command_stream_tests.cpp index 50abfa8b0f..113d45f838 100644 --- a/unit_tests/os_interface/windows/device_command_stream_tests.cpp +++ b/unit_tests/os_interface/windows/device_command_stream_tests.cpp @@ -11,8 +11,10 @@ #include "core/helpers/hw_cmds.h" #include "core/helpers/windows/gmm_callbacks.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/windows/os_context_win.h" #include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm_memory_manager.h" #include "core/os_interface/windows/wddm_memory_operations_handler.h" #include "core/os_interface/windows/wddm_residency_controller.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" @@ -23,9 +25,7 @@ #include "runtime/command_stream/device_command_stream.h" #include "runtime/helpers/built_ins_helper.h" #include "runtime/mem_obj/buffer.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/windows/wddm_device_command_stream.h" -#include "runtime/os_interface/windows/wddm_memory_manager.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/os_interface/windows/mock_wddm_memory_manager.h b/unit_tests/os_interface/windows/mock_wddm_memory_manager.h index d5495d7894..f2b989e18c 100644 --- a/unit_tests/os_interface/windows/mock_wddm_memory_manager.h +++ b/unit_tests/os_interface/windows/mock_wddm_memory_manager.h @@ -7,7 +7,7 @@ #pragma once #include "core/memory_manager/deferred_deleter.h" -#include "runtime/os_interface/windows/wddm_memory_manager.h" +#include "core/os_interface/windows/wddm_memory_manager.h" #include "unit_tests/mocks/mock_host_ptr_manager.h" #include "unit_tests/mocks/mock_memory_manager.h" diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp index ac2683830e..29a5a59903 100644 --- a/unit_tests/os_interface/windows/wddm20_tests.cpp +++ b/unit_tests/os_interface/windows/wddm20_tests.cpp @@ -17,9 +17,9 @@ #include "core/os_interface/windows/wddm/wddm_interface.h" #include "core/os_interface/windows/wddm_allocation.h" #include "core/os_interface/windows/wddm_engine_mapper.h" +#include "core/os_interface/windows/wddm_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" -#include "runtime/os_interface/windows/wddm_memory_manager.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/mocks/mock_gfx_partition.h" diff --git a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp index 8e8dc3f73c..612d8cfd26 100644 --- a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp @@ -9,10 +9,10 @@ #include "core/execution_environment/root_device_environment.h" #include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/memory_manager/memory_manager.h" #include "core/os_interface/windows/wddm/wddm.h" #include "core/os_interface/windows/wddm_allocation.h" #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/mock_gdi/mock_gdi.h" diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl b/unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl index eb4636ae06..ec22769130 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl +++ b/unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/wddm_memory_manager.h" +#include "core/os_interface/windows/wddm_memory_manager.h" #include "unit_tests/mocks/mock_memory_manager.h" #include "unit_tests/os_interface/windows/wddm_memory_manager_tests.h" diff --git a/unit_tests/ult_config_listener.cpp b/unit_tests/ult_config_listener.cpp index 3249a1eb69..206d3e0f60 100644 --- a/unit_tests/ult_config_listener.cpp +++ b/unit_tests/ult_config_listener.cpp @@ -8,9 +8,9 @@ #include "unit_tests/ult_config_listener.h" #include "core/execution_environment/execution_environment.h" +#include "core/memory_manager/memory_manager.h" #include "core/unit_tests/helpers/default_hw_info.h" #include "core/unit_tests/helpers/ult_hw_config.h" -#include "runtime/memory_manager/memory_manager.h" #include "runtime/platform/platform.h" void NEO::UltConfigListener::OnTestStart(const ::testing::TestInfo &testInfo) {