COMPMID-417: Fix PaddingCalculator
Change-Id: Idefa8c62d313e25808ea735c60967437035e266d
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/78711
Reviewed-by: SiCong Li <sicong.li@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
diff --git a/tests/validation/CL/BitwiseAnd.cpp b/tests/validation/CL/BitwiseAnd.cpp
index 99e7b3e..bbafa87 100644
--- a/tests/validation/CL/BitwiseAnd.cpp
+++ b/tests/validation/CL/BitwiseAnd.cpp
@@ -166,7 +166,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src1.info()->padding(), padding);
validate(src2.info()->padding(), padding);
validate(dst.info()->padding(), padding);
diff --git a/tests/validation/CL/DepthConvert.cpp b/tests/validation/CL/DepthConvert.cpp
index a7dbbc8..0bca453 100644
--- a/tests/validation/CL/DepthConvert.cpp
+++ b/tests/validation/CL/DepthConvert.cpp
@@ -113,7 +113,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src.info()->padding(), padding);
validate(dst.info()->padding(), padding);
}
diff --git a/tests/validation/CL/IntegralImage.cpp b/tests/validation/CL/IntegralImage.cpp
index 8f7c4b6..9ace8bd 100644
--- a/tests/validation/CL/IntegralImage.cpp
+++ b/tests/validation/CL/IntegralImage.cpp
@@ -108,12 +108,9 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- PaddingCalculator calculator(shape.x(), 16);
- const PaddingSize src_padding(0, calculator.required_padding(), 0, 0);
- const PaddingSize dst_padding(0, calculator.required_padding(), 0, 0);
-
- validate(src.info()->padding(), src_padding);
- validate(dst.info()->padding(), dst_padding);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
+ validate(src.info()->padding(), padding);
+ validate(dst.info()->padding(), padding);
}
BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
diff --git a/tests/validation/CL/Threshold.cpp b/tests/validation/CL/Threshold.cpp
index 122728d..ff7b8f0 100644
--- a/tests/validation/CL/Threshold.cpp
+++ b/tests/validation/CL/Threshold.cpp
@@ -115,7 +115,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src.info()->padding(), padding);
validate(dst.info()->padding(), padding);
}
diff --git a/tests/validation/NEON/AbsoluteDifference.cpp b/tests/validation/NEON/AbsoluteDifference.cpp
index 22f9eac..334a842 100644
--- a/tests/validation/NEON/AbsoluteDifference.cpp
+++ b/tests/validation/NEON/AbsoluteDifference.cpp
@@ -106,7 +106,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src1.info()->padding(), padding);
validate(src2.info()->padding(), padding);
validate(dst.info()->padding(), padding);
diff --git a/tests/validation/NEON/Accumulate.cpp b/tests/validation/NEON/Accumulate.cpp
index e3b78aa..157c298 100644
--- a/tests/validation/NEON/Accumulate.cpp
+++ b/tests/validation/NEON/Accumulate.cpp
@@ -109,7 +109,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src.info()->padding(), padding);
validate(dst.info()->padding(), padding);
}
diff --git a/tests/validation/NEON/AccumulateSquared.cpp b/tests/validation/NEON/AccumulateSquared.cpp
index e17b15ad..3dbdeb2 100644
--- a/tests/validation/NEON/AccumulateSquared.cpp
+++ b/tests/validation/NEON/AccumulateSquared.cpp
@@ -110,7 +110,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src.info()->padding(), padding);
validate(dst.info()->padding(), padding);
}
diff --git a/tests/validation/NEON/AccumulateWeighted.cpp b/tests/validation/NEON/AccumulateWeighted.cpp
index f2a4794..cf1f746 100644
--- a/tests/validation/NEON/AccumulateWeighted.cpp
+++ b/tests/validation/NEON/AccumulateWeighted.cpp
@@ -109,7 +109,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src.info()->padding(), padding);
validate(dst.info()->padding(), padding);
}
diff --git a/tests/validation/NEON/ActivationLayer.cpp b/tests/validation/NEON/ActivationLayer.cpp
index bf00173..a4826ac 100644
--- a/tests/validation/NEON/ActivationLayer.cpp
+++ b/tests/validation/NEON/ActivationLayer.cpp
@@ -152,7 +152,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src.info()->padding(), padding);
validate(dst.info()->padding(), padding);
}
diff --git a/tests/validation/NEON/ArithmeticAddition.cpp b/tests/validation/NEON/ArithmeticAddition.cpp
index cf37a58..d58d0ce 100644
--- a/tests/validation/NEON/ArithmeticAddition.cpp
+++ b/tests/validation/NEON/ArithmeticAddition.cpp
@@ -107,7 +107,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src1.info()->padding(), padding);
validate(src2.info()->padding(), padding);
validate(dst.info()->padding(), padding);
diff --git a/tests/validation/NEON/ArithmeticSubtraction.cpp b/tests/validation/NEON/ArithmeticSubtraction.cpp
index 50659a1..ade473a 100644
--- a/tests/validation/NEON/ArithmeticSubtraction.cpp
+++ b/tests/validation/NEON/ArithmeticSubtraction.cpp
@@ -107,7 +107,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src1.info()->padding(), padding);
validate(src2.info()->padding(), padding);
validate(dst.info()->padding(), padding);
diff --git a/tests/validation/NEON/BitwiseAnd.cpp b/tests/validation/NEON/BitwiseAnd.cpp
index eb4090f..3dcad6f 100644
--- a/tests/validation/NEON/BitwiseAnd.cpp
+++ b/tests/validation/NEON/BitwiseAnd.cpp
@@ -166,7 +166,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src1.info()->padding(), padding);
validate(src2.info()->padding(), padding);
validate(dst.info()->padding(), padding);
diff --git a/tests/validation/NEON/BitwiseNot.cpp b/tests/validation/NEON/BitwiseNot.cpp
index 590d806..de58f55 100644
--- a/tests/validation/NEON/BitwiseNot.cpp
+++ b/tests/validation/NEON/BitwiseNot.cpp
@@ -107,7 +107,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src.info()->padding(), padding);
validate(dst.info()->padding(), padding);
}
diff --git a/tests/validation/NEON/BitwiseOr.cpp b/tests/validation/NEON/BitwiseOr.cpp
index 164b2fe..95f77ee 100644
--- a/tests/validation/NEON/BitwiseOr.cpp
+++ b/tests/validation/NEON/BitwiseOr.cpp
@@ -114,7 +114,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src1.info()->padding(), padding);
validate(src2.info()->padding(), padding);
validate(dst.info()->padding(), padding);
diff --git a/tests/validation/NEON/BitwiseXor.cpp b/tests/validation/NEON/BitwiseXor.cpp
index eea0326..a9225e6 100644
--- a/tests/validation/NEON/BitwiseXor.cpp
+++ b/tests/validation/NEON/BitwiseXor.cpp
@@ -114,7 +114,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src1.info()->padding(), padding);
validate(src2.info()->padding(), padding);
validate(dst.info()->padding(), padding);
diff --git a/tests/validation/NEON/Box3x3.cpp b/tests/validation/NEON/Box3x3.cpp
index 6c9c3b2..b2a66cd 100644
--- a/tests/validation/NEON/Box3x3.cpp
+++ b/tests/validation/NEON/Box3x3.cpp
@@ -112,15 +112,15 @@
PaddingCalculator calculator(shape.x(), 8);
calculator.set_border_size(1);
- const PaddingSize write_padding(0, calculator.required_padding(), 0, 0);
+ const PaddingSize dst_padding = calculator.required_padding();
calculator.set_accessed_elements(16);
calculator.set_access_offset(-1);
- const PaddingSize read_padding(0, calculator.required_padding(), 0, 0);
+ const PaddingSize src_padding = calculator.required_padding();
- validate(src.info()->padding(), read_padding);
- validate(dst.info()->padding(), write_padding);
+ validate(src.info()->padding(), src_padding);
+ validate(dst.info()->padding(), dst_padding);
}
BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
diff --git a/tests/validation/NEON/DepthConvert.cpp b/tests/validation/NEON/DepthConvert.cpp
index cabbf0e..f6ae1f1 100644
--- a/tests/validation/NEON/DepthConvert.cpp
+++ b/tests/validation/NEON/DepthConvert.cpp
@@ -116,7 +116,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src.info()->padding(), padding);
validate(dst.info()->padding(), padding);
}
diff --git a/tests/validation/NEON/IntegralImage.cpp b/tests/validation/NEON/IntegralImage.cpp
index 59acbff..8789e46 100644
--- a/tests/validation/NEON/IntegralImage.cpp
+++ b/tests/validation/NEON/IntegralImage.cpp
@@ -108,9 +108,8 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- PaddingCalculator calculator(shape.x(), 16);
- const PaddingSize src_padding(0, calculator.required_padding(), 0, 0);
- const PaddingSize dst_padding(1, calculator.required_padding(), 0, 1);
+ const PaddingSize src_padding = PaddingCalculator(shape.x(), 16).required_padding();
+ const PaddingSize dst_padding(1, src_padding.right, 0, 1);
validate(src.info()->padding(), src_padding);
validate(dst.info()->padding(), dst_padding);
diff --git a/tests/validation/NEON/MeanStdDev.cpp b/tests/validation/NEON/MeanStdDev.cpp
index 4804354..7087749 100644
--- a/tests/validation/NEON/MeanStdDev.cpp
+++ b/tests/validation/NEON/MeanStdDev.cpp
@@ -109,8 +109,7 @@
validate(src.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
- validate(src.info()->padding(), padding);
+ validate(src.info()->padding(), PaddingCalculator(shape.x(), 16).required_padding());
}
BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
diff --git a/tests/validation/NEON/PixelWiseMultiplication.cpp b/tests/validation/NEON/PixelWiseMultiplication.cpp
index b16e7fe..fd61c72 100644
--- a/tests/validation/NEON/PixelWiseMultiplication.cpp
+++ b/tests/validation/NEON/PixelWiseMultiplication.cpp
@@ -111,7 +111,7 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
validate(src1.info()->padding(), padding);
validate(src2.info()->padding(), padding);
validate(dst.info()->padding(), padding);
diff --git a/tests/validation/NEON/SoftmaxLayer.cpp b/tests/validation/NEON/SoftmaxLayer.cpp
index b04b0fe..519cac3 100644
--- a/tests/validation/NEON/SoftmaxLayer.cpp
+++ b/tests/validation/NEON/SoftmaxLayer.cpp
@@ -127,8 +127,8 @@
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- int step = 16 / arm_compute::data_size_from_type(dt);
- const PaddingSize padding(0, PaddingCalculator(shape.x(), step).required_padding(), 0, 0);
+ const int step = 16 / arm_compute::data_size_from_type(dt);
+ const PaddingSize padding = PaddingCalculator(shape.x(), step).required_padding();
validate(src.info()->padding(), padding);
validate(dst.info()->padding(), padding);
}
diff --git a/tests/validation/NEON/Threshold.cpp b/tests/validation/NEON/Threshold.cpp
index b2a289f..55f7889 100644
--- a/tests/validation/NEON/Threshold.cpp
+++ b/tests/validation/NEON/Threshold.cpp
@@ -99,24 +99,24 @@
shape, thrshConf)
{
// Create tensors
- Tensor src1 = create_tensor(shape, DataType::U8);
- Tensor dst = create_tensor(shape, DataType::U8);
+ Tensor src = create_tensor(shape, DataType::U8);
+ Tensor dst = create_tensor(shape, DataType::U8);
- BOOST_TEST(src1.info()->is_resizable());
+ BOOST_TEST(src.info()->is_resizable());
BOOST_TEST(dst.info()->is_resizable());
// Create and configure function
NEThreshold thrsh;
- thrsh.configure(&src1, &dst, thrshConf.threshold, thrshConf.false_value, thrshConf.true_value, thrshConf.type, thrshConf.upper);
+ thrsh.configure(&src, &dst, thrshConf.threshold, thrshConf.false_value, thrshConf.true_value, thrshConf.type, thrshConf.upper);
// Validate valid region
const ValidRegion valid_region = shape_to_valid_region(shape);
- validate(src1.info()->valid_region(), valid_region);
+ validate(src.info()->valid_region(), valid_region);
validate(dst.info()->valid_region(), valid_region);
// Validate padding
- const PaddingSize padding(0, PaddingCalculator(shape.x(), 16).required_padding(), 0, 0);
- validate(src1.info()->padding(), padding);
+ const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding();
+ validate(src.info()->padding(), padding);
validate(dst.info()->padding(), padding);
}