diff options
author | Conor Kennedy <conor.kennedy@arm.com> | 2019-03-08 08:24:41 +0000 |
---|---|---|
committer | Kevin May <kevin.may@arm.com> | 2019-03-11 10:38:20 +0000 |
commit | b99480bc522fd98a8e587478b78906e8a57936df (patch) | |
tree | fc6b5ce8e28eda60fa791cec097f65572b641408 /src/backends/neon/test | |
parent | a6d45c77688978518ca2113ff68ca7d98aaca36a (diff) | |
download | armnn-b99480bc522fd98a8e587478b78906e8a57936df.tar.gz |
IVGCVSW-2792 Update Neon Mul/Sub workload for latest CL master
* Update Neon Subtraction/Multiplication to use BaseWorkload
* Add Uint8 tests for Subtraction/Multiplication
Change-Id: Ied2aa048924817a4db0025b9bd9e54151667bd74
Signed-off-by: Conor Kennedy <conor.kennedy@arm.com>
Diffstat (limited to 'src/backends/neon/test')
-rw-r--r-- | src/backends/neon/test/NeonCreateWorkloadTests.cpp | 24 | ||||
-rw-r--r-- | src/backends/neon/test/NeonLayerTests.cpp | 6 |
2 files changed, 26 insertions, 4 deletions
diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index 86fc457130..d4065898a8 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE(CreateAdditionFloatWorkload) #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC BOOST_AUTO_TEST_CASE(CreateSubtractionFloat16Workload) { - NeonCreateElementwiseWorkloadTest<NeonSubtractionFloatWorkload, + NeonCreateElementwiseWorkloadTest<NeonSubtractionWorkload, SubtractionQueueDescriptor, SubtractionLayer, DataType::Float16>(); @@ -134,16 +134,24 @@ BOOST_AUTO_TEST_CASE(CreateSubtractionFloat16Workload) BOOST_AUTO_TEST_CASE(CreateSubtractionFloatWorkload) { - NeonCreateElementwiseWorkloadTest<NeonSubtractionFloatWorkload, + NeonCreateElementwiseWorkloadTest<NeonSubtractionWorkload, SubtractionQueueDescriptor, SubtractionLayer, DataType::Float32>(); } +BOOST_AUTO_TEST_CASE(CreateSubtractionUint8Workload) +{ + NeonCreateElementwiseWorkloadTest<NeonSubtractionWorkload, + SubtractionQueueDescriptor, + SubtractionLayer, + DataType::QuantisedAsymm8>(); +} + #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC BOOST_AUTO_TEST_CASE(CreateMultiplicationFloat16Workload) { - NeonCreateElementwiseWorkloadTest<NeonMultiplicationFloatWorkload, + NeonCreateElementwiseWorkloadTest<NeonMultiplicationWorkload, MultiplicationQueueDescriptor, MultiplicationLayer, DataType::Float16>(); @@ -152,12 +160,20 @@ BOOST_AUTO_TEST_CASE(CreateMultiplicationFloat16Workload) BOOST_AUTO_TEST_CASE(CreateMultiplicationFloatWorkload) { - NeonCreateElementwiseWorkloadTest<NeonMultiplicationFloatWorkload, + NeonCreateElementwiseWorkloadTest<NeonMultiplicationWorkload, MultiplicationQueueDescriptor, MultiplicationLayer, DataType::Float32>(); } +BOOST_AUTO_TEST_CASE(CreateMultiplicationUint8Workload) +{ + NeonCreateElementwiseWorkloadTest<NeonMultiplicationWorkload, + MultiplicationQueueDescriptor, + MultiplicationLayer, + DataType::QuantisedAsymm8>(); +} + template <typename BatchNormalizationWorkloadType, typename armnn::DataType DataType> static void NeonCreateBatchNormalizationWorkloadTest(DataLayout dataLayout) { diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 8370da4d14..01773dba03 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -313,11 +313,17 @@ ARMNN_AUTO_TEST_CASE(AddBroadcast1Element, AdditionBroadcast1ElementTest) ARMNN_AUTO_TEST_CASE(SimpleSub, SubtractionTest) ARMNN_AUTO_TEST_CASE(SubBroadcast1Element, SubtractionBroadcast1ElementTest) ARMNN_AUTO_TEST_CASE(SubBroadcast, SubtractionBroadcastTest) +ARMNN_AUTO_TEST_CASE(SubtractionUint8, SubtractionUint8Test) +ARMNN_AUTO_TEST_CASE(SubBroadcastUint8, SubtractionBroadcastUint8Test) +ARMNN_AUTO_TEST_CASE(SubBroadcast1ElementUint8, SubtractionBroadcast1ElementUint8Test) // Mul ARMNN_AUTO_TEST_CASE(SimpleMultiplication, MultiplicationTest) ARMNN_AUTO_TEST_CASE(MultiplicationBroadcast1Element, MultiplicationBroadcast1ElementTest) ARMNN_AUTO_TEST_CASE(MultiplicationBroadcast1DVector, MultiplicationBroadcast1DVectorTest) +ARMNN_AUTO_TEST_CASE(MultiplicationUint8, MultiplicationUint8Test) +ARMNN_AUTO_TEST_CASE(MultiplicationBroadcast1ElementUint8, MultiplicationBroadcast1ElementUint8Test) +ARMNN_AUTO_TEST_CASE(MultiplicationBroadcast1DVectorUint8, MultiplicationBroadcast1DVectorUint8Test) // Batch Norm ARMNN_AUTO_TEST_CASE(BatchNorm, BatchNormTest) |