From 06145cc4b2734608b8abe36d5bf06f7449b818ca Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Thu, 5 May 2022 15:31:30 +0100 Subject: IVGCVSW-6936 Add SQRT support to Neon Signed-off-by: Teresa Charlin Change-Id: I195957541069cb52cdd2c8aead0e4a34498a6f38 --- src/backends/neon/NeonLayerSupport.cpp | 6 +++ src/backends/neon/backend.mk | 1 + src/backends/neon/workloads/CMakeLists.txt | 2 + src/backends/neon/workloads/NeonSqrtWorkload.cpp | 60 ++++++++++++++++++++++++ src/backends/neon/workloads/NeonSqrtWorkload.hpp | 27 +++++++++++ 5 files changed, 96 insertions(+) create mode 100644 src/backends/neon/workloads/NeonSqrtWorkload.cpp create mode 100644 src/backends/neon/workloads/NeonSqrtWorkload.hpp diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp index 26b650b49d..d50b25377d 100644 --- a/src/backends/neon/NeonLayerSupport.cpp +++ b/src/backends/neon/NeonLayerSupport.cpp @@ -72,6 +72,7 @@ #include "workloads/NeonSpaceToBatchNdWorkload.hpp" #include "workloads/NeonSpaceToDepthWorkload.hpp" #include "workloads/NeonSplitterWorkload.hpp" +#include "workloads/NeonSqrtWorkload.hpp" #include "workloads/NeonStackWorkload.hpp" #include "workloads/NeonStridedSliceWorkload.hpp" #include "workloads/NeonSubtractionWorkload.hpp" @@ -941,6 +942,11 @@ bool NeonLayerSupport::IsElementwiseUnarySupported(const TensorInfo& input, reasonIfUnsupported, input, output); + case UnaryOperation::Sqrt: + FORWARD_WORKLOAD_VALIDATE_FUNC(NeonSqrtWorkloadValidate, + reasonIfUnsupported, + input, + output); default: return false; } diff --git a/src/backends/neon/backend.mk b/src/backends/neon/backend.mk index c522df6bad..d940c92ba1 100644 --- a/src/backends/neon/backend.mk +++ b/src/backends/neon/backend.mk @@ -81,6 +81,7 @@ BACKEND_SOURCES := \ workloads/NeonSpaceToBatchNdWorkload.cpp \ workloads/NeonSpaceToDepthWorkload.cpp \ workloads/NeonSplitterWorkload.cpp \ + workloads/NeonSqrtWorkload.cpp \ workloads/NeonStackWorkload.cpp \ workloads/NeonStridedSliceWorkload.cpp \ workloads/NeonSubtractionWorkload.cpp \ diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index 8953dc9d4d..16fae69029 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -123,6 +123,8 @@ list(APPEND armnnNeonBackendWorkloads_sources NeonSpaceToDepthWorkload.hpp NeonSplitterWorkload.cpp NeonSplitterWorkload.hpp + NeonSqrtWorkload.cpp + NeonSqrtWorkload.hpp NeonStackWorkload.cpp NeonStackWorkload.hpp NeonStridedSliceWorkload.cpp diff --git a/src/backends/neon/workloads/NeonSqrtWorkload.cpp b/src/backends/neon/workloads/NeonSqrtWorkload.cpp new file mode 100644 index 0000000000..dc6e3a3759 --- /dev/null +++ b/src/backends/neon/workloads/NeonSqrtWorkload.cpp @@ -0,0 +1,60 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "NeonSqrtWorkload.hpp" + +#include "NeonWorkloadUtils.hpp" + +#include +#include +#include +#include + +namespace armnn +{ + +arm_compute::Status NeonSqrtWorkloadValidate(const TensorInfo& input, const TensorInfo& output) +{ + const arm_compute::TensorInfo aclInput = armcomputetensorutils::BuildArmComputeTensorInfo(input); + const arm_compute::TensorInfo aclOutput = armcomputetensorutils::BuildArmComputeTensorInfo(output); + + ActivationDescriptor descriptor; + descriptor.m_Function = ActivationFunction::Sqrt; + const arm_compute::ActivationLayerInfo activationLayerInfo = + ConvertActivationDescriptorToAclActivationLayerInfo(descriptor); + + return arm_compute::NEActivationLayer::validate(&aclInput, &aclOutput, activationLayerInfo); +} + +NeonSqrtWorkload::NeonSqrtWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info) + : NeonBaseWorkload(descriptor, info) +{ + ARMNN_ASSERT(descriptor.m_Parameters.m_Operation == UnaryOperation::Sqrt); + + ARMNN_REPORT_PROFILING_WORKLOAD_DESC("NeonSqrtWorkload_Construct", + descriptor.m_Parameters, + info, + this->GetGuid()); + + m_Data.ValidateInputsOutputs("NeonSqrtWorkload", 1, 1); + + ActivationDescriptor activationDescriptor; + activationDescriptor.m_Function = ActivationFunction::Sqrt; + const arm_compute::ActivationLayerInfo activationLayerInfo = + ConvertActivationDescriptorToAclActivationLayerInfo(activationDescriptor); + + arm_compute::ITensor& input = PolymorphicDowncast(m_Data.m_Inputs[0])->GetTensor(); + arm_compute::ITensor& output = PolymorphicDowncast(m_Data.m_Outputs[0])->GetTensor(); + + m_SqrtLayer.configure(&input, &output, activationLayerInfo); +} + +void NeonSqrtWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_NEON_GUID("NeonSqrtWorkload_Execute", this->GetGuid()); + m_SqrtLayer.run(); +} + +} // namespace armnn \ No newline at end of file diff --git a/src/backends/neon/workloads/NeonSqrtWorkload.hpp b/src/backends/neon/workloads/NeonSqrtWorkload.hpp new file mode 100644 index 0000000000..479255838b --- /dev/null +++ b/src/backends/neon/workloads/NeonSqrtWorkload.hpp @@ -0,0 +1,27 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "NeonBaseWorkload.hpp" +#include +#include + +namespace armnn +{ + +arm_compute::Status NeonSqrtWorkloadValidate(const TensorInfo& input, const TensorInfo& output); + +class NeonSqrtWorkload : public NeonBaseWorkload +{ +public: + NeonSqrtWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info); + virtual void Execute() const override; + +private: + mutable arm_compute::NEActivationLayer m_SqrtLayer; +}; + +} //namespace armnn \ No newline at end of file -- cgit v1.2.1