From da953f2e17b401ff595ac88008cd5e90440ebf74 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 2 Apr 2019 17:27:03 +0100 Subject: COMPMID-2098: Scope handling of memory group resources. Change-Id: Ie945526bd7845301458039edf3129253c1808505 Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/938 Comments-Addressed: Arm Jenkins Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins --- .../functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.cpp | 4 +--- src/runtime/NEON/functions/assembly/NEGEMMInterleavedWrapper.cpp | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/runtime/NEON/functions/assembly') diff --git a/src/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.cpp b/src/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.cpp index a64426500f..d9b2bff810 100644 --- a/src/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.cpp +++ b/src/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.cpp @@ -299,7 +299,7 @@ void NEDepthwiseConvolutionAssemblyDispatch::run() // Prepare assembly kernel prepare(); - _memory_group.acquire(); + MemoryGroupResourceScope scope_mg(_memory_group); // Setup inputs/outputs ARM_COMPUTE_ERROR_ON(_workspace.buffer() == nullptr); @@ -323,8 +323,6 @@ void NEDepthwiseConvolutionAssemblyDispatch::run() // Schedule assembly kernel NEScheduler::get().schedule(&_dwc_acl_kernel, Window::DimX); - - _memory_group.release(); } void NEDepthwiseConvolutionAssemblyDispatch::prepare() diff --git a/src/runtime/NEON/functions/assembly/NEGEMMInterleavedWrapper.cpp b/src/runtime/NEON/functions/assembly/NEGEMMInterleavedWrapper.cpp index 34aaea0ef1..e207ab007a 100644 --- a/src/runtime/NEON/functions/assembly/NEGEMMInterleavedWrapper.cpp +++ b/src/runtime/NEON/functions/assembly/NEGEMMInterleavedWrapper.cpp @@ -183,9 +183,8 @@ void NEGEMMInterleavedWrapper::run() { prepare(); - _memory_group.acquire(); + MemoryGroupResourceScope scope_mg(_memory_group); NEScheduler::get().run_tagged_workloads(_workloads, _tag.c_str()); - _memory_group.release(); } void NEGEMMInterleavedWrapper::prepare() -- cgit v1.2.1