diff options
Diffstat (limited to 'src/runtime/NEON/functions/NEPoolingLayer.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NEPoolingLayer.cpp | 104 |
1 files changed, 65 insertions, 39 deletions
diff --git a/src/runtime/NEON/functions/NEPoolingLayer.cpp b/src/runtime/NEON/functions/NEPoolingLayer.cpp index 887f00de24..0c857b54dc 100644 --- a/src/runtime/NEON/functions/NEPoolingLayer.cpp +++ b/src/runtime/NEON/functions/NEPoolingLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -27,73 +27,99 @@ #include "arm_compute/runtime/NEON/NEScheduler.h" #include "src/core/NEON/kernels/NEFillBorderKernel.h" #include "src/core/NEON/kernels/NEPoolingLayerKernel.h" +#include "src/runtime/NEON/functions/NEPoolingAssemblyDispatch.h" namespace arm_compute { NEPoolingLayer::~NEPoolingLayer() = default; -NEPoolingLayer::NEPoolingLayer() - : _pooling_layer_kernel(), _border_handler(), _is_global_pooling_layer(false), _data_layout(DataLayout::NCHW) +NEPoolingLayer::NEPoolingLayer(std::shared_ptr<IMemoryManager> memory_manager) + : _memory_manager(std::move(memory_manager)), _pooling_layer_kernel(), _border_handler(), _asm_glue(), _is_global_pooling_layer(false), _data_layout(DataLayout::NCHW) { } void NEPoolingLayer::configure(ITensor *input, ITensor *output, const PoolingLayerInfo &pool_info, ITensor *indices) { - // Check if we have Global Pooling Layer - _is_global_pooling_layer = (input->info()->dimension(0) == pool_info.pool_size.width) && (input->info()->dimension(1) == pool_info.pool_size.height); + // Check if we can run assembly kernels. Currently, indices are not supported by those kernels + const bool run_optimised = bool(NEPoolingAssemblyDispatch::validate(input->info(), output->info(), pool_info)) && (indices == nullptr); - // Get data layout - _data_layout = pool_info.data_layout == DataLayout::UNKNOWN ? input->info()->data_layout() : pool_info.data_layout; + if(run_optimised) + { + _asm_glue = std::make_unique<NEPoolingAssemblyDispatch>(_memory_manager); + _asm_glue->configure(input, output, pool_info); + ARM_COMPUTE_ERROR_ON(!_asm_glue->is_configured()); + } + else + { + // Check if we have Global Pooling Layer + _is_global_pooling_layer = (input->info()->dimension(0) == pool_info.pool_size.width) && (input->info()->dimension(1) == pool_info.pool_size.height); - // Configure pooling kernel - _pooling_layer_kernel = std::make_unique<NEPoolingLayerKernel>(); - _pooling_layer_kernel->configure(input, output, pool_info, indices); + // Get data layout + _data_layout = pool_info.data_layout == DataLayout::UNKNOWN ? input->info()->data_layout() : pool_info.data_layout; - switch(_data_layout) - { - case DataLayout::NCHW: + // Configure pooling kernel + _pooling_layer_kernel = std::make_unique<NEPoolingLayerKernel>(); + _pooling_layer_kernel->configure(input, output, pool_info, indices); + + switch(_data_layout) { - // Configure border depending on operation required (quantize border in case of asymmetric data_type) - BorderMode border_mode = (!indices && pool_info.pool_type == PoolingType::MAX) ? BorderMode::REPLICATE : BorderMode::CONSTANT; - PixelValue zero_value((indices) ? std::numeric_limits<int>::min() : 0.f); - if(is_data_type_quantized_asymmetric(input->info()->data_type()) && !pool_info.exclude_padding) + case DataLayout::NCHW: { - zero_value = PixelValue(0, input->info()->data_type(), input->info()->quantization_info()); + // Configure border depending on operation required (quantize border in case of asymmetric data_type) + BorderMode border_mode = (!indices && pool_info.pool_type == PoolingType::MAX) ? BorderMode::REPLICATE : BorderMode::CONSTANT; + PixelValue zero_value((indices) ? std::numeric_limits<int>::min() : 0.f); + if(is_data_type_quantized_asymmetric(input->info()->data_type()) && !pool_info.exclude_padding) + { + zero_value = PixelValue(0, input->info()->data_type(), input->info()->quantization_info()); + } + _border_handler = std::make_unique<NEFillBorderKernel>(); + _border_handler->configure(input, _pooling_layer_kernel->border_size(), border_mode, zero_value); + break; } - _border_handler = std::make_unique<NEFillBorderKernel>(); - _border_handler->configure(input, _pooling_layer_kernel->border_size(), border_mode, zero_value); - break; + case DataLayout::NHWC: + break; + default: + ARM_COMPUTE_ERROR("Data layout not supported"); } - case DataLayout::NHWC: - break; - default: - ARM_COMPUTE_ERROR("Data layout not supported"); } } Status NEPoolingLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const PoolingLayerInfo &pool_info, const ITensorInfo *indices) { + const bool run_optimised = bool(NEPoolingAssemblyDispatch::validate(input, output, pool_info)) && (indices == nullptr); + + if(run_optimised) + { + return Status{}; + } + return NEPoolingLayerKernel::validate(input, output, pool_info, indices); } void NEPoolingLayer::run() { - switch(_data_layout) + if(_asm_glue && _asm_glue->is_configured()) + { + _asm_glue->run(); + } + else { - case DataLayout::NCHW: - // Fill border - NEScheduler::get().schedule(_border_handler.get(), Window::DimY); + switch(_data_layout) + { + case DataLayout::NCHW: + // Fill border + NEScheduler::get().schedule(_border_handler.get(), Window::DimY); - // Run pooling layer - NEScheduler::get().schedule(_pooling_layer_kernel.get(), _is_global_pooling_layer ? Window::DimZ : Window::DimY); - break; - case DataLayout::NHWC: - // Run pooling layer - NEScheduler::get().schedule(_pooling_layer_kernel.get(), Window::DimX); - break; - default: - ARM_COMPUTE_ERROR("Data layout not supported"); + // Run pooling layer + NEScheduler::get().schedule(_pooling_layer_kernel.get(), _is_global_pooling_layer ? Window::DimZ : Window::DimY); + break; + case DataLayout::NHWC: + // Run pooling layer + NEScheduler::get().schedule(_pooling_layer_kernel.get(), Window::DimX); + break; + default: + ARM_COMPUTE_ERROR("Data layout not supported"); + } } } - } // namespace arm_compute |