From aac61129e4317000c46e37063b010851b0e17d27 Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Thu, 5 May 2022 16:11:36 +0100 Subject: IVGCVSW-6936 Add SQRT support to CL Signed-off-by: Teresa Charlin Change-Id: Ib90bade63cd0437329c690b09cf719a2e2bd06a4 --- src/backends/cl/ClLayerSupport.cpp | 6 +++ src/backends/cl/backend.mk | 1 + src/backends/cl/workloads/CMakeLists.txt | 2 + src/backends/cl/workloads/ClSqrtWorkload.cpp | 67 ++++++++++++++++++++++++++++ src/backends/cl/workloads/ClSqrtWorkload.hpp | 30 +++++++++++++ 5 files changed, 106 insertions(+) create mode 100644 src/backends/cl/workloads/ClSqrtWorkload.cpp create mode 100644 src/backends/cl/workloads/ClSqrtWorkload.hpp diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp index 09b3f43838..6b8cf52d87 100644 --- a/src/backends/cl/ClLayerSupport.cpp +++ b/src/backends/cl/ClLayerSupport.cpp @@ -74,6 +74,7 @@ #include "workloads/ClSpaceToBatchNdWorkload.hpp" #include "workloads/ClSpaceToDepthWorkload.hpp" #include "workloads/ClSplitterWorkload.hpp" +#include "workloads/ClSqrtWorkload.hpp" #include "workloads/ClStackWorkload.hpp" #include "workloads/ClStridedSliceWorkload.hpp" #include "workloads/ClSubtractionWorkload.hpp" @@ -957,6 +958,11 @@ bool ClLayerSupport::IsElementwiseUnarySupported(const TensorInfo& input, reasonIfUnsupported, input, output); + case UnaryOperation::Sqrt: + FORWARD_WORKLOAD_VALIDATE_FUNC(ClSqrtWorkloadValidate, + reasonIfUnsupported, + input, + output); default: return false; } diff --git a/src/backends/cl/backend.mk b/src/backends/cl/backend.mk index ed0d9252ad..bf9689a6e9 100644 --- a/src/backends/cl/backend.mk +++ b/src/backends/cl/backend.mk @@ -82,6 +82,7 @@ BACKEND_SOURCES := \ workloads/ClSpaceToBatchNdWorkload.cpp \ workloads/ClSpaceToDepthWorkload.cpp \ workloads/ClSplitterWorkload.cpp \ + workloads/ClSqrtWorkload.cpp \ workloads/ClStackWorkload.cpp \ workloads/ClStridedSliceWorkload.cpp \ workloads/ClSubtractionWorkload.cpp \ diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index 52326ae4a9..59e11cdf9f 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -117,6 +117,8 @@ list(APPEND armnnClBackendWorkloads_sources ClSpaceToDepthWorkload.hpp ClSplitterWorkload.cpp ClSplitterWorkload.hpp + ClSqrtWorkload.cpp + ClSqrtWorkload.hpp ClStackWorkload.cpp ClStackWorkload.hpp ClStridedSliceWorkload.cpp diff --git a/src/backends/cl/workloads/ClSqrtWorkload.cpp b/src/backends/cl/workloads/ClSqrtWorkload.cpp new file mode 100644 index 0000000000..b78c114cf7 --- /dev/null +++ b/src/backends/cl/workloads/ClSqrtWorkload.cpp @@ -0,0 +1,67 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "ClSqrtWorkload.hpp" + +#include "ClWorkloadUtils.hpp" + +#include +#include +#include + +#include + +namespace armnn +{ + +arm_compute::Status ClSqrtWorkloadValidate(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::CLActivationLayer::validate(&aclInput, &aclOutput, activationLayerInfo); +} + +ClSqrtWorkload::ClSqrtWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, + const WorkloadInfo& info, + const arm_compute::CLCompileContext& clCompileContext) + : ClBaseWorkload(descriptor, info) +{ + ARMNN_ASSERT(descriptor.m_Parameters.m_Operation == UnaryOperation::Sqrt); + + // Report Profiling Details + ARMNN_REPORT_PROFILING_WORKLOAD_DESC("ClSqrtWorkload_Construct", + descriptor.m_Parameters, + info, + this->GetGuid()); + + m_Data.ValidateInputsOutputs("ClSqrtWorkload", 1, 1); + + ActivationDescriptor activationDescriptor; + activationDescriptor.m_Function = ActivationFunction::Sqrt; + const arm_compute::ActivationLayerInfo activationLayerInfo = + ConvertActivationDescriptorToAclActivationLayerInfo(activationDescriptor); + + arm_compute::ICLTensor& input = PolymorphicDowncast(m_Data.m_Inputs[0])->GetTensor(); + arm_compute::ICLTensor& output = PolymorphicDowncast(m_Data.m_Outputs[0])->GetTensor(); + + { + ARMNN_SCOPED_PROFILING_EVENT(Compute::Undefined, "ClSqrtWorkload_configure"); + m_SqrtLayer.configure(clCompileContext, &input, &output, activationLayerInfo); + } +} + +void ClSqrtWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_CL_GUID("ClSqrtWorkload_Execute", this->GetGuid()); + RunClFunction(m_SqrtLayer, CHECK_LOCATION()); +} + +} // namespace armnn diff --git a/src/backends/cl/workloads/ClSqrtWorkload.hpp b/src/backends/cl/workloads/ClSqrtWorkload.hpp new file mode 100644 index 0000000000..0476800192 --- /dev/null +++ b/src/backends/cl/workloads/ClSqrtWorkload.hpp @@ -0,0 +1,30 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "ClBaseWorkload.hpp" + +#include +#include + +namespace armnn +{ + +arm_compute::Status ClSqrtWorkloadValidate(const TensorInfo& input, const TensorInfo& output); + +class ClSqrtWorkload : public ClBaseWorkload +{ +public: + ClSqrtWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, + const WorkloadInfo& info, + const arm_compute::CLCompileContext& clCompileContext); + virtual void Execute() const override; + +private: + mutable arm_compute::CLActivationLayer m_SqrtLayer; +}; + +} // namespace armnn -- cgit v1.2.1