From 3d677ccee046cd384abf2142f323f8e9e7a4834f Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Mon, 23 Jul 2018 16:42:59 +0100 Subject: COMPMID-1406: Refactor gemm_interleaved to use our own types and scheduler - Ported PrepareB kernel from gemm_interleave - Ported TransformA feature from gemm_interleave - Allocate reshaped a and b buffers - Added memory_manager / memory_group - MatrixMultiply kernel - Interleave kernels execution. - Fixed a few bugs: all nightly Convolution tests passing for threads=1 and threads=4 - Added Doxygen documentations and comments in the code - Added support for all data types supported Change-Id: Iffa1c09fda0bb9c61213bb83524d5a48e7ecb03c Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/141281 Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- .../assembly/NEGEMMInterleavedTransformAWrapper.h | 110 +++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 arm_compute/core/NEON/kernels/assembly/NEGEMMInterleavedTransformAWrapper.h (limited to 'arm_compute/core/NEON/kernels/assembly/NEGEMMInterleavedTransformAWrapper.h') diff --git a/arm_compute/core/NEON/kernels/assembly/NEGEMMInterleavedTransformAWrapper.h b/arm_compute/core/NEON/kernels/assembly/NEGEMMInterleavedTransformAWrapper.h new file mode 100644 index 0000000000..b6831e3ca9 --- /dev/null +++ b/arm_compute/core/NEON/kernels/assembly/NEGEMMInterleavedTransformAWrapper.h @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_NEGEMMINTERLEAVEDTRANSFORMAWRAPPER_H__ +#define __ARM_COMPUTE_NEGEMMINTERLEAVEDTRANSFORMAWRAPPER_H__ + +#include "arm_compute/core/CPP/CPPTypes.h" +#include "arm_compute/core/NEON/kernels/assembly/INEGEMMWrapperKernel.h" +#include "arm_compute/core/Window.h" + +namespace arm_compute +{ +class ITensor; + +/** Unit of work for @ref NEGEMMInterleavedTransformAWrapper to process */ +struct TransformAWorkload +{ + /** Constructor + * + * @param[in] k0 First value to process along the K dimension. + * @param[in] kmax Last value to process along the K dimension. + * @param[in] multi Multi index. + */ + TransformAWorkload(unsigned int k0, unsigned int kmax, unsigned int multi) + : _k0(k0), _kmax(kmax), _multi(multi) + { + } + unsigned int _k0; /**< First value to process along the K dimension. */ + unsigned int _kmax; /**< Last value to process along the K dimension. */ + unsigned int _multi; /**< Multi index. */ +}; + +/** Equivalent to arm_gemm::GemmInterleaved's Transform &workloads) = 0; + /** Default destructor */ + virtual ~NEGEMMInterleavedTransformAWrapper() = default; +}; + +/** Type specialisations of @ref NEGEMMInterleavedTransformAWrapper */ +template +class NEGEMMInterleavedTransformAWrapperTemplate : public NEGEMMInterleavedTransformAWrapper +{ +public: + /** Configure the reshape A routine. + * + * @param[in] a Input matrix A. + * @param[out] transformed_a Reshaped matrix A. + * @param[in] transpose_a Also transpose A ? + * @param[in] block_walker Window representing the layout of the matrix's blocks + * @param[in] params M, N, K sizes. + */ + void configure(const ITensor *a, ITensor *transformed_a, bool transpose_a, const Window &block_walker, const INEGEMMWrapperKernel::Params ¶ms); + + // Inherited methods overridden: + void transform(const TransformAWorkload &wl, const ThreadInfo &info, const Window &batch_window, const Coordinates &start_offset, const Coordinates &end_offset) override; + void create_workloads(std::vector &workloads) override; + +private: + const ITensor *_a + { + nullptr + }; + ITensor *_transformed_a{ nullptr }; + unsigned int _Msize{ 0 }; + unsigned int _Ksize{ 0 }; + bool _transpose_a{ false }; + Window _k_multi_window{}; +}; + +} // namespace arm_compute +#endif /* __ARM_COMPUTE_NEGEMMINTERLEAVEDTRANSFORMAWRAPPER_H__ */ -- cgit v1.2.1