IVGCVSW-7830 Add backend optimizations to remove Reshapes where possible

 * Added optimization to remove reshapes for Neon and Ref Backends
   by using overridden TensorInfos
 * Added ability to delete Subgraphs during Optimization
 * Fixed naming error in NeonEndToEndTests and CLEndToEndTests
 * Added LayerNameAndTypeCheck for testing.
 * Fixed error where layers were not marked as altered when removed in
   CLBackend

Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I1ac25cd4ec9821470d961831ae2c8d24882276cc

4 files changed, 31 insertions, 3 deletions

diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp
index 9b8c3b0b7b..e311fa8840 100644
--- a/include/armnn/INetwork.hpp
+++ b/include/armnn/INetwork.hpp
@@ -31,6 +31,18 @@ public:
     virtual IConnectableLayer& GetOwningIConnectableLayer() = 0;
     virtual unsigned int GetSlotIndex() const = 0;
 
+    /// Sets the TensorInfo for this InputSlot. This can be used to override the TensorInfo and if set will be returned
+    /// instead of the TensorInfo for the Connected OutputSlot.
+    virtual void SetTensorInfo(const TensorInfo tensorInfo) = 0;
+    /// Gets the TensorInfo for this InputSlot. If the InputSlot's TensorInfo has not been set then this will get the
+    /// TensorInfo from the Connected TensorInfo.
+    virtual const TensorInfo& GetTensorInfo() const = 0;
+    /// Returns true if this InputSlot either has an overridden TensorInfo for this InputSlot that was set through a
+    /// call to SetTensorInfo() or is Connected to an OutputSlot that has its TensorInfo set.
+    virtual bool IsTensorInfoSet() const = 0;
+    /// Returns true if this InputSlot has an overridden TensorInfo that was set through a call to SetTensorInfo().
+    virtual bool IsTensorInfoOverridden() const = 0;
+
 protected:
    /// Not user deletable.
     ~IInputSlot() {}
diff --git a/include/armnn/Version.hpp b/include/armnn/Version.hpp
index 82d546a56a..3c4abdef54 100644
--- a/include/armnn/Version.hpp
+++ b/include/armnn/Version.hpp
@@ -10,8 +10,8 @@
 #define STRINGIFY_MACRO(s) #s
 
 // ArmNN version components
-#define ARMNN_MAJOR_VERSION 32
-#define ARMNN_MINOR_VERSION 1
+#define ARMNN_MAJOR_VERSION 33
+#define ARMNN_MINOR_VERSION 0
 #define ARMNN_PATCH_VERSION 0
 
 /// ARMNN_VERSION: "X.Y.Z"
diff --git a/include/armnn/backends/ITensorHandle.hpp b/include/armnn/backends/ITensorHandle.hpp
index 78404d0e39..5d8f36ff12 100644
--- a/include/armnn/backends/ITensorHandle.hpp
+++ b/include/armnn/backends/ITensorHandle.hpp
@@ -1,11 +1,12 @@
 //
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 #pragma once
 
 #include <armnn/MemorySources.hpp>
 #include <armnn/utility/IgnoreUnused.hpp>
+#include <armnn/Tensor.hpp>
 
 namespace armnn
 {
@@ -91,6 +92,14 @@ public:
     /// Unimport externally allocated memory
     virtual void Unimport()
     {};
+
+    /// Returns a decorated version of this TensorHandle allowing us to override the TensorInfo for it
+    /// \param tensorInfo the overidden TensorInfo.
+    virtual std::shared_ptr<ITensorHandle> DecorateTensorHandle(const TensorInfo& tensorInfo)
+    {
+        IgnoreUnused(tensorInfo);
+        return nullptr;
+    }
 };
 
 }
diff --git a/include/armnn/backends/OptimizationViews.hpp b/include/armnn/backends/OptimizationViews.hpp
index 6f27345ca4..ec1dc55156 100644
--- a/include/armnn/backends/OptimizationViews.hpp
+++ b/include/armnn/backends/OptimizationViews.hpp
@@ -50,9 +50,15 @@ public:
         m_UntouchedSubgraphs.emplace_back(subgraph);
     }
 
+    void AddDeletedSubgraph(SubgraphView&& subgraph)
+    {
+        m_DeletedSubgraphs.emplace_back(subgraph);
+    }
+
     const Substitutions& GetSubstitutions() const { return m_SuccesfulOptimizations; }
     const Subgraphs& GetFailedSubgraphs() const { return m_FailedOptimizations; }
     const Subgraphs& GetUntouchedSubgraphs() const { return m_UntouchedSubgraphs; }
+    const Subgraphs& GetDeletedSubgraphs() const { return m_DeletedSubgraphs; }
 
     Substitutions& GetSubstitutions() { return m_SuccesfulOptimizations; }
     Subgraphs& GetFailedSubgraphs() { return m_FailedOptimizations; }
@@ -67,6 +73,7 @@ private:
     Substitutions m_SuccesfulOptimizations;     ///< Proposed substitutions from successful optimizations
     Subgraphs m_FailedOptimizations;            ///< Subgraphs from the original subgraph which cannot be supported
     Subgraphs m_UntouchedSubgraphs;             ///< Subgraphs from the original subgraph which remain unmodified
+    Subgraphs m_DeletedSubgraphs;               ///< Subgraphs from the original subgraph which have been deleted
 
     /// INetworkPtr object used only as a container for any layer generated by the optimization process
     /// Also, can use to AddPrecompiledLayer to the SubstitutionPair