diff options
Diffstat (limited to 'src/backends/neon')
-rw-r--r-- | src/backends/neon/NeonLayerSupport.cpp | 16 | ||||
-rw-r--r-- | src/backends/neon/NeonWorkloadFactory.cpp | 16 | ||||
-rw-r--r-- | src/backends/neon/backend.mk | 2 | ||||
-rw-r--r-- | src/backends/neon/test/NeonLayerTests.cpp | 14 | ||||
-rw-r--r-- | src/backends/neon/workloads/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/backends/neon/workloads/NeonLogWorkload.cpp | 42 | ||||
-rw-r--r-- | src/backends/neon/workloads/NeonLogWorkload.hpp | 27 | ||||
-rw-r--r-- | src/backends/neon/workloads/NeonSinWorkload.cpp | 42 | ||||
-rw-r--r-- | src/backends/neon/workloads/NeonSinWorkload.hpp | 27 | ||||
-rw-r--r-- | src/backends/neon/workloads/NeonWorkloads.hpp | 2 |
10 files changed, 183 insertions, 9 deletions
diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp index a1519cd46f..d9bde26bde 100644 --- a/src/backends/neon/NeonLayerSupport.cpp +++ b/src/backends/neon/NeonLayerSupport.cpp @@ -37,6 +37,7 @@ #include "workloads/NeonDequantizeWorkload.hpp" #include "workloads/NeonInstanceNormalizationWorkload.hpp" #include "workloads/NeonL2NormalizationFloatWorkload.hpp" +#include "workloads/NeonLogWorkload.hpp" #include "workloads/NeonLogSoftmaxWorkload.hpp" #include "workloads/NeonLogicalAndWorkload.hpp" #include "workloads/NeonLogicalNotWorkload.hpp" @@ -63,6 +64,7 @@ #include "workloads/NeonReshapeWorkload.hpp" #include "workloads/NeonResizeWorkload.hpp" #include "workloads/NeonRsqrtWorkload.hpp" +#include "workloads/NeonSinWorkload.hpp" #include "workloads/NeonSliceWorkload.hpp" #include "workloads/NeonSoftmaxWorkload.hpp" #include "workloads/NeonSpaceToBatchNdWorkload.hpp" @@ -439,6 +441,16 @@ bool NeonLayerSupport::IsElementwiseUnarySupported(const TensorInfo& input, reasonIfUnsupported, input, output); + case UnaryOperation::LogicalNot: + FORWARD_WORKLOAD_VALIDATE_FUNC(NeonLogicalNotWorkloadValidate, + reasonIfUnsupported, + input, + output); + case UnaryOperation::Log: + FORWARD_WORKLOAD_VALIDATE_FUNC(NeonLogWorkloadValidate, + reasonIfUnsupported, + input, + output); case UnaryOperation::Neg: FORWARD_WORKLOAD_VALIDATE_FUNC(NeonNegWorkloadValidate, reasonIfUnsupported, @@ -449,8 +461,8 @@ bool NeonLayerSupport::IsElementwiseUnarySupported(const TensorInfo& input, reasonIfUnsupported, input, output); - case UnaryOperation::LogicalNot: - FORWARD_WORKLOAD_VALIDATE_FUNC(NeonLogicalNotWorkloadValidate, + case UnaryOperation::Sin: + FORWARD_WORKLOAD_VALIDATE_FUNC(NeonSinWorkloadValidate, reasonIfUnsupported, input, output); diff --git a/src/backends/neon/NeonWorkloadFactory.cpp b/src/backends/neon/NeonWorkloadFactory.cpp index 8751d8ca2c..5ccec62650 100644 --- a/src/backends/neon/NeonWorkloadFactory.cpp +++ b/src/backends/neon/NeonWorkloadFactory.cpp @@ -294,6 +294,14 @@ std::unique_ptr<IWorkload> NeonWorkloadFactory::CreateElementwiseUnary( return std::make_unique<NeonAbsWorkload>(absQueueDescriptor, info); } + case UnaryOperation::Exp: + return std::make_unique<NeonExpWorkload>(descriptor, info); + case UnaryOperation::LogicalNot: + return std::make_unique<NeonLogicalNotWorkload>(descriptor, info); + case UnaryOperation::Log: + return std::make_unique<NeonLogWorkload>(descriptor, info); + case UnaryOperation::Neg: + return std::make_unique<NeonNegWorkload>(descriptor, info); case UnaryOperation::Rsqrt: { RsqrtQueueDescriptor rsqrtQueueDescriptor; @@ -302,12 +310,8 @@ std::unique_ptr<IWorkload> NeonWorkloadFactory::CreateElementwiseUnary( return std::make_unique<NeonRsqrtWorkload>(rsqrtQueueDescriptor, info); } - case UnaryOperation::Neg: - return std::make_unique<NeonNegWorkload>(descriptor, info); - case UnaryOperation::Exp: - return std::make_unique<NeonExpWorkload>(descriptor, info); - case UnaryOperation::LogicalNot: - return std::make_unique<NeonLogicalNotWorkload>(descriptor, info); + case UnaryOperation::Sin: + return std::make_unique<NeonSinWorkload>(descriptor, info); default: return nullptr; } diff --git a/src/backends/neon/backend.mk b/src/backends/neon/backend.mk index 21a1770cb5..9906c80033 100644 --- a/src/backends/neon/backend.mk +++ b/src/backends/neon/backend.mk @@ -48,6 +48,7 @@ BACKEND_SOURCES := \ workloads/NeonGatherWorkload.cpp \ workloads/NeonInstanceNormalizationWorkload.cpp \ workloads/NeonL2NormalizationFloatWorkload.cpp \ + workloads/NeonLogWorkload.cpp \ workloads/NeonLogicalAndWorkload.cpp \ workloads/NeonLogicalNotWorkload.cpp \ workloads/NeonLogicalOrWorkload.cpp \ @@ -71,6 +72,7 @@ BACKEND_SOURCES := \ workloads/NeonReshapeWorkload.cpp \ workloads/NeonResizeWorkload.cpp \ workloads/NeonRsqrtWorkload.cpp \ + workloads/NeonSinWorkload.cpp \ workloads/NeonSliceWorkload.cpp \ workloads/NeonSoftmaxWorkload.cpp \ workloads/NeonSpaceToBatchNdWorkload.cpp \ diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 62864f82dc..6985776bf0 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -1354,10 +1354,22 @@ ARMNN_AUTO_TEST_CASE_WITH_THF(NegNegative, NegNegativeTest<DataType::Float32>) // Exp ARMNN_AUTO_TEST_CASE_WITH_THF(Exp2d, Exp2dTest<DataType::Float32>) -ARMNN_AUTO_TEST_CASE_WITH_THF(Exo3d, Exp3dTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE_WITH_THF(Exp3d, Exp3dTest<DataType::Float32>) ARMNN_AUTO_TEST_CASE_WITH_THF(ExpZero, ExpZeroTest<DataType::Float32>) ARMNN_AUTO_TEST_CASE_WITH_THF(ExpNegative, ExpNegativeTest<DataType::Float32>) +// Log +ARMNN_AUTO_TEST_CASE_WITH_THF(Log2d, Log2dTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE_WITH_THF(Log3d, Log3dTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE_WITH_THF(LogZero, LogZeroTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE_WITH_THF(LogNegative, LogNegativeTest<DataType::Float32>) + +// Sin +ARMNN_AUTO_TEST_CASE_WITH_THF(Sin2d, Sin2dTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE_WITH_THF(Sin3d, Sin3dTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE_WITH_THF(SinZero, SinZeroTest<DataType::Float32>) +ARMNN_AUTO_TEST_CASE_WITH_THF(SinNegative, SinNegativeTest<DataType::Float32>) + // Fill ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleFill, SimpleFillTest<DataType::Float32>) ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleFillF16, SimpleFillTest<DataType::Float16>) diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index f8fc18fdda..d08dd7e704 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -56,6 +56,8 @@ list(APPEND armnnNeonBackendWorkloads_sources NeonInstanceNormalizationWorkload.hpp NeonL2NormalizationFloatWorkload.cpp NeonL2NormalizationFloatWorkload.hpp + NeonLogWorkload.cpp + NeonLogWorkload.hpp NeonLogicalAndWorkload.cpp NeonLogicalAndWorkload.hpp NeonLogicalNotWorkload.cpp @@ -103,6 +105,8 @@ list(APPEND armnnNeonBackendWorkloads_sources NeonResizeWorkload.hpp NeonRsqrtWorkload.cpp NeonRsqrtWorkload.hpp + NeonSinWorkload.cpp + NeonSinWorkload.hpp NeonSliceWorkload.cpp NeonSliceWorkload.hpp NeonSoftmaxWorkload.cpp diff --git a/src/backends/neon/workloads/NeonLogWorkload.cpp b/src/backends/neon/workloads/NeonLogWorkload.cpp new file mode 100644 index 0000000000..460f5b3b09 --- /dev/null +++ b/src/backends/neon/workloads/NeonLogWorkload.cpp @@ -0,0 +1,42 @@ +// +// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "NeonLogWorkload.hpp" + +#include "NeonWorkloadUtils.hpp" + +#include <aclCommon/ArmComputeTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> + +namespace armnn +{ + +arm_compute::Status NeonLogWorkloadValidate(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::NELogLayer::validate(&aclInput, &aclOutput); +} + +NeonLogWorkload::NeonLogWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info) + : BaseWorkload<ElementwiseUnaryQueueDescriptor>(descriptor, info) +{ + m_Data.ValidateInputsOutputs("NeonLogWorkload", 1, 1); + + arm_compute::ITensor& input = PolymorphicDowncast<IAclTensorHandle*>(m_Data.m_Inputs[0])->GetTensor(); + arm_compute::ITensor& output = PolymorphicDowncast<IAclTensorHandle*>(m_Data.m_Outputs[0])->GetTensor(); + + m_LogLayer.configure(&input, &output); +} + +void NeonLogWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonLogWorkload_Execute"); + m_LogLayer.run(); +} + +} // namespace armnn diff --git a/src/backends/neon/workloads/NeonLogWorkload.hpp b/src/backends/neon/workloads/NeonLogWorkload.hpp new file mode 100644 index 0000000000..965a845ea8 --- /dev/null +++ b/src/backends/neon/workloads/NeonLogWorkload.hpp @@ -0,0 +1,27 @@ +// +// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <backendsCommon/Workload.hpp> +#include <arm_compute/core/Error.h> +#include <arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h> + +namespace armnn +{ + +arm_compute::Status NeonLogWorkloadValidate(const TensorInfo& input, const TensorInfo& output); + +class NeonLogWorkload : public BaseWorkload<ElementwiseUnaryQueueDescriptor> +{ +public: + NeonLogWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info); + virtual void Execute() const override; + +private: + mutable arm_compute::NELogLayer m_LogLayer; +}; + +} //namespace armnn
\ No newline at end of file diff --git a/src/backends/neon/workloads/NeonSinWorkload.cpp b/src/backends/neon/workloads/NeonSinWorkload.cpp new file mode 100644 index 0000000000..ac2bd4965a --- /dev/null +++ b/src/backends/neon/workloads/NeonSinWorkload.cpp @@ -0,0 +1,42 @@ +// +// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "NeonSinWorkload.hpp" + +#include "NeonWorkloadUtils.hpp" + +#include <aclCommon/ArmComputeTensorHandle.hpp> +#include <aclCommon/ArmComputeTensorUtils.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> + +namespace armnn +{ + +arm_compute::Status NeonSinWorkloadValidate(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::NESinLayer::validate(&aclInput, &aclOutput); +} + +NeonSinWorkload::NeonSinWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info) + : BaseWorkload<ElementwiseUnaryQueueDescriptor>(descriptor, info) +{ + m_Data.ValidateInputsOutputs("NeonSinWorkload", 1, 1); + + arm_compute::ITensor& input = PolymorphicDowncast<IAclTensorHandle*>(m_Data.m_Inputs[0])->GetTensor(); + arm_compute::ITensor& output = PolymorphicDowncast<IAclTensorHandle*>(m_Data.m_Outputs[0])->GetTensor(); + + m_SinLayer.configure(&input, &output); +} + +void NeonSinWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonSinWorkload_Execute"); + m_SinLayer.run(); +} + +} // namespace armnn
\ No newline at end of file diff --git a/src/backends/neon/workloads/NeonSinWorkload.hpp b/src/backends/neon/workloads/NeonSinWorkload.hpp new file mode 100644 index 0000000000..9405c3c734 --- /dev/null +++ b/src/backends/neon/workloads/NeonSinWorkload.hpp @@ -0,0 +1,27 @@ +// +// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <backendsCommon/Workload.hpp> +#include <arm_compute/core/Error.h> +#include <arm_compute/runtime/NEON/functions/NEElementwiseUnaryLayer.h> + +namespace armnn +{ + +arm_compute::Status NeonSinWorkloadValidate(const TensorInfo& input, const TensorInfo& output); + +class NeonSinWorkload : public BaseWorkload<ElementwiseUnaryQueueDescriptor> +{ +public: + NeonSinWorkload(const ElementwiseUnaryQueueDescriptor& descriptor, const WorkloadInfo& info); + virtual void Execute() const override; + +private: + mutable arm_compute::NESinLayer m_SinLayer; +}; + +} //namespace armnn
\ No newline at end of file diff --git a/src/backends/neon/workloads/NeonWorkloads.hpp b/src/backends/neon/workloads/NeonWorkloads.hpp index 16035e02cd..2fb4b17eff 100644 --- a/src/backends/neon/workloads/NeonWorkloads.hpp +++ b/src/backends/neon/workloads/NeonWorkloads.hpp @@ -31,6 +31,7 @@ #include "NeonGatherWorkload.hpp" #include "NeonInstanceNormalizationWorkload.hpp" #include "NeonL2NormalizationFloatWorkload.hpp" +#include "NeonLogWorkload.hpp" #include "NeonLogicalAndWorkload.hpp" #include "NeonLogicalNotWorkload.hpp" #include "NeonLogicalOrWorkload.hpp" @@ -54,6 +55,7 @@ #include "NeonReshapeWorkload.hpp" #include "NeonResizeWorkload.hpp" #include "NeonRsqrtWorkload.hpp" +#include "NeonSinWorkload.hpp" #include "NeonSliceWorkload.hpp" #include "NeonSoftmaxWorkload.hpp" #include "NeonSpaceToBatchNdWorkload.hpp" |