From 0302723e409df80bebd83883ce0aad07fece54c5 Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Mon, 9 May 2022 17:27:08 +0100 Subject: IVGCVSW-6936 Sqrt for CpuRef, CpuAcc and GpuAcc * Add Unit Tests * Bug Fix: add Sqrt to Neon and Cl workload factories Signed-off-by: Teresa Charlin Change-Id: I0db1d813a4e7d15431e87e825e6d14e61f5ffb7d --- src/backends/backendsCommon/common.mk | 1 + src/backends/backendsCommon/test/CMakeLists.txt | 2 + src/backends/backendsCommon/test/LayerTests.hpp | 1 + .../test/layerTests/SqrtTestImpl.cpp | 204 +++++++++++++++++++++ .../test/layerTests/SqrtTestImpl.hpp | 37 ++++ src/backends/cl/ClWorkloadFactory.cpp | 2 + src/backends/cl/test/ClLayerTests.cpp | 6 + src/backends/cl/workloads/ClWorkloads.hpp | 1 + src/backends/neon/NeonWorkloadFactory.cpp | 2 + src/backends/neon/test/NeonLayerTests.cpp | 6 + src/backends/neon/workloads/NeonWorkloads.hpp | 1 + src/backends/reference/test/RefLayerTests.cpp | 14 ++ 12 files changed, 277 insertions(+) create mode 100644 src/backends/backendsCommon/test/layerTests/SqrtTestImpl.cpp create mode 100644 src/backends/backendsCommon/test/layerTests/SqrtTestImpl.hpp diff --git a/src/backends/backendsCommon/common.mk b/src/backends/backendsCommon/common.mk index 1f42a5cd8f..86de7e331b 100644 --- a/src/backends/backendsCommon/common.mk +++ b/src/backends/backendsCommon/common.mk @@ -100,6 +100,7 @@ COMMON_TEST_SOURCES := \ test/layerTests/SpaceToBatchNdTestImpl.cpp \ test/layerTests/SpaceToDepthTestImpl.cpp \ test/layerTests/SplitterTestImpl.cpp \ + test/layerTests/SqrtTestImpl.cpp \ test/layerTests/StackTestImpl.cpp \ test/layerTests/StridedSliceTestImpl.cpp \ test/layerTests/SubtractionTestImpl.cpp \ diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index 991f37d17e..8beb7c4169 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -183,6 +183,8 @@ list(APPEND armnnBackendsCommonUnitTests_sources layerTests/SpaceToDepthTestImpl.hpp layerTests/SplitterTestImpl.cpp layerTests/SplitterTestImpl.hpp + layerTests/SqrtTestImpl.cpp + layerTests/SqrtTestImpl.hpp layerTests/StackTestImpl.cpp layerTests/StackTestImpl.hpp layerTests/StridedSliceTestImpl.cpp diff --git a/src/backends/backendsCommon/test/LayerTests.hpp b/src/backends/backendsCommon/test/LayerTests.hpp index e30cf2b6f6..8d73027783 100644 --- a/src/backends/backendsCommon/test/LayerTests.hpp +++ b/src/backends/backendsCommon/test/LayerTests.hpp @@ -68,6 +68,7 @@ #include #include #include +#include #include #include #include diff --git a/src/backends/backendsCommon/test/layerTests/SqrtTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/SqrtTestImpl.cpp new file mode 100644 index 0000000000..d0a6b81de9 --- /dev/null +++ b/src/backends/backendsCommon/test/layerTests/SqrtTestImpl.cpp @@ -0,0 +1,204 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +//#include "ReshapeTestImpl.hpp" +#include "ElementwiseUnaryTestImpl.hpp" + + +template +LayerTestResult Sqrt2dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) +{ + const unsigned int inputShape[] = { 2, 2 }; + + std::vector inputValues + { + 1.f, 4.f, + 16.f, 25.f + }; + + std::vector expectedOutputValues + { + 1.f, 2.f, + 4.f, 5.f + }; + + return ElementwiseUnaryTestHelper<2, ArmnnType>( + workloadFactory, + memoryManager, + armnn::UnaryOperation::Sqrt, + inputShape, + inputValues, + inputShape, + expectedOutputValues, + tensorHandleFactory); +} + +template +LayerTestResult Sqrt3dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) +{ + const unsigned int inputShape[] = { 3, 1, 2 }; + + std::vector inputValues + { + 1.f, 4.f, 16.f, + 25.f, 64.f, 100.f + }; + + std::vector expectedOutputValues + { + 1.f, 2.f, 4.f, + 5.f, 8.f, 10.f + }; + + return ElementwiseUnaryTestHelper<3, ArmnnType>( + workloadFactory, + memoryManager, + armnn::UnaryOperation::Sqrt, + inputShape, + inputValues, + inputShape, + expectedOutputValues, + tensorHandleFactory); +} + +template +LayerTestResult SqrtZeroTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) +{ + const unsigned int inputShape[] = { 1, 2 }; + + std::vector inputValues + { + 0.f, -0.f + }; + + std::vector expectedOutputValues + { + 0, 0 + }; + + return ElementwiseUnaryTestHelper<2, ArmnnType>( + workloadFactory, + memoryManager, + armnn::UnaryOperation::Sqrt, + inputShape, + inputValues, + inputShape, + expectedOutputValues, + tensorHandleFactory); +} + +template +LayerTestResult SqrtNegativeTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory) +{ + const unsigned int inputShape[] = { 1, 2 }; + + std::vector inputValues + { + -25.f, -16.f + }; + + std::vector expectedOutputValues + { + -NAN, -NAN + }; + + return ElementwiseUnaryTestHelper<2, ArmnnType>( + workloadFactory, + memoryManager, + armnn::UnaryOperation::Sqrt, + inputShape, + inputValues, + inputShape, + expectedOutputValues, + tensorHandleFactory); +} + +// +// Explicit template specializations +// + +template LayerTestResult, 2> +Sqrt2dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 2> +Sqrt2dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 2> +Sqrt2dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 2> +Sqrt2dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 2> +Sqrt2dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 3> +Sqrt3dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 3> +Sqrt3dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 3> +Sqrt3dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 3> +Sqrt3dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 3> +Sqrt3dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 2> +SqrtZeroTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template LayerTestResult, 2> +SqrtNegativeTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); diff --git a/src/backends/backendsCommon/test/layerTests/SqrtTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/SqrtTestImpl.hpp new file mode 100644 index 0000000000..1e301703e2 --- /dev/null +++ b/src/backends/backendsCommon/test/layerTests/SqrtTestImpl.hpp @@ -0,0 +1,37 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include + +#include + +#include +#include + +template> +LayerTestResult Sqrt2dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template> +LayerTestResult Sqrt3dTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template> +LayerTestResult SqrtZeroTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); + +template> +LayerTestResult SqrtNegativeTest( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ITensorHandleFactory& tensorHandleFactory); diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index d4a1cb081d..02dbcb3230 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -435,6 +435,8 @@ std::unique_ptr ClWorkloadFactory::CreateWorkload(LayerType type, } case UnaryOperation::Sin: return std::make_unique(*elementwiseUnaryQueueDescriptor, info, m_CLCompileContext); + case UnaryOperation::Sqrt: + return std::make_unique(*elementwiseUnaryQueueDescriptor, info, m_CLCompileContext); default: return nullptr; } diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index de39f986e0..68635ac6fc 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -1790,6 +1790,12 @@ ARMNN_AUTO_TEST_FIXTURE_WITH_THF(Rsqrt3d, ClContextControlFixture, Rsqrt3dTest) ARMNN_AUTO_TEST_FIXTURE_WITH_THF(RsqrtNegative, ClContextControlFixture, RsqrtNegativeTest) +// Sqrt +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(Sqrt2d, ClContextControlFixture, Sqrt2dTest) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(Sqrt3d, ClContextControlFixture, Sqrt3dTest) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SqrtZero, ClContextControlFixture, SqrtZeroTest) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SqrtNegative, ClContextControlFixture, SqrtNegativeTest) + // Quantize ARMNN_AUTO_TEST_FIXTURE_WITH_THF(QuantizeSimpleUint8, ClContextControlFixture, QuantizeSimpleUint8Test) ARMNN_AUTO_TEST_FIXTURE_WITH_THF(QuantizeClampUint8, ClContextControlFixture, QuantizeClampUint8Test) diff --git a/src/backends/cl/workloads/ClWorkloads.hpp b/src/backends/cl/workloads/ClWorkloads.hpp index 71f401ae0e..c3a79b7583 100644 --- a/src/backends/cl/workloads/ClWorkloads.hpp +++ b/src/backends/cl/workloads/ClWorkloads.hpp @@ -60,6 +60,7 @@ #include "ClSpaceToBatchNdWorkload.hpp" #include "ClSpaceToDepthWorkload.hpp" #include "ClSplitterWorkload.hpp" +#include "ClSqrtWorkload.hpp" #include "ClStackWorkload.hpp" #include "ClStridedSliceWorkload.hpp" #include "ClSubtractionWorkload.hpp" diff --git a/src/backends/neon/NeonWorkloadFactory.cpp b/src/backends/neon/NeonWorkloadFactory.cpp index cbed690733..f087c6262a 100644 --- a/src/backends/neon/NeonWorkloadFactory.cpp +++ b/src/backends/neon/NeonWorkloadFactory.cpp @@ -320,6 +320,8 @@ std::unique_ptr NeonWorkloadFactory::CreateWorkload(LayerType type, } case UnaryOperation::Sin: return std::make_unique(*elementwiseUnaryQueueDescriptor, info); + case UnaryOperation::Sqrt: + return std::make_unique(*elementwiseUnaryQueueDescriptor, info); default: return nullptr; } diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index e0811022f9..d71ce1f2bf 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -1424,6 +1424,12 @@ ARMNN_AUTO_TEST_CASE_WITH_THF(Rsqrt3d, Rsqrt3dTest) ARMNN_AUTO_TEST_CASE_WITH_THF(RsqrtZero, RsqrtZeroTest) ARMNN_AUTO_TEST_CASE_WITH_THF(RsqrtNegative, RsqrtNegativeTest) +// Sqrt +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt2d, Sqrt2dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt3d, Sqrt3dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(SqrtZero, SqrtZeroTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(SqrtNegative, SqrtNegativeTest) + // ArgMinMax ARMNN_AUTO_TEST_CASE_WITH_THF(ArgMinFloat32, ArgMinSimpleTest) ARMNN_AUTO_TEST_CASE_WITH_THF(ArgMaxFloat32, ArgMaxSimpleTest) diff --git a/src/backends/neon/workloads/NeonWorkloads.hpp b/src/backends/neon/workloads/NeonWorkloads.hpp index 024f1ca983..d486a1d988 100644 --- a/src/backends/neon/workloads/NeonWorkloads.hpp +++ b/src/backends/neon/workloads/NeonWorkloads.hpp @@ -64,6 +64,7 @@ #include "NeonSpaceToBatchNdWorkload.hpp" #include "NeonSpaceToDepthWorkload.hpp" #include "NeonSplitterWorkload.hpp" +#include "NeonSqrtWorkload.hpp" #include "NeonStackWorkload.hpp" #include "NeonStridedSliceWorkload.hpp" #include "NeonSubtractionWorkload.hpp" diff --git a/src/backends/reference/test/RefLayerTests.cpp b/src/backends/reference/test/RefLayerTests.cpp index 29df20f834..419ae2b0e9 100644 --- a/src/backends/reference/test/RefLayerTests.cpp +++ b/src/backends/reference/test/RefLayerTests.cpp @@ -1705,6 +1705,20 @@ ARMNN_AUTO_TEST_CASE_WITH_THF(Rsqrt3dQuantisedAsymm8, Rsqrt3dTest) ARMNN_AUTO_TEST_CASE_WITH_THF(Rsqrt3dQuantisedSymm16, Rsqrt3dTest) +// Sqrt +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt2d, Sqrt2dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt3d, Sqrt3dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(SqrtZero, SqrtZeroTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(SqrtNegative, SqrtNegativeTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt2dFloat16, Sqrt2dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt3dFloat16, Sqrt3dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt2dQuantisedAsymmS8, Sqrt2dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt3dQuantisedAsymmS8, Sqrt3dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt2dQuantisedAsymm8, Sqrt2dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt3dQuantisedAsymm8, Sqrt3dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt2dQuantisedSymm16, Sqrt2dTest) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sqrt3dQuantisedSymm16, Sqrt3dTest) + // Permute ARMNN_AUTO_TEST_CASE_WITH_THF(SimplePermuteBFloat16, SimplePermuteTest) ARMNN_AUTO_TEST_CASE_WITH_THF(PermuteBFloat16ValueSet1Test, PermuteValueSet1Test) -- cgit v1.2.1