diff options
author | Alex Gilday <alexander.gilday@arm.com> | 2018-01-09 11:40:19 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:42:33 +0000 |
commit | 345ab188c66017bf80512024a42b8e85ee96c872 (patch) | |
tree | 995d7147444483e8d7c342a9c90e615ca9445bc7 /tests/benchmark | |
parent | 780db4eb6a9e3dee565d14f36d772038cd3253da (diff) | |
download | ComputeLibrary-345ab188c66017bf80512024a42b8e85ee96c872.tar.gz |
COMPMID-742: Add image input support for Harris Corners tests
Change-Id: I4833eec0734776d8683fe867bb4f4d827f1a2fb7
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/115503
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'tests/benchmark')
-rw-r--r-- | tests/benchmark/CL/HarrisCorners.cpp | 6 | ||||
-rw-r--r-- | tests/benchmark/NEON/HarrisCorners.cpp | 10 | ||||
-rw-r--r-- | tests/benchmark/fixtures/HarrisCornersFixture.h | 12 |
3 files changed, 15 insertions, 13 deletions
diff --git a/tests/benchmark/CL/HarrisCorners.cpp b/tests/benchmark/CL/HarrisCorners.cpp index 618968f8c1..990ac24894 100644 --- a/tests/benchmark/CL/HarrisCorners.cpp +++ b/tests/benchmark/CL/HarrisCorners.cpp @@ -28,7 +28,7 @@ #include "arm_compute/runtime/CL/functions/CLHarrisCorners.h" #include "tests/CL/CLAccessor.h" #include "tests/benchmark/fixtures/HarrisCornersFixture.h" -#include "tests/datasets/ShapeDatasets.h" +#include "tests/datasets/ImageFileDatasets.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" #include "utils/TypePrinter.h" @@ -54,7 +54,7 @@ using CLHarrisCornersFixture = HarrisCornersFixture<CLTensor, CLHarrisCorners, C TEST_SUITE(CL) TEST_SUITE(HarrisCorners) -REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLHarrisCornersFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(combine(combine(combine(datasets::SmallImageShapes(), +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLHarrisCornersFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(combine(combine(combine(datasets::SmallImageFiles(), framework::dataset::make("Format", { Format::U8 })), threshold), min_dist), @@ -64,7 +64,7 @@ REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLHarrisCornersFixture, framework::Dat border_mode), framework::dataset::make("UseFP16", { false }))); -REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLHarrisCornersFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(combine(combine(combine(combine(combine(datasets::LargeImageShapes(), +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLHarrisCornersFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(combine(combine(combine(combine(combine(datasets::LargeImageFiles(), framework::dataset::make("Format", { Format::U8 })), threshold), min_dist), diff --git a/tests/benchmark/NEON/HarrisCorners.cpp b/tests/benchmark/NEON/HarrisCorners.cpp index 4fffded24b..33315ffcd0 100644 --- a/tests/benchmark/NEON/HarrisCorners.cpp +++ b/tests/benchmark/NEON/HarrisCorners.cpp @@ -27,7 +27,7 @@ #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" #include "tests/benchmark/fixtures/HarrisCornersFixture.h" -#include "tests/datasets/ShapeDatasets.h" +#include "tests/datasets/ImageFileDatasets.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" #include "utils/TypePrinter.h" @@ -56,7 +56,7 @@ TEST_SUITE(HarrisCorners) #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC TEST_SUITE(FP16) -REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEHarrisCornersFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(combine(combine(combine(datasets::SmallImageShapes(), +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEHarrisCornersFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(combine(combine(combine(datasets::SmallImageFiles(), framework::dataset::make("Format", { Format::U8 })), threshold), min_dist), @@ -65,7 +65,7 @@ REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEHarrisCornersFixture, framework::Dat block_size), border_mode), framework::dataset::make("UseFP16", { true }))); -REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEHarrisCornersFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(combine(combine(combine(combine(combine(datasets::LargeImageShapes(), +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEHarrisCornersFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(combine(combine(combine(combine(combine(datasets::LargeImageFiles(), framework::dataset::make("Format", { Format::U8 })), threshold), min_dist), @@ -78,7 +78,7 @@ TEST_SUITE_END() // FP16 #endif // __ARM_FEATURE_FP16_VECTOR_ARITHMETIC TEST_SUITE(S16) -REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEHarrisCornersFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(combine(combine(combine(datasets::SmallImageShapes(), +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEHarrisCornersFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(combine(combine(combine(datasets::SmallImageFiles(), framework::dataset::make("Format", { Format::U8 })), threshold), min_dist), @@ -87,7 +87,7 @@ REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEHarrisCornersFixture, framework::Dat block_size), border_mode), framework::dataset::make("UseFP16", { false }))); -REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEHarrisCornersFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(combine(combine(combine(combine(combine(datasets::LargeImageShapes(), +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEHarrisCornersFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(combine(combine(combine(combine(combine(datasets::LargeImageFiles(), framework::dataset::make("Format", { Format::U8 })), threshold), min_dist), diff --git a/tests/benchmark/fixtures/HarrisCornersFixture.h b/tests/benchmark/fixtures/HarrisCornersFixture.h index 1596ede962..c7ce683ab5 100644 --- a/tests/benchmark/fixtures/HarrisCornersFixture.h +++ b/tests/benchmark/fixtures/HarrisCornersFixture.h @@ -41,12 +41,15 @@ class HarrisCornersFixture : public framework::Fixture { public: template <typename...> - void setup(const TensorShape &shape, Format format, float threshold, float min_dist, float sensitivity, + void setup(std::string image, Format format, float threshold, float min_dist, float sensitivity, int32_t gradient_size, int32_t block_size, BorderMode border_mode, bool use_fp16) { + // Load the image (cached by the library if loaded before) + const RawTensor &raw = library->get(image, format); + // Create tensor - src = create_tensor<TensorType>(shape, format); + src = create_tensor<TensorType>(raw.shape(), format); // Create and configure function harris_corners_func.configure(&src, threshold, min_dist, sensitivity, gradient_size, block_size, &out, border_mode, 0, use_fp16); @@ -54,9 +57,8 @@ public: // Allocate tensor src.allocator()->allocate(); - // Fill tensor - std::uniform_int_distribution<int32_t> distribution(100, 100); - library->fill(Accessor(src), distribution, 0); + // Copy image data to tensor + library->fill(Accessor(src), raw); } void run() |