From 198ee400733aa633ddeb867e42cc241a684e9787 Mon Sep 17 00:00:00 2001
From: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Date: Fri, 2 Aug 2019 18:54:28 +0100
Subject: IVGCVSW-3609 Fix decoding and encoding of INT32 tensors

* Added Int32Decoder and Int32Encoder to decode INT32 tensors
* Changed MakeDecoder to return ScaledInt32Decoder only
  if the scale is different from 0, i.e. for quantized bias
  tensors

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I278061d445d1c549c7ace11f51aa172ce7c691ae
---
 src/backends/reference/workloads/BaseIterator.hpp | 35 +++++++++++++++++++++++
 src/backends/reference/workloads/Decoders.hpp     | 10 +++++--
 src/backends/reference/workloads/Encoders.hpp     |  4 +++
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/backends/reference/workloads/BaseIterator.hpp b/src/backends/reference/workloads/BaseIterator.hpp
index 5583fe79ad..c9fd773d5e 100644
--- a/src/backends/reference/workloads/BaseIterator.hpp
+++ b/src/backends/reference/workloads/BaseIterator.hpp
@@ -175,6 +175,21 @@ private:
     const float m_Scale;
 };
 
+class Int32Decoder : public TypedIterator<const int32_t, Decoder<float>>
+{
+public:
+    Int32Decoder(const int32_t* data)
+        : TypedIterator(data) {}
+
+    Int32Decoder()
+        : Int32Decoder(nullptr) {}
+
+    float Get() const override
+    {
+        return static_cast<float>(*m_Iterator);
+    }
+};
+
 class QASymm8Encoder : public TypedIterator<uint8_t, Encoder<float>>
 {
 public:
@@ -243,6 +258,26 @@ public:
     }
 };
 
+class Int32Encoder : public TypedIterator<int32_t, Encoder<float>>
+{
+public:
+    Int32Encoder(int32_t* data)
+        : TypedIterator(data) {}
+
+    Int32Encoder()
+        : Int32Encoder(nullptr) {}
+
+    void Set(float right) override
+    {
+        *m_Iterator = static_cast<int32_t>(right);
+    }
+
+    float Get() const override
+    {
+        return static_cast<float>(*m_Iterator);
+    }
+};
+
 class BooleanEncoder : public TypedIterator<uint8_t, Encoder<bool>>
 {
 public:
diff --git a/src/backends/reference/workloads/Decoders.hpp b/src/backends/reference/workloads/Decoders.hpp
index 793e550764..0101789bec 100644
--- a/src/backends/reference/workloads/Decoders.hpp
+++ b/src/backends/reference/workloads/Decoders.hpp
@@ -40,9 +40,13 @@ inline std::unique_ptr<Decoder<float>> MakeDecoder(const TensorInfo& info, const
         }
         case armnn::DataType::Signed32:
         {
-            return std::make_unique<ScaledInt32Decoder>(
-                    static_cast<const int32_t*>(data),
-                    info.GetQuantizationScale());
+            const float scale = info.GetQuantizationScale();
+            if (scale == 0.f)
+            {
+                return std::make_unique<Int32Decoder>(static_cast<const int32_t*>(data));
+            }
+            // NOTE: ScaledInt32Decoder is used for quantized convolution biases
+            return std::make_unique<ScaledInt32Decoder>(static_cast<const int32_t*>(data), scale);
         }
         default:
         {
diff --git a/src/backends/reference/workloads/Encoders.hpp b/src/backends/reference/workloads/Encoders.hpp
index ed92393cdb..f0e40d224b 100644
--- a/src/backends/reference/workloads/Encoders.hpp
+++ b/src/backends/reference/workloads/Encoders.hpp
@@ -34,6 +34,10 @@ inline std::unique_ptr<Encoder<float>> MakeEncoder(const TensorInfo& info, void*
                 info.GetQuantizationScale(),
                 info.GetQuantizationOffset());
         }
+        case armnn::DataType::Signed32:
+        {
+            return std::make_unique<Int32Encoder>(static_cast<int32_t*>(data));
+        }
         case armnn::DataType::Float32:
         {
             return std::make_unique<FloatEncoder>(static_cast<float*>(data));
-- 
cgit v1.2.1