From 20fca524baf99402f742ce38c538f2fd07d5fff9 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Mon, 7 Jun 2021 14:23:57 +0100 Subject: Create core library using high priority operators A smaller core library is created using a subset of the operators. Changed the structure of filelist.json in order to include more information about the kernels and make the selection easier. Resolves: COMPMID-4514 Change-Id: I079ca7d8e64346174eebdd13b834e1dd4dc36ca2 Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5786 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- .../kernels/arm_conv/depthwise/depthwise_u8q.cpp | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 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 3e190d242a..67713c5bcc 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/depthwise_u8q.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/depthwise_u8q.cpp @@ -33,14 +33,14 @@ #include "depthwise_implementation_constraints.hpp" #if defined(__aarch64__) -#if defined(__ARM_FEATURE_SVE) && defined(SVE2) +#if defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) #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_FEATURE_SVE) && defined(SVE2) +#endif // defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) #include "kernels/a64_u8q_nhwc_3x3_s1_output2x2_dot_depthfirst.hpp" #include "kernels/a64_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst.hpp" #include "kernels/a64_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst.hpp" @@ -60,13 +60,14 @@ namespace depthwise { static const DepthwiseImplementation depthwise_u8q_methods[] = { #if defined(__aarch64__) -#if defined(__ARM_FEATURE_SVE) && defined(SVE2) +#if defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) { DepthwiseMethod::DEPTHFIRST, "sve_u8q_nhwc_3x3_s1_output2x2_dot_depthfirst", constraint(is_supported, has_no_channel_multiplier, - qp_has_no_left_shift), + qp_has_no_left_shift, + cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { return new DepthwiseDepthfirstQuantized(args, qp); @@ -77,7 +78,8 @@ static const DepthwiseImplementation de "sve_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst", constraint(is_supported, has_no_channel_multiplier, - qp_has_no_left_shift), + qp_has_no_left_shift, + cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { return new DepthwiseDepthfirstQuantized(args, qp); @@ -88,7 +90,8 @@ static const DepthwiseImplementation de "sve_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst", constraint(is_supported, has_no_channel_multiplier, - qp_has_no_left_shift), + qp_has_no_left_shift, + cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { return new DepthwiseDepthfirstQuantized(args, qp); @@ -99,7 +102,8 @@ static const DepthwiseImplementation de "sve_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst", constraint(is_supported, has_no_channel_multiplier, - qp_has_no_left_shift), + qp_has_no_left_shift, + cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { return new DepthwiseDepthfirstQuantized(args, qp); @@ -109,7 +113,8 @@ static const DepthwiseImplementation de DepthwiseMethod::DEPTHFIRST, "sve_u8q_packed_to_nhwc_3x3_s2_with_multiplier_output2x4_dot_depthfirst", constraint(is_supported, - qp_has_no_left_shift), + qp_has_no_left_shift, + cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { return new DepthwiseDepthfirstWithMultiplierQuantized(args, qp); @@ -119,13 +124,14 @@ static const DepthwiseImplementation de DepthwiseMethod::DEPTHFIRST, "sve_u8q_packed_to_nhwc_5x5_s1_with_multiplier_output4x2_dot_depthfirst", constraint(is_supported, - qp_has_no_left_shift), + qp_has_no_left_shift, + cpu_has_sve2), nullptr, [] (const DepthwiseArgs &args, const Requantize32 &qp) -> DepthwiseCommon * { return new DepthwiseDepthfirstWithMultiplierQuantized(args, qp); }, }, -#endif // defined(__ARM_FEATURE_SVE) && defined(SVE2) +#endif // defined(ARM_COMPUTE_ENABLE_SVE) && defined(ARM_COMPUTE_ENABLE_SVE2) { DepthwiseMethod::DEPTHFIRST, "a64_u8q_nhwc_3x3_s1_output2x2_dot_depthfirst", -- cgit v1.2.1