From ff225fe320db64d4716cfd1b42845443c5ba541c Mon Sep 17 00:00:00 2001 From: John Richardson Date: Wed, 9 May 2018 09:45:49 +0100 Subject: COMPMID-761: Add CL/NEON Remap benchmark tests Change-Id: I7e51733054086254f75c2035c6a300bc2a68a5d6 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/131834 Reviewed-by: Pablo Tello Tested-by: Jenkins Reviewed-by: Anthony Barbier --- tests/benchmark/CL/Remap.cpp | 66 +++++++++++++++++++ tests/benchmark/NEON/Remap.cpp | 66 +++++++++++++++++++ tests/benchmark/fixtures/RemapFixture.h | 108 ++++++++++++++++++++++++++++++++ 3 files changed, 240 insertions(+) create mode 100644 tests/benchmark/CL/Remap.cpp create mode 100644 tests/benchmark/NEON/Remap.cpp create mode 100644 tests/benchmark/fixtures/RemapFixture.h (limited to 'tests/benchmark') diff --git a/tests/benchmark/CL/Remap.cpp b/tests/benchmark/CL/Remap.cpp new file mode 100644 index 0000000000..9da1356eaa --- /dev/null +++ b/tests/benchmark/CL/Remap.cpp @@ -0,0 +1,66 @@ +/* + * 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/Types.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/functions/CLRemap.h" +#include "tests/CL/CLAccessor.h" +#include "tests/benchmark/fixtures/RemapFixture.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" + +namespace arm_compute +{ +namespace test +{ +namespace benchmark +{ +namespace +{ +const auto interpolation_policies = framework::dataset::make("InterpolationPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR, InterpolationPolicy::BILINEAR }); +const auto border_modes = framework::dataset::make("BorderModes", { BorderMode::UNDEFINED, BorderMode::CONSTANT }); +const auto remap_data = interpolation_policies * framework::dataset::make("DataType", DataType::U8) * border_modes; +} // namespace + +using CLRemapFixture = RemapFixture; + +TEST_SUITE(CL) +TEST_SUITE(Remap) + +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLRemapFixture, framework::DatasetMode::PRECOMMIT, + combine( datasets::SmallShapes(), remap_data)); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLRemapFixture, framework::DatasetMode::NIGHTLY, + combine( datasets::LargeShapes(), remap_data)); +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // Remap +TEST_SUITE_END() // CL +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/NEON/Remap.cpp b/tests/benchmark/NEON/Remap.cpp new file mode 100644 index 0000000000..187aeb7927 --- /dev/null +++ b/tests/benchmark/NEON/Remap.cpp @@ -0,0 +1,66 @@ +/* + * 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/Types.h" +#include "arm_compute/runtime/NEON/functions/NERemap.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/NEON/Accessor.h" +#include "tests/benchmark/fixtures/RemapFixture.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" + +namespace arm_compute +{ +namespace test +{ +namespace benchmark +{ +namespace +{ +const auto interpolation_policies = framework::dataset::make("InterpolationPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR, InterpolationPolicy::BILINEAR }); +const auto border_modes = framework::dataset::make("BorderModes", { BorderMode::UNDEFINED, BorderMode::CONSTANT }); +const auto remap_data = interpolation_policies * framework::dataset::make("DataType", DataType::U8) * border_modes; +} // namespace + +using NERemapFixture = RemapFixture; + +TEST_SUITE(NEON) +TEST_SUITE(Remap) + +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NERemapFixture, framework::DatasetMode::PRECOMMIT, + combine( datasets::SmallShapes(), remap_data)); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NERemapFixture, framework::DatasetMode::NIGHTLY, + combine( datasets::LargeShapes(), remap_data)); +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // Remap +TEST_SUITE_END() // NEON +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/fixtures/RemapFixture.h b/tests/benchmark/fixtures/RemapFixture.h new file mode 100644 index 0000000000..c0b0c13754 --- /dev/null +++ b/tests/benchmark/fixtures/RemapFixture.h @@ -0,0 +1,108 @@ +/* + * 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. + */ +#ifndef ARM_COMPUTE_TEST_REMAP_FIXTURE +#define ARM_COMPUTE_TEST_REMAP_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "tests/Globals.h" +#include "tests/Utils.h" +#include "tests/framework/Fixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace benchmark +{ +template +class RemapFixture : public framework::Fixture +{ +public: + template + void setup(const TensorShape &input_shape, InterpolationPolicy policy, DataType data_type, BorderMode border_mode) + { + std::mt19937 gen(library->seed()); + std::uniform_int_distribution distribution(0, 255); + const uint8_t constant_border_value = distribution(gen); + + // Create tensors + src = create_tensor(input_shape, data_type); + map_x = create_tensor(input_shape, DataType::F32); + map_y = create_tensor(input_shape, DataType::F32); + dst = create_tensor(input_shape, data_type); + + // Create and configure function + remap_func.configure(&src, &map_x, &map_y, &dst, policy, border_mode, constant_border_value); + + // Allocate tensors + src.allocator()->allocate(); + map_x.allocator()->allocate(); + map_y.allocator()->allocate(); + dst.allocator()->allocate(); + + // Fill tensors + fill(Accessor(src), 0, 0, 255); + fill(Accessor(map_x), 1, -5, input_shape.x() + 5); + fill(Accessor(map_y), 2, -5, input_shape.y() + 5); + } + + void run() + { + remap_func.run(); + } + + void sync() + { + sync_if_necessary(); + sync_tensor_if_necessary(dst); + } + + void teardown() + { + src.allocator()->free(); + map_x.allocator()->free(); + map_y.allocator()->free(); + dst.allocator()->free(); + } + +protected: + template + void fill(U &&tensor, int i, float min, float max) + { + std::uniform_int_distribution<> distribution((int)min, (int)max); + library->fill(tensor, distribution, i); + } + +private: + TensorType src{}; + TensorType map_x{}; + TensorType map_y{}; + TensorType dst{}; + Function remap_func{}; +}; +} // namespace benchmark +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_REMAP_FIXTURE */ -- cgit v1.2.1