diff options
| -rw-r--r-- | arm_compute/runtime/NEON/AssemblyHelper.h | 22 | ||||
| -rw-r--r-- | src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp | 4 |
2 files changed, 21 insertions, 5 deletions
diff --git a/arm_compute/runtime/NEON/AssemblyHelper.h b/arm_compute/runtime/NEON/AssemblyHelper.h index ecaf35ac3e..3aa43ec96e 100644 --- a/arm_compute/runtime/NEON/AssemblyHelper.h +++ b/arm_compute/runtime/NEON/AssemblyHelper.h @@ -51,7 +51,7 @@ public: using TypeResult = TypeOutput; /** Default constructor. */ AssemblyKernelGlue() - : _gemm_kernel_asm(nullptr), _optimised_kernel(nullptr), _a(nullptr), _b(nullptr), _d(nullptr), _pretranspose(nullptr) + : _gemm_kernel_asm(nullptr), _optimised_kernel(nullptr), _a(nullptr), _b(nullptr), _d(nullptr), _workspace(nullptr), _pretranspose(nullptr) { } /** Assembly Gemm */ @@ -72,6 +72,8 @@ public: const ITensor *_b; /** Output */ ITensor *_d; + /** GEMM workspace */ + ITensor *_workspace; /** Pre-transpose tensor */ ITensor *_pretranspose; @@ -100,7 +102,16 @@ public: const auto in1_ptr = reinterpret_cast<const TypeInput *>(_b->buffer()); auto out_ptr = reinterpret_cast<TypeOutput *>(_d->buffer()); + // Set workspace if needed + if(_workspace != nullptr) + { + _gemm_kernel_asm->set_working_space(reinterpret_cast<void *>(_workspace->buffer())); + } + + // Set gemm parameters _gemm_kernel_asm->set_arrays(in0_ptr, lda, batch_stride_a, multi_stride_a, in1_ptr, ldb, multi_stride_b, out_ptr, ldd, batch_stride_d, multi_stride_d); + + // Pretranspose B if required if(_gemm_kernel_asm->B_pretranspose_required()) { // Forcing 128-byte alignment (required by 32-bit kernels) @@ -113,6 +124,7 @@ public: _b->mark_as_unused(); } + // Schedule assembly kernel NEScheduler::get().schedule(_optimised_kernel.get(), Window::DimX); } }; @@ -134,9 +146,12 @@ using AssemblyKernelGlueS8S32 = AssemblyKernelGlue<int8_t, int32_t>; */ inline void allocate_workspace(size_t workspace_size, Tensor &workspace, MemoryGroup *memory_group, size_t alignment, unsigned int num_threads) { - ARM_COMPUTE_UNUSED(memory_group); ARM_COMPUTE_ERROR_ON_MSG(workspace_size == 0, "size cannot be 0"); workspace.allocator()->init(TensorInfo(TensorShape{ (workspace_size + alignment - 1) * num_threads }, 1, DataType::S8)); + if(memory_group != nullptr) + { + memory_group->manage(&workspace); + } workspace.allocator()->allocate(); } @@ -182,8 +197,7 @@ inline bool setup_assembly_kernel(const ITensor *a, const ITensor *b, ITensor *d // Allocate workspace const unsigned int alignment = 4096; allocate_workspace(workspace_size, workspace, &memory_group, alignment, num_threads); - ARM_COMPUTE_ERROR_ON_NULLPTR(workspace.buffer()); - asm_gemm->set_working_space(reinterpret_cast<typename T::TypeResult *>(workspace.buffer())); + asm_glue._workspace = &workspace; } //if we disable this code below in brackets then ConvLayer deadlocks when threads > 1 and diff --git a/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp b/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp index 8f2c4c4361..1a9c72965b 100644 --- a/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp @@ -269,7 +269,9 @@ void NEWinogradConvolutionLayer::configure(const ITensor *input, const ITensor * if(workspace_size > 0) { const unsigned int alignment = 4096; - allocate_workspace(workspace_size, _workspace, &_memory_group, alignment, 1); + // TODO (COMPMID-1248) : Add support for memory manager in NEWinogradConvolutionLayer + // Warning : Do not set a memory group in allocate_workspace, should be done under COMPMID-1248 + allocate_workspace(workspace_size, _workspace, nullptr, alignment, 1); _arm_gemm->set_working_space(reinterpret_cast<float *>(_workspace.buffer())); } |