From 7d08231562314551a423c34d74045cd2ab0d315f Mon Sep 17 00:00:00 2001 From: John Richardson Date: Mon, 21 May 2018 15:19:41 +0100 Subject: COMPMID-761: Add CL/NEON Sobel benchmark tests Change-Id: Iae8244edcc7ec525bc2e8bbec5980b8b9ea935a1 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/132078 Reviewed-by: Pablo Tello Tested-by: Jenkins Reviewed-by: Anthony Barbier --- tests/benchmark/CL/Sobel.cpp | 109 ++++++++++++++++++++++ tests/benchmark/NEON/Sobel.cpp | 109 ++++++++++++++++++++++ tests/benchmark/fixtures/SobelFixture.h | 158 ++++++++++++++++++++++++++++++++ 3 files changed, 376 insertions(+) create mode 100644 tests/benchmark/CL/Sobel.cpp create mode 100644 tests/benchmark/NEON/Sobel.cpp create mode 100644 tests/benchmark/fixtures/SobelFixture.h (limited to 'tests/benchmark') diff --git a/tests/benchmark/CL/Sobel.cpp b/tests/benchmark/CL/Sobel.cpp new file mode 100644 index 0000000000..f0478b88e5 --- /dev/null +++ b/tests/benchmark/CL/Sobel.cpp @@ -0,0 +1,109 @@ +/* + * 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/CLSobel3x3.h" +#include "arm_compute/runtime/CL/functions/CLSobel5x5.h" +#include "arm_compute/runtime/CL/functions/CLSobel7x7.h" +#include "tests/CL/CLAccessor.h" +#include "tests/benchmark/fixtures/SobelFixture.h" +#include "tests/datasets/BorderModeDataset.h" +#include "tests/datasets/GradientDimensionDataset.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 +{ +using CLSobel3x3Fixture = SobelFixture; + +TEST_SUITE(CL) +TEST_SUITE(Sobel) + +// *INDENT-OFF* +// clang-format off +TEST_SUITE(W3x3) +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLSobel3x3Fixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine( + datasets::Small2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLSobel3x3Fixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine( + datasets::Large2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); +TEST_SUITE_END() // W3x3 + +using CLSobel5x5Fixture = SobelFixture; + +TEST_SUITE(W5x5) +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLSobel5x5Fixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine( + datasets::Small2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLSobel5x5Fixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine( + datasets::Large2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); +TEST_SUITE_END() // W5x5 + +using CLSobel7x7Fixture = SobelFixture; + +TEST_SUITE(W7x7) +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLSobel7x7Fixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine( + datasets::Small2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLSobel7x7Fixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine( + datasets::Large2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); +TEST_SUITE_END() // W7x7 +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // Sobel +TEST_SUITE_END() // CL +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/NEON/Sobel.cpp b/tests/benchmark/NEON/Sobel.cpp new file mode 100644 index 0000000000..8afda38c01 --- /dev/null +++ b/tests/benchmark/NEON/Sobel.cpp @@ -0,0 +1,109 @@ +/* + * 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/NESobel3x3.h" +#include "arm_compute/runtime/NEON/functions/NESobel5x5.h" +#include "arm_compute/runtime/NEON/functions/NESobel7x7.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/NEON/Accessor.h" +#include "tests/benchmark/fixtures/SobelFixture.h" +#include "tests/datasets/BorderModeDataset.h" +#include "tests/datasets/GradientDimensionDataset.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 +{ +using NESobel3x3Fixture = SobelFixture; + +TEST_SUITE(NEON) +TEST_SUITE(Sobel) + +// *INDENT-OFF* +// clang-format off +TEST_SUITE(W3x3) +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NESobel3x3Fixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine( + datasets::Small2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NESobel3x3Fixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine( + datasets::Large2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); +TEST_SUITE_END() // W3x3 + +using NESobel5x5Fixture = SobelFixture; + +TEST_SUITE(W5x5) +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NESobel5x5Fixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine( + datasets::Small2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NESobel5x5Fixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine( + datasets::Large2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); +TEST_SUITE_END() // W5x5 + +using NESobel7x7Fixture = SobelFixture; + +TEST_SUITE(W7x7) +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NESobel7x7Fixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine( + datasets::Small2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NESobel7x7Fixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine( + datasets::Large2DShapes(), + datasets::BorderModes()), + datasets::GradientDimensions()), + framework::dataset::make("Format", Format::U8))); +TEST_SUITE_END() // W7x7 +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // Sobel +TEST_SUITE_END() // NEON +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/fixtures/SobelFixture.h b/tests/benchmark/fixtures/SobelFixture.h new file mode 100644 index 0000000000..2717e8146b --- /dev/null +++ b/tests/benchmark/fixtures/SobelFixture.h @@ -0,0 +1,158 @@ +/* + * 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_SOBEL_FIXTURE +#define ARM_COMPUTE_TEST_SOBEL_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "tests/Globals.h" +#include "tests/Types.h" +#include "tests/Utils.h" +#include "tests/framework/Fixture.h" + +namespace arm_compute +{ +class CLSobel3x3; +class CLSobel5x5; +class CLSobel7x7; +class NESobel3x3; +class NESobel5x5; +class NESobel7x7; + +namespace test +{ +namespace benchmark +{ +namespace +{ +template +struct info; + +template <> +struct info +{ + static const Format dst_format = Format::S16; +}; + +template <> +struct info +{ + static const Format dst_format = Format::S16; +}; + +template <> +struct info +{ + static const Format dst_format = Format::S16; +}; + +template <> +struct info +{ + static const Format dst_format = Format::S16; +}; + +template <> +struct info +{ + static const Format dst_format = Format::S32; +}; + +template <> +struct info +{ + static const Format dst_format = Format::S32; +}; +} // namespace + +template +class SobelFixture : public framework::Fixture +{ +public: + template + void setup(const TensorShape &input_shape, BorderMode border_mode, GradientDimension gradient_dimension, Format input_format) + { + // Generate a random constant value + std::mt19937 gen(library->seed()); + std::uniform_int_distribution int_dist(0, 255); + const uint8_t constant_border_value = int_dist(gen); + + // Create source tensor + src = create_tensor(input_shape, input_format); + + // Create destination tensors and configure function + switch(gradient_dimension) + { + case GradientDimension::GRAD_X: + dst_x = create_tensor(input_shape, info::dst_format); + sobel_func.configure(&src, &dst_x, nullptr, border_mode, constant_border_value); + break; + case GradientDimension::GRAD_Y: + dst_y = create_tensor(input_shape, info::dst_format); + sobel_func.configure(&src, nullptr, &dst_y, border_mode, constant_border_value); + break; + case GradientDimension::GRAD_XY: + dst_x = create_tensor(input_shape, info::dst_format); + dst_y = create_tensor(input_shape, info::dst_format); + sobel_func.configure(&src, &dst_x, &dst_y, border_mode, constant_border_value); + break; + default: + ARM_COMPUTE_ERROR("Gradient dimension not supported"); + } + + // Allocate tensors + src.allocator()->allocate(); + dst_x.allocator()->allocate(); + dst_y.allocator()->allocate(); + } + + void run() + { + sobel_func.run(); + } + + void sync() + { + sync_if_necessary(); + sync_tensor_if_necessary(dst_x); + sync_tensor_if_necessary(dst_y); + } + + void teardown() + { + src.allocator()->free(); + dst_x.allocator()->free(); + dst_y.allocator()->free(); + } + +private: + TensorType src{}; + TensorType dst_x{}; + TensorType dst_y{}; + Function sobel_func{}; +}; +} // namespace benchmark +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_SOBEL_FIXTURE */ -- cgit v1.2.1