IVGCVSW-6026 Delegate VisitUnpackOperator not supported error

* Determine Splitter outputs to correctly perform validation
* Add validation for a Reshape Layer
* Add back the Num6 Axis2 test to CpuAcc and GpuAcc

Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I1e8108ce50d81420057d7a8b098a07eda63c5c8d
diff --git a/delegate/src/test/UnpackTest.cpp b/delegate/src/test/UnpackTest.cpp
index e9ab6f7..c036f64 100644
--- a/delegate/src/test/UnpackTest.cpp
+++ b/delegate/src/test/UnpackTest.cpp
@@ -122,6 +122,12 @@
 UnpackAxis0Num4Test<float>(tflite::TensorType_FLOAT32, backends);
 }
 
+TEST_CASE ("Unpack_Fp32_Axis2_Num6_CpuAcc_Test")
+{
+std::vector<armnn::BackendId> backends = {armnn::Compute::CpuAcc};
+UnpackAxis2Num6Test<float>(tflite::TensorType_FLOAT32, backends);
+}
+
 // Uint8
 TEST_CASE ("Unpack_Uint8_Axis0_Num4_CpuAcc_Test")
 {
@@ -129,6 +135,12 @@
 UnpackAxis0Num4Test<uint8_t>(tflite::TensorType_UINT8, backends);
 }
 
+TEST_CASE ("Unpack_Uint8_Axis2_Num6_CpuAcc_Test")
+{
+std::vector<armnn::BackendId> backends = {armnn::Compute::CpuAcc};
+UnpackAxis2Num6Test<uint8_t>(tflite::TensorType_UINT8, backends);
+}
+
 } // End of Unpack_CpuAccTests
 
 TEST_SUITE("Unpack_GpuAccTests")
@@ -141,6 +153,12 @@
 UnpackAxis0Num4Test<float>(tflite::TensorType_FLOAT32, backends);
 }
 
+TEST_CASE ("Unpack_Fp32_Axis2_Num6_GpuAcc_Test")
+{
+std::vector<armnn::BackendId> backends = {armnn::Compute::GpuAcc};
+UnpackAxis2Num6Test<float>(tflite::TensorType_FLOAT32, backends);
+}
+
 // Uint8
 TEST_CASE ("Unpack_Uint8_Axis0_Num4_GpuAcc_Test")
 {
@@ -148,6 +166,12 @@
 UnpackAxis0Num4Test<uint8_t>(tflite::TensorType_UINT8, backends);
 }
 
+TEST_CASE ("Unpack_Uint8_Axis2_Num6_GpuAcc_Test")
+{
+std::vector<armnn::BackendId> backends = {armnn::Compute::GpuAcc};
+UnpackAxis2Num6Test<uint8_t>(tflite::TensorType_UINT8, backends);
+}
+
 } // End of Unpack_GpuAccTests
 
 // End of Unpack Test Suite