From 4788c384f738cc8eb659fb3838132d7c59d6aab7 Mon Sep 17 00:00:00 2001
From: Cathal Corbett <cathal.corbett@arm.com>
Date: Wed, 1 Jun 2022 16:45:14 +0100
Subject: IVGCVSW-6986 SLTS Failures due to Caching commits

  * TestGenerated/GeneratedTests.Sync/argmax_1 fix.
  * TestGenerated/GeneratedTests.Sync/conv2d_quant8_signed_nchw_quant8_signed_5 fix.

Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I47893713d615e75e9f9bd08e5caf13a4542bca07
---
 shim/sl/canonical/ArmnnPreparedModel.cpp          | 9 +--------
 src/backends/cl/ClWorkloadFactory.cpp             | 2 +-
 src/backends/cl/workloads/ClArgMinMaxWorkload.cpp | 6 +++++-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/shim/sl/canonical/ArmnnPreparedModel.cpp b/shim/sl/canonical/ArmnnPreparedModel.cpp
index 927d5bfad6..910a0fce46 100644
--- a/shim/sl/canonical/ArmnnPreparedModel.cpp
+++ b/shim/sl/canonical/ArmnnPreparedModel.cpp
@@ -388,14 +388,7 @@ ErrorStatus ArmnnPreparedModel::ExecuteGraph(
         armnn::Status status;
         VLOG(DRIVER) << "ArmnnPreparedModel::ExecuteGraph m_AsyncModelExecutionEnabled false";
 
-        std::vector<armnn::ImportedInputId> importedInputIds;
-        importedInputIds = m_Runtime->ImportInputs(m_NetworkId, inputTensors, armnn::MemorySource::Malloc);
-
-        std::vector<armnn::ImportedOutputId> importedOutputIds;
-        importedOutputIds = m_Runtime->ImportOutputs(m_NetworkId, outputTensors, armnn::MemorySource::Malloc);
-
-        status = m_Runtime->EnqueueWorkload(m_NetworkId, inputTensors, outputTensors,
-                                            importedInputIds, importedOutputIds);
+        status = m_Runtime->EnqueueWorkload(m_NetworkId, inputTensors, outputTensors);
 
         if (ctx.measureTimings == MeasureTiming::YES)
         {
diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp
index 0632787db0..c3a3c764d2 100644
--- a/src/backends/cl/ClWorkloadFactory.cpp
+++ b/src/backends/cl/ClWorkloadFactory.cpp
@@ -263,7 +263,7 @@ std::unique_ptr<IWorkload> ClWorkloadFactory::CreateWorkload(LayerType type,
         case LayerType::ArgMinMax :
         {
             auto argMinMaxQueueDescriptor = PolymorphicDowncast<const ArgMinMaxQueueDescriptor*>(&descriptor);
-            return std::make_unique<ClArgMinMaxWorkload>(*argMinMaxQueueDescriptor, info, m_CLCompileContext);
+            return MakeWorkload<ClArgMinMaxWorkload>(*argMinMaxQueueDescriptor, info, m_CLCompileContext);
         }
         case LayerType::BatchNormalization :
         {
diff --git a/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp b/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp
index 4305b255c0..1f81f7d26e 100644
--- a/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp
+++ b/src/backends/cl/workloads/ClArgMinMaxWorkload.cpp
@@ -74,7 +74,11 @@ ClArgMinMaxWorkload::ClArgMinMaxWorkload(const ArgMinMaxQueueDescriptor& descrip
         ARMNN_SCOPED_PROFILING_EVENT(Compute::Undefined, "ClArgMinMaxWorkload_configure");
         if (m_Data.m_Parameters.m_Function == ArgMinMaxFunction::Max)
         {
-            m_ArgMinMaxLayer.configure(&input, aclAxis, &output, arm_compute::ReductionOperation::ARG_IDX_MAX);
+            m_ArgMinMaxLayer.configure(clCompileContext,
+                                       &input,
+                                       aclAxis,
+                                       &output,
+                                       arm_compute::ReductionOperation::ARG_IDX_MAX);
         }
         else
         {
-- 
cgit v1.2.1