diff options
Diffstat (limited to 'src/core/NEON/kernels/arm_conv/pooling/pooling_s8.cpp')
| -rw-r--r-- | src/core/NEON/kernels/arm_conv/pooling/pooling_s8.cpp | 57 |
1 files changed, 26 insertions, 31 deletions
diff --git a/src/core/NEON/kernels/arm_conv/pooling/pooling_s8.cpp b/src/core/NEON/kernels/arm_conv/pooling/pooling_s8.cpp index 1cad674e6e..0867abc054 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/pooling_s8.cpp +++ b/src/core/NEON/kernels/arm_conv/pooling/pooling_s8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. + * Copyright (c) 2021-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -31,9 +31,7 @@ #include "kernels/cpp_nhwc_1x1_stride_any_depthfirst.hpp" #if defined(__aarch64__) #if defined(ARM_COMPUTE_ENABLE_SVE) -#if defined(ARM_COMPUTE_ENABLE_SVE2) #include "kernels/sve_s8_nhwc_avg_generic_depthfirst.hpp" -#endif // defined(ARM_COMPUTE_ENABLE_SVE2) #include "kernels/sve_s8_nhwc_max_2x2_s1_output2x2_depthfirst.hpp" #include "kernels/sve_s8_nhwc_max_generic_depthfirst.hpp" #endif // defined(ARM_COMPUTE_ENABLE_SVE) @@ -47,19 +45,6 @@ namespace arm_conv { namespace pooling { -namespace -{ - template <class Strategy> - bool is_supported(const PoolingArgs &args, const Nothing &) - { - return ((args.pool_type == Strategy::pooling_type()) && - (args.pool_window.rows == Strategy::pool_rows()) && - (args.pool_window.cols == Strategy::pool_cols()) && - (args.pool_stride.rows == Strategy::stride_rows()) && - (args.pool_stride.cols == Strategy::stride_cols())); - } -} - static const PoolingImplementation<int8_t, int8_t> pooling_s8_methods[] = { { PoolingMethod::DEPTHFIRST, @@ -69,40 +54,47 @@ static const PoolingImplementation<int8_t, int8_t> pooling_s8_methods[] = { }, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<int8_t, int8_t> * { - return new PoolingDepthfirstGeneric<cpp_nhwc_1x1_stride_any_depthfirst<int8_t>>(args); + auto strat = new cpp_nhwc_1x1_stride_any_depthfirst<int8_t>(args.cpu_info); + return new PoolingDepthfirstGeneric<int8_t>(strat, args); }, }, #if defined(__aarch64__) #if defined(ARM_COMPUTE_ENABLE_SVE) -#if defined(ARM_COMPUTE_ENABLE_SVE2) { PoolingMethod::DEPTHFIRST, - "sve_s8_nhwc_avg_generic_depthfirst", - [] (const PoolingArgs &args, const Nothing &) -> bool { return args.cpu_info->has_sve2() && args.pool_type == PoolingType::AVERAGE; }, + "sve_s8_nhwc_max_2x2_s1_output2x2_depthfirst", + [] (const PoolingArgs &args, const Nothing &os) -> bool { + return args.cpu_info->has_sve() && + is_supported<sve_s8_nhwc_max_2x2_s1_output2x2_depthfirst>(args, os); + }, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<int8_t, int8_t> * { - return new PoolingDepthfirstGeneric<sve_s8_nhwc_avg_generic_depthfirst>(args); + auto strat = new sve_s8_nhwc_max_2x2_s1_output2x2_depthfirst(args.cpu_info); + return new PoolingDepthfirst<int8_t>(strat, args); }, }, -#endif // defined(ARM_COMPUTE_ENABLE_SVE2) { PoolingMethod::DEPTHFIRST, - "sve_s8_nhwc_max_2x2_s1_output2x2_depthfirst", - [] (const PoolingArgs &args, const Nothing &unused) -> bool { - return args.cpu_info->has_sve() && is_supported<sve_s8_nhwc_max_2x2_s1_output2x2_depthfirst>(args, unused); + "sve_s8_nhwc_avg_generic_depthfirst", + [] (const PoolingArgs &args, const Nothing &) -> bool { + return args.cpu_info->has_sve2() && args.pool_type == PoolingType::AVERAGE; }, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<int8_t, int8_t> * { - return new PoolingDepthfirst<sve_s8_nhwc_max_2x2_s1_output2x2_depthfirst>(args); + auto strat = new sve_s8_nhwc_avg_generic_depthfirst(args.cpu_info); + return new PoolingDepthfirstGeneric<int8_t>(strat, args); }, }, { PoolingMethod::DEPTHFIRST, "sve_s8_nhwc_max_generic_depthfirst", - [] (const PoolingArgs &args, const Nothing &) -> bool { return args.cpu_info->has_sve() && args.pool_type == PoolingType::MAX; }, + [] (const PoolingArgs &args, const Nothing &) -> bool { + return args.cpu_info->has_sve() && args.pool_type == PoolingType::MAX; + }, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<int8_t, int8_t> * { - return new PoolingDepthfirstGeneric<sve_s8_nhwc_max_generic_depthfirst>(args); + auto strat = new sve_s8_nhwc_max_generic_depthfirst(args.cpu_info); + return new PoolingDepthfirstGeneric<int8_t>(strat, args); }, }, #endif // defined(ARM_COMPUTE_ENABLE_SVE) @@ -112,7 +104,8 @@ static const PoolingImplementation<int8_t, int8_t> pooling_s8_methods[] = { is_supported<a64_s8_nhwc_max_2x2_s1_output2x2_depthfirst>, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<int8_t, int8_t> * { - return new PoolingDepthfirst<a64_s8_nhwc_max_2x2_s1_output2x2_depthfirst>(args); + auto strat = new a64_s8_nhwc_max_2x2_s1_output2x2_depthfirst(args.cpu_info); + return new PoolingDepthfirst<int8_t>(strat, args); }, }, { @@ -121,7 +114,8 @@ static const PoolingImplementation<int8_t, int8_t> pooling_s8_methods[] = { [] (const PoolingArgs &args, const Nothing &) -> bool { return args.pool_type == PoolingType::AVERAGE; }, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<int8_t, int8_t> * { - return new PoolingDepthfirstGeneric<a64_s8_nhwc_avg_generic_depthfirst>(args); + auto strat = new a64_s8_nhwc_avg_generic_depthfirst(args.cpu_info); + return new PoolingDepthfirstGeneric<int8_t>(strat, args); }, }, { @@ -130,7 +124,8 @@ static const PoolingImplementation<int8_t, int8_t> pooling_s8_methods[] = { [] (const PoolingArgs &args, const Nothing &) -> bool { return args.pool_type == PoolingType::MAX; }, nullptr, [] (const PoolingArgs &args, const Nothing &) -> PoolingCommon<int8_t, int8_t> * { - return new PoolingDepthfirstGeneric<a64_s8_nhwc_max_generic_depthfirst>(args); + auto strat = new a64_s8_nhwc_max_generic_depthfirst(args.cpu_info); + return new PoolingDepthfirstGeneric<int8_t>(strat, args); }, }, #endif // defined(__aarch64__) |