From e0078dde6e1d41ed59cfcb4120aab8630a4213b7 Mon Sep 17 00:00:00 2001 From: John Richardson Date: Tue, 15 May 2018 11:01:49 +0100 Subject: COMPMID-761: Add CL/NEON FastCorners benchmark tests Change-Id: Ie874a867e0aa283a69edba7013c8cd59f18da489 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/131835 Reviewed-by: Giorgio Arena Tested-by: Jenkins Reviewed-by: Pablo Tello Reviewed-by: Anthony Barbier --- tests/benchmark/CL/FastCorners.cpp | 77 +++++++++++++++++++ tests/benchmark/NEON/FastCorners.cpp | 77 +++++++++++++++++++ tests/benchmark/fixtures/FastCornersFixture.h | 105 ++++++++++++++++++++++++++ 3 files changed, 259 insertions(+) create mode 100644 tests/benchmark/CL/FastCorners.cpp create mode 100644 tests/benchmark/NEON/FastCorners.cpp create mode 100644 tests/benchmark/fixtures/FastCornersFixture.h (limited to 'tests/benchmark') diff --git a/tests/benchmark/CL/FastCorners.cpp b/tests/benchmark/CL/FastCorners.cpp new file mode 100644 index 0000000000..8b85893fde --- /dev/null +++ b/tests/benchmark/CL/FastCorners.cpp @@ -0,0 +1,77 @@ +/* + * 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/CLArray.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/functions/CLFastCorners.h" +#include "tests/CL/CLAccessor.h" +#include "tests/benchmark/fixtures/FastCornersFixture.h" +#include "tests/datasets/ImageFileDatasets.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 threshold = framework::dataset::make("Threshold", { 64.f }); // valid range (0.0 ≤ threshold < 256.0) +const auto border_mode = framework::dataset::make("BorderMode", { BorderMode::UNDEFINED }); // NOTE: only BorderMode::UNDEFINED is implemented +const auto suppress_nonmax = framework::dataset::make("SuppressNonMax", { false, true }); +} // namespace + +using CLFastCornersFixture = FastCornersFixture; + +TEST_SUITE(CL) +TEST_SUITE(FastCorners) + +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLFastCornersFixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine(combine( + datasets::SmallImageFiles(), + framework::dataset::make("Format", { Format::U8 })), + threshold), + suppress_nonmax), + border_mode)); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLFastCornersFixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine(combine( + datasets::LargeImageFiles(), + framework::dataset::make("Format", { Format::U8 })), + threshold), + suppress_nonmax), + border_mode)); +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // FastCorners +TEST_SUITE_END() // CL +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/NEON/FastCorners.cpp b/tests/benchmark/NEON/FastCorners.cpp new file mode 100644 index 0000000000..0e30d90900 --- /dev/null +++ b/tests/benchmark/NEON/FastCorners.cpp @@ -0,0 +1,77 @@ +/* + * 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/Array.h" +#include "arm_compute/runtime/NEON/functions/NEFastCorners.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/NEON/Accessor.h" +#include "tests/benchmark/fixtures/FastCornersFixture.h" +#include "tests/datasets/ImageFileDatasets.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 threshold = framework::dataset::make("Threshold", { 64.f }); // valid range (0.0 ≤ threshold < 256.0) +const auto border_mode = framework::dataset::make("BorderMode", { BorderMode::UNDEFINED }); // NOTE: only BorderMode::UNDEFINED is implemented +const auto suppress_nonmax = framework::dataset::make("SuppressNonMax", { false, true }); +} // namespace + +using NEFastCornersFixture = FastCornersFixture; + +TEST_SUITE(NEON) +TEST_SUITE(FastCorners) + +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEFastCornersFixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine(combine( + datasets::SmallImageFiles(), + framework::dataset::make("Format", { Format::U8 })), + threshold), + suppress_nonmax), + border_mode)); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEFastCornersFixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine(combine( + datasets::LargeImageFiles(), + framework::dataset::make("Format", { Format::U8 })), + threshold), + suppress_nonmax), + border_mode)); +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // FastCorners +TEST_SUITE_END() // NEON +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/fixtures/FastCornersFixture.h b/tests/benchmark/fixtures/FastCornersFixture.h new file mode 100644 index 0000000000..636d25819f --- /dev/null +++ b/tests/benchmark/fixtures/FastCornersFixture.h @@ -0,0 +1,105 @@ +/* + * 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_FAST_CORNERS_FIXTURE +#define ARM_COMPUTE_TEST_FAST_CORNERS_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 +{ +class CLFastCorners; +class NEFastCorners; + +namespace test +{ +namespace benchmark +{ +template +class FastCornersFixture : public framework::Fixture +{ +public: + template + void setup(std::string image, Format format, float threshold, bool suppress_nonmax, BorderMode border_mode) + { + // Load the image (cached by the library if loaded before) + const RawTensor &raw = library->get(image, format); + + // Create tensor + src = create_tensor(raw.shape(), format); + + // Create and configure function + configure_target(fast_corners_func, src, corners, &num_corners, threshold, suppress_nonmax, border_mode, 0); + + // Allocate tensor + src.allocator()->allocate(); + + // Copy image data to tensor + library->fill(Accessor(src), raw); + } + + void run() + { + fast_corners_func.run(); + } + + void sync() + { + sync_if_necessary(); + } + + void teardown() + { + src.allocator()->free(); + } + +protected: + template ::value, int>::type = 0> + void configure_target(F &func, TensorType &src, ArrayType &corners, unsigned int *num_corners, float threshold, bool suppress_nonmax, BorderMode border_mode, uint8_t constant_border_value) + { + func.configure(&src, threshold, suppress_nonmax, &corners, num_corners, border_mode, constant_border_value); + } + + template ::value, int>::type = 0> + void configure_target(F &func, TensorType &src, ArrayType &corners, unsigned int *num_corners, float threshold, bool suppress_nonmax, BorderMode border_mode, uint8_t constant_border_value) + { + ARM_COMPUTE_UNUSED(num_corners); + func.configure(&src, threshold, suppress_nonmax, &corners, border_mode, constant_border_value); + } + +private: + const static size_t max_corners = 20000; + + TensorType src{}; + ArrayType corners{ max_corners }; + unsigned int num_corners{ max_corners }; + Function fast_corners_func{}; +}; +} // namespace benchmark +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_FAST_CORNERS_FIXTURE */ -- cgit v1.2.1