diff options
author | Matthew Bentham <Matthew.Bentham@arm.com> | 2019-06-21 17:22:23 +0100 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2019-07-04 09:10:46 +0000 |
commit | 7c1603a4e310c5b7b0d3bdddc0c80a63a7661107 (patch) | |
tree | 9be52766d80394d253b2b51f4ef8fd136272cf6e /src/backends/reference/RefTensorHandle.cpp | |
parent | f9ac3fd5676565b1065698158f8d54a27f24981c (diff) | |
download | armnn-7c1603a4e310c5b7b0d3bdddc0c80a63a7661107.tar.gz |
IVGCVSW-3307 Add RefMemoryManager
Simple pool memory manager for use in the reference backend,
in order to make the backend usable for testing large networks.
Change-Id: I5694da29052c60f95b57da595c64cc114d75b8ba
Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com>
Diffstat (limited to 'src/backends/reference/RefTensorHandle.cpp')
-rw-r--r-- | src/backends/reference/RefTensorHandle.cpp | 66 |
1 files changed, 55 insertions, 11 deletions
diff --git a/src/backends/reference/RefTensorHandle.cpp b/src/backends/reference/RefTensorHandle.cpp index b7670f6f6e..fe9310f423 100644 --- a/src/backends/reference/RefTensorHandle.cpp +++ b/src/backends/reference/RefTensorHandle.cpp @@ -7,39 +7,83 @@ namespace armnn { -RefTensorHandle::RefTensorHandle(const TensorInfo &tensorInfo): +RefTensorHandle::RefTensorHandle(const TensorInfo &tensorInfo, std::shared_ptr<RefMemoryManager> &memoryManager): m_TensorInfo(tensorInfo), - m_Memory(nullptr) + m_MemoryManager(memoryManager), + m_Pool(nullptr), + m_UnmanagedMemory(nullptr) { } RefTensorHandle::~RefTensorHandle() { - ::operator delete(m_Memory); + if (!m_Pool) + { + // unmanaged + ::operator delete(m_UnmanagedMemory); + } +} + +void RefTensorHandle::Manage() +{ + BOOST_ASSERT_MSG(!m_Pool, "RefTensorHandle::Manage() called twice"); + BOOST_ASSERT_MSG(!m_UnmanagedMemory, "RefTensorHandle::Manage() called after Allocate()"); + + m_Pool = m_MemoryManager->Manage(m_TensorInfo.GetNumBytes()); } void RefTensorHandle::Allocate() { - if (m_Memory == nullptr) + if (!m_UnmanagedMemory) { - m_Memory = ::operator new(m_TensorInfo.GetNumBytes()); + if (!m_Pool) + { + // unmanaged + m_UnmanagedMemory = ::operator new(m_TensorInfo.GetNumBytes()); + } + else + { + m_MemoryManager->Allocate(m_Pool); + } } else { throw InvalidArgumentException("RefTensorHandle::Allocate Trying to allocate a RefTensorHandle" - "that already has allocated memory."); + "that already has allocated memory."); + } +} + +const void* RefTensorHandle::Map(bool /*unused*/) const +{ + return GetPointer(); +} + +void* RefTensorHandle::GetPointer() const +{ + if (m_UnmanagedMemory) + { + return m_UnmanagedMemory; + } + else + { + BOOST_ASSERT_MSG(m_Pool, "RefTensorHandle::GetPointer called on unmanaged, unallocated tensor handle"); + return m_MemoryManager->GetPointer(m_Pool); } } -void RefTensorHandle::CopyOutTo(void* memory) const +void RefTensorHandle::CopyOutTo(void* dest) const { - memcpy(memory, m_Memory, m_TensorInfo.GetNumBytes()); + const void *src = GetPointer(); + BOOST_ASSERT(src); + memcpy(dest, src, m_TensorInfo.GetNumBytes()); } -void RefTensorHandle::CopyInFrom(const void* memory) +void RefTensorHandle::CopyInFrom(const void* src) { - memcpy(m_Memory, memory, m_TensorInfo.GetNumBytes()); + void *dest = GetPointer(); + BOOST_ASSERT(dest); + memcpy(dest, src, m_TensorInfo.GetNumBytes()); } -}
\ No newline at end of file +} |