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_s8q.cpp | 73 ++++++++++++++-------- 1 file changed, 47 insertions(+), 26 deletions(-) (limited to 'src/core/NEON/kernels/arm_conv/depthwise/depthwise_s8q.cpp') diff --git a/src/core/NEON/kernels/arm_conv/depthwise/depthwise_s8q.cpp b/src/core/NEON/kernels/arm_conv/depthwise/depthwise_s8q.cpp index 46a31185d7..4ff249a5d5 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/depthwise_s8q.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/depthwise_s8q.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. + * Copyright (c) 2021-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -25,15 +25,14 @@ #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_s8qs_nhwc_3x3_s1_output2x2_dot_depthfirst.hpp" #include "kernels/sve_s8q_nhwc_3x3_s1_output2x2_dot_depthfirst.hpp" #include "kernels/sve_s8q_nhwc_3x3_s1_output2x2_mla_depthfirst.hpp" @@ -41,7 +40,7 @@ #include "kernels/sve_s8q_nhwc_5x5_s1_output2x2_mla_depthfirst.hpp" #include "kernels/sve_s8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst.hpp" #include "kernels/sve_s8q_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_s8qs_nhwc_3x3_s1_output2x2_dot_depthfirst.hpp" #include "kernels/a64_s8q_nhwc_3x3_s1_output2x2_dot_depthfirst.hpp" #include "kernels/a64_s8q_nhwc_3x3_s1_output2x2_mla_depthfirst.hpp" @@ -73,7 +72,7 @@ bool qp_weights_are_symmetric(const DepthwiseArgs &, const void *_qp) static const DepthwiseImplementation depthwise_s8q_methods[] = { #if defined(__aarch64__) -#if defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) +#if defined(ARM_COMPUTE_ENABLE_SVE) { DepthwiseMethod::DEPTHFIRST, "sve_s8qs_nhwc_3x3_s1_output2x2_dot_depthfirst", @@ -84,7 +83,8 @@ static const DepthwiseImplementation depth cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new sve_s8qs_nhwc_3x3_s1_output2x2_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -96,7 +96,8 @@ static const DepthwiseImplementation depth cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new sve_s8q_nhwc_3x3_s1_output2x2_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -108,7 +109,8 @@ static const DepthwiseImplementation depth cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new sve_s8q_nhwc_3x3_s1_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -120,7 +122,8 @@ static const DepthwiseImplementation depth cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new sve_s8q_nhwc_3x3_s2_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -132,7 +135,8 @@ static const DepthwiseImplementation depth cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new sve_s8q_nhwc_5x5_s1_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -140,10 +144,12 @@ static const DepthwiseImplementation depth "sve_s8q_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_s8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirstMultiplier(strat, args, qp); }, }, { @@ -151,13 +157,15 @@ static const DepthwiseImplementation depth "sve_s8q_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_s8q_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_s8qs_nhwc_3x3_s1_output2x2_dot_depthfirst", @@ -168,7 +176,8 @@ static const DepthwiseImplementation depth cpu_has_dot_product), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new a64_s8qs_nhwc_3x3_s1_output2x2_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -180,7 +189,8 @@ static const DepthwiseImplementation depth cpu_has_dot_product), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new a64_s8q_nhwc_3x3_s1_output2x2_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -191,7 +201,8 @@ static const DepthwiseImplementation depth qp_has_no_left_shift), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new a64_s8q_nhwc_3x3_s1_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -202,7 +213,8 @@ static const DepthwiseImplementation depth qp_has_no_left_shift), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new a64_s8q_nhwc_3x3_s2_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -213,7 +225,8 @@ static const DepthwiseImplementation depth qp_has_no_left_shift), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstQuantized(args, qp); + auto strat = new a64_s8q_nhwc_5x5_s1_output2x2_mla_depthfirst(args.cpu_info); + return new DepthwiseDepthfirst(strat, args, qp); }, }, { @@ -222,7 +235,9 @@ static const DepthwiseImplementation depth constraint(has_no_channel_multiplier), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstGenericQuantized(args, qp); + auto kernel = new a64_s8q_nhwc_generic_output9_mla_depthfirst(args.cpu_info); + auto strat = new GenericDepthfirstStrategy(kernel, 3, 3, args); + return new DepthwiseDepthfirstGeneric(strat, args, qp); }, }, { @@ -230,10 +245,12 @@ static const DepthwiseImplementation depth "a64_s8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst", constraint(is_supported, qp_has_no_left_shift, + has_channel_multiplier, cpu_has_dot_product), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstWithMultiplierQuantized(args, qp); + auto strat = new a64_s8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirstMultiplier(strat, args, qp); }, }, { @@ -241,19 +258,23 @@ static const DepthwiseImplementation depth "a64_s8q_packed_to_nhwc_5x5_s1_with_multiplier_output4x2_dot_depthfirst", constraint(is_supported, qp_has_no_left_shift, + has_channel_multiplier, cpu_has_dot_product), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { - return new DepthwiseDepthfirstWithMultiplierQuantized(args, qp); + auto strat = new a64_s8q_packed_to_nhwc_5x5_s1_with_multiplier_output4x2_dot_depthfirst(args.cpu_info); + return new DepthwiseDepthfirstMultiplier(strat, args, qp); }, }, { DepthwiseMethod::DEPTHFIRST, "a64_s8q_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_s8q_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__) -- cgit v1.2.1