diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-05-03 20:47:16 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:51:50 +0000 |
commit | 3d1489de593574e65ef1e64a7ae64e4e56c2978b (patch) | |
tree | f87f3df521cb5ed8bd383dad89cbeb92c49670ac /src/graph/backends/NEON | |
parent | 54d6fae4dbb4f556cc5ec484c51681ad84c015a7 (diff) | |
download | ComputeLibrary-3d1489de593574e65ef1e64a7ae64e4e56c2978b.tar.gz |
COMPMID-605: Transition buffer memory manager
Change-Id: Ide7c6124eb19f13f15f517e62d705646a0cd1ecd
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/130184
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/graph/backends/NEON')
-rw-r--r-- | src/graph/backends/NEON/NEDeviceBackend.cpp | 12 | ||||
-rw-r--r-- | src/graph/backends/NEON/NESubTensorHandle.cpp | 35 | ||||
-rw-r--r-- | src/graph/backends/NEON/NETensorHandle.cpp | 35 |
3 files changed, 70 insertions, 12 deletions
diff --git a/src/graph/backends/NEON/NEDeviceBackend.cpp b/src/graph/backends/NEON/NEDeviceBackend.cpp index def6c39003..7c2db40260 100644 --- a/src/graph/backends/NEON/NEDeviceBackend.cpp +++ b/src/graph/backends/NEON/NEDeviceBackend.cpp @@ -37,6 +37,7 @@ #include "arm_compute/core/TensorInfo.h" #include "arm_compute/runtime/Allocator.h" #include "arm_compute/runtime/BlobLifetimeManager.h" +#include "arm_compute/runtime/MemoryGroup.h" #include "arm_compute/runtime/MemoryManagerOnDemand.h" #include "arm_compute/runtime/OffsetLifetimeManager.h" #include "arm_compute/runtime/PoolManager.h" @@ -74,8 +75,10 @@ void NEDeviceBackend::setup_backend_context(GraphContext &ctx) if(ctx.memory_management_ctx(Target::NEON) == nullptr) { MemoryManagerContext mm_ctx; - mm_ctx.target = Target::NEON; - mm_ctx.mm = create_memory_manager(MemoryManagerAffinity::Buffer); + mm_ctx.target = Target::NEON; + mm_ctx.intra_mm = create_memory_manager(MemoryManagerAffinity::Offset); + mm_ctx.cross_mm = create_memory_manager(MemoryManagerAffinity::Offset); + mm_ctx.cross_group = std::make_shared<MemoryGroup>(mm_ctx.cross_mm); ctx.insert_memory_management_ctx(std::move(mm_ctx)); } @@ -86,6 +89,11 @@ bool NEDeviceBackend::is_backend_supported() return true; } +IAllocator *NEDeviceBackend::backend_allocator() +{ + return &_allocator; +} + std::unique_ptr<ITensorHandle> NEDeviceBackend::create_tensor(const Tensor &tensor) { // Get tensor descriptor diff --git a/src/graph/backends/NEON/NESubTensorHandle.cpp b/src/graph/backends/NEON/NESubTensorHandle.cpp index c48ba6b9d6..c0acedd9f2 100644 --- a/src/graph/backends/NEON/NESubTensorHandle.cpp +++ b/src/graph/backends/NEON/NESubTensorHandle.cpp @@ -30,10 +30,11 @@ namespace graph namespace backends { NESubTensorHandle::NESubTensorHandle(ITensorHandle *parent_handle, const TensorShape &shape, const Coordinates &coords, bool extend_parent) - : _sub_tensor() + : _sub_tensor(), _parent_handle(nullptr) { ARM_COMPUTE_ERROR_ON(!parent_handle); - _sub_tensor = arm_compute::SubTensor(&parent_handle->tensor(), shape, coords, extend_parent); + _sub_tensor = arm_compute::SubTensor(&parent_handle->tensor(), shape, coords, extend_parent); + _parent_handle = parent_handle; } void NESubTensorHandle::allocate() @@ -41,14 +42,15 @@ void NESubTensorHandle::allocate() // noop } -const arm_compute::ITensor &NESubTensorHandle::tensor() const +void NESubTensorHandle::free() { - return _sub_tensor; + // noop } -arm_compute::ITensor &NESubTensorHandle::tensor() +void NESubTensorHandle::manage(IMemoryGroup *mg) { - return _sub_tensor; + ARM_COMPUTE_UNUSED(mg); + // noop } void NESubTensorHandle::map(bool blocking) @@ -66,10 +68,31 @@ void NESubTensorHandle::release_if_unused() // noop } +const arm_compute::ITensor &NESubTensorHandle::tensor() const +{ + return _sub_tensor; +} + +arm_compute::ITensor &NESubTensorHandle::tensor() +{ + return _sub_tensor; +} + +ITensorHandle *NESubTensorHandle::parent_handle() +{ + ARM_COMPUTE_ERROR_ON(_parent_handle == nullptr); + return _parent_handle->parent_handle(); +} + bool NESubTensorHandle::is_subtensor() const { return true; } + +Target NESubTensorHandle::target() const +{ + return Target::NEON; +} } // namespace backends } // namespace graph } // namespace arm_compute
\ No newline at end of file diff --git a/src/graph/backends/NEON/NETensorHandle.cpp b/src/graph/backends/NEON/NETensorHandle.cpp index 8508ac9511..5892116caf 100644 --- a/src/graph/backends/NEON/NETensorHandle.cpp +++ b/src/graph/backends/NEON/NETensorHandle.cpp @@ -23,6 +23,9 @@ */ #include "arm_compute/graph/backends/NEON/NETensorHandle.h" +#include "arm_compute/core/utils/misc/Cast.h" +#include "arm_compute/runtime/MemoryGroup.h" + namespace arm_compute { namespace graph @@ -40,14 +43,18 @@ void NETensorHandle::allocate() _tensor.allocator()->allocate(); } -const arm_compute::ITensor &NETensorHandle::tensor() const +void NETensorHandle::free() { - return _tensor; + _tensor.allocator()->free(); } -arm_compute::ITensor &NETensorHandle::tensor() +void NETensorHandle::manage(IMemoryGroup *mg) { - return _tensor; + if(mg != nullptr) + { + auto *ne_mg = arm_compute::utils::cast::polymorphic_downcast<MemoryGroup *>(mg); + ne_mg->manage(&_tensor); + } } void NETensorHandle::map(bool blocking) @@ -68,10 +75,30 @@ void NETensorHandle::release_if_unused() } } +const arm_compute::ITensor &NETensorHandle::tensor() const +{ + return _tensor; +} + +arm_compute::ITensor &NETensorHandle::tensor() +{ + return _tensor; +} + +ITensorHandle *NETensorHandle::parent_handle() +{ + return this; +} + bool NETensorHandle::is_subtensor() const { return false; } + +Target NETensorHandle::target() const +{ + return Target::NEON; +} } // namespace backends } // namespace graph } // namespace arm_compute
\ No newline at end of file |