Move memory_manager to core folder

Change-Id: I8d84d6982fea3cd785f1e15af0ee7fa361258a23

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 {
 

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)

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)

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 {

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);

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 {
 

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

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 {
 

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) {

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 {

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;
 

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){};

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"

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 <vector>
 

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 {
 

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

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 <sstream>
 

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"
 

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 <atomic>
 #include <iostream>

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
  *

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"

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"
 

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) {

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

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"

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 <d3dkmthk.h>
 

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) {

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 {
 

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 {
 

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 <atomic>
 #include <cstdint>

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"
 

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 <new>
 

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 {

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"
 

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"
 

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 <cstring>
 #include <type_traits>

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"

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"

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] = {};

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 <typename GfxFamily>

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> MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) {

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> MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) {

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"

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 {
 

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 {
 

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"

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 {
 

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"

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 <algorithm>
 

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"

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 {
 

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

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() {

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;

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

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"
 

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 <cstdlib>
 #include <cstring>

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)

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 {
 

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 <cstdint>

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 {
 

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"
 

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"

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 {

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"
 

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;
 

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"
 

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"
 

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"
 

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 {
 

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,

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 {
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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 {

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"

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 {
 

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"
 

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"

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"

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"

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"

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 {