From ca8c0f79a9fc1b3056c574bdd134748ea3cfd885 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Thu, 20 Feb 2020 15:21:21 +0000 Subject: COMPMID-3162: Remove padding from NEFloorKernel Change-Id: I943b4e03c2e7a9db9a78f80413b2d5d470381488 Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2770 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- src/core/NEON/kernels/NEFloorKernel.cpp | 78 ++++++++++++++++++++------------- tests/validation/NEON/Floor.cpp | 6 +-- 2 files changed, 50 insertions(+), 34 deletions(-) diff --git a/src/core/NEON/kernels/NEFloorKernel.cpp b/src/core/NEON/kernels/NEFloorKernel.cpp index 43554a097c..99dc31e858 100644 --- a/src/core/NEON/kernels/NEFloorKernel.cpp +++ b/src/core/NEON/kernels/NEFloorKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -53,22 +53,6 @@ Status validate_arguments(const ITensorInfo *input, const ITensorInfo *output) return Status{}; } - -std::pair validate_and_configure_window(ITensorInfo *input, ITensorInfo *output) -{ - auto_init_if_empty(*output, *input); - - const unsigned int num_elems_processed_per_iteration = 16 / input->element_size(); - - Window win = calculate_max_window(*input, Steps(num_elems_processed_per_iteration)); - AccessWindowHorizontal input_access(input, 0, num_elems_processed_per_iteration); - AccessWindowHorizontal output_access(output, 0, num_elems_processed_per_iteration); - bool window_changed = update_window_and_padding(win, input_access, output_access); - output_access.set_valid_region(win, input->valid_region()); - - Status err = (window_changed) ? ARM_COMPUTE_CREATE_ERROR(ErrorCode::RUNTIME_ERROR, "Insufficient Padding!") : Status{}; - return std::make_pair(err, win); -} } // namespace void NEFloorKernel::configure(const ITensor *input, ITensor *output) @@ -85,16 +69,18 @@ void NEFloorKernel::configure(const ITensor *input, ITensor *output) _output = output; // Configure kernel window - auto win_config = validate_and_configure_window(input->info(), output->info()); - ARM_COMPUTE_ERROR_THROW_ON(win_config.first); - INEKernel::configure(win_config.second); + Window win = calculate_max_window(*input->info(), Steps()); + + Coordinates coord; + coord.set_num_dimensions(output->info()->num_dimensions()); + output->info()->set_valid_region(ValidRegion(coord, output->info()->tensor_shape())); + + INEKernel::configure(win); } Status NEFloorKernel::validate(const ITensorInfo *input, const ITensorInfo *output) { ARM_COMPUTE_RETURN_ON_ERROR(validate_arguments(input, output)); - ARM_COMPUTE_RETURN_ON_ERROR(validate_and_configure_window(input->clone().get(), output->clone().get()).first); - return Status{}; } @@ -106,25 +92,57 @@ void NEFloorKernel::run(const Window &window, const ThreadInfo &info) const DataType data_type = _input->info()->data_type(); - Iterator input(_input, window); - Iterator output(_output, window); + const auto window_start_x = static_cast(window.x().start()); + const auto window_end_x = static_cast(window.x().end()); + const int window_step_x = 16 / _input->info()->element_size(); + + Window win{ window }; + win.set(Window::DimX, Window::Dimension(0, 1, 1)); + Iterator input(_input, win); + Iterator output(_output, win); if(data_type == DataType::F32) { - execute_window_loop(window, [&](const Coordinates &) + execute_window_loop(win, [&](const Coordinates &) { - const float32x4_t res = vfloorq_f32(vld1q_f32(reinterpret_cast(input.ptr()))); - vst1q_f32(reinterpret_cast(output.ptr()), res); + const auto input_ptr = reinterpret_cast(input.ptr()); + const auto output_ptr = reinterpret_cast(output.ptr()); + + int x = window_start_x; + for(; x <= (window_end_x - window_step_x); x += window_step_x) + { + const float32x4_t res = vfloorq_f32(vld1q_f32(input_ptr + x)); + vst1q_f32(output_ptr + x, res); + } + + // Compute left-over elements + for(; x < window_end_x; ++x) + { + *(output_ptr + x) = std::floor(*(input_ptr + x)); + } }, input, output); } #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC else if(data_type == DataType::F16) { - execute_window_loop(window, [&](const Coordinates &) + execute_window_loop(win, [&](const Coordinates &) { - const float16x8_t res = vfloorq_f16(vld1q_f16(reinterpret_cast(input.ptr()))); - vst1q_f16(reinterpret_cast(output.ptr()), res); + const auto input_ptr = reinterpret_cast(input.ptr()); + const auto output_ptr = reinterpret_cast(output.ptr()); + + int x = window_start_x; + for(; x <= (window_end_x - window_step_x); x += window_step_x) + { + const float16x8_t res = vfloorq_f16(vld1q_f16(input_ptr + x)); + vst1q_f16(output_ptr + x, res); + } + + // Compute left-over elements + for(; x < window_end_x; ++x) + { + *(output_ptr + x) = std::floor(*(input_ptr + x)); + } }, input, output); } diff --git a/tests/validation/NEON/Floor.cpp b/tests/validation/NEON/Floor.cpp index 540da570bb..978b6dbbd6 100644 --- a/tests/validation/NEON/Floor.cpp +++ b/tests/validation/NEON/Floor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -47,18 +47,16 @@ TEST_SUITE(Floor) // clang-format off DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip( framework::dataset::make("InputInfo", { TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), // Wrong data type - TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), // Window shrink TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), // Invalid data type combination TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), // Mismatching shapes TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), }), framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), - TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F16), TensorInfo(TensorShape(48U, 11U, 2U), 1, DataType::F32), TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), })), - framework::dataset::make("Expected", { false, false, false, false, true })), + framework::dataset::make("Expected", { false, false, false, true })), input_info, output_info, expected) { const Status status = NEFloor::validate(&input_info.clone()->set_is_resizable(false), &output_info.clone()->set_is_resizable(false)); -- cgit v1.2.1