From aa6a04a56f21ab8de23b24c5f9ee7cafeaef8320 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 29 Aug 2018 12:53:41 +0100 Subject: COMPMID-1528: Add ReorgLayer on NEON Change-Id: I44369b4a716767163e2233b7d87bff300c523383 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/146314 Reviewed-by: Pablo Tello Tested-by: Jenkins --- src/core/NEON/kernels/NEReorgLayerKernel.cpp | 166 +++++++++++++++++++++++++++ src/runtime/NEON/functions/NEReorgLayer.cpp | 42 +++++++ 2 files changed, 208 insertions(+) create mode 100644 src/core/NEON/kernels/NEReorgLayerKernel.cpp create mode 100644 src/runtime/NEON/functions/NEReorgLayer.cpp (limited to 'src') diff --git a/src/core/NEON/kernels/NEReorgLayerKernel.cpp b/src/core/NEON/kernels/NEReorgLayerKernel.cpp new file mode 100644 index 0000000000..1b2ec92cba --- /dev/null +++ b/src/core/NEON/kernels/NEReorgLayerKernel.cpp @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/core/NEON/kernels/NEReorgLayerKernel.h" + +#include "arm_compute/core/Error.h" +#include "arm_compute/core/Helpers.h" +#include "arm_compute/core/ITensor.h" +#include "arm_compute/core/TensorInfo.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/core/Validate.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" + +#include +#include + +namespace arm_compute +{ +namespace +{ +Status validate_arguments(const ITensorInfo *input, const ITensorInfo *output, int32_t stride) +{ + //Note: ARM_COMPUTE_RETURN_ERROR_ON_CPU_F16_UNSUPPORTED(input) is not needed here as this kernel doesn't use NEON FP16 instructions. + ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, + DataType::U8, DataType::S8, DataType::QASYMM8, + DataType::U16, DataType::S16, + DataType::U32, DataType::S32, + DataType::F16, DataType::F32); + ARM_COMPUTE_RETURN_ERROR_ON_MSG(stride <= 0, "Stride should be a positive number"); + + const TensorShape output_shape = misc::shape_calculator::compute_reorg_output_shape(*input, stride); + + // Validate configured output + if(output->total_size() != 0) + { + ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DIMENSIONS(output->tensor_shape(), output_shape); + ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); + } + + return Status{}; +} +} // namespace + +template +void NEReorgLayerKernel::run_reorg(const Window &window) +{ + const DataLayout data_layout = _input->info()->data_layout(); + const size_t idx_w = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH); + const size_t idx_h = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT); + const size_t idx_c = get_data_layout_dimension_index(data_layout, DataLayoutDimension::CHANNEL); + + const unsigned int stride = _stride; + const unsigned int out_c = _output->info()->tensor_shape()[idx_c] / (stride * stride); + const uint8_t *in_ptr = _input->buffer(); + + // Collapse + Window collapsed_window = window.collapse_if_possible(window, 4); + + // Create Iterator + Iterator out(_output, collapsed_window); + + // Perform reorg + execute_window_loop(collapsed_window, [&](const Coordinates & id) + { + // Get spatial coords and channels + const unsigned int w = id[idx_w]; + const unsigned int h = id[idx_h]; + const unsigned int c = id[idx_c]; + + // Calculate mapping + const unsigned int offset = c / out_c; + Coordinates map_coords = id; + map_coords.set(idx_w, w * stride + offset % stride); + map_coords.set(idx_h, h * stride + offset / stride); + map_coords.set(idx_c, c % out_c); + + // Perform mapping + *(reinterpret_cast(out.ptr())) = *(reinterpret_cast(in_ptr + _input->info()->offset_element_in_bytes(map_coords))); + }, + out); +} + +NEReorgLayerKernel::NEReorgLayerKernel() + : _func(nullptr), _input(nullptr), _output(nullptr), _stride(1) +{ +} + +void NEReorgLayerKernel::configure(const ITensor *input, ITensor *output, int32_t stride) +{ + ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); + + // Output auto inizialitation if not yet initialized + const TensorShape output_shape = misc::shape_calculator::compute_reorg_output_shape(*input->info(), stride); + auto_init_if_empty(*output->info(), input->info()->clone()->set_tensor_shape(output_shape)); + + // Perform validation step + ARM_COMPUTE_ERROR_THROW_ON(validate_arguments(input->info(), output->info(), stride)); + + _func = nullptr; + _input = input; + _output = output; + _stride = stride; + + switch(input->info()->element_size()) + { + case 1: + _func = &NEReorgLayerKernel::run_reorg; + break; + case 2: + _func = &NEReorgLayerKernel::run_reorg; + break; + case 4: + _func = &NEReorgLayerKernel::run_reorg; + break; + default: + ARM_COMPUTE_ERROR("Element size not supported"); + break; + } + + // The NEReorgLayerKernel doesn't need padding so update_window_and_padding() can be skipped + output->info()->set_valid_region(ValidRegion(Coordinates(), output->info()->tensor_shape())); + + // Configure kernel window + Window win = calculate_max_window(*output->info(), Steps()); + + ICPPKernel::configure(win); +} + +Status NEReorgLayerKernel::validate(const ITensorInfo *input, const ITensorInfo *output, int32_t stride) +{ + ARM_COMPUTE_RETURN_ON_ERROR(validate_arguments(input, output, stride)); + return Status{}; +} + +void NEReorgLayerKernel::run(const Window &window, const ThreadInfo &info) +{ + ARM_COMPUTE_UNUSED(info); + ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); + ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(ICPPKernel::window(), window); + + if(_func != nullptr) + { + (this->*_func)(window); + } +} +} // namespace arm_compute diff --git a/src/runtime/NEON/functions/NEReorgLayer.cpp b/src/runtime/NEON/functions/NEReorgLayer.cpp new file mode 100644 index 0000000000..4ad032bb32 --- /dev/null +++ b/src/runtime/NEON/functions/NEReorgLayer.cpp @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/runtime/NEON/functions/NEReorgLayer.h" + +#include "arm_compute/core/NEON/kernels/NEReorgLayerKernel.h" +#include "support/ToolchainSupport.h" + +namespace arm_compute +{ +void NEReorgLayer::configure(const ITensor *input, ITensor *output, int32_t stride) +{ + auto k = arm_compute::support::cpp14::make_unique(); + k->configure(input, output, stride); + _kernel = std::move(k); +} + +Status NEReorgLayer::validate(const ITensorInfo *input, const ITensorInfo *output, int32_t stride) +{ + return NEReorgLayerKernel::validate(input, output, stride); +} +} // namespace arm_compute -- cgit v1.2.1