From 1426a3f52854d0d9457109c5f806bffde037bd34 Mon Sep 17 00:00:00 2001
From: Ryan OShea <ryaosh02@e121865.galway.arm.com>
Date: Thu, 23 Jan 2020 11:56:05 +0000
Subject: IVGCVSW-4152 Remove check for QAsymm8 in ArgMinMax CL layer support

 * Added ClLayerTests
 * Added ClEndToEndTests

Signed-off-by: Ryan OShea <ryaosh02@e121865.galway.arm.com>
Change-Id: I1512ebae248dee9a0e6a8c4f52ecf99f677a22c6
---
 src/backends/cl/ClLayerSupport.cpp       |  4 ---
 src/backends/cl/test/ClEndToEndTests.cpp | 50 ++++++++++++++++++++++++++++++++
 src/backends/cl/test/ClLayerTests.cpp    |  7 +++++
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp
index ffe68a33d0..7bf7f1529e 100644
--- a/src/backends/cl/ClLayerSupport.cpp
+++ b/src/backends/cl/ClLayerSupport.cpp
@@ -194,10 +194,6 @@ bool ClLayerSupport::IsArgMinMaxSupported(const TensorInfo& input,
                                           const ArgMinMaxDescriptor& descriptor,
                                           Optional<std::string&> reasonIfUnsupported) const
 {
-    if (input.GetDataType() == DataType::QAsymmU8)
-    {
-        return false;
-    }
 
     FORWARD_WORKLOAD_VALIDATE_FUNC(ClArgMinMaxWorkloadValidate,
                                    reasonIfUnsupported,
diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp
index eafdb7c3e5..10abcc9fe6 100644
--- a/src/backends/cl/test/ClEndToEndTests.cpp
+++ b/src/backends/cl/test/ClEndToEndTests.cpp
@@ -398,4 +398,54 @@ BOOST_AUTO_TEST_CASE(ClArgMinAxis3Test)
     ArgMinAxis3EndToEnd<armnn::DataType::Float32>(defaultBackends);
 }
 
+BOOST_AUTO_TEST_CASE(ClArgMaxSimpleTestQAsymmU8)
+{
+    ArgMaxEndToEndSimple<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMinSimpleTestQAsymmU8)
+{
+    ArgMinEndToEndSimple<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMaxAxis0TestQAsymmU8)
+{
+    ArgMaxAxis0EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMinAxis0TestQAsymmU8)
+{
+    ArgMinAxis0EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMaxAxis1TestQAsymmU8)
+{
+    ArgMaxAxis1EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMinAxis1TestQAsymmU8)
+{
+    ArgMinAxis1EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMaxAxis2TestQAsymmU8)
+{
+    ArgMaxAxis2EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMinAxis2TestQAsymmU8)
+{
+    ArgMinAxis2EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMaxAxis3TestQAsymmU8)
+{
+    ArgMaxAxis3EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
+BOOST_AUTO_TEST_CASE(ClArgMinAxis3TestQAsymmU8)
+{
+    ArgMinAxis3EndToEnd<armnn::DataType::QAsymmU8>(defaultBackends);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp
index 76e5174cb7..294c77bf7f 100644
--- a/src/backends/cl/test/ClLayerTests.cpp
+++ b/src/backends/cl/test/ClLayerTests.cpp
@@ -902,6 +902,13 @@ ARMNN_AUTO_TEST_CASE(ArgMaxChannel, ArgMaxChannelTest<DataType::Float32>)
 ARMNN_AUTO_TEST_CASE(ArgMaxHeight, ArgMaxHeightTest<DataType::Float32>)
 ARMNN_AUTO_TEST_CASE(ArgMinWidth, ArgMinWidthTest<DataType::Float32>)
 
+ARMNN_AUTO_TEST_CASE(ArgMinQAsymm8, ArgMinSimpleTest<DataType::QAsymmU8>)
+ARMNN_AUTO_TEST_CASE(ArgMaxQAsymm8, ArgMaxSimpleTest<DataType::QAsymmU8>)
+ARMNN_AUTO_TEST_CASE(ArgMinChannelQAsymm8, ArgMinChannelTest<DataType::QAsymmU8>)
+ARMNN_AUTO_TEST_CASE(ArgMaxChannelQAsymm8, ArgMaxChannelTest<DataType::QAsymmU8>)
+ARMNN_AUTO_TEST_CASE(ArgMaxHeightQAsymm8, ArgMaxHeightTest<DataType::QAsymmU8>)
+ARMNN_AUTO_TEST_CASE(ArgMinWidthQAsymm8, ArgMinWidthTest<DataType::QAsymmU8>)
+
 #if defined(ARMNNREF_ENABLED)
 
 // The ARMNN_COMPARE_REF_AUTO_TEST_CASE and the ARMNN_COMPARE_REF_FIXTURE_TEST_CASE test units are not available
-- 
cgit v1.2.1