From 3b0a2654034714c16f5930d2b24936d8be7b18a6 Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Fri, 7 Dec 2018 11:18:09 +0000 Subject: COMPMID-1775: Implement CLGEMMReshapeRHSMatrixKernel to reshape the RHS matrix of GEMM/GEMMLowp Change-Id: I77f2bfcc5d170bcc2428a2f27104942c1ec877d7 Reviewed-on: https://review.mlplatform.org/375 Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins --- .../validation/reference/GEMMReshapeRHSMatrix.cpp | 111 +++++++++++++++++++++ tests/validation/reference/GEMMReshapeRHSMatrix.h | 44 ++++++++ 2 files changed, 155 insertions(+) create mode 100644 tests/validation/reference/GEMMReshapeRHSMatrix.cpp create mode 100644 tests/validation/reference/GEMMReshapeRHSMatrix.h (limited to 'tests/validation/reference') diff --git a/tests/validation/reference/GEMMReshapeRHSMatrix.cpp b/tests/validation/reference/GEMMReshapeRHSMatrix.cpp new file mode 100644 index 0000000000..0224c5c67c --- /dev/null +++ b/tests/validation/reference/GEMMReshapeRHSMatrix.cpp @@ -0,0 +1,111 @@ +/* + * 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. + */ +#include "GEMMReshapeRHSMatrix.h" + +#include "arm_compute/core/Types.h" + +#include "tests/validation/Helpers.h" + +#include +#include +#include + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor gemm_reshape_rhs_matrix(const SimpleTensor &in, const TensorShape &output_shape, const GEMMRHSMatrixInfo &rhs_info) +{ + ARM_COMPUTE_ERROR_ON(in.shape().num_dimensions() > 3); + + SimpleTensor out{ output_shape, in.data_type() }; + + // Initialize the output tensor with zero + std::memset(&out[0], 0, out.num_elements() * sizeof(T)); + + const unsigned int N = in.shape()[0]; + const unsigned int K = in.shape()[1]; + const unsigned int B = in.shape()[2]; + + const unsigned int num_tiles_x = std::ceil(N / static_cast(rhs_info.n0)); + const unsigned int num_tiles_y = std::ceil(K / static_cast(rhs_info.k0)); + + const TensorShape tile_dims(rhs_info.n0, rhs_info.k0); + const TensorShape tile_dims_transposed(rhs_info.k0, rhs_info.n0); + + // Simple tensor for the input tile + SimpleTensor src_tile{ tile_dims, in.data_type() }; + + // Simple tensor for the input tile + SimpleTensor src_tile_transposed{ tile_dims_transposed, in.data_type() }; + + // Simple tensor to use when storing the values + SimpleTensor *tile_to_use = rhs_info.transpose ? &src_tile_transposed : &src_tile; + + const unsigned int offset_output_x = rhs_info.interleave ? tile_to_use->shape()[0] : tile_to_use->shape()[0] * tile_to_use->shape()[1]; + const unsigned int step_output_x = rhs_info.interleave ? tile_to_use->shape()[0] * rhs_info.h0 : tile_to_use->shape()[0]; + + for(unsigned int z = 0; z < B; ++z) + { + for(unsigned int y = 0; y < num_tiles_y; ++y) + { + for(unsigned int x = 0; x < num_tiles_x; ++x) + { + // Get the tile from the input tensor + get_tile(in, src_tile, Coordinates(x * rhs_info.n0, y * rhs_info.k0, z, 0)); + + if(rhs_info.transpose) + { + // Transpose matrix + transpose_matrix(src_tile, src_tile_transposed); + } + + // Store + const unsigned int offset_output = (y * rhs_info.k0 * rhs_info.n0 * rhs_info.h0) + ((x % rhs_info.h0) * offset_output_x) + ((x / rhs_info.h0) * out.shape()[0]) + (z * out.shape()[0] * out.shape()[1]); + + for(unsigned int i = 0; i < tile_to_use->shape()[1]; ++i) + { + const unsigned int offset_tile = i * tile_to_use->shape()[0]; + + // Copy per row + std::copy(&(*tile_to_use)[offset_tile], &(*tile_to_use)[offset_tile + tile_to_use->shape()[0]], &out[offset_output + i * step_output_x]); + } + } + } + } + + return out; +} +template SimpleTensor gemm_reshape_rhs_matrix(const SimpleTensor &in, const TensorShape &output_shape, const GEMMRHSMatrixInfo &rhs_info); +template SimpleTensor gemm_reshape_rhs_matrix(const SimpleTensor &in, const TensorShape &output_shape, const GEMMRHSMatrixInfo &rhs_info); +template SimpleTensor gemm_reshape_rhs_matrix(const SimpleTensor &in, const TensorShape &output_shape, const GEMMRHSMatrixInfo &rhs_info); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute \ No newline at end of file diff --git a/tests/validation/reference/GEMMReshapeRHSMatrix.h b/tests/validation/reference/GEMMReshapeRHSMatrix.h new file mode 100644 index 0000000000..8edcfd67fa --- /dev/null +++ b/tests/validation/reference/GEMMReshapeRHSMatrix.h @@ -0,0 +1,44 @@ +/* + * 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_TEST_GEMMRESHAPERHSMATRIX_H__ +#define __ARM_COMPUTE_TEST_GEMMRESHAPERHSMATRIX_H__ + +#include "tests/SimpleTensor.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor gemm_reshape_rhs_matrix(const SimpleTensor &in, const TensorShape &output_shape, const GEMMRHSMatrixInfo &rhs_info); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_GEMMRESHAPERHS_MATRIX_H__ */ \ No newline at end of file -- cgit v1.2.1