From e071b5e31004b29afefaa96907032bfd2b4e5a43 Mon Sep 17 00:00:00 2001 From: Gunes Bayir Date: Tue, 19 Sep 2023 15:44:21 +0100 Subject: Fix the validation issue in AddMulAdd fused kernel Resolves: COMPMID-6558 Change-Id: I015d504aaa9b8a1a232b01e49ab373d415ea1de9 Signed-off-by: Gunes Bayir Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10340 Reviewed-by: Viet-Hoa Do Reviewed-by: TeresaARM Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/fixtures/AddMulAddFixture.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'tests/validation') diff --git a/tests/validation/fixtures/AddMulAddFixture.h b/tests/validation/fixtures/AddMulAddFixture.h index a3a761bff1..d13fef2f02 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 @@ protected: // 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 @@ public: } // namespace test } // namespace arm_compute -#endif /* TESTS_VALIDATION_FIXTURES_ADDMULADDFIXTURE */ +#endif // ACL_TESTS_VALIDATION_FIXTURES_ADDMULADDFIXTURE_H -- cgit v1.2.1