From 2979457c5974e298033c387a5cd33f95e3301623 Mon Sep 17 00:00:00 2001 From: Ellen Norris-Thompson Date: Wed, 26 Jun 2019 16:40:36 +0100 Subject: IVGCVSW-3355 Add NeonSpaceToDepthWorkload * Add Neon backend support for SpaceToDepth * Enabled Neon Unit, CreateWorkload and EndToEnd tests for SpaceToDepth. * Added QSymm16 support to NeonTensorHandle. Signed-off-by: Ellen Norris-Thompson Change-Id: Ibbb0bce5ad77dace2bf4c4c111006d2fadf844e8 --- src/backends/neon/NeonLayerSupport.cpp | 13 +++++ src/backends/neon/NeonLayerSupport.hpp | 5 ++ src/backends/neon/NeonTensorHandle.hpp | 20 ++++++++ src/backends/neon/NeonWorkloadFactory.cpp | 6 +++ src/backends/neon/NeonWorkloadFactory.hpp | 3 ++ src/backends/neon/backend.mk | 1 + src/backends/neon/test/NeonCreateWorkloadTests.cpp | 37 ++++++++++++++ src/backends/neon/test/NeonEndToEndTests.cpp | 21 ++++++++ src/backends/neon/test/NeonLayerTests.cpp | 13 +++++ src/backends/neon/workloads/CMakeLists.txt | 2 + .../neon/workloads/NeonSpaceToDepthWorkload.cpp | 58 ++++++++++++++++++++++ .../neon/workloads/NeonSpaceToDepthWorkload.hpp | 31 ++++++++++++ src/backends/neon/workloads/NeonWorkloads.hpp | 1 + 13 files changed, 211 insertions(+) create mode 100644 src/backends/neon/workloads/NeonSpaceToDepthWorkload.cpp create mode 100644 src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp (limited to 'src') diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp index c05456b01c..4fee53f51f 100644 --- a/src/backends/neon/NeonLayerSupport.cpp +++ b/src/backends/neon/NeonLayerSupport.cpp @@ -40,6 +40,7 @@ #include "workloads/NeonQuantizeWorkload.hpp" #include "workloads/NeonResizeBilinearWorkload.hpp" #include "workloads/NeonSoftmaxBaseWorkload.hpp" +#include "workloads/NeonSpaceToDepthWorkload.hpp" #include "workloads/NeonSplitterWorkload.hpp" #include "workloads/NeonSubtractionWorkload.hpp" #endif @@ -514,6 +515,18 @@ bool NeonLayerSupport::IsSoftmaxSupported(const TensorInfo& input, FORWARD_WORKLOAD_VALIDATE_FUNC(NeonSoftmaxWorkloadValidate, reasonIfUnsupported, input, output, descriptor); } +bool NeonLayerSupport::IsSpaceToDepthSupported(const TensorInfo& input, + const TensorInfo& output, + const SpaceToDepthDescriptor& descriptor, + Optional reasonIfUnsupported) const +{ + FORWARD_WORKLOAD_VALIDATE_FUNC(NeonSpaceToDepthWorkloadValidate, + reasonIfUnsupported, + input, + output, + descriptor); +} + bool NeonLayerSupport::IsSplitterSupported(const TensorInfo& input, const ViewsDescriptor& descriptor, Optional reasonIfUnsupported) const diff --git a/src/backends/neon/NeonLayerSupport.hpp b/src/backends/neon/NeonLayerSupport.hpp index 344ce84d65..315248c79d 100644 --- a/src/backends/neon/NeonLayerSupport.hpp +++ b/src/backends/neon/NeonLayerSupport.hpp @@ -177,6 +177,11 @@ public: const SoftmaxDescriptor& descriptor, Optional reasonIfUnsupported = EmptyOptional()) const override; + bool IsSpaceToDepthSupported(const TensorInfo& input, + const TensorInfo& output, + const SpaceToDepthDescriptor& descriptor, + Optional reasonIfUnsupported = EmptyOptional()) const override; + ARMNN_DEPRECATED_MSG("Use IsSplitterSupported with outputs instead") bool IsSplitterSupported(const TensorInfo& input, const ViewsDescriptor& descriptor, diff --git a/src/backends/neon/NeonTensorHandle.hpp b/src/backends/neon/NeonTensorHandle.hpp index 3bbba78525..9077f34888 100644 --- a/src/backends/neon/NeonTensorHandle.hpp +++ b/src/backends/neon/NeonTensorHandle.hpp @@ -91,6 +91,11 @@ private: armcomputetensorutils::CopyArmComputeITensorData(this->GetTensor(), static_cast(memory)); break; + case arm_compute::DataType::S16: + case arm_compute::DataType::QSYMM16: + armcomputetensorutils::CopyArmComputeITensorData(this->GetTensor(), + static_cast(memory)); + break; default: { throw armnn::UnimplementedException(); @@ -112,6 +117,11 @@ private: armcomputetensorutils::CopyArmComputeITensorData(static_cast(memory), this->GetTensor()); break; + case arm_compute::DataType::S16: + case arm_compute::DataType::QSYMM16: + armcomputetensorutils::CopyArmComputeITensorData(static_cast(memory), + this->GetTensor()); + break; default: { throw armnn::UnimplementedException(); @@ -180,6 +190,11 @@ private: armcomputetensorutils::CopyArmComputeITensorData(this->GetTensor(), static_cast(memory)); break; + case arm_compute::DataType::S16: + case arm_compute::DataType::QSYMM16: + armcomputetensorutils::CopyArmComputeITensorData(this->GetTensor(), + static_cast(memory)); + break; default: { throw armnn::UnimplementedException(); @@ -201,6 +216,11 @@ private: armcomputetensorutils::CopyArmComputeITensorData(static_cast(memory), this->GetTensor()); break; + case arm_compute::DataType::S16: + case arm_compute::DataType::QSYMM16: + armcomputetensorutils::CopyArmComputeITensorData(static_cast(memory), + this->GetTensor()); + break; default: { throw armnn::UnimplementedException(); diff --git a/src/backends/neon/NeonWorkloadFactory.cpp b/src/backends/neon/NeonWorkloadFactory.cpp index 1802459f6a..eadd636dd1 100644 --- a/src/backends/neon/NeonWorkloadFactory.cpp +++ b/src/backends/neon/NeonWorkloadFactory.cpp @@ -294,6 +294,12 @@ std::unique_ptr NeonWorkloadFactory::CreateSpaceToBatchNd(const Space return nullptr; } +std::unique_ptr NeonWorkloadFactory::CreateSpaceToDepth(const armnn::SpaceToDepthQueueDescriptor& descriptor, + const armnn::WorkloadInfo& info) const +{ + return std::make_unique(descriptor, info); +} + std::unique_ptr NeonWorkloadFactory::CreateFloor(const FloorQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/neon/NeonWorkloadFactory.hpp b/src/backends/neon/NeonWorkloadFactory.hpp index 234167324f..4fd9bf22ea 100644 --- a/src/backends/neon/NeonWorkloadFactory.hpp +++ b/src/backends/neon/NeonWorkloadFactory.hpp @@ -123,6 +123,9 @@ public: std::unique_ptr CreateSpaceToBatchNd(const SpaceToBatchNdQueueDescriptor& descriptor, const WorkloadInfo& info) const override; + std::unique_ptr CreateSpaceToDepth(const SpaceToDepthQueueDescriptor& descriptor, + const WorkloadInfo& info) const override; + std::unique_ptr CreateFloor(const FloorQueueDescriptor& descriptor, const WorkloadInfo& info) const override; diff --git a/src/backends/neon/backend.mk b/src/backends/neon/backend.mk index e5fafa319f..9b0c188ea1 100644 --- a/src/backends/neon/backend.mk +++ b/src/backends/neon/backend.mk @@ -49,6 +49,7 @@ BACKEND_SOURCES := \ workloads/NeonSoftmaxBaseWorkload.cpp \ workloads/NeonSoftmaxFloatWorkload.cpp \ workloads/NeonSoftmaxUint8Workload.cpp \ + workloads/NeonSpaceToDepthWorkload.cpp \ workloads/NeonSplitterWorkload.cpp \ workloads/NeonSubtractionWorkload.cpp diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index 19b520d1e9..4968d0ed90 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -522,6 +522,43 @@ BOOST_AUTO_TEST_CASE(CreateSoftmaxFloatWorkload) NeonCreateSoftmaxWorkloadTest(); } +template +static void NeonSpaceToDepthWorkloadTest() +{ + Graph graph; + NeonWorkloadFactory factory = + NeonWorkloadFactoryHelper::GetFactory(NeonWorkloadFactoryHelper::GetMemoryManager()); + + auto workload = CreateSpaceToDepthWorkloadTest(factory, graph); + + SpaceToDepthQueueDescriptor queueDescriptor = workload->GetData(); + auto inputHandle = boost::polymorphic_downcast(queueDescriptor.m_Inputs[0]); + auto outputHandle = boost::polymorphic_downcast(queueDescriptor.m_Outputs[0]); + + BOOST_TEST(TestNeonTensorHandleInfo(inputHandle, TensorInfo({ 1, 2, 2, 1 }, DataType))); + BOOST_TEST(TestNeonTensorHandleInfo(outputHandle, TensorInfo({ 1, 1, 1, 4 }, DataType))); +} + +BOOST_AUTO_TEST_CASE(CreateSpaceToDepthFloat32Workload) +{ + NeonSpaceToDepthWorkloadTest(); +} + +BOOST_AUTO_TEST_CASE(CreateSpaceToDepthFloat16Workload) +{ + NeonSpaceToDepthWorkloadTest(); +} + +BOOST_AUTO_TEST_CASE(CreateSpaceToDepthQAsymm8Workload) +{ + NeonSpaceToDepthWorkloadTest(); +} + +BOOST_AUTO_TEST_CASE(CreateSpaceToDepthQSymm16Workload) +{ + NeonSpaceToDepthWorkloadTest(); +} + BOOST_AUTO_TEST_CASE(CreateSplitterWorkload) { Graph graph; diff --git a/src/backends/neon/test/NeonEndToEndTests.cpp b/src/backends/neon/test/NeonEndToEndTests.cpp index 7a22b458c9..66cace6908 100644 --- a/src/backends/neon/test/NeonEndToEndTests.cpp +++ b/src/backends/neon/test/NeonEndToEndTests.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -135,6 +136,26 @@ BOOST_AUTO_TEST_CASE(DequantizeEndToEndOffsetTest) DequantizeEndToEndOffset(defaultBackends); } +BOOST_AUTO_TEST_CASE(NeonSpaceToDepthNHWCEndToEndTest1) +{ + SpaceToDepthNHWCEndToEndTest1(defaultBackends); +} + +BOOST_AUTO_TEST_CASE(NeonSpaceToDepthNCHWEndToEndTest1) +{ + SpaceToDepthNCHWEndToEndTest1(defaultBackends); +} + +BOOST_AUTO_TEST_CASE(NeonSpaceToDepthNHWCEndToEndTest2) +{ + SpaceToDepthNHWCEndToEndTest2(defaultBackends); +} + +BOOST_AUTO_TEST_CASE(NeonSpaceToDepthNCHWEndToEndTest2) +{ + SpaceToDepthNCHWEndToEndTest2(defaultBackends); +} + BOOST_AUTO_TEST_CASE(NeonSplitter1dEndToEndTest) { Splitter1dEndToEnd(defaultBackends); diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 078016a1de..162aaadd67 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -302,6 +302,19 @@ ARMNN_AUTO_TEST_CASE(Simple3dSoftmaxBeta1Uint8, Simple3dSoftmaxUint8Test, 1.0f) ARMNN_AUTO_TEST_CASE(Simple4dSoftmaxBeta1, Simple4dSoftmaxTest, 1.0f) ARMNN_AUTO_TEST_CASE(Simple4dSoftmaxBeta1Uint8, Simple4dSoftmaxUint8Test, 1.0f) +// SpaceToDepth +ARMNN_AUTO_TEST_CASE(SpaceToDepthNCHWAsymmQ8, SpaceToDepthNCHWAsymmQ8Test) +ARMNN_AUTO_TEST_CASE(SpaceToDepthNHWCAsymmQ8, SpaceToDepthNHWCAsymmQ8Test) + +ARMNN_AUTO_TEST_CASE(SpaceToDepthNHWC1Float32, SpaceToDepthNHWCFloat32Test1) +ARMNN_AUTO_TEST_CASE(SpaceToDepthNCHW1Float32, SpaceToDepthNCHWFloat32Test1) + +ARMNN_AUTO_TEST_CASE(SpaceToDepthNHWC2Float32, SpaceToDepthNHWCFloat32Test2) +ARMNN_AUTO_TEST_CASE(SpaceToDepthNCHW2Float32, SpaceToDepthNCHWFloat32Test2) + +ARMNN_AUTO_TEST_CASE(SpaceToDepthNHWCQSymm16, SpaceToDepthNHWCQSymm16Test) +ARMNN_AUTO_TEST_CASE(SpaceToDepthNCHWQSymm16, SpaceToDepthNCHWQSymm16Test) + // Splitter ARMNN_AUTO_TEST_CASE(SimpleSplitter, SplitterTest) ARMNN_AUTO_TEST_CASE(SimpleSplitterUint8, SplitterUint8Test) diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index 8f9b7d5d09..0ad961aa86 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -64,6 +64,8 @@ list(APPEND armnnNeonBackendWorkloads_sources NeonSoftmaxFloatWorkload.hpp NeonSoftmaxUint8Workload.cpp NeonSoftmaxUint8Workload.hpp + NeonSpaceToDepthWorkload.cpp + NeonSpaceToDepthWorkload.hpp NeonSplitterWorkload.cpp NeonSplitterWorkload.hpp NeonSubtractionWorkload.cpp diff --git a/src/backends/neon/workloads/NeonSpaceToDepthWorkload.cpp b/src/backends/neon/workloads/NeonSpaceToDepthWorkload.cpp new file mode 100644 index 0000000000..a4204b21e6 --- /dev/null +++ b/src/backends/neon/workloads/NeonSpaceToDepthWorkload.cpp @@ -0,0 +1,58 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "NeonSpaceToDepthWorkload.hpp" +#include "NeonWorkloadUtils.hpp" +#include + +namespace armnn +{ + +using namespace armcomputetensorutils; + +arm_compute::Status NeonSpaceToDepthWorkloadValidate(const TensorInfo& input, + const TensorInfo& output, + const SpaceToDepthDescriptor& descriptor) +{ + DataLayout dataLayout = descriptor.m_DataLayout; + const arm_compute::TensorInfo aclInput = BuildArmComputeTensorInfo(input, dataLayout); + const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output, dataLayout); + + int32_t blockSize = boost::numeric_cast(descriptor.m_BlockSize); + + return arm_compute::NESpaceToDepthLayer::validate(&aclInput, &aclOutput, blockSize); +} + +NeonSpaceToDepthWorkload::NeonSpaceToDepthWorkload(const SpaceToDepthQueueDescriptor& desc, + const WorkloadInfo& info) + : BaseWorkload(desc, info) +{ + m_Data.ValidateInputsOutputs("NeonSpaceToDepthWorkload", 1, 1); + + arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout); + + arm_compute::ITensor& input = boost::polymorphic_downcast(m_Data.m_Inputs[0])->GetTensor(); + input.info()->set_data_layout(aclDataLayout); + + int32_t blockSize = boost::numeric_cast(desc.m_Parameters.m_BlockSize); + + arm_compute::ITensor& output = boost::polymorphic_downcast(m_Data.m_Outputs[0])->GetTensor(); + output.info()->set_data_layout(aclDataLayout); + + m_Layer.reset(new arm_compute::NESpaceToDepthLayer()); + m_Layer->configure(&input, &output, blockSize); + m_Layer->prepare(); +} + +void NeonSpaceToDepthWorkload::Execute() const +{ + if (m_Layer) + { + ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonSpaceToDepthWorkload_Execute"); + m_Layer->run(); + } +} + +} //namespace armnn \ No newline at end of file diff --git a/src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp b/src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp new file mode 100644 index 0000000000..f2de26b3c6 --- /dev/null +++ b/src/backends/neon/workloads/NeonSpaceToDepthWorkload.hpp @@ -0,0 +1,31 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include + +#include + +#include + +namespace armnn +{ + +arm_compute::Status NeonSpaceToDepthWorkloadValidate(const TensorInfo& input, + const TensorInfo& output, + const SpaceToDepthDescriptor& descriptor); + +class NeonSpaceToDepthWorkload : public BaseWorkload +{ +public: + using BaseWorkload::BaseWorkload; + NeonSpaceToDepthWorkload(const SpaceToDepthQueueDescriptor& descriptor, const WorkloadInfo& info); + virtual void Execute() const override; +private: + mutable std::unique_ptr m_Layer; +}; + +} //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 ebea879bad..a9604a160c 100644 --- a/src/backends/neon/workloads/NeonWorkloads.hpp +++ b/src/backends/neon/workloads/NeonWorkloads.hpp @@ -33,5 +33,6 @@ #include "NeonResizeBilinearWorkload.hpp" #include "NeonSoftmaxFloatWorkload.hpp" #include "NeonSoftmaxUint8Workload.hpp" +#include "NeonSpaceToDepthWorkload.hpp" #include "NeonSplitterWorkload.hpp" #include "NeonSubtractionWorkload.hpp" -- cgit v1.2.1