IVGCVSW-2957 MergerLayer subtensor optimization now backend agnostic

+ Update clframework pin
+ Cl and Neon Merger workloads updated to use MemoryLayout agnostic API
+ Workloads only use sub-tensor optimization if ALL input tensors are sub-tensors
+ Refactor LayerSupportCommon code to be a bit more succinct

Change-Id: Ib61ad4ccbd767e924dff07e61022e0cda4069828
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>

1 files changed, 17 insertions, 32 deletions

diff --git a/src/armnn/LayerSupportCommon.hpp b/src/armnn/LayerSupportCommon.hpp
index 70b5f182f4..3e2a1241db 100644
--- a/src/armnn/LayerSupportCommon.hpp
+++ b/src/armnn/LayerSupportCommon.hpp
@@ -12,6 +12,15 @@
 namespace armnn
 {
 
+template<typename T, typename V>
+void SetValueChecked(Optional<T&> optionalRef, V&& val)
+{
+    if (optionalRef)
+    {
+        optionalRef.value() = val;
+    }
+}
+
 template<typename Float16Func, typename Float32Func, typename Uint8Func, typename Int32Func, typename BooleanFunc,
          typename ... Params>
 bool IsSupportedForDataTypeGeneric(Optional<std::string&> reasonIfUnsupported,
@@ -55,80 +64,56 @@ bool FalseFunc(Optional<std::string&> reasonIfUnsupported, Params&&... params)
 template<typename ... Params>
 bool FalseFuncF16(Optional<std::string&> reasonIfUnsupported, Params&&... params)
 {
-    if (reasonIfUnsupported)
-    {
-        reasonIfUnsupported.value() = "Layer is not supported with float16 data type";
-    }
+    SetValueChecked(reasonIfUnsupported, "Layer is not supported with float16 data type");
     return false;
 }
 
 template<typename ... Params>
 bool FalseFuncF32(Optional<std::string&> reasonIfUnsupported, Params&&... params)
 {
-    if (reasonIfUnsupported)
-    {
-        reasonIfUnsupported.value() = "Layer is not supported with float32 data type";
-    }
+    SetValueChecked(reasonIfUnsupported, "Layer is not supported with float32 data type");
     return false;
 }
 
 template<typename ... Params>
 bool FalseFuncU8(Optional<std::string&> reasonIfUnsupported, Params&&... params)
 {
-    if (reasonIfUnsupported)
-    {
-        reasonIfUnsupported.value() = "Layer is not supported with 8-bit data type";
-    }
+    SetValueChecked(reasonIfUnsupported, "Layer is not supported with 8-bit data type");
     return false;
 }
 
 template<typename ... Params>
 bool FalseFuncI32(Optional<std::string&> reasonIfUnsupported, Params&&... params)
 {
-    if (reasonIfUnsupported)
-    {
-        reasonIfUnsupported.value() = "Layer is not supported with int32 data type";
-    }
+    SetValueChecked(reasonIfUnsupported, "Layer is not supported with int32 data type");
     return false;
 }
 
 template<typename ... Params>
 bool FalseInputFuncF32(Optional<std::string&> reasonIfUnsupported, Params&&... params)
 {
-    if (reasonIfUnsupported)
-    {
-        reasonIfUnsupported.value() = "Layer is not supported with float32 data type input";
-    }
+    SetValueChecked(reasonIfUnsupported, "Layer is not supported with float32 data type input");
     return false;
 }
 
 template<typename ... Params>
 bool FalseInputFuncF16(Optional<std::string&> reasonIfUnsupported, Params&&... params)
 {
-    if (reasonIfUnsupported)
-    {
-        reasonIfUnsupported.value() = "Layer is not supported with float16 data type input";
-    }
+    SetValueChecked(reasonIfUnsupported, "Layer is not supported with float16 data type input");
     return false;
 }
 
 template<typename ... Params>
 bool FalseOutputFuncF32(Optional<std::string&> reasonIfUnsupported, Params&&... params)
 {
-    if (reasonIfUnsupported)
-    {
-        reasonIfUnsupported.value() = "Layer is not supported with float32 data type output";
-    }
+    SetValueChecked(reasonIfUnsupported, "Layer is not supported with float32 data type output");
     return false;
 }
 
 template<typename ... Params>
 bool FalseOutputFuncF16(Optional<std::string&> reasonIfUnsupported, Params&&... params)
 {
-    if (reasonIfUnsupported)
-    {
-        reasonIfUnsupported.value() = "Layer is not supported with float16 data type output";
-    }
+    SetValueChecked(reasonIfUnsupported, "Layer is not supported with float16 data type output");
     return false;
 }