COMPMID-1710: Account alignment for blob-base allocations

Change-Id: I290d33e25a5966d25a91df39ebc01c28bfa31f78
Reviewed-on: https://review.mlplatform.org/402
Reviewed-by: Anthony Barbier <Anthony.barbier@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

6 files changed, 39 insertions, 24 deletions

diff --git a/arm_compute/runtime/BlobLifetimeManager.h b/arm_compute/runtime/BlobLifetimeManager.h
index edf4d43421..2dbe92d7b6 100644
--- a/arm_compute/runtime/BlobLifetimeManager.h
+++ b/arm_compute/runtime/BlobLifetimeManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 ARM Limited.
+ * Copyright (c) 2017-2018 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -26,7 +26,7 @@
 
 #include "arm_compute/runtime/ISimpleLifetimeManager.h"
 
-#include "arm_compute/runtime/IMemoryPool.h"
+#include "arm_compute/runtime/BlobMemoryPool.h"
 #include "arm_compute/runtime/Types.h"
 
 #include <cstddef>
@@ -60,7 +60,7 @@ private:
     void update_blobs_and_mappings() override;
 
 private:
-    std::vector<size_t> _blobs; /**< Memory blobs' sizes */
+    std::vector<BlobInfo> _blobs; /**< Memory blobs */
 };
 } // namespace arm_compute
 #endif /* __ARM_COMPUTE_BLOBLIFETIMEMANAGER_H__ */
diff --git a/arm_compute/runtime/BlobMemoryPool.h b/arm_compute/runtime/BlobMemoryPool.h
index c9c4da0f54..ba97dbd94e 100644
--- a/arm_compute/runtime/BlobMemoryPool.h
+++ b/arm_compute/runtime/BlobMemoryPool.h
@@ -35,8 +35,20 @@
 
 namespace arm_compute
 {
+// Forward declaration
 class IAllocator;
 
+/** Meta-data information for each blob */
+struct BlobInfo
+{
+    BlobInfo(size_t size_ = 0, size_t alignment_ = 0)
+        : size(size_), alignment(alignment_)
+    {
+    }
+    size_t size;      /**< Blob size */
+    size_t alignment; /**< Blob alignment */
+};
+
 /** Blob memory pool */
 class BlobMemoryPool : public IMemoryPool
 {
@@ -45,10 +57,10 @@ public:
      *
      * @note allocator should outlive the memory pool
      *
-     * @param[in] allocator  Backing memory allocator
-     * @param[in] blob_sizes Sizes of the blobs to be allocated
+     * @param[in] allocator Backing memory allocator
+     * @param[in] blob_info Configuration information of the blobs to be allocated
      */
-    BlobMemoryPool(IAllocator *allocator, std::vector<size_t> blob_sizes);
+    BlobMemoryPool(IAllocator *allocator, std::vector<BlobInfo> blob_info);
     /** Default Destructor */
     ~BlobMemoryPool();
     /** Prevent instances of this class to be copy constructed */
@@ -69,16 +81,16 @@ public:
 private:
     /** Allocates internal blobs
      *
-     * @param sizes Size of each blob
+     * @param blob_info Size of each blob
      */
-    void allocate_blobs(const std::vector<size_t> &sizes);
+    void allocate_blobs(const std::vector<BlobInfo> &blob_info);
     /** Frees blobs **/
     void free_blobs();
 
 private:
-    IAllocator                                 *_allocator;  /**< Allocator to use for internal allocation */
-    std::vector<std::unique_ptr<IMemoryRegion>> _blobs;      /**< Vector holding all the memory blobs */
-    std::vector<size_t>                         _blob_sizes; /**< Sizes of each blob */
+    IAllocator                                 *_allocator; /**< Allocator to use for internal allocation */
+    std::vector<std::unique_ptr<IMemoryRegion>> _blobs;     /**< Vector holding all the memory blobs */
+    std::vector<BlobInfo>                       _blob_info; /**< Information of each blob */
 };
 } // namespace arm_compute
 #endif /* __ARM_COMPUTE_BLOBMEMORYPOOL_H__ */
diff --git a/arm_compute/runtime/ILifetimeManager.h b/arm_compute/runtime/ILifetimeManager.h
index f2e9b497c9..3684ddf8fb 100644
--- a/arm_compute/runtime/ILifetimeManager.h
+++ b/arm_compute/runtime/ILifetimeManager.h
@@ -58,8 +58,9 @@ public:
      * @param[in] obj        Object
      * @param[in] obj_memory Object memory
      * @param[in] size       Size of the given object at given time
+     * @param[in] alignment  Alignment requirements for the object
      */
-    virtual void end_lifetime(void *obj, IMemory &obj_memory, size_t size) = 0;
+    virtual void end_lifetime(void *obj, IMemory &obj_memory, size_t size, size_t alignment) = 0;
     /** Checks if the lifetime of the registered object is complete
      *
      * @return True if all object lifetimes are finalized else false.
diff --git a/arm_compute/runtime/ISimpleLifetimeManager.h b/arm_compute/runtime/ISimpleLifetimeManager.h
index f2eb4f5904..4384283b94 100644
--- a/arm_compute/runtime/ISimpleLifetimeManager.h
+++ b/arm_compute/runtime/ISimpleLifetimeManager.h
@@ -58,7 +58,7 @@ public:
     // Inherited methods overridden:
     void register_group(IMemoryGroup *group) override;
     void start_lifetime(void *obj) override;
-    void end_lifetime(void *obj, IMemory &obj_memory, size_t size) override;
+    void end_lifetime(void *obj, IMemory &obj_memory, size_t size, size_t alignment) override;
     bool are_all_finalized() const override;
 
 protected:
@@ -69,14 +69,15 @@ protected:
     /** Element struct */
     struct Element
     {
-        Element(void *id_ = nullptr, IMemory *handle_ = nullptr, size_t size_ = 0, bool status_ = false)
-            : id(id_), handle(handle_), size(size_), status(status_)
+        Element(void *id_ = nullptr, IMemory *handle_ = nullptr, size_t size_ = 0, size_t alignment_ = 0, bool status_ = false)
+            : id(id_), handle(handle_), size(size_), alignment(alignment_), status(status_)
         {
         }
-        void    *id;     /**< Element id */
-        IMemory *handle; /**< Element's memory handle */
-        size_t   size;   /**< Element's size */
-        bool     status; /**< Lifetime status */
+        void    *id;        /**< Element id */
+        IMemory *handle;    /**< Element's memory handle */
+        size_t   size;      /**< Element's size */
+        size_t   alignment; /**< Alignment requirement */
+        bool     status;    /**< Lifetime status */
     };
 
     /** Blob struct */
@@ -84,6 +85,7 @@ protected:
     {
         void            *id;
         size_t           max_size;
+        size_t           max_alignment;
         std::set<void *> bound_elements;
     };
 
diff --git a/arm_compute/runtime/MemoryGroupBase.h b/arm_compute/runtime/MemoryGroupBase.h
index 0ceaa900c5..7dc18c8b4f 100644
--- a/arm_compute/runtime/MemoryGroupBase.h
+++ b/arm_compute/runtime/MemoryGroupBase.h
@@ -70,8 +70,9 @@ public:
      * @param[in, out] obj_memory Object's memory handling interface which can be used to alter the underlying memory
      *                            that is used by the object.
      * @param[in]      size       Size of memory to allocate
+     * @param[in]      alignment  (Optional) Alignment to use
      */
-    void finalize_memory(TensorType *obj, IMemory &obj_memory, size_t size);
+    void finalize_memory(TensorType *obj, IMemory &obj_memory, size_t size, size_t alignment = 0);
 
     // Inherited methods overridden:
     void            acquire() override;
@@ -116,7 +117,7 @@ inline void MemoryGroupBase<TensorType>::manage(TensorType *obj)
 }
 
 template <typename TensorType>
-inline void MemoryGroupBase<TensorType>::finalize_memory(TensorType *obj, IMemory &obj_memory, size_t size)
+inline void MemoryGroupBase<TensorType>::finalize_memory(TensorType *obj, IMemory &obj_memory, size_t size, size_t alignment)
 {
     // TODO (geopin01) : Check size (track size in MemoryMappings)
     // Check if existing mapping is valid
@@ -125,7 +126,7 @@ inline void MemoryGroupBase<TensorType>::finalize_memory(TensorType *obj, IMemor
     if(_memory_manager && _mappings.empty())
     {
         ARM_COMPUTE_ERROR_ON(!_memory_manager->lifetime_manager());
-        _memory_manager->lifetime_manager()->end_lifetime(obj, obj_memory, size);
+        _memory_manager->lifetime_manager()->end_lifetime(obj, obj_memory, size, alignment);
     }
 }
 
diff --git a/arm_compute/runtime/Types.h b/arm_compute/runtime/Types.h
index b962427ef8..f2607c0204 100644
--- a/arm_compute/runtime/Types.h
+++ b/arm_compute/runtime/Types.h
@@ -46,6 +46,5 @@ using MemoryMappings = std::map<IMemory *, size_t>;
 
 /** A map of the groups and memory mappings */
 using GroupMappings = std::map<size_t, MemoryMappings>;
-
-} // arm_compute
+} // namespace arm_compute
 #endif /* __ARM_COMPUTE_RUNTIME_TYPES_H__ */