diff options
Diffstat (limited to 'tests/benchmark')
-rw-r--r-- | tests/benchmark/CL/CannyEdge.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/CL/HarrisCorners.cpp | 10 | ||||
-rw-r--r-- | tests/benchmark/NEON/CannyEdge.cpp | 3 | ||||
-rw-r--r-- | tests/benchmark/NEON/HarrisCorners.cpp | 34 | ||||
-rw-r--r-- | tests/benchmark/fixtures/CannyEdgeFixture.h | 20 | ||||
-rw-r--r-- | tests/benchmark/fixtures/HarrisCornersFixture.h | 5 |
6 files changed, 14 insertions, 61 deletions
diff --git a/tests/benchmark/CL/CannyEdge.cpp b/tests/benchmark/CL/CannyEdge.cpp index 7e327f3df3..8cc918f4c8 100644 --- a/tests/benchmark/CL/CannyEdge.cpp +++ b/tests/benchmark/CL/CannyEdge.cpp @@ -42,10 +42,9 @@ namespace { // *INDENT-OFF* // clang-format off -const auto use_fp16 = framework::dataset::make("UseFP16", { false }); const auto canny_edge_dataset = combine(framework::dataset::make("GradientSize", { 3, 5, 7 }), combine(framework::dataset::make("Normalization", { MagnitudeType::L1NORM, MagnitudeType::L2NORM }), - combine(datasets::BorderModes(), use_fp16))); + datasets::BorderModes())); } // namespace using CLCannyEdgeFixture = CannyEdgeFixture<CLTensor, CLCannyEdge, CLAccessor>; diff --git a/tests/benchmark/CL/HarrisCorners.cpp b/tests/benchmark/CL/HarrisCorners.cpp index 990ac24894..dbaf95c98d 100644 --- a/tests/benchmark/CL/HarrisCorners.cpp +++ b/tests/benchmark/CL/HarrisCorners.cpp @@ -54,25 +54,23 @@ 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::SmallImageFiles(), +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, CLHarrisCornersFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(combine(combine(datasets::SmallImageFiles(), framework::dataset::make("Format", { Format::U8 })), threshold), min_dist), sensitivity), gradient_size), block_size), - border_mode), - framework::dataset::make("UseFP16", { false }))); + border_mode)); -REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLHarrisCornersFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(combine(combine(combine(combine(combine(datasets::LargeImageFiles(), +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, CLHarrisCornersFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(combine(combine(combine(combine(datasets::LargeImageFiles(), framework::dataset::make("Format", { Format::U8 })), threshold), min_dist), sensitivity), gradient_size), block_size), - border_mode), - framework::dataset::make("UseFP16", { false }))); + border_mode)); TEST_SUITE_END() // HarrisCorners TEST_SUITE_END() // CL diff --git a/tests/benchmark/NEON/CannyEdge.cpp b/tests/benchmark/NEON/CannyEdge.cpp index 50fd832e5d..c4414507c9 100644 --- a/tests/benchmark/NEON/CannyEdge.cpp +++ b/tests/benchmark/NEON/CannyEdge.cpp @@ -42,10 +42,9 @@ namespace { // *INDENT-OFF* // clang-format off -const auto use_fp16 = framework::dataset::make("UseFP16", { false }); const auto canny_edge_dataset = combine(framework::dataset::make("GradientSize", { 3, 5, 7 }), combine(framework::dataset::make("Normalization", { MagnitudeType::L1NORM, MagnitudeType::L2NORM }), - combine(datasets::BorderModes(), use_fp16))); + datasets::BorderModes())); } // namespace using NECannyEdgeFixture = CannyEdgeFixture<Tensor, NECannyEdge, Accessor>; diff --git a/tests/benchmark/NEON/HarrisCorners.cpp b/tests/benchmark/NEON/HarrisCorners.cpp index 33315ffcd0..75a6794cc5 100644 --- a/tests/benchmark/NEON/HarrisCorners.cpp +++ b/tests/benchmark/NEON/HarrisCorners.cpp @@ -53,49 +53,23 @@ using NEHarrisCornersFixture = HarrisCornersFixture<Tensor, NEHarrisCorners, Acc TEST_SUITE(NEON) 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::SmallImageFiles(), - framework::dataset::make("Format", { Format::U8 })), - threshold), - min_dist), - sensitivity), - gradient_size), - 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::LargeImageFiles(), - framework::dataset::make("Format", { Format::U8 })), - threshold), - min_dist), - sensitivity), - gradient_size), - block_size), - border_mode), - framework::dataset::make("UseFP16", { true }))); -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::SmallImageFiles(), +REGISTER_FIXTURE_DATA_TEST_CASE(RunSmall, NEHarrisCornersFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(combine(combine(datasets::SmallImageFiles(), framework::dataset::make("Format", { Format::U8 })), threshold), min_dist), sensitivity), gradient_size), 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::LargeImageFiles(), + border_mode)); +REGISTER_FIXTURE_DATA_TEST_CASE(RunLarge, NEHarrisCornersFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(combine(combine(combine(combine(datasets::LargeImageFiles(), framework::dataset::make("Format", { Format::U8 })), threshold), min_dist), sensitivity), gradient_size), block_size), - border_mode), - framework::dataset::make("UseFP16", { false }))); + border_mode)); TEST_SUITE_END() // S16 TEST_SUITE_END() // HarrisCorners TEST_SUITE_END() // NEON diff --git a/tests/benchmark/fixtures/CannyEdgeFixture.h b/tests/benchmark/fixtures/CannyEdgeFixture.h index 099dabaf18..e2aec24b3e 100644 --- a/tests/benchmark/fixtures/CannyEdgeFixture.h +++ b/tests/benchmark/fixtures/CannyEdgeFixture.h @@ -44,7 +44,7 @@ class CannyEdgeFixture : public framework::Fixture { public: template <typename...> - void setup(std::string image, int gradient_size, MagnitudeType norm_type, BorderMode border_mode, bool use_fp16, Format format) + void setup(std::string image, int gradient_size, MagnitudeType norm_type, BorderMode border_mode, Format format) { // Load the image (cached by the library if loaded before) const RawTensor &raw = library->get(image, format); @@ -52,7 +52,7 @@ public: src = create_tensor<TensorType>(raw.shape(), format); dst = create_tensor<TensorType>(raw.shape(), format); - configure_target<Function>(canny_edge_func, src, dst, gradient_size, static_cast<int>(norm_type) + 1, border_mode, use_fp16); + canny_edge_func.configure(&src, &dst, upper_thresh, lower_thresh, gradient_size, static_cast<int>(norm_type) + 1, border_mode, constant_border_value); // Allocate tensors src.allocator()->allocate(); @@ -72,22 +72,6 @@ public: sync_tensor_if_necessary<TensorType>(dst); } -protected: - template <typename F, typename std::enable_if<std::is_same<F, NECannyEdge>::value, int>::type = 0> - void configure_target(F &func, TensorType &src, TensorType &dst, int gradient_size, int norm_type, BorderMode border_mode, bool use_fp16) - { - func.configure(&src, &dst, upper_thresh, lower_thresh, gradient_size, norm_type, border_mode, constant_border_value, use_fp16); - } - - template <typename F, typename std::enable_if<std::is_same<F, CLCannyEdge>::value, int>::type = 0> - void configure_target(F &func, TensorType &src, TensorType &dst, int gradient_size, int norm_type, BorderMode border_mode, bool use_fp16) - { - ARM_COMPUTE_UNUSED(use_fp16); - ARM_COMPUTE_ERROR_ON(use_fp16); - - func.configure(&src, &dst, upper_thresh, lower_thresh, gradient_size, norm_type, border_mode, constant_border_value); - } - private: static const int32_t lower_thresh = 0; static const int32_t upper_thresh = 255; diff --git a/tests/benchmark/fixtures/HarrisCornersFixture.h b/tests/benchmark/fixtures/HarrisCornersFixture.h index c7ce683ab5..29d1741156 100644 --- a/tests/benchmark/fixtures/HarrisCornersFixture.h +++ b/tests/benchmark/fixtures/HarrisCornersFixture.h @@ -42,8 +42,7 @@ class HarrisCornersFixture : public framework::Fixture public: template <typename...> 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) + int32_t gradient_size, int32_t block_size, BorderMode border_mode) { // Load the image (cached by the library if loaded before) const RawTensor &raw = library->get(image, format); @@ -52,7 +51,7 @@ public: 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); + harris_corners_func.configure(&src, threshold, min_dist, sensitivity, gradient_size, block_size, &out, border_mode, 0); // Allocate tensor src.allocator()->allocate(); |