From 980446b2beefa0002814028980d83a48621685d3 Mon Sep 17 00:00:00 2001
From: Ryan OShea <ryan.oshea3@arm.com>
Date: Thu, 8 Jun 2023 16:23:28 +0100
Subject: Enable Slice EndToEndTests in all backends and Signed32 in CpuRef

 * Enable SliceEndToEnd tests on CpuRef, CpuAcc, GpuAcc
 * Enable Signed32 support for slice in CpuRefLayerSupport

Signed-off-by: Ryan OShea <ryan.oshea3@arm.com>
Change-Id: Ie9907c65dcb0eb2f2f346b22541ebfc692a109cb
---
 src/backends/cl/test/ClEndToEndTests.cpp         | 17 +++++++++++++++++
 src/backends/neon/test/NeonEndToEndTests.cpp     | 17 +++++++++++++++++
 src/backends/reference/RefLayerSupport.cpp       |  3 ++-
 src/backends/reference/test/RefEndToEndTests.cpp | 17 +++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp
index 6342cbc48a..2d7a813e60 100644
--- a/src/backends/cl/test/ClEndToEndTests.cpp
+++ b/src/backends/cl/test/ClEndToEndTests.cpp
@@ -22,6 +22,7 @@
 #include <backendsCommon/test/QuantizedLstmEndToEndTestImpl.hpp>
 #include <backendsCommon/test/ReduceEndToEndTestImpl.hpp>
 #include <backendsCommon/test/ReshapeEndToEndTestImpl.hpp>
+#include <backendsCommon/test/SliceEndToEndTestImpl.hpp>
 #include <backendsCommon/test/SpaceToDepthEndToEndTestImpl.hpp>
 #include <backendsCommon/test/SplitterEndToEndTestImpl.hpp>
 #include <backendsCommon/test/SubgraphUtilsTest.hpp>
@@ -176,6 +177,22 @@ TEST_CASE("DequantizeEndToEndOffsetTest")
     DequantizeEndToEndOffset<armnn::DataType::QAsymmU8>(clDefaultBackends);
 }
 
+// Slice
+TEST_CASE("ClSliceEndtoEndTestFloat32")
+{
+    SliceEndToEnd<DataType::Float32>(clDefaultBackends);
+}
+
+TEST_CASE("ClSliceEndtoEndTestInt32")
+{
+    SliceEndToEnd<DataType::Signed32>(clDefaultBackends);
+}
+
+TEST_CASE("ClSliceEndtoEndTestFloat16")
+{
+    SliceEndToEndFloat16<DataType::Float16>(clDefaultBackends);
+}
+
 TEST_CASE("ClStridedSliceInvalidSliceEndToEndTest")
 {
     StridedSliceInvalidSliceEndToEndTest(clDefaultBackends);
diff --git a/src/backends/neon/test/NeonEndToEndTests.cpp b/src/backends/neon/test/NeonEndToEndTests.cpp
index 4f3b8ec832..e582fadf11 100644
--- a/src/backends/neon/test/NeonEndToEndTests.cpp
+++ b/src/backends/neon/test/NeonEndToEndTests.cpp
@@ -23,6 +23,7 @@
 #include <backendsCommon/test/QuantizedLstmEndToEndTestImpl.hpp>
 #include <backendsCommon/test/ReduceEndToEndTestImpl.hpp>
 #include <backendsCommon/test/ReshapeEndToEndTestImpl.hpp>
+#include <backendsCommon/test/SliceEndToEndTestImpl.hpp>
 #include <backendsCommon/test/SpaceToDepthEndToEndTestImpl.hpp>
 #include <backendsCommon/test/SplitterEndToEndTestImpl.hpp>
 #include <backendsCommon/test/SubgraphUtilsTest.hpp>
@@ -670,6 +671,22 @@ TEST_CASE("NeonReshapeEndToEndTestFloat16")
     ReshapeEndToEndFloat16<armnn::DataType::Float16>(neonDefaultBackends);
 }
 
+// Slice
+TEST_CASE("NeonSliceEndtoEndTestFloat32")
+{
+    SliceEndToEnd<DataType::Float32>(neonDefaultBackends);
+}
+
+TEST_CASE("NeonSliceEndtoEndTestInt32")
+{
+    SliceEndToEnd<DataType::Signed32>(neonDefaultBackends);
+}
+
+TEST_CASE("NeonSliceEndtoEndTestFloat16")
+{
+    SliceEndToEndFloat16<DataType::Float16>(neonDefaultBackends);
+}
+
 TEST_CASE("NeonStridedSliceInvalidSliceEndToEndTest")
 {
     StridedSliceInvalidSliceEndToEndTest(neonDefaultBackends);
diff --git a/src/backends/reference/RefLayerSupport.cpp b/src/backends/reference/RefLayerSupport.cpp
index 2e845a8c51..6323db1c03 100644
--- a/src/backends/reference/RefLayerSupport.cpp
+++ b/src/backends/reference/RefLayerSupport.cpp
@@ -2436,7 +2436,8 @@ bool RefLayerSupport::IsSliceSupported(const TensorInfo& input,
         DataType::Float32,
         DataType::QAsymmS8,
         DataType::QAsymmU8,
-        DataType::QSymmS16
+        DataType::QSymmS16,
+        DataType::Signed32
     };
 
     supported &= CheckSupportRule(TypeAnyOf(input, supportedTypes), reasonIfUnsupported,
diff --git a/src/backends/reference/test/RefEndToEndTests.cpp b/src/backends/reference/test/RefEndToEndTests.cpp
index fc62a89dd7..09d6ac5d20 100644
--- a/src/backends/reference/test/RefEndToEndTests.cpp
+++ b/src/backends/reference/test/RefEndToEndTests.cpp
@@ -33,6 +33,7 @@
 #include <backendsCommon/test/ReshapeEndToEndTestImpl.hpp>
 #include <backendsCommon/test/ResizeEndToEndTestImpl.hpp>
 #include <backendsCommon/test/ReverseV2EndToEndTestImpl.hpp>
+#include <backendsCommon/test/SliceEndToEndTestImpl.hpp>
 #include <backendsCommon/test/SpaceToDepthEndToEndTestImpl.hpp>
 #include <backendsCommon/test/SplitterEndToEndTestImpl.hpp>
 #include <backendsCommon/test/StridedSliceAsyncEndToEndTest.hpp>
@@ -1609,6 +1610,22 @@ TEST_CASE("RefExportOutputWithSeveralOutputSlotConnectionsTest")
     ExportOutputWithSeveralOutputSlotConnectionsTest(defaultBackends);
 }
 
+// Slice
+TEST_CASE("RefSliceEndtoEndTestFloat32")
+{
+    SliceEndToEnd<DataType::Float32>(defaultBackends);
+}
+
+TEST_CASE("RefSliceEndtoEndTestInt32")
+{
+    SliceEndToEnd<DataType::Signed32>(defaultBackends);
+}
+
+TEST_CASE("RefSliceEndtoEndTestFloat16")
+{
+    SliceEndToEndFloat16<DataType::Float16>(defaultBackends);
+}
+
 TEST_CASE("RefStridedSliceInvalidSliceEndToEndTest")
 {
     StridedSliceInvalidSliceEndToEndTest(defaultBackends);
-- 
cgit v1.2.1