From 47d39dc615d1dee2482bc84699802165a9778ac8 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Mon, 11 Mar 2019 14:03:23 +0000 Subject: COMPMID-1975: Update depthwise convolution. Change-Id: Iad58672be35710a7ec2e918653d6d529709387e8 Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/898 Tested-by: Arm Jenkins Reviewed-by: Giuseppe Rossini Comments-Addressed: Arm Jenkins Reviewed-by: Gian Marco Iodice --- .../depthwise/depthwise_pack_parameters.cpp | 100 +++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 src/core/NEON/kernels/convolution/depthwise/depthwise_pack_parameters.cpp (limited to 'src/core/NEON/kernels/convolution/depthwise/depthwise_pack_parameters.cpp') diff --git a/src/core/NEON/kernels/convolution/depthwise/depthwise_pack_parameters.cpp b/src/core/NEON/kernels/convolution/depthwise/depthwise_pack_parameters.cpp new file mode 100644 index 0000000000..692086c74a --- /dev/null +++ b/src/core/NEON/kernels/convolution/depthwise/depthwise_pack_parameters.cpp @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2019 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 "arm_compute/core/NEON/kernels/convolution/depthwise/impl_base.hpp" + +// TODO Move to common utilities somewhere +template struct DType { }; +template <> struct DType<1> { using scalar_type = uint8_t; }; +template <> struct DType<2> { using scalar_type = uint16_t; }; +template <> struct DType<4> { using scalar_type = uint32_t; }; + +namespace depthwise +{ + +template +void PackParameters::execute( + unsigned int n_channels, + void *buffer, + const void *weights, + const unsigned int weight_row_stride, + const unsigned int weight_col_stride, + const void *biases +) +{ + using TWeight = typename DType::scalar_type; + using TBias = typename DType::scalar_type; + + auto buffer_ptr = static_cast(buffer); + auto weights_ptr = static_cast(weights); + auto biases_ptr = static_cast(biases); + + const unsigned int veclen = 16 / WeightSize; + for (; n_channels >= veclen; n_channels -= veclen) + { + // Copy biases + for (unsigned int i = 0; i < veclen; i++) + { + auto ptr = reinterpret_cast(buffer_ptr); + *ptr = (biases_ptr == nullptr) ? 0x0 : *(biases_ptr++); + buffer_ptr += BiasSize; + } + + // Copy weights + for (unsigned int i = 0; i < KernelRows; i++) + { + for (unsigned int j = 0; j < KernelColumns; j++) + { + for (unsigned int c = 0; c < veclen; c++) + { + *(reinterpret_cast(buffer_ptr)) = weights_ptr[i*weight_row_stride + j*weight_col_stride + c]; + buffer_ptr += WeightSize; + } + } + } + weights_ptr += veclen; + } + for (; n_channels; n_channels--) + { + // Copy bias + auto ptr = reinterpret_cast(buffer_ptr); + *ptr = (biases_ptr == nullptr) ? 0x0 : *(biases_ptr++); + buffer_ptr += BiasSize; + + // Copy weights + for (unsigned int i = 0; i < KernelRows; i++) + { + for (unsigned int j = 0; j < KernelColumns; j++) + { + *(reinterpret_cast(buffer_ptr)) = weights_ptr[i*weight_row_stride + j*weight_col_stride]; + buffer_ptr += WeightSize; + } + } + weights_ptr++; + } +} + +template struct PackParameters<3, 3, 2ul, 2ul>; +template struct PackParameters<3, 3, 4ul, 4ul>; +} // namespace -- cgit v1.2.1