Skip to content

Commit b5e2f32

Browse files
HoppeMateuszCompute-Runtime-Automation
HoppeMateusz
authored and
Compute-Runtime-Automation
committed
Move files from runtime/memory_manager to core
- remove TbxMemoryManager Change-Id: I554feff51f08e108b2e9ee22ecaa2cb75a1eead7 Signed-off-by: Mateusz Hoppe <[email protected]>
1 parent 4d3dfa9 commit b5e2f32

File tree

62 files changed

+90
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+90
-120
lines changed

‎core/helpers/heap_helper.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2019 Intel Corporation
2+
* Copyright (C) 2019-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -9,7 +9,7 @@
99

1010
#include "core/indirect_heap/indirect_heap.h"
1111
#include "core/memory_manager/graphics_allocation.h"
12-
#include "runtime/memory_manager/internal_allocation_storage.h"
12+
#include "core/memory_manager/internal_allocation_storage.h"
1313
#include "runtime/memory_manager/memory_manager.h"
1414

1515
namespace NEO {

‎core/memory_manager/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@
66

77
set(NEO_CORE_MEMORY_MANAGER
88
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
9+
${CMAKE_CURRENT_SOURCE_DIR}/allocations_list.h
910
${CMAKE_CURRENT_SOURCE_DIR}/allocation_properties.h
1011
${CMAKE_CURRENT_SOURCE_DIR}/deferrable_allocation_deletion.h
1112
${CMAKE_CURRENT_SOURCE_DIR}/deferrable_allocation_deletion.cpp
1213
${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion.h
1314
${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter.cpp
1415
${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter.h
1516
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/engine_limits.h
17+
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/storage_info.cpp
18+
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/storage_info.h
1619
${CMAKE_CURRENT_SOURCE_DIR}/eviction_status.h
1720
${CMAKE_CURRENT_SOURCE_DIR}/gfx_partition.cpp
1821
${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}/gfx_partition_init_additional_range.cpp
@@ -23,6 +26,8 @@ set(NEO_CORE_MEMORY_MANAGER
2326
${CMAKE_CURRENT_SOURCE_DIR}/host_ptr_defines.h
2427
${CMAKE_CURRENT_SOURCE_DIR}/host_ptr_manager.cpp
2528
${CMAKE_CURRENT_SOURCE_DIR}/host_ptr_manager.h
29+
${CMAKE_CURRENT_SOURCE_DIR}/internal_allocation_storage.cpp
30+
${CMAKE_CURRENT_SOURCE_DIR}/internal_allocation_storage.h
2631
${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.cpp
2732
${CMAKE_CURRENT_SOURCE_DIR}/local_memory_usage.h
2833
${CMAKE_CURRENT_SOURCE_DIR}/memory_constants.h

runtime/memory_manager/allocations_list.h renamed to core/memory_manager/allocations_list.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2019 Intel Corporation
2+
* Copyright (C) 2018-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*

runtime/memory_manager/definitions/storage_info.cpp renamed to core/memory_manager/definitions/storage_info.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2019 Intel Corporation
2+
* Copyright (C) 2019-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*

runtime/memory_manager/definitions/storage_info.h renamed to core/memory_manager/definitions/storage_info.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2019 Intel Corporation
2+
* Copyright (C) 2019-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*

runtime/memory_manager/internal_allocation_storage.cpp renamed to core/memory_manager/internal_allocation_storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*/
77

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

1010
#include "core/memory_manager/host_ptr_manager.h"
1111
#include "core/os_interface/os_context.h"

runtime/memory_manager/internal_allocation_storage.h renamed to core/memory_manager/internal_allocation_storage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
2-
* Copyright (C) 2018-2019 Intel Corporation
2+
* Copyright (C) 2018-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

88
#pragma once
9-
#include "runtime/memory_manager/allocations_list.h"
9+
#include "core/memory_manager/allocations_list.h"
1010

1111
namespace NEO {
1212
class CommandStreamReceiver;

‎runtime/command_queue/command_queue.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "core/helpers/options.h"
1313
#include "core/helpers/ptr_math.h"
1414
#include "core/helpers/string.h"
15+
#include "core/memory_manager/internal_allocation_storage.h"
1516
#include "core/os_interface/os_context.h"
1617
#include "core/utilities/api_intercept.h"
1718
#include "runtime/built_ins/builtins_dispatch_builder.h"
@@ -31,7 +32,6 @@
3132
#include "runtime/helpers/timestamp_packet.h"
3233
#include "runtime/mem_obj/buffer.h"
3334
#include "runtime/mem_obj/image.h"
34-
#include "runtime/memory_manager/internal_allocation_storage.h"
3535
#include "runtime/utilities/tag_allocator.h"
3636

3737
#include "CL/cl_ext.h"

‎runtime/command_queue/enqueue_common.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#pragma once
99
#include "core/helpers/engine_node_helper.h"
1010
#include "core/helpers/options.h"
11+
#include "core/memory_manager/internal_allocation_storage.h"
1112
#include "core/os_interface/os_context.h"
1213
#include "core/program/sync_buffer_handler.h"
1314
#include "core/utilities/range.h"
@@ -28,7 +29,6 @@
2829
#include "runtime/helpers/task_information.h"
2930
#include "runtime/mem_obj/buffer.h"
3031
#include "runtime/mem_obj/image.h"
31-
#include "runtime/memory_manager/internal_allocation_storage.h"
3232
#include "runtime/memory_manager/memory_manager.h"
3333
#include "runtime/memory_manager/surface.h"
3434
#include "runtime/program/block_kernel_manager.h"

‎runtime/command_queue/enqueue_fill_buffer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/*
2-
* Copyright (C) 2017-2019 Intel Corporation
2+
* Copyright (C) 2017-2020 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

88
#pragma once
9+
#include "core/memory_manager/internal_allocation_storage.h"
910
#include "runtime/built_ins/built_ins.h"
1011
#include "runtime/command_queue/command_queue_hw.h"
1112
#include "runtime/command_stream/command_stream_receiver.h"
1213
#include "runtime/helpers/hardware_commands_helper.h"
1314
#include "runtime/mem_obj/buffer.h"
14-
#include "runtime/memory_manager/internal_allocation_storage.h"
1515
#include "runtime/memory_manager/memory_manager.h"
1616
#include "runtime/memory_manager/surface.h"
1717

0 commit comments

Comments
 (0)