From 511347a7282b948bddfc071e9a8fa08e79da25b4 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Mon, 18 Sep 2017 18:33:07 +0100 Subject: COMPMID-485: Offset-based memory manager support. Adds support for offset-based memory mappings used from CPU system memory and SVM based allocations. Change-Id: Ibee6a3c02a61df9b11fe8878cfe40dc6fd9a4be0 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/88307 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- src/runtime/BlobLifetimeManager.cpp | 65 +-------------------- src/runtime/ISimpleLifetimeManager.cpp | 103 +++++++++++++++++++++++++++++++++ src/runtime/OffsetLifetimeManager.cpp | 76 ++++++++++++++++++++++++ src/runtime/OffsetMemoryPool.cpp | 80 +++++++++++++++++++++++++ 4 files changed, 261 insertions(+), 63 deletions(-) create mode 100644 src/runtime/ISimpleLifetimeManager.cpp create mode 100644 src/runtime/OffsetLifetimeManager.cpp create mode 100644 src/runtime/OffsetMemoryPool.cpp (limited to 'src') diff --git a/src/runtime/BlobLifetimeManager.cpp b/src/runtime/BlobLifetimeManager.cpp index 69292b9319..3ca5071d91 100644 --- a/src/runtime/BlobLifetimeManager.cpp +++ b/src/runtime/BlobLifetimeManager.cpp @@ -37,77 +37,16 @@ using namespace arm_compute; BlobLifetimeManager::BlobLifetimeManager() - : _active_group(nullptr), _active_elements(), _finalized_groups(), _blobs() + : _blobs() { } -void BlobLifetimeManager::register_group(IMemoryGroup *group) -{ - if(_active_group == nullptr) - { - ARM_COMPUTE_ERROR_ON(group == nullptr); - _active_group = group; - } -} - -void BlobLifetimeManager::start_lifetime(void *obj) -{ - ARM_COMPUTE_ERROR_ON(obj == nullptr); - ARM_COMPUTE_ERROR_ON_MSG(std::find_if(std::begin(_active_elements), std::end(_active_elements), [&obj](const Element & e) - { - return obj == e.id; - }) != std::end(_active_elements), - "Memory object is already registered!"); - - // Insert object in groups and mark its finalized state to false - _active_elements.emplace_back(obj); -} - -void BlobLifetimeManager::end_lifetime(void *obj, void **handle, size_t size) -{ - ARM_COMPUTE_ERROR_ON(obj == nullptr); - - // Find object - auto it = std::find_if(std::begin(_active_elements), std::end(_active_elements), [&obj](const Element & e) - { - return obj == e.id; - }); - ARM_COMPUTE_ERROR_ON(it == std::end(_active_elements)); - - // Update object fields and mark object as complete - it->handle = handle; - it->size = size; - it->status = true; - - // Check if all object are finalized and reset active group - if(are_all_finalized()) - { - // Update finalized groups - _finalized_groups[_active_group].insert(std::end(_finalized_groups[_active_group]), std::begin(_active_elements), std::end(_active_elements)); - - // Update blobs and group mappings - update_blobs_and_mappings(); - - // Reset state - _active_elements.clear(); - _active_group = nullptr; - } -} - std::unique_ptr BlobLifetimeManager::create_pool(IAllocator *allocator) { ARM_COMPUTE_ERROR_ON(allocator == nullptr); return support::cpp14::make_unique(allocator, _blobs); } -bool BlobLifetimeManager::are_all_finalized() const -{ - return !std::any_of(std::begin(_active_elements), std::end(_active_elements), [](const Element e) - { - return !e.status; - }); -} - MappingType BlobLifetimeManager::mapping_type() const { return MappingType::BLOBS; @@ -118,7 +57,7 @@ void BlobLifetimeManager::update_blobs_and_mappings() ARM_COMPUTE_ERROR_ON(!are_all_finalized()); ARM_COMPUTE_ERROR_ON(_active_group == nullptr); - // Sort active group requirements in descending order + // Sort active group requirements in descending order. std::sort(std::begin(_active_elements), std::end(_active_elements), [](const Element & a, const Element & b) { return a.size > b.size; diff --git a/src/runtime/ISimpleLifetimeManager.cpp b/src/runtime/ISimpleLifetimeManager.cpp new file mode 100644 index 0000000000..2c64475b39 --- /dev/null +++ b/src/runtime/ISimpleLifetimeManager.cpp @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2017 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/runtime/ISimpleLifetimeManager.h" + +#include "arm_compute/core/Error.h" +#include "arm_compute/runtime/IAllocator.h" +#include "arm_compute/runtime/IMemoryGroup.h" +#include "arm_compute/runtime/IMemoryPool.h" +#include "support/ToolchainSupport.h" + +#include +#include +#include +#include + +using namespace arm_compute; + +ISimpleLifetimeManager::ISimpleLifetimeManager() + : _active_group(nullptr), _active_elements(), _finalized_groups() +{ +} + +void ISimpleLifetimeManager::register_group(IMemoryGroup *group) +{ + if(_active_group == nullptr) + { + ARM_COMPUTE_ERROR_ON(group == nullptr); + _active_group = group; + } +} + +void ISimpleLifetimeManager::start_lifetime(void *obj) +{ + ARM_COMPUTE_ERROR_ON(obj == nullptr); + ARM_COMPUTE_ERROR_ON_MSG(std::find_if(std::begin(_active_elements), std::end(_active_elements), [&obj](const Element & e) + { + return obj == e.id; + }) != std::end(_active_elements), + "Memory object is already registered!"); + + // Insert object in groups and mark its finalized state to false + _active_elements.emplace_back(obj); +} + +void ISimpleLifetimeManager::end_lifetime(void *obj, void **handle, size_t size) +{ + ARM_COMPUTE_ERROR_ON(obj == nullptr); + + // Find object + auto it = std::find_if(std::begin(_active_elements), std::end(_active_elements), [&obj](const Element & e) + { + return obj == e.id; + }); + ARM_COMPUTE_ERROR_ON(it == std::end(_active_elements)); + + // Update object fields and mark object as complete + it->handle = handle; + it->size = size; + it->status = true; + + // Check if all object are finalized and reset active group + if(are_all_finalized()) + { + // Update finalized groups + _finalized_groups[_active_group].insert(std::end(_finalized_groups[_active_group]), std::begin(_active_elements), std::end(_active_elements)); + + // Update blobs and group mappings + update_blobs_and_mappings(); + + // Reset state + _active_elements.clear(); + _active_group = nullptr; + } +} + +bool ISimpleLifetimeManager::are_all_finalized() const +{ + return !std::any_of(std::begin(_active_elements), std::end(_active_elements), [](const Element e) + { + return !e.status; + }); +} diff --git a/src/runtime/OffsetLifetimeManager.cpp b/src/runtime/OffsetLifetimeManager.cpp new file mode 100644 index 0000000000..4540aeab28 --- /dev/null +++ b/src/runtime/OffsetLifetimeManager.cpp @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2017 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/runtime/OffsetLifetimeManager.h" + +#include "arm_compute/core/Error.h" +#include "arm_compute/runtime/IAllocator.h" +#include "arm_compute/runtime/IMemoryGroup.h" +#include "arm_compute/runtime/OffsetMemoryPool.h" +#include "support/ToolchainSupport.h" + +#include +#include +#include +#include + +using namespace arm_compute; + +OffsetLifetimeManager::OffsetLifetimeManager() + : _blob(0) +{ +} + +std::unique_ptr OffsetLifetimeManager::create_pool(IAllocator *allocator) +{ + ARM_COMPUTE_ERROR_ON(allocator == nullptr); + return support::cpp14::make_unique(allocator, _blob); +} + +MappingType OffsetLifetimeManager::mapping_type() const +{ + return MappingType::OFFSETS; +} + +void OffsetLifetimeManager::update_blobs_and_mappings() +{ + ARM_COMPUTE_ERROR_ON(!are_all_finalized()); + ARM_COMPUTE_ERROR_ON(_active_group == nullptr); + + // Update blob size + size_t max_group_size = std::accumulate(std::begin(_active_elements), std::end(_active_elements), static_cast(0), [](size_t s, const Element & e) + { + return s + e.size; + }); + _blob = std::max(_blob, max_group_size); + + // Calculate group mappings + auto &group_mappings = _active_group->mappings(); + size_t offset = 0; + for(auto &e : _active_elements) + { + group_mappings[e.handle] = offset; + offset += e.size; + ARM_COMPUTE_ERROR_ON(offset > _blob); + } +} diff --git a/src/runtime/OffsetMemoryPool.cpp b/src/runtime/OffsetMemoryPool.cpp new file mode 100644 index 0000000000..96f54f890f --- /dev/null +++ b/src/runtime/OffsetMemoryPool.cpp @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2017 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include + +#include "arm_compute/runtime/OffsetMemoryPool.h" + +#include "arm_compute/core/Error.h" +#include "arm_compute/runtime/IAllocator.h" +#include "arm_compute/runtime/IMemoryPool.h" +#include "arm_compute/runtime/Types.h" +#include "support/ToolchainSupport.h" + +using namespace arm_compute; + +OffsetMemoryPool::OffsetMemoryPool(IAllocator *allocator, size_t blob_size) + : _allocator(allocator), _blob(), _blob_size(blob_size) +{ + ARM_COMPUTE_ERROR_ON(!allocator); + _blob = _allocator->allocate(_blob_size, 0); +} + +OffsetMemoryPool::~OffsetMemoryPool() +{ + ARM_COMPUTE_ERROR_ON(!_allocator); + _allocator->free(_blob); + _blob = nullptr; +} + +void OffsetMemoryPool::acquire(MemoryMappings &handles) +{ + ARM_COMPUTE_ERROR_ON(_blob == nullptr); + + // Set memory to handlers + for(auto &handle : handles) + { + ARM_COMPUTE_ERROR_ON(handle.first == nullptr); + *handle.first = reinterpret_cast(_blob) + handle.second; + } +} + +void OffsetMemoryPool::release(MemoryMappings &handles) +{ + for(auto &handle : handles) + { + ARM_COMPUTE_ERROR_ON(handle.first == nullptr); + *handle.first = nullptr; + } +} + +MappingType OffsetMemoryPool::mapping_type() const +{ + return MappingType::OFFSETS; +} + +std::unique_ptr OffsetMemoryPool::duplicate() +{ + ARM_COMPUTE_ERROR_ON(!_allocator); + return support::cpp14::make_unique(_allocator, _blob_size); +} \ No newline at end of file -- cgit v1.2.1