Fix memory lifetime issue

B matrix was getting released while was still needed for a Native GEMM
execution

Resolves: COMPMID-4705

Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I1e490abbe1feabd451d10fa785de21e725f1d6e0
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6001
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

1 files changed, 1 insertions, 27 deletions

diff --git a/src/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.cpp b/src/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.cpp
index bd31d47b4f..1ae2dfbad6 100644
--- a/src/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.cpp
+++ b/src/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.cpp
@@ -112,34 +112,8 @@ void CLGEMMLowpMatrixMultiplyCore::prepare()
     {
         _impl->op->prepare(_impl->run_pack);
 
-        auto has_reshape = std::find_if(_impl->aux_mem_req.begin(),
-                                        _impl->aux_mem_req.end(),
-                                        [](const MemoryInfo & m) -> bool { return m.lifetime == MemoryLifetime::Persistent; });
-
-        if(has_reshape != std::end(_impl->aux_mem_req))
-        {
-            _impl->b->mark_as_unused();
-        }
-        else
-        {
-            // Pack the B matrix to be used as the underlying GEMM performs no reshapes
-            _impl->run_pack.add_const_tensor(ACL_SRC_1, _impl->b);
-        }
-
         // Release temporary tensors that are only used in prepare stage
-        for(auto &ws : _impl->workspace_tensors)
-        {
-            const int slot = ws.slot;
-            for(auto &m : _impl->aux_mem_req)
-            {
-                if(m.slot == slot && m.lifetime == MemoryLifetime::Prepare)
-                {
-                    auto tensor = ws.tensor.get();
-                    tensor->allocator()->free();
-                    break;
-                }
-            }
-        }
+        release_temporaries(_impl->aux_mem_req, _impl->workspace_tensors);
 
         _impl->is_prepared = true;
     }