From ac47210621a601a2b6ded78e003d136626434f50 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Tue, 24 Mar 2020 09:54:36 +0000 Subject: IVGCVSW-3813 Add Unary Elementwise Operation 'NEG' support to the android-nn-driver * Implemented ClNegWorkload * Implemented NeonNegWorkload * Enabled 'NEG' operator on CL and Neon as well as Ref * Implemented unit tests for 'NEG' operator Signed-off-by: Sadik Armagan Change-Id: I3d7a892692716636cae6bdf8ddd238e3d1ea064f --- src/backends/neon/NeonLayerSupport.cpp | 8 +++++ src/backends/neon/NeonWorkloadFactory.cpp | 9 ++++-- src/backends/neon/backend.mk | 1 + src/backends/neon/test/NeonLayerTests.cpp | 6 ++++ src/backends/neon/workloads/CMakeLists.txt | 2 ++ src/backends/neon/workloads/NeonNegWorkload.cpp | 43 +++++++++++++++++++++++++ src/backends/neon/workloads/NeonNegWorkload.hpp | 28 ++++++++++++++++ src/backends/neon/workloads/NeonWorkloads.hpp | 1 + 8 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 src/backends/neon/workloads/NeonNegWorkload.cpp create mode 100644 src/backends/neon/workloads/NeonNegWorkload.hpp (limited to 'src/backends/neon') diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp index 78776124ec..999b158f74 100644 --- a/src/backends/neon/NeonLayerSupport.cpp +++ b/src/backends/neon/NeonLayerSupport.cpp @@ -38,6 +38,7 @@ #include "workloads/NeonMinimumWorkload.hpp" #include "workloads/NeonMultiplicationWorkload.hpp" #include "workloads/NeonDivisionWorkload.hpp" +#include "workloads/NeonNegWorkload.hpp" #include "workloads/NeonNormalizationFloatWorkload.hpp" #include "workloads/NeonFullyConnectedWorkload.hpp" #include "workloads/NeonPadWorkload.hpp" @@ -370,6 +371,13 @@ bool NeonLayerSupport::IsElementwiseUnarySupported(const TensorInfo& input, input, output); } + else if (descriptor.m_Operation == UnaryOperation::Neg) + { + FORWARD_WORKLOAD_VALIDATE_FUNC(NeonNegWorkloadValidate, + reasonIfUnsupported, + input, + output); + } return false; } diff --git a/src/backends/neon/NeonWorkloadFactory.cpp b/src/backends/neon/NeonWorkloadFactory.cpp index cc7dca031d..bf26d82a76 100644 --- a/src/backends/neon/NeonWorkloadFactory.cpp +++ b/src/backends/neon/NeonWorkloadFactory.cpp @@ -218,9 +218,8 @@ std::unique_ptr NeonWorkloadFactory::CreateDivision( return std::make_unique(descriptor, info); } -std::unique_ptr NeonWorkloadFactory::CreateElementwiseUnary(const ElementwiseUnaryQueueDescriptor& - descriptor, - const WorkloadInfo& info) const +std::unique_ptr NeonWorkloadFactory::CreateElementwiseUnary( + const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info) const { if (descriptor.m_Parameters.m_Operation == UnaryOperation::Abs) { @@ -238,6 +237,10 @@ std::unique_ptr NeonWorkloadFactory::CreateElementwiseUnary(const Ele return std::make_unique(rsqrtQueueDescriptor, info); } + else if (descriptor.m_Parameters.m_Operation == UnaryOperation::Neg) + { + return std::make_unique(descriptor, info); + } return MakeWorkloadHelper(descriptor, info); } diff --git a/src/backends/neon/backend.mk b/src/backends/neon/backend.mk index d9a5405983..3cb8bd582a 100644 --- a/src/backends/neon/backend.mk +++ b/src/backends/neon/backend.mk @@ -47,6 +47,7 @@ BACKEND_SOURCES := \ workloads/NeonMinimumWorkload.cpp \ workloads/NeonMultiplicationWorkload.cpp \ workloads/NeonDivisionWorkload.cpp \ + workloads/NeonNegWorkload.cpp \ workloads/NeonNormalizationFloatWorkload.cpp \ workloads/NeonPadWorkload.cpp \ workloads/NeonPermuteWorkload.cpp \ diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index d3ca675679..06b5597fcf 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -1069,6 +1069,12 @@ ARMNN_AUTO_TEST_CASE(ArgMaxChannelQAsymm8, ArgMaxChannelTest ARMNN_AUTO_TEST_CASE(ArgMaxHeightQAsymm8, ArgMaxHeightTest) ARMNN_AUTO_TEST_CASE(ArgMinWidthQAsymm8, ArgMinWidthTest) +// Neg +ARMNN_AUTO_TEST_CASE(Neg2d, Neg2dTest) +ARMNN_AUTO_TEST_CASE(Neg3d, Neg3dTest) +ARMNN_AUTO_TEST_CASE(NegZero, NegZeroTest) +ARMNN_AUTO_TEST_CASE(NegNegative, NegNegativeTest) + #if defined(ARMNNREF_ENABLED) // The ARMNN_COMPARE_REF_AUTO_TEST_CASE and the ARMNN_COMPARE_REF_FIXTURE_TEST_CASE test units are not available diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index a932f8b852..8160710f65 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -56,6 +56,8 @@ list(APPEND armnnNeonBackendWorkloads_sources NeonMultiplicationWorkload.hpp NeonDivisionWorkload.cpp NeonDivisionWorkload.hpp + NeonNegWorkload.cpp + NeonNegWorkload.hpp NeonNormalizationFloatWorkload.cpp NeonNormalizationFloatWorkload.hpp NeonPadWorkload.cpp diff --git a/src/backends/neon/workloads/NeonNegWorkload.cpp b/src/backends/neon/workloads/NeonNegWorkload.cpp new file mode 100644 index 0000000000..afe05583fd --- /dev/null +++ b/src/backends/neon/workloads/NeonNegWorkload.cpp @@ -0,0 +1,43 @@ +// +// Copyright © 2020 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "NeonNegWorkload.hpp" + +#include "NeonWorkloadUtils.hpp" + +#include +#include + +#include + +namespace armnn +{ + +arm_compute::Status NeonNegWorkloadValidate(const TensorInfo& input, const TensorInfo& output) +{ + const arm_compute::TensorInfo aclInput = armcomputetensorutils::BuildArmComputeTensorInfo(input); + const arm_compute::TensorInfo aclOutput = armcomputetensorutils::BuildArmComputeTensorInfo(output); + + return arm_compute::NENegLayer::validate(&aclInput, &aclOutput); +} + +NeonNegWorkload::NeonNegWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info) + : BaseWorkload(descriptor, info) +{ + m_Data.ValidateInputsOutputs("NeonNegWorkload", 1, 1); + + arm_compute::ITensor& input = boost::polymorphic_downcast(m_Data.m_Inputs[0])->GetTensor(); + arm_compute::ITensor& output = boost::polymorphic_downcast(m_Data.m_Outputs[0])->GetTensor(); + + m_NegLayer.configure(&input, &output); +} + +void NeonNegWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonNegWorkload_Execute"); + m_NegLayer.run(); +} + +} // namespace armnn diff --git a/src/backends/neon/workloads/NeonNegWorkload.hpp b/src/backends/neon/workloads/NeonNegWorkload.hpp new file mode 100644 index 0000000000..7b2ed17a3e --- /dev/null +++ b/src/backends/neon/workloads/NeonNegWorkload.hpp @@ -0,0 +1,28 @@ +// +// Copyright © 2020 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include + +#include +#include + +namespace armnn +{ + +arm_compute::Status NeonNegWorkloadValidate(const TensorInfo& input, const TensorInfo& output); + +class NeonNegWorkload : public BaseWorkload +{ +public: + NeonNegWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info); + virtual void Execute() const override; + +private: + mutable arm_compute::NENegLayer m_NegLayer; +}; + +} // namespace armnn diff --git a/src/backends/neon/workloads/NeonWorkloads.hpp b/src/backends/neon/workloads/NeonWorkloads.hpp index 52cd76f14b..e28d120de7 100644 --- a/src/backends/neon/workloads/NeonWorkloads.hpp +++ b/src/backends/neon/workloads/NeonWorkloads.hpp @@ -31,6 +31,7 @@ #include "NeonConcatWorkload.hpp" #include "NeonMinimumWorkload.hpp" #include "NeonMultiplicationWorkload.hpp" +#include "NeonNegWorkload.hpp" #include "NeonNormalizationFloatWorkload.hpp" #include "NeonPadWorkload.hpp" #include "NeonPermuteWorkload.hpp" -- cgit v1.2.1