From a3c9a3b3d56f0369b199512fef832e6db958a601 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Tue, 8 Dec 2020 21:02:16 +0000 Subject: COMPMID-3874: Create ArithmeticAddition SVE/SVE2 Change-Id: I4ec7561a7f6a42a22b8187968ae302dbe75023bc Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4753 Tested-by: Arm Jenkins Reviewed-by: Sang-Hoon Park Comments-Addressed: Arm Jenkins --- tests/validation/Helpers.h | 3 ++- tests/validation/NEON/ArithmeticAddition.cpp | 24 +++++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) (limited to 'tests') diff --git a/tests/validation/Helpers.h b/tests/validation/Helpers.h index 325cc0042e..604840b33e 100644 --- a/tests/validation/Helpers.h +++ b/tests/validation/Helpers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -30,6 +30,7 @@ #include "tests/Globals.h" #include "tests/SimpleTensor.h" +#include #include #include #include diff --git a/tests/validation/NEON/ArithmeticAddition.cpp b/tests/validation/NEON/ArithmeticAddition.cpp index 7b3d4f9ac0..5598a1106b 100644 --- a/tests/validation/NEON/ArithmeticAddition.cpp +++ b/tests/validation/NEON/ArithmeticAddition.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -43,9 +43,11 @@ namespace validation { namespace { -#ifndef __aarch64__ +#if !defined(__aarch64__) || defined(__ARM_FEATURE_SVE) constexpr AbsoluteTolerance tolerance_quant(1); /**< Tolerance value for comparing reference's output against implementation's output for quantized data types */ -#endif //__aarch64__ +#else // !defined(__aarch64__) || defined(__ARM_FEATURE_SVE) +constexpr AbsoluteTolerance tolerance_quant(0); +#endif // !defined(__aarch64__) || defined(__ARM_FEATURE_SVE) /** Input data sets **/ const auto ArithmeticAdditionU8Dataset = combine(combine(framework::dataset::make("DataType", DataType::U8), framework::dataset::make("DataType", DataType::U8)), framework::dataset::make("DataType", @@ -225,11 +227,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, framework::dataset::make("OutQInfo", { QuantizationInfo(1.f / 255.f, 5) }))) { // Validate output -#ifdef __aarch64__ - validate(Accessor(_target), _reference); -#else //__aarch64__ validate(Accessor(_target), _reference, tolerance_quant); -#endif //__aarch64__ } TEST_SUITE_END() // QASYMM8 @@ -244,11 +242,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, framework::dataset::make("OutQInfo", { QuantizationInfo(0.5f, 5) }))) { // Validate output -#ifdef __aarch64__ - validate(Accessor(_target), _reference); -#else //__aarch64__ validate(Accessor(_target), _reference, tolerance_quant); -#endif //__aarch64__ } FIXTURE_DATA_TEST_CASE(RunSmallBroadcast, NEArithmeticAdditionQuantizedBroadcastFixture, framework::DatasetMode::ALL, combine(combine(combine(combine(combine( @@ -259,11 +253,7 @@ FIXTURE_DATA_TEST_CASE(RunSmallBroadcast, NEArithmeticAdditionQuantizedBroadcast framework::dataset::make("OutQInfo", { QuantizationInfo(0.5f, 5) }))) { // Validate output -#ifdef __aarch64__ - validate(Accessor(_target), _reference); -#else //__aarch64__ validate(Accessor(_target), _reference, tolerance_quant); -#endif //__aarch64__ } TEST_SUITE_END() // QASYMM8_SIGNED @@ -278,11 +268,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, framework::dataset::make("OutQInfo", { QuantizationInfo(5.f / 32768.f, 0) }))) { // Validate output -#ifdef __aarch64__ - validate(Accessor(_target), _reference); -#else //__aarch64__ validate(Accessor(_target), _reference, tolerance_quant); -#endif //__aarch64__ } TEST_SUITE_END() // QSYMM16 TEST_SUITE_END() // Quantized -- cgit v1.2.1