From 0ef7e670a22248806458d7327db9e8b8c4db4ce6 Mon Sep 17 00:00:00 2001 From: John Richardson Date: Mon, 19 Feb 2018 14:44:38 +0000 Subject: COMPMID-761: Add CL/NEON HOGDescriptor benchmark tests Change-Id: I19bb658b0f06b0733fa62a6745c6163e0648a8b0 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/128240 Tested-by: Jenkins Reviewed-by: Georgios Pinitas Reviewed-by: Anthony Barbier Reviewed-by: Gian Marco Iodice --- tests/benchmark/CL/HOGDescriptor.cpp | 66 +++++++++++++++++ tests/benchmark/NEON/HOGDescriptor.cpp | 65 ++++++++++++++++ tests/benchmark/fixtures/HOGDescriptorFixture.h | 99 +++++++++++++++++++++++++ 3 files changed, 230 insertions(+) create mode 100644 tests/benchmark/CL/HOGDescriptor.cpp create mode 100644 tests/benchmark/NEON/HOGDescriptor.cpp create mode 100644 tests/benchmark/fixtures/HOGDescriptorFixture.h (limited to 'tests') diff --git a/tests/benchmark/CL/HOGDescriptor.cpp b/tests/benchmark/CL/HOGDescriptor.cpp new file mode 100644 index 0000000000..f78027eb62 --- /dev/null +++ b/tests/benchmark/CL/HOGDescriptor.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/CLHOG.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/functions/CLHOGDescriptor.h" +#include "tests/CL/CLAccessor.h" +#include "tests/benchmark/fixtures/HOGDescriptorFixture.h" +#include "tests/datasets/HOGDescriptorDataset.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" + +namespace arm_compute +{ +namespace test +{ +namespace benchmark +{ +using CLHOGDescriptorFixture = HOGDescriptorFixture; + +TEST_SUITE(CL) +TEST_SUITE(HOGDescriptor) + +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLHOGDescriptorFixture, framework::DatasetMode::PRECOMMIT, + combine(combine( + datasets::SmallHOGDescriptorDataset(), + framework::dataset::make("Format", { Format::U8 })), + framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE}))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLHOGDescriptorFixture, framework::DatasetMode::NIGHTLY, + combine(combine( + datasets::LargeHOGDescriptorDataset(), + framework::dataset::make("Format", { Format::U8 })), + framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE}))); +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // HOGDescriptor +TEST_SUITE_END() // CL +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/NEON/HOGDescriptor.cpp b/tests/benchmark/NEON/HOGDescriptor.cpp new file mode 100644 index 0000000000..daf201fd63 --- /dev/null +++ b/tests/benchmark/NEON/HOGDescriptor.cpp @@ -0,0 +1,65 @@ +/* + * 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/runtime/HOG.h" +#include "arm_compute/runtime/NEON/functions/NEHOGDescriptor.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/NEON/Accessor.h" +#include "tests/benchmark/fixtures/HOGDescriptorFixture.h" +#include "tests/datasets/HOGDescriptorDataset.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "utils/TypePrinter.h" + +namespace arm_compute +{ +namespace test +{ +namespace benchmark +{ +using NEHOGDescriptorFixture = HOGDescriptorFixture; + +TEST_SUITE(NEON) +TEST_SUITE(HOGDescriptor) + +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEHOGDescriptorFixture, framework::DatasetMode::PRECOMMIT, + combine(combine( + datasets::SmallHOGDescriptorDataset(), + framework::dataset::make("Format", { Format::U8 })), + framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE}))); + +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEHOGDescriptorFixture, framework::DatasetMode::NIGHTLY, + combine(combine( + datasets::LargeHOGDescriptorDataset(), + framework::dataset::make("Format", { Format::U8 })), + framework::dataset::make("BorderMode", {BorderMode::CONSTANT, BorderMode::REPLICATE}))); +// clang-format on +// *INDENT-ON* + +TEST_SUITE_END() // HOGDescriptor +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 new file mode 100644 index 0000000000..3933a165cf --- /dev/null +++ b/tests/benchmark/fixtures/HOGDescriptorFixture.h @@ -0,0 +1,99 @@ +/* + * 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_DESCRIPTOR_FIXTURE +#define ARM_COMPUTE_TEST_HOG_DESCRIPTOR_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 HOGDescriptorFixture : public framework::Fixture +{ +public: + template + void setup(std::string image, HOGInfo hog_info, Format format, BorderMode border_mode) + { + std::mt19937 generator(library->seed()); + std::uniform_int_distribution distribution_u8(0, 255); + uint8_t constant_border_value = static_cast(distribution_u8(generator)); + + // Load the image (cached by the library if loaded before) + const RawTensor &raw = library->get(image, format); + + // Create tensor info for HOG descriptor + TensorInfo tensor_info_hog_descriptor(hog_info, raw.shape().x(), raw.shape().y()); + + // Create tensor + src = create_tensor(raw.shape(), format); + dst = create_tensor(tensor_info_hog_descriptor.tensor_shape(), + DataType::F32, tensor_info_hog_descriptor.num_channels()); + + // Create HOG + HOGType hog = create_HOG(hog_info); + + // Create and configure function + hog_descriptor_func.configure(&src, &dst, &hog, border_mode, constant_border_value); + + // Allocate tensor + src.allocator()->allocate(); + dst.allocator()->allocate(); + + // Copy image data to tensor + library->fill(Accessor(src), raw); + } + + void run() + { + hog_descriptor_func.run(); + } + + void sync() + { + sync_if_necessary(); + } + + void teardown() + { + src.allocator()->free(); + dst.allocator()->free(); + } + +private: + TensorType src{}; + TensorType dst{}; + Function hog_descriptor_func{}; +}; +} // namespace benchmark +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_HOG_DESCRIPTOR_FIXTURE */ -- cgit v1.2.1