From d02d5edfa15ba6c04a9986a8a362a945cb38ac31 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Fri, 22 Jan 2021 09:47:04 +0000 Subject: Integrate improved CPU depthwise convolution kernels * Replace assembly kernels for depthwise convolution with more optimized ones. * Add int8 assembly kernels. * Fix implicit padding on optimized kernels Resolves: COMPMID-3867, COMPMID-4361 Change-Id: I0b0867e05f61be4f368f62190d55e14d0ab3ebf2 Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5622 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas --- src/core/utils/AssemblyUtils.cpp | 70 ++++++++++++++++++++++++++++ src/core/utils/AssemblyUtils.h | 52 +++++++++++++++++++++ src/core/utils/quantization/AsymmHelpers.cpp | 7 ++- 3 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 src/core/utils/AssemblyUtils.cpp create mode 100644 src/core/utils/AssemblyUtils.h (limited to 'src/core/utils') diff --git a/src/core/utils/AssemblyUtils.cpp b/src/core/utils/AssemblyUtils.cpp new file mode 100644 index 0000000000..1e8a2a54c9 --- /dev/null +++ b/src/core/utils/AssemblyUtils.cpp @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2021 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 "src/core/utils/AssemblyUtils.h" + +namespace arm_compute +{ +namespace assembly_utils +{ +arm_gemm::Activation map_to_arm_gemm_activation(const ActivationLayerInfo &act) +{ + arm_gemm::Activation gemm_act; + + // Early exit in case lower bound is other than 0, as it's not yet supported + if(act.b() != 0.f) + { + return gemm_act; + } + + switch(act.activation()) + { + case ActivationLayerInfo::ActivationFunction::RELU: + gemm_act.type = arm_gemm::Activation::Type::ReLU; + break; + case ActivationLayerInfo::ActivationFunction::BOUNDED_RELU: + gemm_act.type = arm_gemm::Activation::Type::BoundedReLU; + gemm_act.param1 = act.a(); + gemm_act.param2 = 0.f; + break; + case ActivationLayerInfo::ActivationFunction::LU_BOUNDED_RELU: + gemm_act.type = arm_gemm::Activation::Type::BoundedReLU; + gemm_act.param1 = act.a(); + gemm_act.param2 = act.b(); + break; + default: + gemm_act.type = arm_gemm::Activation::Type::None; + } + + return gemm_act; +} + +arm_conv::PaddingValues map_to_arm_conv_padding(const PadStrideInfo &pad_stride_info) +{ + return arm_conv::PaddingValues{ pad_stride_info.pad_left(), + pad_stride_info.pad_top(), + pad_stride_info.pad_right(), + pad_stride_info.pad_bottom() }; +} +} // namespace assembly_utils +} // namespace arm_compute diff --git a/src/core/utils/AssemblyUtils.h b/src/core/utils/AssemblyUtils.h new file mode 100644 index 0000000000..e682973827 --- /dev/null +++ b/src/core/utils/AssemblyUtils.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021 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 UTILS_CORE_ASSEMBLY_UTILS_H +#define UTILS_CORE_ASSEMBLY_UTILS_H + +#include "arm_compute/core/Types.h" +#include "src/core/NEON/kernels/assembly/common.hpp" +#include "src/core/cpu/kernels/assembly/arm_gemm.hpp" + +namespace arm_compute +{ +namespace assembly_utils +{ +/** Performs a mapping between Compute Library ActivationLayerInfo and the assembly Activation structure. + * + * @param[in] act Compute Library activation info. + * + * @return Assembly activation info. + */ +arm_gemm::Activation map_to_arm_gemm_activation(const ActivationLayerInfo &act); + +/** Performs a mapping between Compute Library PadStrideInfo and the assembly PaddingValues structure. + * + * @param[in] pad_stride_info Compute Library padding and strides info. + * + * @return Assembly padding values. + */ +arm_conv::PaddingValues map_to_arm_conv_padding(const PadStrideInfo &pad_stride_info); +} // namespace assembly +} // namespace arm_compute +#endif /* UTILS_CORE_ASSEMBLY_UTILS_H */ diff --git a/src/core/utils/quantization/AsymmHelpers.cpp b/src/core/utils/quantization/AsymmHelpers.cpp index 49e39f663f..81e813caff 100644 --- a/src/core/utils/quantization/AsymmHelpers.cpp +++ b/src/core/utils/quantization/AsymmHelpers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -185,16 +185,15 @@ std::pair get_min_max_values_from_quantized_data_type(DataType data_ty void compute_quantized_multipliers_and_shifts(const ITensorInfo *input, const ITensorInfo *weights, const ITensorInfo *output, - unsigned int idx_ofms, int32_t *output_multipliers_ptr, int32_t *output_shifts_ptr) { - const unsigned int num_filters = is_data_type_quantized_per_channel(weights->data_type()) ? weights->dimension(idx_ofms) : 1; - const UniformQuantizationInfo iq_info = input->quantization_info().uniform(); const QuantizationInfo wq_info = weights->quantization_info(); const UniformQuantizationInfo oq_info = output->quantization_info().uniform(); + const unsigned int num_filters = wq_info.scale().size(); + for(unsigned int i = 0; i < num_filters; ++i) { int32_t output_multiplier = 0; -- cgit v1.2.1