From 2f498e47086ac7b76716a932a36485f81d29e73e Mon Sep 17 00:00:00 2001 From: John Richardson Date: Thu, 7 Jun 2018 10:12:07 +0100 Subject: COMPMID-761: Add CL/NEON CannyEdge benchmark tests Change-Id: I72f7eb4b2d4120666558a3d7e0e9dd85321d507f Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/134614 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- tests/benchmark/CL/CannyEdge.cpp | 74 ++++++++++++++++++++ tests/benchmark/NEON/CannyEdge.cpp | 74 ++++++++++++++++++++ tests/benchmark/fixtures/CannyEdgeFixture.h | 103 ++++++++++++++++++++++++++++ 3 files changed, 251 insertions(+) create mode 100644 tests/benchmark/CL/CannyEdge.cpp create mode 100644 tests/benchmark/NEON/CannyEdge.cpp create mode 100644 tests/benchmark/fixtures/CannyEdgeFixture.h (limited to 'tests/benchmark') diff --git a/tests/benchmark/CL/CannyEdge.cpp b/tests/benchmark/CL/CannyEdge.cpp new file mode 100644 index 0000000000..7e327f3df3 --- /dev/null +++ b/tests/benchmark/CL/CannyEdge.cpp @@ -0,0 +1,74 @@ +/* + * 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/CLCannyEdge.h" +#include "tests/CL/CLAccessor.h" +#include "tests/benchmark/fixtures/CannyEdgeFixture.h" +#include "tests/datasets/BorderModeDataset.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 +{ +// *INDENT-OFF* +// clang-format off +const auto use_fp16 = framework::dataset::make("UseFP16", { false }); +const auto canny_edge_dataset = combine(framework::dataset::make("GradientSize", { 3, 5, 7 }), + combine(framework::dataset::make("Normalization", { MagnitudeType::L1NORM, MagnitudeType::L2NORM }), + combine(datasets::BorderModes(), use_fp16))); +} // namespace + +using CLCannyEdgeFixture = CannyEdgeFixture; + +TEST_SUITE(CL) +TEST_SUITE(CannyEdge) + +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLCannyEdgeFixture, framework::DatasetMode::PRECOMMIT, + combine(combine( + datasets::SmallImageFiles(), + canny_edge_dataset), + framework::dataset::make("Format", Format::U8))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLCannyEdgeFixture, framework::DatasetMode::NIGHTLY, + combine(combine( + datasets::LargeImageFiles(), + canny_edge_dataset), + framework::dataset::make("Format", Format::U8))); +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // CannyEdge +TEST_SUITE_END() // CL +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/NEON/CannyEdge.cpp b/tests/benchmark/NEON/CannyEdge.cpp new file mode 100644 index 0000000000..50fd832e5d --- /dev/null +++ b/tests/benchmark/NEON/CannyEdge.cpp @@ -0,0 +1,74 @@ +/* + * 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/NECannyEdge.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/NEON/Accessor.h" +#include "tests/benchmark/fixtures/CannyEdgeFixture.h" +#include "tests/datasets/BorderModeDataset.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 +{ +// *INDENT-OFF* +// clang-format off +const auto use_fp16 = framework::dataset::make("UseFP16", { false }); +const auto canny_edge_dataset = combine(framework::dataset::make("GradientSize", { 3, 5, 7 }), + combine(framework::dataset::make("Normalization", { MagnitudeType::L1NORM, MagnitudeType::L2NORM }), + combine(datasets::BorderModes(), use_fp16))); +} // namespace + +using NECannyEdgeFixture = CannyEdgeFixture; + +TEST_SUITE(NEON) +TEST_SUITE(CannyEdge) + +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NECannyEdgeFixture, framework::DatasetMode::PRECOMMIT, + combine(combine( + datasets::SmallImageFiles(), + canny_edge_dataset), + framework::dataset::make("Format", Format::U8))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NECannyEdgeFixture, framework::DatasetMode::NIGHTLY, + combine(combine( + datasets::LargeImageFiles(), + canny_edge_dataset), + framework::dataset::make("Format", Format::U8))); +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // CannyEdge +TEST_SUITE_END() // NEON +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/fixtures/CannyEdgeFixture.h b/tests/benchmark/fixtures/CannyEdgeFixture.h new file mode 100644 index 0000000000..099dabaf18 --- /dev/null +++ b/tests/benchmark/fixtures/CannyEdgeFixture.h @@ -0,0 +1,103 @@ +/* + * 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_CANNY_EDGE_FIXTURE +#define ARM_COMPUTE_TEST_CANNY_EDGE_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 CLCannyEdge; +class NECannyEdge; + +namespace test +{ +namespace benchmark +{ +template +class CannyEdgeFixture : public framework::Fixture +{ +public: + template + void setup(std::string image, int gradient_size, MagnitudeType norm_type, BorderMode border_mode, bool use_fp16, Format format) + { + // Load the image (cached by the library if loaded before) + const RawTensor &raw = library->get(image, format); + + src = create_tensor(raw.shape(), format); + dst = create_tensor(raw.shape(), format); + + configure_target(canny_edge_func, src, dst, gradient_size, static_cast(norm_type) + 1, border_mode, use_fp16); + + // Allocate tensors + src.allocator()->allocate(); + dst.allocator()->allocate(); + + library->fill(Accessor(src), raw); + } + + void run() + { + canny_edge_func.run(); + } + + void sync() + { + sync_if_necessary(); + sync_tensor_if_necessary(dst); + } + +protected: + template ::value, int>::type = 0> + void configure_target(F &func, TensorType &src, TensorType &dst, int gradient_size, int norm_type, BorderMode border_mode, bool use_fp16) + { + func.configure(&src, &dst, upper_thresh, lower_thresh, gradient_size, norm_type, border_mode, constant_border_value, use_fp16); + } + + template ::value, int>::type = 0> + void configure_target(F &func, TensorType &src, TensorType &dst, int gradient_size, int norm_type, BorderMode border_mode, bool use_fp16) + { + ARM_COMPUTE_UNUSED(use_fp16); + ARM_COMPUTE_ERROR_ON(use_fp16); + + func.configure(&src, &dst, upper_thresh, lower_thresh, gradient_size, norm_type, border_mode, constant_border_value); + } + +private: + static const int32_t lower_thresh = 0; + static const int32_t upper_thresh = 255; + static const uint8_t constant_border_value = 0; + + TensorType src{}; + TensorType dst{}; + Function canny_edge_func{}; +}; +} // namespace benchmark +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_CANNY_EDGE_FIXTURE */ -- cgit v1.2.1