From 82b51482479951cf133c223eb81aae291cb4d590 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 24 Apr 2018 15:14:12 +0100 Subject: COMPMID-959: Sets memory manager to CLWinograd -Sets memory manager to Winograd functions -Marks CLGEMM inputs as unused if needed Change-Id: I425a3f864c756e0e2b4da895e1730b8822149ba8 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/128891 Tested-by: Jenkins Reviewed-by: Gian Marco Iodice Reviewed-by: Anthony Barbier --- src/runtime/CL/functions/CLGEMM.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/runtime/CL/functions/CLGEMM.cpp') diff --git a/src/runtime/CL/functions/CLGEMM.cpp b/src/runtime/CL/functions/CLGEMM.cpp index cf41eccc35..bff5781300 100644 --- a/src/runtime/CL/functions/CLGEMM.cpp +++ b/src/runtime/CL/functions/CLGEMM.cpp @@ -92,8 +92,8 @@ Status validate_arguments(const ITensorInfo *a, const ITensorInfo *b, const ICLT } // namespace CLGEMM::CLGEMM(std::shared_ptr memory_manager) - : _memory_group(std::move(memory_manager)), _interleave_kernel(), _transpose_kernel(), _mm_kernel(), _ma_kernel(), _tmp_a(), _tmp_b(), _is_interleaved_transposed(false), _run_addition(false), - _is_first_run(true), _reshape_b_only_on_first_run(false) + : _memory_group(std::move(memory_manager)), _interleave_kernel(), _transpose_kernel(), _mm_kernel(), _ma_kernel(), _tmp_a(), _tmp_b(), _original_b(nullptr), _is_interleaved_transposed(false), + _run_addition(false), _is_first_run(true), _reshape_b_only_on_first_run(false) { } @@ -104,6 +104,9 @@ void CLGEMM::configure(const ICLTensor *a, const ICLTensor *b, const ICLTensor * // Perform validation step ARM_COMPUTE_ERROR_THROW_ON(validate_arguments(a->info(), b->info(), c, output->info(), alpha, beta, gemm_info)); + // Store original b matrix + _original_b = b; + // Check if we need to reshape the matrix B only on the first run _reshape_b_only_on_first_run = gemm_info.reshape_b_only_on_first_run(); @@ -192,7 +195,11 @@ void CLGEMM::run() // Run transpose kernel CLScheduler::get().enqueue(_transpose_kernel, false); - _is_first_run = false; + // Mark original b matrix as unused + if(_reshape_b_only_on_first_run) + { + _original_b->mark_as_unused(); + } } else if(!_reshape_b_only_on_first_run) { @@ -211,4 +218,6 @@ void CLGEMM::run() } _memory_group.release(); + + _is_first_run = false; } -- cgit v1.2.1