From b988ea40296dc5e173b8a5504f437b25b39d2305 Mon Sep 17 00:00:00 2001
From: Mike Kelly <mike.kelly@arm.com>
Date: Tue, 8 Aug 2023 16:40:45 +0100
Subject: IVGCVSW-7963 Uninitialized variable error in coverity

 * Reorganised WorkloadInfo members

Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I49468ec94184782ed408b1cc8b9a319f9e2afefb
---
 include/armnn/backends/WorkloadInfo.hpp                  | 2 +-
 src/backends/backendsCommon/test/DynamicBackendTests.hpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/armnn/backends/WorkloadInfo.hpp b/include/armnn/backends/WorkloadInfo.hpp
index 23a5172d83..d6c4dcc259 100644
--- a/include/armnn/backends/WorkloadInfo.hpp
+++ b/include/armnn/backends/WorkloadInfo.hpp
@@ -17,10 +17,10 @@ struct WorkloadInfo
 {
     std::vector<TensorInfo> m_InputTensorInfos;
     std::vector<TensorInfo> m_OutputTensorInfos;
+    std::string m_Name;
     Optional<TensorInfo> m_WeightsTensorInfo = EmptyOptional();
     Optional<TensorInfo> m_BiasTensorInfo = EmptyOptional();
     Optional<std::string> m_ConvolutionMethod = EmptyOptional();
-    std::string m_Name;
 };
 
 struct MemoryInfo
diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.hpp b/src/backends/backendsCommon/test/DynamicBackendTests.hpp
index 973759ee41..218a286143 100644
--- a/src/backends/backendsCommon/test/DynamicBackendTests.hpp
+++ b/src/backends/backendsCommon/test/DynamicBackendTests.hpp
@@ -1467,10 +1467,10 @@ void CreateReferenceDynamicBackendTestImpl()
     {
         { inputInfo, weightInfo },
         { outputInfo },
+        "Name",
         EmptyOptional(),
         EmptyOptional(),
-        EmptyOptional(),
-        "Name"
+        EmptyOptional()
     };
     convolution2dQueueDescriptor.m_Inputs.push_back(nullptr);
 
@@ -1553,10 +1553,10 @@ void CreateSampleDynamicBackendTestImpl()
     {
         { inputInfo, inputInfo },
         { outputInfo },
+        "Name",
         EmptyOptional(),
         EmptyOptional(),
-        EmptyOptional(),
-        "Name"
+        EmptyOptional()
     };
 
     // Create a addition workload
-- 
cgit v1.2.1