From 555f1c2241d6fa8c84926a72a0c54e4158817df4 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 14 Dec 2018 17:11:20 +0000 Subject: COMPMID-1710: Account alignment for blob-base allocations Change-Id: I290d33e25a5966d25a91df39ebc01c28bfa31f78 Reviewed-on: https://review.mlplatform.org/402 Reviewed-by: Anthony Barbier Tested-by: Arm Jenkins --- src/runtime/BlobLifetimeManager.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/runtime/BlobLifetimeManager.cpp') diff --git a/src/runtime/BlobLifetimeManager.cpp b/src/runtime/BlobLifetimeManager.cpp index 2a4ab6ec0d..9fef943fb5 100644 --- a/src/runtime/BlobLifetimeManager.cpp +++ b/src/runtime/BlobLifetimeManager.cpp @@ -62,19 +62,21 @@ void BlobLifetimeManager::update_blobs_and_mappings() { return ba.max_size > bb.max_size; }); - std::vector group_sizes; + + // Create group sizes vector + std::vector group_sizes; std::transform(std::begin(_free_blobs), std::end(_free_blobs), std::back_inserter(group_sizes), [](const Blob & b) { - return b.max_size; + return BlobInfo(b.max_size, b.max_alignment); }); // Update blob sizes size_t max_size = std::max(_blobs.size(), group_sizes.size()); - _blobs.resize(max_size, 0); - group_sizes.resize(max_size, 0); - std::transform(std::begin(_blobs), std::end(_blobs), std::begin(group_sizes), std::begin(_blobs), [](size_t lhs, size_t rhs) + _blobs.resize(max_size); + group_sizes.resize(max_size); + std::transform(std::begin(_blobs), std::end(_blobs), std::begin(group_sizes), std::begin(_blobs), [](BlobInfo lhs, BlobInfo rhs) { - return std::max(lhs, rhs); + return BlobInfo(std::max(lhs.size, rhs.size), std::max(lhs.alignment, rhs.alignment)); }); // Calculate group mappings -- cgit v1.2.1