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.h | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/core/utils/AssemblyUtils.h (limited to 'src/core/utils/AssemblyUtils.h') 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 */ -- cgit v1.2.1