From a8fdbbb072ed3a36da590d39168d676d6f5de26a Mon Sep 17 00:00:00 2001 From: John Richardson Date: Wed, 6 Jun 2018 15:34:21 +0100 Subject: COMPMID-761: Add CL/NEON HOGDetector benchmark tests Change-Id: I9fa088d69d05ba49ceabe962f3e0e5ac128ae83b Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/135666 Tested-by: Jenkins Reviewed-by: Georgios Pinitas Reviewed-by: Anthony Barbier --- tests/benchmark/CL/HOGDetector.cpp | 78 ++++++++++++++++++ tests/benchmark/NEON/HOGDetector.cpp | 77 ++++++++++++++++++ tests/benchmark/fixtures/HOGDescriptorFixture.h | 8 +- tests/benchmark/fixtures/HOGDetectorFixture.h | 101 ++++++++++++++++++++++++ 4 files changed, 258 insertions(+), 6 deletions(-) create mode 100644 tests/benchmark/CL/HOGDetector.cpp create mode 100644 tests/benchmark/NEON/HOGDetector.cpp create mode 100644 tests/benchmark/fixtures/HOGDetectorFixture.h (limited to 'tests/benchmark') diff --git a/tests/benchmark/CL/HOGDetector.cpp b/tests/benchmark/CL/HOGDetector.cpp new file mode 100644 index 0000000000..aeed4d22bb --- /dev/null +++ b/tests/benchmark/CL/HOGDetector.cpp @@ -0,0 +1,78 @@ +/* + * 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/CLHOG.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/functions/CLHOGDescriptor.h" +#include "arm_compute/runtime/CL/functions/CLHOGDetector.h" +#include "tests/CL/CLAccessor.h" +#include "tests/CL/CLHOGAccessor.h" +#include "tests/benchmark/fixtures/HOGDetectorFixture.h" +#include "tests/datasets/HOGDescriptorDataset.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 +{ +/* Input dataset (values must be a multiple of the HOGInfo block_size) */ +const auto DetectionWindowStrideDataset = framework::dataset::make("DetectionWindowStride", { Size2D(8, 8), Size2D(16, 16) }); +} // namespace + +TEST_SUITE(CL) +TEST_SUITE(HOGDetector) + +using CLHOGDetectorFixture = HOGDetectorFixture; + +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLHOGDetectorFixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine( + DetectionWindowStrideDataset, + datasets::SmallHOGDescriptorDataset()), + framework::dataset::make("Format", Format::U8)), + framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE}))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLHOGDetectorFixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine( + DetectionWindowStrideDataset, + datasets::LargeHOGDescriptorDataset()), + framework::dataset::make("Format", Format::U8)), + framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE}))); +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // HOGDetector +TEST_SUITE_END() // CL +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/NEON/HOGDetector.cpp b/tests/benchmark/NEON/HOGDetector.cpp new file mode 100644 index 0000000000..3ab9fae2fc --- /dev/null +++ b/tests/benchmark/NEON/HOGDetector.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/NEHOGDescriptor.h" +#include "arm_compute/runtime/NEON/functions/NEHOGDetector.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/NEON/Accessor.h" +#include "tests/NEON/HOGAccessor.h" +#include "tests/benchmark/fixtures/HOGDetectorFixture.h" +#include "tests/datasets/HOGDescriptorDataset.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 +{ +/* Input dataset (values must be a multiple of the HOGInfo block_size) */ +const auto DetectionWindowStrideDataset = framework::dataset::make("DetectionWindowStride", { Size2D(8, 8), Size2D(16, 16) }); +} // namespace + +TEST_SUITE(NEON) +TEST_SUITE(HOGDetector) + +using NEHOGDetectorFixture = HOGDetectorFixture; + +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEHOGDetectorFixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine( + DetectionWindowStrideDataset, + datasets::SmallHOGDescriptorDataset()), + framework::dataset::make("Format", Format::U8)), + framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE}))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEHOGDetectorFixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine( + DetectionWindowStrideDataset, + datasets::LargeHOGDescriptorDataset()), + framework::dataset::make("Format", Format::U8)), + framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE}))); +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // HOGDetector +TEST_SUITE_END() // NEON +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/fixtures/HOGDescriptorFixture.h b/tests/benchmark/fixtures/HOGDescriptorFixture.h index 3933a165cf..312959347b 100644 --- a/tests/benchmark/fixtures/HOGDescriptorFixture.h +++ b/tests/benchmark/fixtures/HOGDescriptorFixture.h @@ -82,15 +82,11 @@ public: sync_if_necessary(); } - void teardown() - { - src.allocator()->free(); - dst.allocator()->free(); - } +protected: + TensorType dst{}; private: TensorType src{}; - TensorType dst{}; Function hog_descriptor_func{}; }; } // namespace benchmark diff --git a/tests/benchmark/fixtures/HOGDetectorFixture.h b/tests/benchmark/fixtures/HOGDetectorFixture.h new file mode 100644 index 0000000000..48404d84ae --- /dev/null +++ b/tests/benchmark/fixtures/HOGDetectorFixture.h @@ -0,0 +1,101 @@ +/* + * 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_HOG_DETECTOR_FIXTURE +#define ARM_COMPUTE_TEST_HOG_DETECTOR_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "tests/Globals.h" +#include "tests/Utils.h" +#include "tests/benchmark/fixtures/HOGDescriptorFixture.h" +#include "tests/framework/Fixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace benchmark +{ +template +class HOGDetectorFixture : public HOGDescriptorFixture +{ +public: + template + void setup(Size2D detection_window_stride, std::string image, HOGInfo hog_info, Format format, BorderMode border_mode) + { + HDF::setup(image, hog_info, format, border_mode); + HDF::run(); + + // Initialise descriptor (linear SVM coefficients). + // NOTE: Fixed values are used to keep the number of detection windows detected + // consistent in order to have meaningful validation tolerances. + // The values are "unbalanced" to reduce the number of detected objects + const std::random_device::result_type seed = 0; + std::vector descriptor = generate_random_real(hog_info.descriptor_size(), -0.505f, 0.495f, seed); + + // Create HOG + hog = create_HOG(hog_info); + + // Copy HOG descriptor values to HOG memory + { + HOGAccessor hog_accessor(hog); + std::memcpy(hog_accessor.descriptor(), descriptor.data(), descriptor.size() * sizeof(float)); + } + + // Create and configure function + hog_detector_func.configure(&(HDF::dst), &hog, &detection_windows, detection_window_stride); + + // Reset detection windows + detection_windows.clear(); + } + + void run() + { + hog_detector_func.run(); + } + + void sync() + { + sync_if_necessary(); + } + +private: + static const unsigned int max_num_detection_windows = 100000; + + HOGType hog{}; + Function hog_detector_func{}; + ArrayType detection_windows{ max_num_detection_windows }; + + using HDF = HOGDescriptorFixture; +}; +} // namespace benchmark +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_HOG_DETECTOR_FIXTURE */ -- cgit v1.2.1