commit 2e6dc3a1c5d47825535db7993ba77eb1596ae99b
author Sadik Armagan <sadik.armagan@arm.com> Wed Apr 03 17:48:18 2019 +0100
committer Sadik Armagan <sadik.armagan@arm.com> Mon Apr 08 15:48:28 2019 +0000
tree 48e73fa1862d17534804d1699bedb76120e88c9f
parent 0324f48e64edb99a5c8d819394545d97e0c2ae97

IVGCVSW-2861 Refactor the Reference Elementwise workload
 * Refactor Reference Comparison workload
 * Removed templating based on the DataType
 * Implemented BaseIterator to do decode/encode

Change-Id: I18f299f47ee23772f90152c1146b42f07465e105
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Kevin May <kevin.may@arm.com>

src/backends/reference/workloads/Broadcast.hpp

diff --git a/src/backends/reference/workloads/Broadcast.hpp b/src/backends/reference/workloads/Broadcast.hpp
index e92ed05..5bf6be8 100644
--- a/src/backends/reference/workloads/Broadcast.hpp
+++ b/src/backends/reference/workloads/Broadcast.hpp
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: MIT
 //
 
+#include "BaseIterator.hpp"
 #include <armnn/Tensor.hpp>
 
 #include <functional>
@@ -19,19 +20,23 @@
         return static_cast<unsigned int>(m_DimData.size());
     }
 
-    template <typename T0, typename T1, typename U, typename Func>
+    template <typename Func, typename DecoderOp, typename EncoderOp>
     void Unroll(Func operationFunc,
                 unsigned int dimension,
-                const T0* inData0,
-                const T1* inData1,
-                U* outData)
+                DecoderOp& inData0,
+                DecoderOp& inData1,
+                EncoderOp& outData)
     {
         if (dimension >= GetNumDimensions())
         {
-            *outData = operationFunc(*inData0, *inData1);
+            outData.Set(operationFunc(inData0.Get(), inData1.Get()));
             return;
         }
 
+        unsigned int inData0Movement = 0;
+        unsigned int inData1Movement = 0;
+        unsigned int outDataMovement = 0;
+
         for (unsigned int i = 0; i < m_DimData[dimension].m_DimSize; i++)
         {
             Unroll(operationFunc, dimension + 1, inData0, inData1, outData);
@@ -39,7 +44,16 @@
             inData0 += m_DimData[dimension].m_Stride1;
             inData1 += m_DimData[dimension].m_Stride2;
             outData += m_DimData[dimension].m_StrideOut;
+
+            inData0Movement += m_DimData[dimension].m_Stride1;
+            inData1Movement += m_DimData[dimension].m_Stride2;
+            outDataMovement += m_DimData[dimension].m_StrideOut;
         }
+
+        // move iterator back to the start
+        inData0 -= inData0Movement;
+        inData1 -= inData1Movement;
+        outData -= outDataMovement;
     }
 
 private: