From bf2fb95c99ebd215b3c0d93cb970461185ef9716 Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Fri, 29 Sep 2017 16:43:25 +0100 Subject: COMPMID-481: Add gemmlowp_aarch64_v8p4 kernel. Change-Id: I15496b16ffd636f5bff76572e750df7e15c80830 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/90532 Reviewed-by: Anthony Barbier Tested-by: Kaizen --- tests/validation/CPP/GEMMInterleaveBlocked.h | 82 ++++++++++++++++++++++++++++ tests/validation/CPP/GEMMLowp.cpp | 36 ++++++++++++ tests/validation/CPP/GEMMLowp.h | 2 + 3 files changed, 120 insertions(+) create mode 100644 tests/validation/CPP/GEMMInterleaveBlocked.h (limited to 'tests/validation/CPP') diff --git a/tests/validation/CPP/GEMMInterleaveBlocked.h b/tests/validation/CPP/GEMMInterleaveBlocked.h new file mode 100644 index 0000000000..ff5a0d647c --- /dev/null +++ b/tests/validation/CPP/GEMMInterleaveBlocked.h @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2017 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. + */ +#include "GEMM.h" + +#include "arm_compute/core/Types.h" +#include "tests/validation/FixedPoint.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +T safe_read(const SimpleTensor &t, int y, int x) +{ + const int stride = t.shape().x(); + const int M = t.shape().y(); + const int N = t.shape().x(); + if((y < M) && (x < N)) + { + return t[y * stride + x]; + } + return 0; +} + +template +SimpleTensor gemm_interleave_blocked(const SimpleTensor &in, SimpleTensor &out, int int_by, int block, bool transposed) +{ + const int M = out.shape().y(); + const int N = out.shape().x(); + for(int y = 0; y < M; y++) + { + T *out_ptr = &out[y * N]; + for(int x = 0; x < (N / int_by); x += block) + { + for(int z = 0; z < int_by; z++) + { + for(int a = 0; (out_ptr <= &out[y * N + (N - 1)]) && a < block; a++) + { + if(!transposed) + *out_ptr++ = safe_read(in, (y * int_by) + z, x + a); + else + { + const T value = safe_read(in, x + a, (y * int_by) + z); + *out_ptr++ = value; + } + } + } + } + } + return out; +} + +template SimpleTensor gemm_interleave_blocked(const SimpleTensor &in, SimpleTensor &out, int int_by, int block, bool transposed); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/CPP/GEMMLowp.cpp b/tests/validation/CPP/GEMMLowp.cpp index d172a773b6..06926e631e 100644 --- a/tests/validation/CPP/GEMMLowp.cpp +++ b/tests/validation/CPP/GEMMLowp.cpp @@ -34,6 +34,42 @@ namespace validation { namespace reference { +SimpleTensor gemmlowp(const SimpleTensor &a, const SimpleTensor &b, SimpleTensor &c) +{ + ARM_COMPUTE_UNUSED(a); + ARM_COMPUTE_UNUSED(b); + ARM_COMPUTE_UNUSED(c); + const int K = a.shape().x(); + const int b_width = b.shape().x(); + const int rows = c.shape().y(); //M + const int cols = c.shape().x(); //N + std::vector acc; + acc.resize(cols); + for(int i = 0; i < rows; ++i) + { + for(int j = 0; j < cols; ++j) + { + acc[j] = 0; + } + for(int k = 0; k < K; ++k) + { + auto tmp_a = static_cast(a[k + i * K]); + for(int j = 0; j < b_width; ++j) + { + auto tmp_b = static_cast(b[j + k * b_width]); + const int32_t mult_as_int = tmp_a * tmp_b; + acc[j] += mult_as_int; + } + } + for(int j = 0; j < cols; ++j) + { + c[j + i * cols] = acc[j]; + } + } + + return c; +} + template SimpleTensor gemmlowp(const SimpleTensor &a, const SimpleTensor &b, SimpleTensor &c, int32_t a_offset, int32_t b_offset, int32_t c_offset, int32_t c_mult_int, int32_t out_shift) diff --git a/tests/validation/CPP/GEMMLowp.h b/tests/validation/CPP/GEMMLowp.h index 216097562e..0428e9e34f 100644 --- a/tests/validation/CPP/GEMMLowp.h +++ b/tests/validation/CPP/GEMMLowp.h @@ -35,6 +35,8 @@ namespace validation { namespace reference { +SimpleTensor gemmlowp(const SimpleTensor &a, const SimpleTensor &b, SimpleTensor &c); + template SimpleTensor gemmlowp(const SimpleTensor &a, const SimpleTensor &b, SimpleTensor &c, int32_t a_offset, int32_t b_offset, int32_t c_offset, int32_t c_mult_int, int32_t out_shift); -- cgit v1.2.1