diff options
| author | ramelg01 <ramy.elgammal@arm.com> | 2022-04-08 03:52:28 +0100 |
|---|---|---|
| committer | Ramy Elgammal <ramy.elgammal@arm.com> | 2022-04-25 15:35:59 +0000 |
| commit | c827e99fc46521f43719b0c2d1b6f05d66abf68c (patch) | |
| tree | 31df1002673b2a4c4aae66608ad85b1ad6517050 /src/core/NEON/kernels/arm_conv/pooling/pooling_implementation.hpp | |
| parent | 0a3948394e7e77344201b8732e9c20fcb5fa9a38 (diff) | |
| download | ComputeLibrary-c827e99fc46521f43719b0c2d1b6f05d66abf68c.tar.gz | |
Update Neon™ pooling kernel
- 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<ramy.elgammal@arm.com>
Change-Id: I5f4dc50913401d5c1cbfc10b866fae9490cbc4d7
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7404
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Andrew Mundy
Reviewed-by: Sheri Zhang <sheri.zhang@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/arm_conv/pooling/pooling_implementation.hpp')
| -rw-r--r-- | src/core/NEON/kernels/arm_conv/pooling/pooling_implementation.hpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/core/NEON/kernels/arm_conv/pooling/pooling_implementation.hpp b/src/core/NEON/kernels/arm_conv/pooling/pooling_implementation.hpp index 3d968b84e5..78320cec44 100644 --- a/src/core/NEON/kernels/arm_conv/pooling/pooling_implementation.hpp +++ b/src/core/NEON/kernels/arm_conv/pooling/pooling_implementation.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. + * Copyright (c) 2021-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -39,7 +39,7 @@ struct PoolingImplementation const char * name; std::function<bool(const PoolingArgs &, const OutputStage &)> is_supported; std::function<uint64_t(const PoolingArgs &, const OutputStage &)> cycle_estimate; - std::function<PoolingCommon<TInput, TOutput, OutputStage> *(const PoolingArgs &, const OutputStage &)> initialise; + std::function<PoolingCommon<TInput, TOutput> *(const PoolingArgs &, const OutputStage &)> initialise; bool get_is_supported(const PoolingArgs &args, const OutputStage &os) const { @@ -51,7 +51,7 @@ struct PoolingImplementation return (cycle_estimate == nullptr) ? 0 : cycle_estimate(args, os); } - PoolingCommon<TInput, TOutput, OutputStage> *get_instance(const PoolingArgs &args, const OutputStage &os) const + PoolingCommon<TInput, TOutput> *get_instance(const PoolingArgs &args, const OutputStage &os) const { return initialise(args, os); } @@ -92,11 +92,21 @@ bool find_implementation( } template <typename TInput, typename TOutput, class OutputStage> -UniquePoolingCommon<TInput, TOutput, OutputStage> pooling(const PoolingArgs &args, const OutputStage &os) +UniquePoolingCommon<TInput, TOutput> pooling(const PoolingArgs &args, const OutputStage &os) { const PoolingImplementation<TInput, TOutput, OutputStage> *impl = nullptr; const bool success = find_implementation<TInput, TOutput, OutputStage>(args, os, impl); - return UniquePoolingCommon<TInput, TOutput, OutputStage>(success ? impl->get_instance(args, os) : nullptr); + return UniquePoolingCommon<TInput, TOutput>(success ? impl->get_instance(args, os) : nullptr); +} + +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)); } } // namespace pooling |