commit e071b5e31004b29afefaa96907032bfd2b4e5a43
author Gunes Bayir <gunes.bayir@arm.com> Tue Sep 19 15:44:21 2023 +0100
committer Gunes Bayir <gunes.bayir@arm.com> Wed Sep 20 13:55:15 2023 +0000
tree 0a53d7c32c6b3f055fdffcd5dcfc3830226e81cb
parent 500e10b3222e726cfc5d484f924d5eb98016a754

Fix the validation issue in AddMulAdd fused kernel

Resolves: COMPMID-6558
Change-Id: I015d504aaa9b8a1a232b01e49ab373d415ea1de9
Signed-off-by: Gunes Bayir <gunes.bayir@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10340
Reviewed-by: Viet-Hoa Do <viet-hoa.do@arm.com>
Reviewed-by: TeresaARM <teresa.charlinreyes@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

tests/validation/fixtures/AddMulAddFixture.h

diff --git a/tests/validation/fixtures/AddMulAddFixture.h b/tests/validation/fixtures/AddMulAddFixture.h
index a3a761b..d13fef2 100644
--- a/tests/validation/fixtures/AddMulAddFixture.h
+++ b/tests/validation/fixtures/AddMulAddFixture.h
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
-#ifndef TESTS_VALIDATION_FIXTURES_ADDMULADDFIXTURE
-#define TESTS_VALIDATION_FIXTURES_ADDMULADDFIXTURE
+#ifndef ACL_TESTS_VALIDATION_FIXTURES_ADDMULADDFIXTURE_H
+#define ACL_TESTS_VALIDATION_FIXTURES_ADDMULADDFIXTURE_H
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
@@ -86,7 +86,12 @@
 
         // Create and configure function
         FunctionType add_mul_add;
-        add_mul_add.configure(&input1, &input2, &bn_mul, &bn_add, interm_out ? &add_output : nullptr, &final_output, ConvertPolicy::SATURATE, act_info);
+        ARM_COMPUTE_ERROR_THROW_ON(add_mul_add.validate(input1.info(), input2.info(), bn_mul.info(),
+                                                        bn_add.info(), interm_out ? add_output.info() : nullptr, final_output.info(),
+                                                        ConvertPolicy::SATURATE, act_info));
+
+        add_mul_add.configure(&input1, &input2, &bn_mul, &bn_add, interm_out ? &add_output : nullptr,
+                              &final_output, ConvertPolicy::SATURATE, act_info);
 
         // Allocate tensors
         input1.allocator()->allocate();
@@ -262,4 +267,4 @@
 } // namespace test
 } // namespace arm_compute
 
-#endif /* TESTS_VALIDATION_FIXTURES_ADDMULADDFIXTURE */
+#endif // ACL_TESTS_VALIDATION_FIXTURES_ADDMULADDFIXTURE_H