Move files from runtime/memory_manager to core

- remove TbxMemoryManager Change-Id: I554feff51f08e108b2e9ee22ecaa2cb75a1eead7 Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
2026-01-08 14:02:58 +08:00 · 2020-01-21 11:00:03 +01:00
parent 4d3dfa9514
commit b5e2f322f6
62 changed files with 90 additions and 120 deletions
--- a/core/helpers/heap_helper.cpp
+++ b/core/helpers/heap_helper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -9,7 +9,7 @@

 #include "core/indirect_heap/indirect_heap.h"
 #include "core/memory_manager/graphics_allocation.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"

 namespace NEO {
--- a/core/memory_manager/CMakeLists.txt
+++ b/core/memory_manager/CMakeLists.txt
@@ -6,6 +6,7 @@

 set(NEO_CORE_MEMORY_MANAGER
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/allocations_list.h
  ${CMAKE_CURRENT_SOURCE_DIR}/allocation_properties.h
  ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_allocation_deletion.h
  ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_allocation_deletion.cpp
@@ -13,6 +14,8 @@ set(NEO_CORE_MEMORY_MANAGER
  ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter.h
  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/engine_limits.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/storage_info.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/storage_info.h
  ${CMAKE_CURRENT_SOURCE_DIR}/eviction_status.h
  ${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/gfx_partition_init_additional_range.cpp
@@ -23,6 +26,8 @@ set(NEO_CORE_MEMORY_MANAGER
  ${CMAKE_CURRENT_SOURCE_DIR}/host_ptr_defines.h
  ${CMAKE_CURRENT_SOURCE_DIR}/host_ptr_manager.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/host_ptr_manager.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/internal_allocation_storage.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/internal_allocation_storage.h
  ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.h
  ${CMAKE_CURRENT_SOURCE_DIR}/memory_constants.h
--- a/runtime/memory_manager/allocations_list.h
+++ b/runtime/memory_manager/allocations_list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/runtime/memory_manager/definitions/storage_info.cpp
+++ b/runtime/memory_manager/definitions/storage_info.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/runtime/memory_manager/definitions/storage_info.h
+++ b/runtime/memory_manager/definitions/storage_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/runtime/memory_manager/internal_allocation_storage.cpp
+++ b/runtime/memory_manager/internal_allocation_storage.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "runtime/memory_manager/internal_allocation_storage.h"
+#include "core/memory_manager/internal_allocation_storage.h"

 #include "core/memory_manager/host_ptr_manager.h"
 #include "core/os_interface/os_context.h"
--- a/runtime/memory_manager/internal_allocation_storage.h
+++ b/runtime/memory_manager/internal_allocation_storage.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/allocations_list.h"
+#include "core/memory_manager/allocations_list.h"

 namespace NEO {
 class CommandStreamReceiver;
--- a/runtime/command_queue/command_queue.cpp
+++ b/runtime/command_queue/command_queue.cpp
@@ -12,6 +12,7 @@
 #include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/utilities/api_intercept.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
@@ -31,7 +32,6 @@
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/utilities/tag_allocator.h"

 #include "CL/cl_ext.h"
--- a/runtime/command_queue/enqueue_common.h
+++ b/runtime/command_queue/enqueue_common.h
@@ -8,6 +8,7 @@
 #pragma once
 #include "core/helpers/engine_node_helper.h"
 #include "core/helpers/options.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/program/sync_buffer_handler.h"
 #include "core/utilities/range.h"
@@ -28,7 +29,6 @@
 #include "runtime/helpers/task_information.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/program/block_kernel_manager.h"
--- a/runtime/command_queue/enqueue_fill_buffer.h
+++ b/runtime/command_queue/enqueue_fill_buffer.h
@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #pragma once
+#include "core/memory_manager/internal_allocation_storage.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/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/surface.h"

--- a/runtime/command_queue/hardware_interface_base.inl
+++ b/runtime/command_queue/hardware_interface_base.inl
@@ -1,16 +1,16 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #pragma once
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/hardware_interface.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/task_information.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"

 namespace NEO {

--- a/runtime/command_stream/command_stream_receiver.cpp
+++ b/runtime/command_stream/command_stream_receiver.cpp
@@ -12,20 +12,18 @@
 #include "core/helpers/cache_policy.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/string.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/utilities/cpuintrinsics.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_stream/experimental_command_buffer.h"
 #include "runtime/command_stream/scratch_space_controller.h"
-#include "runtime/context/context.h"
 #include "runtime/device/device.h"
 #include "runtime/event/event.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/array_count.h"
 #include "runtime/helpers/flush_stamp.h"
 #include "runtime/helpers/timestamp_packet.h"
-#include "runtime/mem_obj/buffer.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/os_interface/os_interface.h"
--- a/runtime/command_stream/command_stream_receiver_hw_base.inl
+++ b/runtime/command_stream/command_stream_receiver_hw_base.inl
@@ -17,6 +17,7 @@
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/state_base_address.h"
 #include "core/indirect_heap/indirect_heap.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
@@ -30,7 +31,6 @@
 #include "runtime/helpers/flush_stamp.h"
 #include "runtime/helpers/state_compute_mode_helper.h"
 #include "runtime/helpers/timestamp_packet.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/utilities/tag_allocator.h"

--- a/runtime/command_stream/experimental_command_buffer.cpp
+++ b/runtime/command_stream/experimental_command_buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,9 +8,9 @@
 #include "runtime/command_stream/experimental_command_buffer.h"

 #include "core/command_stream/linear_stream.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/memory_manager/memory_constants.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"

 #include <cstring>
--- a/runtime/command_stream/scratch_space_controller.cpp
+++ b/runtime/command_stream/scratch_space_controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -9,8 +9,8 @@

 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/graphics_allocation.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"

 namespace NEO {
--- a/runtime/command_stream/scratch_space_controller_base.cpp
+++ b/runtime/command_stream/scratch_space_controller_base.cpp
@@ -11,10 +11,10 @@
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/preamble.h"
 #include "core/memory_manager/graphics_allocation.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"

 namespace NEO {
--- a/runtime/command_stream/tbx_command_stream_receiver_hw.h
+++ b/runtime/command_stream/tbx_command_stream_receiver_hw.h
@@ -21,14 +21,6 @@ namespace NEO {
 class AubSubCaptureManager;
 class TbxStream;

-class TbxMemoryManager : public OsAgnosticMemoryManager {
-  public:
-    TbxMemoryManager(ExecutionEnvironment &executionEnvironment) : OsAgnosticMemoryManager(executionEnvironment) {}
-    uint64_t getSystemSharedMemory(uint32_t rootDeviceIndex) override {
-        return 1 * GB;
-    }
-};
-
 template <typename GfxFamily>
 class TbxCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFamily> {
  protected:
@@ -70,8 +62,8 @@ class TbxCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw<GfxFa

    void initializeEngine();

-    TbxMemoryManager *getMemoryManager() {
-        return (TbxMemoryManager *)CommandStreamReceiver::getMemoryManager();
+    MemoryManager *getMemoryManager() {
+        return CommandStreamReceiver::getMemoryManager();
    }

    TbxStream tbxStream;
--- a/runtime/event/event.cpp
+++ b/runtime/event/event.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,6 +8,7 @@
 #include "runtime/event/event.h"

 #include "core/helpers/aligned_memory.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/utilities/range.h"
 #include "core/utilities/stackvec.h"
 #include "public/cl_ext_private.h"
@@ -22,7 +23,6 @@
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/mem_obj.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/platform/platform.h"
 #include "runtime/utilities/tag_allocator.h"

--- a/runtime/execution_environment/execution_environment.cpp
+++ b/runtime/execution_environment/execution_environment.cpp
@@ -12,10 +12,8 @@
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_helper.h"
 #include "runtime/built_ins/built_ins.h"
-#include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
 #include "runtime/compiler_interface/default_cl_cache_config.h"
-#include "runtime/helpers/device_helpers.h"
-#include "runtime/memory_manager/memory_manager.h"
+#include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/source_level_debugger/source_level_debugger.h"

 namespace NEO {
@@ -53,8 +51,6 @@ void ExecutionEnvironment::initializeMemoryManager() {
    switch (setCommandStreamReceiverType) {
    case CommandStreamReceiverType::CSR_TBX:
    case CommandStreamReceiverType::CSR_TBX_WITH_AUB:
-        memoryManager = std::make_unique<TbxMemoryManager>(*this);
-        break;
    case CommandStreamReceiverType::CSR_AUB:
        memoryManager = std::make_unique<OsAgnosticMemoryManager>(*this);
        break;
--- a/runtime/helpers/task_information.cpp
+++ b/runtime/helpers/task_information.cpp
@@ -12,6 +12,7 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/engine_node_helper.h"
 #include "core/helpers/string.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_queue/enqueue_common.h"
@@ -23,7 +24,6 @@
 #include "runtime/helpers/enqueue_properties.h"
 #include "runtime/helpers/task_information.inl"
 #include "runtime/mem_obj/mem_obj.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/surface.h"

 namespace NEO {
--- a/runtime/mem_obj/mem_obj.cpp
+++ b/runtime/mem_obj/mem_obj.cpp
@@ -12,13 +12,13 @@
 #include "core/gmm_helper/resource_info.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/memory_manager/deferred_deleter.h"
+#include "core/memory_manager/internal_allocation_storage.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/device.h"
 #include "runtime/helpers/get_info.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"

 #include <algorithm>
--- a/runtime/memory_manager/CMakeLists.txt
+++ b/runtime/memory_manager/CMakeLists.txt
@@ -8,12 +8,7 @@ set(RUNTIME_SRCS_MEMORY_MANAGER
  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
  ${CMAKE_CURRENT_SOURCE_DIR}/address_mapper.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/address_mapper.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/allocations_list.h
  ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_memory_sync.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/storage_info.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/storage_info.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/internal_allocation_storage.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/internal_allocation_storage.h
  ${CMAKE_CURRENT_SOURCE_DIR}/memory_banks.h
  ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/memory_manager.h
--- a/runtime/memory_manager/memory_manager.cpp
+++ b/runtime/memory_manager/memory_manager.cpp
@@ -23,10 +23,10 @@
 #include "core/memory_manager/deferrable_allocation_deletion.h"
 #include "core/memory_manager/deferred_deleter.h"
 #include "core/memory_manager/host_ptr_manager.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/utilities/stackvec.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/os_interface/os_interface.h"

 #include <algorithm>
--- a/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp
+++ b/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,7 +7,7 @@

 #include "unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h"

-#include "runtime/memory_manager/allocations_list.h"
+#include "core/memory_manager/allocations_list.h"
 #include "test.h"

 using namespace NEO;
--- a/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h
+++ b/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h
@@ -6,13 +6,13 @@
 */

 #pragma once
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/aub_mem_dump/page_table_entry_bits.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_banks.h"
 #include "unit_tests/command_stream/command_stream_fixture.h"
 #include "unit_tests/mocks/mock_allocation_properties.h"
--- a/unit_tests/aub_tests/fixtures/aub_fixture.cpp
+++ b/unit_tests/aub_tests/fixtures/aub_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,7 +8,7 @@
 #include "unit_tests/aub_tests/fixtures/aub_fixture.h"

 #include "core/memory_manager/graphics_allocation.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"

 namespace NEO {
--- a/unit_tests/command_queue/command_queue_tests.cpp
+++ b/unit_tests/command_queue/command_queue_tests.cpp
@@ -7,13 +7,13 @@

 #include "core/helpers/basic_math.h"
 #include "core/helpers/options.h"
+#include "core/memory_manager/internal_allocation_storage.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/helpers/timestamp_packet.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
--- a/unit_tests/command_queue/dispatch_walker_tests.cpp
+++ b/unit_tests/command_queue/dispatch_walker_tests.cpp
@@ -6,6 +6,7 @@
 */

 #include "core/helpers/aligned_memory.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/built_ins/aux_translation_builtin.h"
 #include "runtime/command_queue/gpgpu_walker.h"
@@ -13,7 +14,6 @@
 #include "runtime/event/perf_counter.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/task_information.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
--- a/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp
+++ b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp
@@ -7,13 +7,13 @@

 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
+#include "core/memory_manager/allocations_list.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/allocations_list.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "test.h"
 #include "unit_tests/command_queue/enqueue_fill_buffer_fixture.h"
--- a/unit_tests/command_queue/enqueue_kernel_2_tests.cpp
+++ b/unit_tests/command_queue/enqueue_kernel_2_tests.cpp
@@ -6,10 +6,10 @@
 */

 #include "core/helpers/hw_helper.h"
+#include "core/memory_manager/allocations_list.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
 #include "runtime/command_stream/scratch_space_controller.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/fixtures/hello_world_fixture.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"
--- a/unit_tests/command_queue/enqueue_read_buffer_tests.cpp
+++ b/unit_tests/command_queue/enqueue_read_buffer_tests.cpp
@@ -7,11 +7,11 @@

 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/cache_policy.h"
+#include "core/memory_manager/allocations_list.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "test.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/command_queue/enqueue_read_buffer_fixture.h"
--- a/unit_tests/command_queue/enqueue_read_image_tests.cpp
+++ b/unit_tests/command_queue/enqueue_read_image_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/memory_manager/allocations_list.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "test.h"
 #include "unit_tests/command_queue/enqueue_read_image_fixture.h"
 #include "unit_tests/gen_common/gen_commands_common_validation.h"
--- a/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp
+++ b/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/memory_manager/allocations_list.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
--- a/unit_tests/command_queue/enqueue_svm_tests.cpp
+++ b/unit_tests/command_queue/enqueue_svm_tests.cpp
@@ -7,13 +7,13 @@

 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/aligned_memory.h"
+#include "core/memory_manager/allocations_list.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/event/user_event.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "runtime/memory_manager/surface.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
--- a/unit_tests/command_queue/enqueue_write_buffer_tests.cpp
+++ b/unit_tests/command_queue/enqueue_write_buffer_tests.cpp
@@ -5,11 +5,11 @@
 *
 */

+#include "core/memory_manager/allocations_list.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "test.h"
 #include "unit_tests/command_queue/buffer_operations_fixture.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
--- a/unit_tests/command_queue/enqueue_write_image_tests.cpp
+++ b/unit_tests/command_queue/enqueue_write_image_tests.cpp
@@ -5,8 +5,8 @@
 *
 */

+#include "core/memory_manager/allocations_list.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "test.h"
 #include "unit_tests/command_queue/enqueue_write_image_fixture.h"
--- a/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp
+++ b/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp
@@ -8,12 +8,12 @@
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/state_base_address.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/csr_definitions.h"
 #include "runtime/command_stream/scratch_space_controller.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "test.h"
 #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h"
 #include "unit_tests/helpers/dispatch_flags_helper.h"
--- 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
@@ -5,10 +5,10 @@
 *
 */

+#include "core/memory_manager/internal_allocation_storage.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/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
--- a/unit_tests/command_stream/command_stream_receiver_tests.cpp
+++ b/unit_tests/command_stream/command_stream_receiver_tests.cpp
@@ -11,12 +11,12 @@
 #include "core/helpers/cache_policy.h"
 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/graphics_allocation.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_stream/scratch_space_controller.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/buffer.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/platform/platform.h"
--- a/unit_tests/command_stream/experimental_command_buffer_tests.cpp
+++ b/unit_tests/command_stream/experimental_command_buffer_tests.cpp
@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "test.h"
 #include "unit_tests/fixtures/multi_root_device_fixture.h"
--- a/unit_tests/command_stream/tbx_command_stream_fixture.cpp
+++ b/unit_tests/command_stream/tbx_command_stream_fixture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -21,12 +21,12 @@ void TbxCommandStreamFixture::SetUp(MockDevice *pDevice) {
    // Create our TBX command stream receiver based on HW type
    pCommandStreamReceiver = TbxCommandStreamReceiver::create("", false, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex());
    ASSERT_NE(nullptr, pCommandStreamReceiver);
-    mmTbx = new TbxMemoryManager(*pDevice->executionEnvironment);
+    memoryManager = new OsAgnosticMemoryManager(*pDevice->executionEnvironment);
    pDevice->resetCommandStreamReceiver(pCommandStreamReceiver);
 }

 void TbxCommandStreamFixture::TearDown() {
-    delete mmTbx;
+    delete memoryManager;
    CommandStreamFixture::TearDown();
 }
 } // namespace NEO
--- a/unit_tests/command_stream/tbx_command_stream_fixture.h
+++ b/unit_tests/command_stream/tbx_command_stream_fixture.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -23,6 +23,6 @@ class TbxCommandStreamFixture : public CommandStreamFixture {

    CommandStreamReceiver *pCommandStreamReceiver = nullptr;

-    MemoryManager *mmTbx;
+    MemoryManager *memoryManager;
 };
 } // namespace NEO
--- a/unit_tests/command_stream/tbx_command_stream_tests.cpp
+++ b/unit_tests/command_stream/tbx_command_stream_tests.cpp
@@ -84,24 +84,14 @@ struct MockTbxCsrToTestDumpTbxNonWritable : public TbxCommandStreamReceiverHw<Gf
    }
 };

-TEST_F(TbxCommandStreamTests, DISABLED_testFactory) {
-}
-
-HWTEST_F(TbxCommandStreamTests, DISABLED_testTbxMemoryManager) {
-    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = (TbxCommandStreamReceiverHw<FamilyType> *)pCommandStreamReceiver;
-    TbxMemoryManager *getMM = tbxCsr->getMemoryManager();
-    EXPECT_NE(nullptr, getMM);
-    EXPECT_EQ(1 * GB, getMM->getSystemSharedMemory(0u));
-}
-
 TEST_F(TbxCommandStreamTests, DISABLED_makeResident) {
    uint8_t buffer[0x10000];
    size_t size = sizeof(buffer);

-    GraphicsAllocation *graphicsAllocation = mmTbx->allocateGraphicsMemoryWithProperties(MockAllocationProperties{false, size}, buffer);
+    GraphicsAllocation *graphicsAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{false, size}, buffer);
    pCommandStreamReceiver->makeResident(*graphicsAllocation);
    pCommandStreamReceiver->makeNonResident(*graphicsAllocation);
-    mmTbx->freeGraphicsMemory(graphicsAllocation);
+    memoryManager->freeGraphicsMemory(graphicsAllocation);
 }

 TEST_F(TbxCommandStreamTests, DISABLED_makeResidentOnZeroSizedBufferShouldDoNothing) {
@@ -177,7 +167,7 @@ TEST(TbxCommandStreamReceiverTest, givenTbxCommandStreamReceiverWhenTypeIsChecke

 HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenMakeResidentIsCalledForGraphicsAllocationThenItShouldPushAllocationForResidencyToCsr) {
    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = (TbxCommandStreamReceiverHw<FamilyType> *)pCommandStreamReceiver;
-    TbxMemoryManager *memoryManager = tbxCsr->getMemoryManager();
+    MemoryManager *memoryManager = tbxCsr->getMemoryManager();
    ASSERT_NE(nullptr, memoryManager);

    auto graphicsAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -206,7 +196,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenItIsCreatedWith

 HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenMakeResidentHasAlreadyBeenCalledForGraphicsAllocationThenItShouldNotPushAllocationForResidencyAgainToCsr) {
    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = (TbxCommandStreamReceiverHw<FamilyType> *)pCommandStreamReceiver;
-    TbxMemoryManager *memoryManager = tbxCsr->getMemoryManager();
+    MemoryManager *memoryManager = tbxCsr->getMemoryManager();
    ASSERT_NE(nullptr, memoryManager);

    auto graphicsAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -227,7 +217,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenMakeResidentHas

 HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenWriteMemoryIsCalledForGraphicsAllocationWithNonZeroSizeThenItShouldReturnTrue) {
    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = (TbxCommandStreamReceiverHw<FamilyType> *)pCommandStreamReceiver;
-    TbxMemoryManager *memoryManager = tbxCsr->getMemoryManager();
+    MemoryManager *memoryManager = tbxCsr->getMemoryManager();
    ASSERT_NE(nullptr, memoryManager);

    auto graphicsAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -240,7 +230,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenWriteMemoryIsCa

 HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenWriteMemoryIsCalledWithGraphicsAllocationThatIsOnlyOneTimeWriteableThenGraphicsAllocationIsUpdated) {
    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = (TbxCommandStreamReceiverHw<FamilyType> *)pCommandStreamReceiver;
-    TbxMemoryManager *memoryManager = tbxCsr->getMemoryManager();
+    MemoryManager *memoryManager = tbxCsr->getMemoryManager();
    ASSERT_NE(nullptr, memoryManager);

    auto graphicsAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize, GraphicsAllocation::AllocationType::BUFFER});
@@ -255,7 +245,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenWriteMemoryIsCa

 HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenWriteMemoryIsCalledWithGraphicsAllocationThatIsOnlyOneTimeWriteableButAlreadyWrittenThenGraphicsAllocationIsNotUpdated) {
    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = (TbxCommandStreamReceiverHw<FamilyType> *)pCommandStreamReceiver;
-    TbxMemoryManager *memoryManager = tbxCsr->getMemoryManager();
+    MemoryManager *memoryManager = tbxCsr->getMemoryManager();
    ASSERT_NE(nullptr, memoryManager);

    auto graphicsAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize, GraphicsAllocation::AllocationType::BUFFER});
@@ -277,7 +267,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenWriteMemoryIsCa

 HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenProcessResidencyIsCalledWithoutAllocationsForResidencyThenItShouldProcessAllocationsFromMemoryManager) {
    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = (TbxCommandStreamReceiverHw<FamilyType> *)pCommandStreamReceiver;
-    TbxMemoryManager *memoryManager = tbxCsr->getMemoryManager();
+    MemoryManager *memoryManager = tbxCsr->getMemoryManager();
    ASSERT_NE(nullptr, memoryManager);

    auto graphicsAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -296,7 +286,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenProcessResidenc

 HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenProcessResidencyIsCalledWithAllocationsForResidencyThenItShouldProcessGivenAllocations) {
    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = (TbxCommandStreamReceiverHw<FamilyType> *)pCommandStreamReceiver;
-    TbxMemoryManager *memoryManager = tbxCsr->getMemoryManager();
+    MemoryManager *memoryManager = tbxCsr->getMemoryManager();
    ASSERT_NE(nullptr, memoryManager);

    auto graphicsAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -315,7 +305,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenProcessResidenc

 HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenFlushIsCalledThenItShouldProcessAllocationsForResidency) {
    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = (TbxCommandStreamReceiverHw<FamilyType> *)pCommandStreamReceiver;
-    TbxMemoryManager *memoryManager = tbxCsr->getMemoryManager();
+    MemoryManager *memoryManager = tbxCsr->getMemoryManager();
    ASSERT_NE(nullptr, memoryManager);

    auto graphicsAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -342,7 +332,7 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenFlushIsCalledTh

 HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenFlushIsCalledThenItMakesCommandBufferAllocationsProperlyResident) {
    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = (TbxCommandStreamReceiverHw<FamilyType> *)pCommandStreamReceiver;
-    TbxMemoryManager *memoryManager = tbxCsr->getMemoryManager();
+    MemoryManager *memoryManager = tbxCsr->getMemoryManager();
    ASSERT_NE(nullptr, memoryManager);

    GraphicsAllocation *commandBuffer = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -366,12 +356,6 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCommandStreamReceiverWhenFlushIsCalledTh
    memoryManager->freeGraphicsMemory(commandBuffer);
 }

-TEST(TbxMemoryManagerTest, givenTbxMemoryManagerWhenItIsQueriedForSystemSharedMemoryThen1GBIsReturned) {
-    MockExecutionEnvironment executionEnvironment(*platformDevices);
-    TbxMemoryManager memoryManager(executionEnvironment);
-    EXPECT_EQ(1 * GB, memoryManager.getSystemSharedMemory(0u));
-}
-
 HWTEST_F(TbxCommandStreamTests, givenNoDbgDeviceIdFlagWhenTbxCsrIsCreatedThenUseDefaultDeviceId) {
    const HardwareInfo &hwInfo = *platformDevices[0];
    TbxCommandStreamReceiverHw<FamilyType> *tbxCsr = reinterpret_cast<TbxCommandStreamReceiverHw<FamilyType> *>(pCommandStreamReceiver);
--- a/unit_tests/event/event_builder_tests.cpp
+++ b/unit_tests/event/event_builder_tests.cpp
@@ -5,11 +5,11 @@
 *
 */

+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/utilities/arrayref.h"
 #include "runtime/event/event_builder.h"
 #include "runtime/event/user_event.h"
 #include "runtime/helpers/task_information.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "unit_tests/mocks/mock_command_queue.h"
 #include "unit_tests/mocks/mock_context.h"
 #include "unit_tests/mocks/mock_csr.h"
--- a/unit_tests/event/event_tests.cpp
+++ b/unit_tests/event/event_tests.cpp
@@ -6,12 +6,12 @@
 */

 #include "core/helpers/hw_info.h"
+#include "core/memory_manager/internal_allocation_storage.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/perf_counter.h"
 #include "runtime/helpers/task_information.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/utilities/tag_allocator.h"
--- a/unit_tests/event/user_events_tests.cpp
+++ b/unit_tests/event/user_events_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/mocks/mock_event.h"
--- a/unit_tests/fixtures/buffer_enqueue_fixture.h
+++ b/unit_tests/fixtures/buffer_enqueue_fixture.h
@@ -7,7 +7,7 @@

 #pragma once
 #include "core/helpers/hw_info.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "test.h"
 #include "unit_tests/fixtures/buffer_fixture.h"
 #include "unit_tests/helpers/execution_environment_helper.h"
--- a/unit_tests/helpers/task_information_tests.cpp
+++ b/unit_tests/helpers/task_information_tests.cpp
@@ -5,9 +5,9 @@
 *
 */

+#include "core/memory_manager/internal_allocation_storage.h"
 #include "runtime/event/user_event.h"
 #include "runtime/helpers/task_information.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/fixtures/dispatch_flags_fixture.h"
--- a/unit_tests/kernel/kernel_tests.cpp
+++ b/unit_tests/kernel/kernel_tests.cpp
@@ -9,6 +9,7 @@
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/options.h"
+#include "core/memory_manager/allocations_list.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
@@ -21,7 +22,6 @@
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/image.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
--- a/unit_tests/kernel/substitute_kernel_heap_tests.cpp
+++ b/unit_tests/kernel/substitute_kernel_heap_tests.cpp
@@ -5,8 +5,8 @@
 *
 */

+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/mocks/mock_kernel.h"
--- a/unit_tests/mem_obj/buffer_tests.cpp
+++ b/unit_tests/mem_obj/buffer_tests.cpp
@@ -10,6 +10,7 @@
 #include "core/gmm_helper/resource_info.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/options.h"
+#include "core/memory_manager/allocations_list.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
@@ -21,7 +22,6 @@
 #include "runtime/helpers/array_count.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/mem_obj/buffer.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
--- a/unit_tests/mem_obj/mem_obj_destruction_tests.cpp
+++ b/unit_tests/mem_obj/mem_obj_destruction_tests.cpp
@@ -5,10 +5,10 @@
 *
 */

+#include "core/memory_manager/allocations_list.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/mem_obj/mem_obj.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
--- a/unit_tests/mem_obj/mem_obj_tests.cpp
+++ b/unit_tests/mem_obj/mem_obj_tests.cpp
@@ -6,13 +6,13 @@
 */

 #include "core/gmm_helper/gmm.h"
+#include "core/memory_manager/allocations_list.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/helpers/properties_helper.h"
 #include "runtime/mem_obj/mem_obj.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/fixtures/multi_root_device_fixture.h"
 #include "unit_tests/mocks/mock_context.h"
--- a/unit_tests/memory_manager/internal_allocation_storage_tests.cpp
+++ b/unit_tests/memory_manager/internal_allocation_storage_tests.cpp
@@ -5,10 +5,10 @@
 *
 */

+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/containers_tests_helpers.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "test.h"
 #include "unit_tests/fixtures/memory_allocator_fixture.h"
 #include "unit_tests/mocks/mock_allocation_properties.h"
--- a/unit_tests/memory_manager/memory_manager_multi_device_tests.cpp
+++ b/unit_tests/memory_manager/memory_manager_multi_device_tests.cpp
@@ -5,11 +5,11 @@
 *
 */

+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
--- a/unit_tests/memory_manager/memory_manager_tests.cpp
+++ b/unit_tests/memory_manager/memory_manager_tests.cpp
@@ -9,6 +9,7 @@
 #include "core/gmm_helper/page_table_mngr.h"
 #include "core/helpers/cache_policy.h"
 #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/residency.h"
 #include "core/os_interface/os_context.h"
@@ -18,7 +19,6 @@
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/printf_handler.h"
--- a/unit_tests/mocks/mock_internal_allocation_storage.h
+++ b/unit_tests/mocks/mock_internal_allocation_storage.h
@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #pragma once
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"

 namespace NEO {
 class MockInternalAllocationStorage : public InternalAllocationStorage {
--- a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp
+++ b/unit_tests/os_interface/linux/drm_command_stream_tests.cpp
@@ -10,13 +10,13 @@
 #include "core/gmm_helper/page_table_mngr.h"
 #include "core/gmm_helper/resource_info.h"
 #include "core/memory_manager/graphics_allocation.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/memory_manager/residency.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/helpers/flush_stamp.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/mem_obj/buffer.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/os_interface/linux/drm_buffer_object.h"
 #include "runtime/os_interface/linux/drm_command_stream.h"
 #include "runtime/os_interface/linux/os_context_linux.h"
--- a/unit_tests/os_interface/windows/device_command_stream_tests.cpp
+++ b/unit_tests/os_interface/windows/device_command_stream_tests.cpp
@@ -10,6 +10,7 @@
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/options.h"
 #include "core/helpers/windows/gmm_callbacks.h"
+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
@@ -19,7 +20,6 @@
 #include "runtime/helpers/built_ins_helper.h"
 #include "runtime/helpers/flush_stamp.h"
 #include "runtime/mem_obj/buffer.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/os_interface.h"
--- a/unit_tests/program/program_data_tests.cpp
+++ b/unit_tests/program/program_data_tests.cpp
@@ -6,10 +6,10 @@
 */

 #include "core/helpers/string.h"
+#include "core/memory_manager/allocations_list.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "core/unit_tests/compiler_interface/linker_mock.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/program.h"
 #include "test.h"
--- a/unit_tests/program/program_tests.cpp
+++ b/unit_tests/program/program_tests.cpp
@@ -14,6 +14,7 @@
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
+#include "core/memory_manager/allocations_list.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
@@ -22,7 +23,6 @@
 #include "runtime/compiler_interface/patchtokens_decoder.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/kernel/kernel.h"
-#include "runtime/memory_manager/allocations_list.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/program/create.inl"
 #include "test.h"
--- a/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp
+++ b/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp
@@ -5,8 +5,8 @@
 *
 */

+#include "core/memory_manager/internal_allocation_storage.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/wddm_device_command_stream.h"
 #include "test.h"