From 914e4db5a9083e922d89f133672fd44e92016e96 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Mon, 9 Sep 2019 13:36:45 +0100 Subject: IVGCVSW-3822 Add NEON workload support for ABS Signed-off-by: Aron Virginas-Tar Change-Id: I0c2ead004200e053d748ea39937f2f9ed35a636b --- src/backends/neon/NeonLayerSupport.cpp | 11 +++++++ src/backends/neon/NeonLayerSupport.hpp | 4 +++ src/backends/neon/NeonWorkloadFactory.cpp | 6 ++++ src/backends/neon/NeonWorkloadFactory.hpp | 3 ++ src/backends/neon/backend.mk | 1 + src/backends/neon/test/NeonEndToEndTests.cpp | 8 +++++ src/backends/neon/test/NeonLayerTests.cpp | 6 ++++ src/backends/neon/workloads/CMakeLists.txt | 2 ++ src/backends/neon/workloads/NeonAbsWorkload.cpp | 43 +++++++++++++++++++++++++ src/backends/neon/workloads/NeonAbsWorkload.hpp | 28 ++++++++++++++++ src/backends/neon/workloads/NeonWorkloads.hpp | 1 + 11 files changed, 113 insertions(+) create mode 100644 src/backends/neon/workloads/NeonAbsWorkload.cpp create mode 100644 src/backends/neon/workloads/NeonAbsWorkload.hpp (limited to 'src/backends/neon') diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp index 80695fb3c7..67c156001d 100644 --- a/src/backends/neon/NeonLayerSupport.cpp +++ b/src/backends/neon/NeonLayerSupport.cpp @@ -18,6 +18,7 @@ #if defined(ARMCOMPUTENEON_ENABLED) #include +#include "workloads/NeonAbsWorkload.hpp" #include "workloads/NeonAdditionWorkload.hpp" #include "workloads/NeonActivationWorkload.hpp" #include "workloads/NeonBatchNormalizationWorkload.hpp" @@ -108,6 +109,16 @@ inline bool IsWorkloadSupported(FuncType& func, Optional reasonIfU } // anonymous namespace +bool NeonLayerSupport::IsAbsSupported(const TensorInfo& input, + const TensorInfo& output, + Optional reasonIfUnsupported) const +{ + FORWARD_WORKLOAD_VALIDATE_FUNC(NeonAbsWorkloadValidate, + reasonIfUnsupported, + input, + output); +} + bool NeonLayerSupport::IsActivationSupported(const TensorInfo& input, const TensorInfo& output, const ActivationDescriptor& descriptor, diff --git a/src/backends/neon/NeonLayerSupport.hpp b/src/backends/neon/NeonLayerSupport.hpp index 7ba90e4c93..16a7030f5f 100644 --- a/src/backends/neon/NeonLayerSupport.hpp +++ b/src/backends/neon/NeonLayerSupport.hpp @@ -12,6 +12,10 @@ namespace armnn class NeonLayerSupport : public LayerSupportBase { public: + bool IsAbsSupported(const TensorInfo& input, + const TensorInfo& output, + Optional reasonIfUnsupported = EmptyOptional()) const override; + bool IsActivationSupported(const TensorInfo& input, const TensorInfo& output, const ActivationDescriptor& descriptor, diff --git a/src/backends/neon/NeonWorkloadFactory.cpp b/src/backends/neon/NeonWorkloadFactory.cpp index a22a64fe91..fc1a65d712 100644 --- a/src/backends/neon/NeonWorkloadFactory.cpp +++ b/src/backends/neon/NeonWorkloadFactory.cpp @@ -101,6 +101,12 @@ std::unique_ptr NeonWorkloadFactory::CreateOutput(const OutputQueueDe return std::make_unique(descriptor, info); } +std::unique_ptr NeonWorkloadFactory::CreateAbs(const AbsQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return std::make_unique(descriptor, info); +} + std::unique_ptr NeonWorkloadFactory::CreateActivation(const ActivationQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/neon/NeonWorkloadFactory.hpp b/src/backends/neon/NeonWorkloadFactory.hpp index de0bd5c2e0..935f9e4b4c 100644 --- a/src/backends/neon/NeonWorkloadFactory.hpp +++ b/src/backends/neon/NeonWorkloadFactory.hpp @@ -43,6 +43,9 @@ public: std::unique_ptr CreateOutput(const OutputQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + std::unique_ptr CreateAbs(const AbsQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + std::unique_ptr CreateActivation(const ActivationQueueDescriptor& descriptor, const WorkloadInfo& info) const override; diff --git a/src/backends/neon/backend.mk b/src/backends/neon/backend.mk index e29919c2ed..706e8b0224 100644 --- a/src/backends/neon/backend.mk +++ b/src/backends/neon/backend.mk @@ -21,6 +21,7 @@ BACKEND_SOURCES := \ NeonTensorHandleFactory.cpp \ NeonTimer.cpp \ NeonWorkloadFactory.cpp \ + workloads/NeonAbsWorkload.cpp \ workloads/NeonActivationWorkload.cpp \ workloads/NeonAdditionWorkload.cpp \ workloads/NeonBatchNormalizationWorkload.cpp \ diff --git a/src/backends/neon/test/NeonEndToEndTests.cpp b/src/backends/neon/test/NeonEndToEndTests.cpp index 33c377f443..eb41e949b3 100644 --- a/src/backends/neon/test/NeonEndToEndTests.cpp +++ b/src/backends/neon/test/NeonEndToEndTests.cpp @@ -5,6 +5,7 @@ #include +#include #include #include #include @@ -20,6 +21,13 @@ BOOST_AUTO_TEST_SUITE(NeonEndToEnd) std::vector defaultBackends = {armnn::Compute::CpuAcc}; +// Abs +BOOST_AUTO_TEST_CASE(NeonAbsEndToEndTestFloat32) +{ + AbsEndToEnd(defaultBackends); +} + +// Constant BOOST_AUTO_TEST_CASE(ConstantUsage_Neon_Float32) { BOOST_TEST(ConstantUsageFloat32Test(defaultBackends)); diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index e0f2e841f3..5a0c966a6d 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -853,6 +853,12 @@ ARMNN_AUTO_TEST_CASE(MultiChannelTransposeConvolution2dUint8Nhwc, MultiChannelTransposeConvolution2dTest, DataLayout::NHWC) +// Abs +ARMNN_AUTO_TEST_CASE(Abs2d, Abs2dTest) +ARMNN_AUTO_TEST_CASE(Abs3d, Abs3dTest) + +ARMNN_AUTO_TEST_CASE(AbsZero, AbsZeroTest) + #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 e03a7137de..e0831be814 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -4,6 +4,8 @@ # list(APPEND armnnNeonBackendWorkloads_sources + NeonAbsWorkload.cpp + NeonAbsWorkload.hpp NeonActivationWorkload.cpp NeonActivationWorkload.hpp NeonAdditionWorkload.cpp diff --git a/src/backends/neon/workloads/NeonAbsWorkload.cpp b/src/backends/neon/workloads/NeonAbsWorkload.cpp new file mode 100644 index 0000000000..7f8ed5a006 --- /dev/null +++ b/src/backends/neon/workloads/NeonAbsWorkload.cpp @@ -0,0 +1,43 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "NeonAbsWorkload.hpp" + +#include "NeonWorkloadUtils.hpp" + +#include +#include + +#include + +namespace armnn +{ + +arm_compute::Status NeonAbsWorkloadValidate(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::NEAbsLayer::validate(&aclInput, &aclOutput); +} + +NeonAbsWorkload::NeonAbsWorkload(const AbsQueueDescriptor& descriptor, const WorkloadInfo& info) + : BaseWorkload(descriptor, info) +{ + m_Data.ValidateInputsOutputs("NeonAbsWorkload", 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_AbsLayer.configure(&input, &output); +} + +void NeonAbsWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonAbsWorkload_Execute"); + m_AbsLayer.run(); +} + +} // namespace armnn diff --git a/src/backends/neon/workloads/NeonAbsWorkload.hpp b/src/backends/neon/workloads/NeonAbsWorkload.hpp new file mode 100644 index 0000000000..0024d19cac --- /dev/null +++ b/src/backends/neon/workloads/NeonAbsWorkload.hpp @@ -0,0 +1,28 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include + +#include +#include + +namespace armnn +{ + +arm_compute::Status NeonAbsWorkloadValidate(const TensorInfo& input, const TensorInfo& output); + +class NeonAbsWorkload : public BaseWorkload +{ +public: + NeonAbsWorkload(const AbsQueueDescriptor& descriptor, const WorkloadInfo& info); + virtual void Execute() const override; + +private: + mutable arm_compute::NEAbsLayer m_AbsLayer; +}; + +} // namespace armnn diff --git a/src/backends/neon/workloads/NeonWorkloads.hpp b/src/backends/neon/workloads/NeonWorkloads.hpp index 210ba96e62..d807e80b15 100644 --- a/src/backends/neon/workloads/NeonWorkloads.hpp +++ b/src/backends/neon/workloads/NeonWorkloads.hpp @@ -4,6 +4,7 @@ // #pragma once +#include "NeonAbsWorkload.hpp" #include "NeonActivationWorkload.hpp" #include "NeonAdditionWorkload.hpp" #include "NeonBatchNormalizationWorkload.hpp" -- cgit v1.2.1