commit 7a0357549a0ffa0ea3ea56fa791a15a35368afe8
author SiCong Li <sicong.li@arm.com> Wed Jun 28 15:27:02 2017 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Mon Sep 17 14:15:39 2018 +0100
tree 8f9c9d87f8199d69068ff769cc2136f7407363eb
parent 4e288696a2ca8e1c9d6d37d90d237c1a18d6e364

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 <moritz.pflanzer@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

tests/validation/NEON/Sobel3x3.cpp

diff --git a/tests/validation/NEON/Sobel3x3.cpp b/tests/validation/NEON/Sobel3x3.cpp
index 8324614..c6c58f1 100644
--- a/tests/validation/NEON/Sobel3x3.cpp
+++ b/tests/validation/NEON/Sobel3x3.cpp
@@ -52,6 +52,9 @@
 
 namespace
 {
+constexpr unsigned int filter_size = 3;              /** Size of the kernel/filter in number of elements. */
+constexpr BorderSize   border_size(filter_size / 2); /** Border size of the kernel/filter around its central element. */
+
 /** Compute Neon Sobel 3x3 function.
  *
  * @param[in] shape                 Shape of the input and output tensors.
@@ -120,11 +123,7 @@
 
     // 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(1));
-    }
+    const ValidRegion dst_valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, border_size);
 
     validate(src.info()->valid_region(), src_valid_region);
     validate(dst_x.info()->valid_region(), dst_valid_region);
@@ -168,11 +167,7 @@
     std::pair<RawTensor, RawTensor> ref_dst = Reference::compute_reference_sobel_3x3(shape, 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(1));
-    }
+    const ValidRegion valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, border_size);
 
     // Validate output
     validate(NEAccessor(dst.first), ref_dst.first, valid_region);
@@ -199,11 +194,7 @@
     std::pair<RawTensor, RawTensor> ref_dst = Reference::compute_reference_sobel_3x3(shape, 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(1));
-    }
+    const ValidRegion valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, border_size);
 
     // Validate output
     validate(NEAccessor(dst.first), ref_dst.first, valid_region);