From c7b82f1319ad85bc2d203bf7f3e18341792eed26 Mon Sep 17 00:00:00 2001 From: Sanghoon Lee Date: Fri, 6 Jul 2018 13:27:27 +0100 Subject: COMPMID-761: Add CL/NEON ColorConvert benchmark tests Change-Id: I25b42c5b74567bb50444da393d723b7f5cedafad Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/138694 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- tests/benchmark/CL/ColorConvert.cpp | 124 +++++++++++++++++++++ tests/benchmark/CL/LocallyConnectedLayer.cpp | 2 +- tests/benchmark/NEON/ColorConvert.cpp | 124 +++++++++++++++++++++ tests/benchmark/fixtures/ColorConvertFixture.h | 143 +++++++++++++++++++++++++ 4 files changed, 392 insertions(+), 1 deletion(-) create mode 100644 tests/benchmark/CL/ColorConvert.cpp create mode 100644 tests/benchmark/NEON/ColorConvert.cpp create mode 100644 tests/benchmark/fixtures/ColorConvertFixture.h (limited to 'tests/benchmark') diff --git a/tests/benchmark/CL/ColorConvert.cpp b/tests/benchmark/CL/ColorConvert.cpp new file mode 100644 index 0000000000..a6337919ed --- /dev/null +++ b/tests/benchmark/CL/ColorConvert.cpp @@ -0,0 +1,124 @@ +/* + * 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/CL/CLMultiImage.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/functions/CLColorConvert.h" +#include "tests/CL/CLAccessor.h" +#include "tests/benchmark/fixtures/ColorConvertFixture.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Macros.h" +#include "utils/TypePrinter.h" + +namespace arm_compute +{ +namespace test +{ +namespace benchmark +{ +namespace +{ +const auto RGBDataset = framework::dataset::make("FormatType", { Format::RGB888, Format::RGBA8888 }); +const auto YUYVDataset = framework::dataset::make("FormatType", { Format::YUYV422, Format::UYVY422 }); + +const auto ColorConvert_RGBA_to_RGB = combine(framework::dataset::make("FormatType", { Format::RGBA8888 }), + framework::dataset::make("FormatType", { Format::RGB888 })); + +const auto ColorConvert_RGB_to_RGBA = combine(framework::dataset::make("FormatType", { Format::RGB888 }), + framework::dataset::make("FormatType", { Format::RGBA8888 })); + +const auto ColorConvert_YUYV_to_RGBDataset = combine(YUYVDataset, + RGBDataset); + +const auto ColorConvert_YUVPlanar_to_RGBDataset = combine(framework::dataset::make("FormatType", { Format::IYUV, Format::NV12, Format::NV21 }), + RGBDataset); + +const auto ColorConvert_RGBDataset_to_NVDataset = combine(RGBDataset, + framework::dataset::make("FormatType", { Format::NV12, Format::IYUV, Format::YUV444 })); + +const auto ColorConvert_YUYVDataset_to_NVDataset = combine(YUYVDataset, + framework::dataset::make("FormatType", { Format::NV12, Format::IYUV })); + +const auto ColorConvert_NVDataset_to_YUVDataset = combine(framework::dataset::make("FormatType", { Format::NV12, Format::NV21 }), + framework::dataset::make("FormatType", { Format::IYUV, Format::YUV444 })); +} // namespace + +TEST_SUITE(CL) +TEST_SUITE(ColorConvert) + +using CLColorConvertFixture = ColorConvertFixture; + +TEST_SUITE(RGBA) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_RGBA_to_RGB)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_RGBA_to_RGB)); +TEST_SUITE_END() + +TEST_SUITE(RGB) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_RGB_to_RGBA)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_RGB_to_RGBA)); +TEST_SUITE_END() + +TEST_SUITE(YUV) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_YUYV_to_RGBDataset)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_YUYV_to_RGBDataset)); +TEST_SUITE_END() + +TEST_SUITE(YUVPlanar) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_YUVPlanar_to_RGBDataset)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_YUVPlanar_to_RGBDataset)); +TEST_SUITE_END() + +TEST_SUITE(NV) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_RGBDataset_to_NVDataset)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_RGBDataset_to_NVDataset)); +TEST_SUITE_END() + +TEST_SUITE(YUYVtoNV) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_YUYVDataset_to_NVDataset)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_YUYVDataset_to_NVDataset)); +TEST_SUITE_END() + +TEST_SUITE(NVtoYUV) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_NVDataset_to_YUVDataset)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_NVDataset_to_YUVDataset)); +TEST_SUITE_END() + +TEST_SUITE_END() // ColorConvert +TEST_SUITE_END() // CL +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/CL/LocallyConnectedLayer.cpp b/tests/benchmark/CL/LocallyConnectedLayer.cpp index bd1904678e..91e2bd3524 100644 --- a/tests/benchmark/CL/LocallyConnectedLayer.cpp +++ b/tests/benchmark/CL/LocallyConnectedLayer.cpp @@ -51,7 +51,7 @@ TEST_SUITE(LocallyConnectedLayer) // *INDENT-OFF* // clang-format off -REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLLocallyConnectedLayerFixture, framework::DatasetMode::ALL, +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLLocallyConnectedLayerFixture, framework::DatasetMode::PRECOMMIT, combine(combine( datasets::SmallLocallyConnectedDataset(), data_types), diff --git a/tests/benchmark/NEON/ColorConvert.cpp b/tests/benchmark/NEON/ColorConvert.cpp new file mode 100644 index 0000000000..6aef5723d3 --- /dev/null +++ b/tests/benchmark/NEON/ColorConvert.cpp @@ -0,0 +1,124 @@ +/* + * 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/MultiImage.h" +#include "arm_compute/runtime/NEON/functions/NEColorConvert.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/NEON/Accessor.h" +#include "tests/benchmark/fixtures/ColorConvertFixture.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Macros.h" +#include "utils/TypePrinter.h" + +namespace arm_compute +{ +namespace test +{ +namespace benchmark +{ +namespace +{ +const auto RGBDataset = framework::dataset::make("FormatType", { Format::RGB888, Format::RGBA8888 }); +const auto YUYVDataset = framework::dataset::make("FormatType", { Format::YUYV422, Format::UYVY422 }); + +const auto ColorConvert_RGBA_to_RGB = combine(framework::dataset::make("FormatType", { Format::RGBA8888 }), + framework::dataset::make("FormatType", { Format::RGB888 })); + +const auto ColorConvert_RGB_to_RGBA = combine(framework::dataset::make("FormatType", { Format::RGB888 }), + framework::dataset::make("FormatType", { Format::RGBA8888 })); + +const auto ColorConvert_YUYVDataset_to_RGBDataset = combine(YUYVDataset, + RGBDataset); + +const auto ColorConvert_YUVPlanar_to_RGBDataset = combine(framework::dataset::make("FormatType", { Format::IYUV, Format::NV12, Format::NV21 }), + RGBDataset); + +const auto ColorConvert_RGBDataset_to_NVDataset = combine(RGBDataset, + framework::dataset::make("FormatType", { Format::NV12, Format::IYUV, Format::YUV444 })); + +const auto ColorConvert_YUYVDataset_to_NVDataset = combine(YUYVDataset, + framework::dataset::make("FormatType", { Format::NV12, Format::IYUV })); + +const auto ColorConvert_NVDataset_to_YUVDataset = combine(framework::dataset::make("FormatType", { Format::NV12, Format::NV21 }), + framework::dataset::make("FormatType", { Format::IYUV, Format::YUV444 })); +} // namespace + +TEST_SUITE(NEON) +TEST_SUITE(ColorConvert) + +using NEColorConvertFixture = ColorConvertFixture; + +TEST_SUITE(RGBA) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_RGBA_to_RGB)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_RGBA_to_RGB)); +TEST_SUITE_END() + +TEST_SUITE(RGB) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_RGB_to_RGBA)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_RGB_to_RGBA)); +TEST_SUITE_END() + +TEST_SUITE(YUYV) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_YUYVDataset_to_RGBDataset)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_YUYVDataset_to_RGBDataset)); +TEST_SUITE_END() + +TEST_SUITE(YUVPlanar) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_YUVPlanar_to_RGBDataset)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_YUVPlanar_to_RGBDataset)); +TEST_SUITE_END() + +TEST_SUITE(NV) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_RGBDataset_to_NVDataset)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_RGBDataset_to_NVDataset)); +TEST_SUITE_END() + +TEST_SUITE(YUYVtoNV) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_YUYVDataset_to_NVDataset)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_YUYVDataset_to_NVDataset)); +TEST_SUITE_END() + +TEST_SUITE(NVtoYUV) +// *INDENT-OFF* +// clang-format off +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEColorConvertFixture, framework::DatasetMode::PRECOMMIT, combine(datasets::Small2DShapes(), ColorConvert_NVDataset_to_YUVDataset)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEColorConvertFixture, framework::DatasetMode::NIGHTLY, combine(datasets::Large2DShapes(), ColorConvert_NVDataset_to_YUVDataset)); +TEST_SUITE_END() + +TEST_SUITE_END() // ColorConvert +TEST_SUITE_END() // CL +} // namespace benchmark +} // namespace test +} // namespace arm_compute diff --git a/tests/benchmark/fixtures/ColorConvertFixture.h b/tests/benchmark/fixtures/ColorConvertFixture.h new file mode 100644 index 0000000000..6656e1482e --- /dev/null +++ b/tests/benchmark/fixtures/ColorConvertFixture.h @@ -0,0 +1,143 @@ +/* + * 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_COLOR_CONVERT_FIXTURE +#define ARM_COMPUTE_TEST_COLOR_CONVERT_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 ColorConvertFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape input_shape, Format src_format, Format dst_format) + { + _src_num_planes = num_planes_from_format(src_format); + _dst_num_planes = num_planes_from_format(dst_format); + + TensorShape dst_shape = adjust_odd_shape(input_shape, src_format); + dst_shape = adjust_odd_shape(dst_shape, dst_format); + + // Create tensors + ref_src = create_multi_image(dst_shape, src_format); + ref_dst = create_multi_image(dst_shape, dst_format); + + if(1U == _src_num_planes) + { + const TensorType *plane_src = static_cast(ref_src.plane(0)); + + if(1U == _dst_num_planes) + { + TensorType *plane_dst = static_cast(ref_dst.plane(0)); + colorconvert_func.configure(plane_src, plane_dst); + } + else + { + colorconvert_func.configure(plane_src, &ref_dst); + } + } + else + { + if(1U == _dst_num_planes) + { + TensorType *plane_dst = static_cast(ref_dst.plane(0)); + colorconvert_func.configure(&ref_src, plane_dst); + } + else + { + colorconvert_func.configure(&ref_src, &ref_dst); + } + } + + // Allocate tensors + ref_src.allocate(); + ref_dst.allocate(); + + // Fill tensor planes + for(unsigned int plane_idx = 0; plane_idx < _src_num_planes; ++plane_idx) + { + TensorType *src_plane = static_cast(ref_src.plane(plane_idx)); + + fill(AccessorType(*src_plane), plane_idx); + } + } + + void run() + { + colorconvert_func.run(); + } + + void sync() + { + sync_if_necessary(); + for(unsigned int plane_idx = 0; plane_idx < _dst_num_planes; ++plane_idx) + { + TensorType *dst_plane = static_cast(ref_dst.plane(plane_idx)); + sync_tensor_if_necessary(*dst_plane); + } + } + + void teardown() + { + for(unsigned int plane_idx = 0; plane_idx < _src_num_planes; ++plane_idx) + { + TensorType *src_plane = static_cast(ref_src.plane(plane_idx)); + src_plane->allocator()->free(); + } + for(unsigned int plane_idx = 0; plane_idx < _dst_num_planes; ++plane_idx) + { + TensorType *dst_plane = static_cast(ref_dst.plane(plane_idx)); + dst_plane->allocator()->free(); + } + } + +protected: + template + void fill(U &&tensor, int i) + { + library->fill_tensor_uniform(tensor, i); + } + +private: + MultiImageType ref_src{}; + MultiImageType ref_dst{}; + FunctionType colorconvert_func{}; + + unsigned int _src_num_planes{}; + unsigned int _dst_num_planes{}; +}; +} // namespace benchmark +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_COLOR_CONVERT_FIXTURE */ -- cgit v1.2.1