From 7a0357549a0ffa0ea3ea56fa791a15a35368afe8 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Wed, 28 Jun 2017 15:27:02 +0100 Subject: COMPMID-424 Clean up validation tests for 2D spatial filter functions * Remove shape_to_valid_region_undefined_border * Remove hardcoded border size Change-Id: I3c64148d8f7ce7e960f21d88d3af43bb23501683 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79106 Reviewed-by: Moritz Pflanzer Tested-by: Kaizen Reviewed-by: Georgios Pinitas --- tests/validation/NEON/NonLinearFilter.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'tests/validation/NEON/NonLinearFilter.cpp') diff --git a/tests/validation/NEON/NonLinearFilter.cpp b/tests/validation/NEON/NonLinearFilter.cpp index 3b71eaa9c6..c5d5087d39 100644 --- a/tests/validation/NEON/NonLinearFilter.cpp +++ b/tests/validation/NEON/NonLinearFilter.cpp @@ -125,11 +125,7 @@ BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) // Validate valid region const ValidRegion src_valid_region = shape_to_valid_region(shape); - ValidRegion dst_valid_region = shape_to_valid_region(shape); - if(border_mode == BorderMode::UNDEFINED) - { - dst_valid_region = shape_to_valid_region_undefined_border(shape, BorderSize(half_mask_size)); - } + const ValidRegion dst_valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, BorderSize(half_mask_size)); validate(src.info()->valid_region(), src_valid_region); validate(dst.info()->valid_region(), dst_valid_region); @@ -171,11 +167,7 @@ BOOST_DATA_TEST_CASE(RunSmall, SmallShapes() RawTensor ref_dst = Reference::compute_reference_non_linear_filter(shape, function, mask_size, pattern, mask, border_mode, constant_border_value); // Calculate valid region - ValidRegion valid_region = shape_to_valid_region(shape); - if(border_mode == BorderMode::UNDEFINED) - { - valid_region = shape_to_valid_region_undefined_border(shape, BorderSize(static_cast(mask_size / 2))); - } + const ValidRegion valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, BorderSize(static_cast(mask_size / 2))); // Validate output validate(NEAccessor(dst), ref_dst, valid_region); @@ -202,11 +194,7 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() RawTensor ref_dst = Reference::compute_reference_non_linear_filter(shape, function, mask_size, pattern, mask, border_mode, constant_border_value); // Calculate valid region - ValidRegion valid_region = shape_to_valid_region(shape); - if(border_mode == BorderMode::UNDEFINED) - { - valid_region = shape_to_valid_region_undefined_border(shape, BorderSize(static_cast(mask_size / 2))); - } + const ValidRegion valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, BorderSize(static_cast(mask_size / 2))); // Validate output validate(NEAccessor(dst), ref_dst, valid_region); -- cgit v1.2.1