From 8a164884dddf769643cf3b9f7f94e43cb4f3c20b Mon Sep 17 00:00:00 2001 From: ramelg01 Date: Thu, 7 Apr 2022 02:42:52 +0100 Subject: =?UTF-8?q?Update=20Neon=E2=84=A2=20depthwise=20kernel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Reduce duplication and simplify overall structure. - Improve multi-threaded performance by sharing more data in lower-level caches. Partially Resolves: COMPMID-5054 Signed-off-by: Ramy Elgammal Change-Id: Iac747f39b21c540122fa75218762631c4d787911 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7449 Tested-by: Arm Jenkins Reviewed-by: Andrew Mundy Reviewed-by: Sheri Zhang Comments-Addressed: Arm Jenkins --- .../kernels/arm_conv/depthwise/depthwise_u8q.cpp | 115 ++++++++++++++++----- 1 file changed, 91 insertions(+), 24 deletions(-) (limited to 'src/core/NEON/kernels/arm_conv/depthwise/depthwise_u8q.cpp') diff --git a/src/core/NEON/kernels/arm_conv/depthwise/depthwise_u8q.cpp b/src/core/NEON/kernels/arm_conv/depthwise/depthwise_u8q.cpp index 67713c5bcc..b1489d0b59 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/depthwise_u8q.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/depthwise_u8q.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. + * Copyright (c) 2021-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -25,23 +25,27 @@ #include "arm_gemm_local.hpp" #include "depthwise_implementation.hpp" -#include "depthwise_depthfirst_quantized.hpp" -#include "depthwise_depthfirst_generic_quantized.hpp" -#include "depthwise_depthfirst_multiplier_quantized.hpp" -#include "depthwise_depthfirst_generic_multiplier_quantized.hpp" +#include "depthwise_depthfirst.hpp" +#include "depthwise_depthfirst_generic.hpp" +#include "depthwise_depthfirst_multiplier.hpp" #include "depthwise_implementation_constraints.hpp" #if defined(__aarch64__) -#if defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) +#if defined(ARM_COMPUTE_ENABLE_SVE) #include "kernels/sve_u8q_nhwc_3x3_s1_output2x2_dot_depthfirst.hpp" #include "kernels/sve_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst.hpp" #include "kernels/sve_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst.hpp" #include "kernels/sve_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst.hpp" #include "kernels/sve_u8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst.hpp" #include "kernels/sve_u8q_packed_to_nhwc_5x5_s1_with_multiplier_output4x2_dot_depthfirst.hpp" -#endif // defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) +#endif // defined(ARM_COMPUTE_ENABLE_SVE) #include "kernels/a64_u8q_nhwc_3x3_s1_output2x2_dot_depthfirst.hpp" + +#include "kernels/a64_u8qa_nhwc_3x3_s1_output2x2_mla_depthfirst.hpp" +#include "kernels/a64_u8qa_nhwc_3x3_s2_output2x2_mla_depthfirst.hpp" +#include "kernels/a64_u8qa_nhwc_5x5_s1_output2x2_mla_depthfirst.hpp" + #include "kernels/a64_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst.hpp" #include "kernels/a64_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst.hpp" #include "kernels/a64_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst.hpp" @@ -49,6 +53,7 @@ #include "kernels/a64_u8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst.hpp" #include "kernels/a64_u8q_packed_to_nhwc_5x5_s1_with_multiplier_output4x2_dot_depthfirst.hpp" #include "kernels/a64_u8q_packed_to_nhwc_generic_with_multiplier_output2x8_mla_depthfirst.hpp" + #endif // defined(__aarch64__) #include @@ -60,7 +65,7 @@ namespace depthwise { static const DepthwiseImplementation depthwise_u8q_methods[] = { #if defined(__aarch64__) -#if defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) +#if defined(ARM_COMPUTE_ENABLE_SVE) { DepthwiseMethod::DEPTHFIRST, "sve_u8q_nhwc_3x3_s1_output2x2_dot_depthfirst", @@ -70,7 +75,8 @@ static const DepthwiseImplementation de cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new sve_u8q_nhwc_3x3_s1_output2x2_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -82,7 +88,8 @@ static const DepthwiseImplementation de cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new sve_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -94,7 +101,8 @@ static const DepthwiseImplementation de cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new sve_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -106,7 +114,8 @@ static const DepthwiseImplementation de cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new sve_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -114,10 +123,12 @@ static const DepthwiseImplementation de "sve_u8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst", constraint(is_supported, qp_has_no_left_shift, + has_channel_multiplier, cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstWithMultiplierQuantized(args, qp); + auto strat = new sve_u8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirstMultiplier(strat, args, qp); }, }, { @@ -125,13 +136,15 @@ static const DepthwiseImplementation de "sve_u8q_packed_to_nhwc_5x5_s1_with_multiplier_output4x2_dot_depthfirst", constraint(is_supported, qp_has_no_left_shift, + has_channel_multiplier, cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstWithMultiplierQuantized(args, qp); + auto strat = new sve_u8q_packed_to_nhwc_5x5_s1_with_multiplier_output4x2_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirstMultiplier(strat, args, qp); }, }, -#endif // defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) +#endif // defined(ARM_COMPUTE_ENABLE_SVE) { DepthwiseMethod::DEPTHFIRST, "a64_u8q_nhwc_3x3_s1_output2x2_dot_depthfirst", @@ -141,9 +154,51 @@ static const DepthwiseImplementation de qp_has_no_left_shift), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new a64_u8q_nhwc_3x3_s1_output2x2_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); + }, + }, + + { + DepthwiseMethod::DEPTHFIRST, + "a64_u8qa_nhwc_3x3_s1_output2x2_mla_depthfirst", + constraint(is_supported, + has_no_channel_multiplier, + qp_zero_a_offset, + qp_has_no_left_shift), + nullptr, + [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { + auto strat = new a64_u8qa_nhwc_3x3_s1_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, + { + DepthwiseMethod::DEPTHFIRST, + "a64_u8qa_nhwc_3x3_s2_output2x2_mla_depthfirst", + constraint(is_supported, + has_no_channel_multiplier, + qp_zero_a_offset, + qp_has_no_left_shift), + nullptr, + [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { + auto strat = new a64_u8qa_nhwc_3x3_s2_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); + }, + }, + { + DepthwiseMethod::DEPTHFIRST, + "a64_u8qa_nhwc_5x5_s1_output2x2_mla_depthfirst", + constraint(is_supported, + has_no_channel_multiplier, + qp_zero_a_offset, + qp_has_no_left_shift), + nullptr, + [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { + auto strat = new a64_u8qa_nhwc_5x5_s1_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); + }, + }, + { DepthwiseMethod::DEPTHFIRST, "a64_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst", @@ -152,7 +207,8 @@ static const DepthwiseImplementation de qp_has_no_left_shift), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new a64_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -163,7 +219,8 @@ static const DepthwiseImplementation de qp_has_no_left_shift), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new a64_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -174,7 +231,8 @@ static const DepthwiseImplementation de qp_has_no_left_shift), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new a64_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -183,7 +241,9 @@ static const DepthwiseImplementation de constraint(has_no_channel_multiplier), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstGenericQuantized(args, qp); + auto kernel = new a64_u8q_nhwc_generic_output9_mla_depthfirst(args.cpu_info); + auto strat = new GenericDepthfirstStrategy(kernel, 3, 3, args); + return new DepthwiseDepthfirstGeneric(strat, args, qp); }, }, { @@ -191,10 +251,12 @@ static const DepthwiseImplementation de "a64_u8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst", constraint(is_supported, cpu_has_dot_product, + has_channel_multiplier, qp_has_no_left_shift), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstWithMultiplierQuantized(args, qp); + auto strat = new a64_u8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirstMultiplier(strat, args, qp); }, }, { @@ -202,21 +264,26 @@ static const DepthwiseImplementation de "a64_u8q_packed_to_nhwc_5x5_s1_with_multiplier_output4x2_dot_depthfirst", constraint(is_supported, cpu_has_dot_product, + has_channel_multiplier, qp_has_no_left_shift), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstWithMultiplierQuantized(args, qp); + auto strat = new a64_u8q_packed_to_nhwc_5x5_s1_with_multiplier_output4x2_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirstMultiplier(strat, args, qp); }, }, { DepthwiseMethod::DEPTHFIRST, "a64_u8q_packed_to_nhwc_generic_with_multiplier_output2x8_mla_depthfirst", - nullptr, + constraint(has_channel_multiplier), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstGenericWithMultiplierQuantized(args, qp); + auto kern = new a64_u8q_packed_to_nhwc_generic_with_multiplier_output2x8_mla_depthfirst(args.cpu_info); + auto strat = new GenericDepthfirstMultiplierStrategy(kern, args); + return new DepthwiseDepthfirstMultiplier(strat, args, qp); }, }, + #endif // defined(__aarch64__) { DepthwiseMethod::DEFAULT, "", nullptr, nullptr, nullptr }, // End of list }; -- cgit v1.2.1