From 110b920510a4b4c0edbf9859070a506c438f67b9 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Fri, 28 Dec 2018 16:32:49 +0000 Subject: COMPMID-1759 NEON: Implement Reverse Change-Id: I53852069ca223eb571a443e501278980fc60f3b4 Reviewed-on: https://review.mlplatform.org/474 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio --- tests/validation/NEON/Reverse.cpp | 162 +++++++++++++++++++++++++++++ tests/validation/fixtures/ReverseFixture.h | 21 ++-- 2 files changed, 176 insertions(+), 7 deletions(-) create mode 100644 tests/validation/NEON/Reverse.cpp (limited to 'tests') diff --git a/tests/validation/NEON/Reverse.cpp b/tests/validation/NEON/Reverse.cpp new file mode 100644 index 0000000000..2f3f69aee9 --- /dev/null +++ b/tests/validation/NEON/Reverse.cpp @@ -0,0 +1,162 @@ +/* + * Copyright (c) 2018-2019 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/Types.h" +#include "arm_compute/runtime/NEON/functions/NEReverse.h" +#include "arm_compute/runtime/Tensor.h" +#include "arm_compute/runtime/TensorAllocator.h" +#include "tests/NEON/Accessor.h" +#include "tests/PaddingCalculator.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/ReverseFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +auto run_small_dataset = combine(datasets::SmallShapes(), datasets::Tiny1DShapes()); +auto run_large_dataset = combine(datasets::LargeShapes(), datasets::Tiny1DShapes()); + +} // namespace +TEST_SUITE(NEON) +TEST_SUITE(Reverse) + +// *INDENT-OFF* +// clang-format off +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( + framework::dataset::make("InputInfo", { TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::S8), // Invalid axis datatype + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), // Invalid axis shape + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), // Invalid axis length (> 4) + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), // Mismatching shapes + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(2U), 1, DataType::U8), + }), + framework::dataset::make("OutputInfo", { TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::S8), + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(2U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(2U), 1, DataType::U8), + })), + framework::dataset::make("AxisInfo", { TensorInfo(TensorShape(3U), 1, DataType::U8), + TensorInfo(TensorShape(2U, 10U), 1, DataType::U32), + TensorInfo(TensorShape(8U), 1, DataType::U32), + TensorInfo(TensorShape(2U), 1, DataType::U32), + TensorInfo(TensorShape(2U), 1, DataType::U32), + TensorInfo(TensorShape(2U), 1, DataType::U32), + })), + framework::dataset::make("Expected", { false, false, false, false, true, true})), + src_info, dst_info, axis_info, expected) +{ + Status s = NEReverse::validate(&src_info.clone()->set_is_resizable(false), + &dst_info.clone()->set_is_resizable(false), + &axis_info.clone()->set_is_resizable(false)); + ARM_COMPUTE_EXPECT(bool(s) == expected, framework::LogLevel::ERRORS); +} +// clang-format on +// *INDENT-ON* + +template +using NEReverseFixture = ReverseValidationFixture; + +TEST_SUITE(Float) + +#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC +TEST_SUITE(F16) +FIXTURE_DATA_TEST_CASE(RunSmall, + NEReverseFixture, + framework::DatasetMode::PRECOMMIT, + combine(run_small_dataset, framework::dataset::make("DataType", DataType::F16))) +{ + // Validate output + validate(Accessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + NEReverseFixture, + framework::DatasetMode::NIGHTLY, + combine(run_large_dataset, framework::dataset::make("DataType", DataType::F16))) +{ + // Validate output + validate(Accessor(_target), _reference); +} +TEST_SUITE_END() // F16 +#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ + +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, + NEReverseFixture, + framework::DatasetMode::PRECOMMIT, + combine(run_small_dataset, framework::dataset::make("DataType", DataType::F32))) +{ + // Validate output + validate(Accessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + NEReverseFixture, + framework::DatasetMode::NIGHTLY, + combine(run_large_dataset, framework::dataset::make("DataType", DataType::F32))) +{ + // Validate output + validate(Accessor(_target), _reference); +} +TEST_SUITE_END() // F32 +TEST_SUITE_END() // Float + +TEST_SUITE(Quantized) +TEST_SUITE(QASYMM8) +FIXTURE_DATA_TEST_CASE(RunSmall, + NEReverseFixture, + framework::DatasetMode::PRECOMMIT, + combine(run_small_dataset, framework::dataset::make("DataType", DataType::QASYMM8))) +{ + // Validate output + validate(Accessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + NEReverseFixture, + framework::DatasetMode::NIGHTLY, + combine(run_large_dataset, framework::dataset::make("DataType", DataType::QASYMM8))) +{ + // Validate output + validate(Accessor(_target), _reference); +} +TEST_SUITE_END() // QASYMM8 +TEST_SUITE_END() // Quantized + +TEST_SUITE_END() // Reverse +TEST_SUITE_END() // NEON +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/fixtures/ReverseFixture.h b/tests/validation/fixtures/ReverseFixture.h index 172357c4b7..ed5253d041 100644 --- a/tests/validation/fixtures/ReverseFixture.h +++ b/tests/validation/fixtures/ReverseFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -58,11 +58,13 @@ protected: { library->fill_tensor_uniform(tensor, 0); } - template - void fill_axis(U &&tensor) + std::vector generate_random_axis() { - std::uniform_int_distribution<> distribution(0, 3); - library->fill(tensor, distribution, 0); + std::vector axis_v = { 0, 1, 2, 3 }; + std::mt19937 g(0); + std::shuffle(axis_v.begin(), axis_v.end(), g); + + return axis_v; } TensorType compute_target(const TensorShape &shape, const TensorShape &axis_shape, DataType data_type) @@ -91,7 +93,11 @@ protected: // Fill tensors fill(AccessorType(src)); - fill_axis(AccessorType(axis)); + { + auto axis_data = AccessorType(axis); + auto axis_v = generate_random_axis(); + std::copy(axis_v.begin(), axis_v.begin() + axis_shape.x(), static_cast(axis_data.data())); + } // Compute function reverse_func.run(); @@ -107,7 +113,8 @@ protected: // Fill reference fill(src); - fill_axis(axis); + auto axis_v = generate_random_axis(); + std::copy(axis_v.begin(), axis_v.begin() + axis_shape.x(), axis.data()); return reference::reverse(src, axis); } -- cgit v1.2.1