From 99a663140294afd2a4ea91ccc61b7266f735b46a Mon Sep 17 00:00:00 2001 From: nikraj01 Date: Thu, 6 Jun 2019 10:31:27 +0100 Subject: IVGCVSW-3211 Refactor reference Rsqrt workload Change-Id: Ia413c6b5352dbb3390e7d84e837a542c24ae8813 Signed-off-by: nikraj01 --- src/backends/reference/RefWorkloadFactory.cpp | 26 ++++++++++++++- src/backends/reference/backend.mk | 2 +- .../reference/test/RefCreateWorkloadTests.cpp | 2 +- src/backends/reference/workloads/CMakeLists.txt | 4 +-- .../workloads/RefRsqrtFloat32Workload.cpp | 25 --------------- .../workloads/RefRsqrtFloat32Workload.hpp | 21 ------------ .../reference/workloads/RefRsqrtWorkload.cpp | 37 ++++++++++++++++++++++ .../reference/workloads/RefRsqrtWorkload.hpp | 21 ++++++++++++ src/backends/reference/workloads/RefWorkloads.hpp | 2 +- src/backends/reference/workloads/Rsqrt.cpp | 10 +++--- src/backends/reference/workloads/Rsqrt.hpp | 5 +-- 11 files changed, 97 insertions(+), 58 deletions(-) delete mode 100644 src/backends/reference/workloads/RefRsqrtFloat32Workload.cpp delete mode 100644 src/backends/reference/workloads/RefRsqrtFloat32Workload.hpp create mode 100644 src/backends/reference/workloads/RefRsqrtWorkload.cpp create mode 100644 src/backends/reference/workloads/RefRsqrtWorkload.hpp diff --git a/src/backends/reference/RefWorkloadFactory.cpp b/src/backends/reference/RefWorkloadFactory.cpp index 319a620d2b..1ef88a090e 100644 --- a/src/backends/reference/RefWorkloadFactory.cpp +++ b/src/backends/reference/RefWorkloadFactory.cpp @@ -43,6 +43,22 @@ bool IsFloat16(const WorkloadInfo& info) return false; } +bool IsUint8(const WorkloadInfo& info) +{ + auto checkUint8 = [](const TensorInfo& tensorInfo) {return tensorInfo.GetDataType() == DataType::QuantisedAsymm8;}; + auto it = std::find_if(std::begin(info.m_InputTensorInfos), std::end(info.m_InputTensorInfos), checkUint8); + if (it != std::end(info.m_InputTensorInfos)) + { + return true; + } + it = std::find_if(std::begin(info.m_OutputTensorInfos), std::end(info.m_OutputTensorInfos), checkUint8); + if (it != std::end(info.m_OutputTensorInfos)) + { + return true; + } + return false; +} + RefWorkloadFactory::RefWorkloadFactory() { } @@ -382,7 +398,15 @@ std::unique_ptr RefWorkloadFactory::CreateDebug(const DebugQueueDescr std::unique_ptr RefWorkloadFactory::CreateRsqrt(const RsqrtQueueDescriptor& descriptor, const WorkloadInfo& info) const { - return MakeWorkload(descriptor, info); + if (IsFloat16(info)) + { + return MakeWorkload(descriptor, info); + } + else if(IsUint8(info)) + { + return MakeWorkload(descriptor, info); + } + return std::make_unique(descriptor, info); } std::unique_ptr RefWorkloadFactory::CreateGather(const armnn::GatherQueueDescriptor& descriptor, diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk index 2822c305f5..0d2b65d433 100644 --- a/src/backends/reference/backend.mk +++ b/src/backends/reference/backend.mk @@ -55,7 +55,7 @@ BACKEND_SOURCES := \ workloads/RefReshapeWorkload.cpp \ workloads/RefResizeBilinearFloat32Workload.cpp \ workloads/RefResizeBilinearUint8Workload.cpp \ - workloads/RefRsqrtFloat32Workload.cpp \ + workloads/RefRsqrtWorkload.cpp \ workloads/RefSoftmaxWorkload.cpp \ workloads/RefSpaceToBatchNdWorkload.cpp \ workloads/RefStridedSliceWorkload.cpp \ diff --git a/src/backends/reference/test/RefCreateWorkloadTests.cpp b/src/backends/reference/test/RefCreateWorkloadTests.cpp index 82a4120d9a..5139888e39 100644 --- a/src/backends/reference/test/RefCreateWorkloadTests.cpp +++ b/src/backends/reference/test/RefCreateWorkloadTests.cpp @@ -674,7 +674,7 @@ static void RefCreateRsqrtTest() BOOST_AUTO_TEST_CASE(CreateRsqrtFloat32) { - RefCreateRsqrtTest(); + RefCreateRsqrtTest(); } template diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index 9d5c4442fc..4d11447280 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -92,8 +92,8 @@ list(APPEND armnnRefBackendWorkloads_sources RefResizeBilinearFloat32Workload.hpp RefResizeBilinearUint8Workload.cpp RefResizeBilinearUint8Workload.hpp - RefRsqrtFloat32Workload.cpp - RefRsqrtFloat32Workload.hpp + RefRsqrtWorkload.cpp + RefRsqrtWorkload.hpp RefSoftmaxWorkload.cpp RefSoftmaxWorkload.hpp RefSpaceToBatchNdWorkload.cpp diff --git a/src/backends/reference/workloads/RefRsqrtFloat32Workload.cpp b/src/backends/reference/workloads/RefRsqrtFloat32Workload.cpp deleted file mode 100644 index c08dbf0cab..0000000000 --- a/src/backends/reference/workloads/RefRsqrtFloat32Workload.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#include "RefRsqrtFloat32Workload.hpp" - -#include "RefWorkloadUtils.hpp" -#include "Rsqrt.hpp" - -#include - -namespace armnn -{ - -void RefRsqrtFloat32Workload::Execute() const -{ - ARMNN_SCOPED_PROFILING_EVENT(Compute::CpuRef, "RefRsqrtFloat32Workload_Execute"); - - Rsqrt(GetInputTensorDataFloat(0, m_Data), - GetOutputTensorDataFloat(0, m_Data), - GetTensorInfo(m_Data.m_Inputs[0])); -} - -} //namespace armnn diff --git a/src/backends/reference/workloads/RefRsqrtFloat32Workload.hpp b/src/backends/reference/workloads/RefRsqrtFloat32Workload.hpp deleted file mode 100644 index 9d1b4505fe..0000000000 --- a/src/backends/reference/workloads/RefRsqrtFloat32Workload.hpp +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright © 2017 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include -#include - -namespace armnn -{ - -class RefRsqrtFloat32Workload : public Float32Workload -{ -public: - using Float32Workload::Float32Workload; - virtual void Execute() const override; -}; - -} //namespace armnn diff --git a/src/backends/reference/workloads/RefRsqrtWorkload.cpp b/src/backends/reference/workloads/RefRsqrtWorkload.cpp new file mode 100644 index 0000000000..fd6b9a3549 --- /dev/null +++ b/src/backends/reference/workloads/RefRsqrtWorkload.cpp @@ -0,0 +1,37 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "RefRsqrtWorkload.hpp" + +#include "Decoders.hpp" +#include "Encoders.hpp" +#include "RefWorkloadUtils.hpp" +#include "Rsqrt.hpp" + +#include + +namespace armnn +{ + +void RefRsqrtWorkload::Execute() const +{ + ARMNN_SCOPED_PROFILING_EVENT(Compute::CpuRef, "RefRsqrtWorkload_Execute"); + + const TensorInfo& inputTensorInfo = GetTensorInfo(m_Data.m_Inputs[0]); + + std::unique_ptr> decoderPtr = MakeDecoder(inputTensorInfo, m_Data.m_Inputs[0]->Map()); + Decoder& decoder = *decoderPtr; + + const TensorInfo& outputTensorInfo = GetTensorInfo(m_Data.m_Outputs[0]); + + std::unique_ptr> encoderPtr = MakeEncoder(outputTensorInfo, m_Data.m_Outputs[0]->Map()); + Encoder& encoder = *encoderPtr; + + Rsqrt(decoder, + encoder, + GetTensorInfo(m_Data.m_Inputs[0])); +} + +} //namespace armnn diff --git a/src/backends/reference/workloads/RefRsqrtWorkload.hpp b/src/backends/reference/workloads/RefRsqrtWorkload.hpp new file mode 100644 index 0000000000..6c8ad5bc60 --- /dev/null +++ b/src/backends/reference/workloads/RefRsqrtWorkload.hpp @@ -0,0 +1,21 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include +#include + +namespace armnn +{ + +class RefRsqrtWorkload : public BaseWorkload +{ +public: + using BaseWorkload::BaseWorkload; + virtual void Execute() const override; +}; + +} //namespace armnn diff --git a/src/backends/reference/workloads/RefWorkloads.hpp b/src/backends/reference/workloads/RefWorkloads.hpp index 96f98ee7a8..53f7aa2efb 100644 --- a/src/backends/reference/workloads/RefWorkloads.hpp +++ b/src/backends/reference/workloads/RefWorkloads.hpp @@ -49,7 +49,7 @@ #include "RefBatchToSpaceNdUint8Workload.hpp" #include "RefBatchToSpaceNdFloat32Workload.hpp" #include "RefDebugWorkload.hpp" -#include "RefRsqrtFloat32Workload.hpp" +#include "RefRsqrtWorkload.hpp" #include "RefDequantizeWorkload.hpp" #include "RefQuantizeWorkload.hpp" #include "RefReshapeWorkload.hpp" diff --git a/src/backends/reference/workloads/Rsqrt.cpp b/src/backends/reference/workloads/Rsqrt.cpp index cee38fc1f1..5abc2c8f7b 100644 --- a/src/backends/reference/workloads/Rsqrt.cpp +++ b/src/backends/reference/workloads/Rsqrt.cpp @@ -10,13 +10,15 @@ namespace armnn { -void Rsqrt(const float* in, - float* out, +void Rsqrt(Decoder& in, + Encoder& out, const TensorInfo& tensorInfo) { - for (size_t i = 0; i < tensorInfo.GetNumElements(); i++) + for (unsigned int i = 0; i < tensorInfo.GetNumElements(); ++i) { - out[i] = 1.f / sqrtf(in[i]); + out[i]; + in[i]; + out.Set(1.f / sqrtf(in.Get())); } } diff --git a/src/backends/reference/workloads/Rsqrt.hpp b/src/backends/reference/workloads/Rsqrt.hpp index 35cacede66..ffc6b18d13 100644 --- a/src/backends/reference/workloads/Rsqrt.hpp +++ b/src/backends/reference/workloads/Rsqrt.hpp @@ -3,6 +3,7 @@ // SPDX-License-Identifier: MIT // +#include "BaseIterator.hpp" #include #include @@ -11,8 +12,8 @@ namespace armnn /// Performs the reciprocal squareroot function elementwise /// on the inputs to give the outputs. -void Rsqrt(const float* in, - float* out, +void Rsqrt(Decoder& in, + Encoder& out, const TensorInfo& tensorInfo); } //namespace armnn -- cgit v1.2.1