David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 1 | // |
| 2 | // Copyright © 2017 Arm Ltd. All rights reserved. |
| 3 | // SPDX-License-Identifier: MIT |
| 4 | // |
| 5 | |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 6 | |
Sadik Armagan | a097d2a | 2021-11-24 15:47:28 +0000 | [diff] [blame] | 7 | #include <CommonTestUtils.hpp> |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 8 | #include "MockBackend.hpp" |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 9 | |
Jan Eilers | bb446e5 | 2020-04-02 13:56:54 +0100 | [diff] [blame] | 10 | #include <Graph.hpp> |
| 11 | #include <Network.hpp> |
Jan Eilers | bb446e5 | 2020-04-02 13:56:54 +0100 | [diff] [blame] | 12 | #include <SubgraphViewSelector.hpp> |
| 13 | |
Francis Murtagh | a49ff08 | 2022-01-17 17:08:01 +0000 | [diff] [blame] | 14 | #include <armnn/backends/OptimizationViews.hpp> |
| 15 | #include <armnn/backends/SubgraphView.hpp> |
| 16 | #include <armnn/utility/PolymorphicDowncast.hpp> |
| 17 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 18 | #include <doctest/doctest.h> |
Jan Eilers | bb446e5 | 2020-04-02 13:56:54 +0100 | [diff] [blame] | 19 | |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 20 | using namespace armnn; |
| 21 | |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 22 | void CheckLayers(Graph& graph) |
| 23 | { |
| 24 | unsigned int m_inputLayerCount = 0, m_outputLayerCount = 0, m_addLayerCount = 0; |
| 25 | for(auto layer : graph) |
| 26 | { |
| 27 | switch(layer->GetType()) |
| 28 | { |
| 29 | case LayerType::Input: |
| 30 | ++m_inputLayerCount; |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 31 | CHECK((layer->GetName() == std::string("inLayer0") || |
Narumol Prangnawarat | 60a20fb | 2019-12-09 17:24:41 +0000 | [diff] [blame] | 32 | layer->GetName() == std::string("inLayer1"))); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 33 | break; |
| 34 | // The Addition layer should become a PreCompiled Layer after Optimisation |
| 35 | case LayerType::PreCompiled: |
| 36 | ++m_addLayerCount; |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 37 | CHECK(std::string(layer->GetName()) == "pre-compiled"); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 38 | break; |
| 39 | case LayerType::Output: |
| 40 | ++m_outputLayerCount; |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 41 | CHECK(std::string(layer->GetName()) == "outLayer"); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 42 | break; |
| 43 | default: |
| 44 | //Fail for anything else |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 45 | CHECK(false); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 46 | } |
| 47 | } |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 48 | CHECK(m_inputLayerCount == 2); |
| 49 | CHECK(m_outputLayerCount == 1); |
| 50 | CHECK(m_addLayerCount == 1); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 51 | } |
| 52 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 53 | TEST_SUITE("OptimizationViewsTestSuite") |
| 54 | { |
| 55 | TEST_CASE("OptimizedViewsSubgraphLayerCount") |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 56 | { |
| 57 | OptimizationViews view; |
| 58 | // Construct a graph with 3 layers |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 59 | Graph baseGraph; |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 60 | |
| 61 | Layer* const inputLayer = baseGraph.AddLayer<InputLayer>(0, "input"); |
| 62 | |
| 63 | Convolution2dDescriptor convDescriptor; |
| 64 | PreCompiledDescriptor substitutionLayerDescriptor(1, 1); |
| 65 | Layer* const convLayer1 = baseGraph.AddLayer<Convolution2dLayer>(convDescriptor, "conv1"); |
| 66 | Layer* const convLayer2 = baseGraph.AddLayer<Convolution2dLayer>(convDescriptor, "conv2"); |
| 67 | Layer* const substitutableCompiledLayer = |
| 68 | baseGraph.AddLayer<PreCompiledLayer>(substitutionLayerDescriptor, "pre-compiled"); |
| 69 | |
| 70 | Layer* const outputLayer = baseGraph.AddLayer<OutputLayer>(0, "output"); |
| 71 | |
| 72 | inputLayer->GetOutputSlot(0).Connect(convLayer1->GetInputSlot(0)); |
| 73 | convLayer1->GetOutputSlot(0).Connect(convLayer2->GetInputSlot(0)); |
| 74 | convLayer2->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); |
| 75 | |
| 76 | // Subgraph for a failed layer |
| 77 | SubgraphViewSelector::SubgraphViewPtr failedSubgraph = |
| 78 | CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}), |
| 79 | CreateOutputsFrom({convLayer1}), |
| 80 | {convLayer1}); |
| 81 | // Subgraph for an untouched layer |
| 82 | SubgraphViewSelector::SubgraphViewPtr untouchedSubgraph = |
| 83 | CreateSubgraphViewFrom(CreateInputsFrom({convLayer2}), |
| 84 | CreateOutputsFrom({convLayer2}), |
| 85 | {convLayer2}); |
| 86 | // Subgraph for a substitutable layer |
| 87 | SubgraphViewSelector::SubgraphViewPtr substitutableSubgraph = |
| 88 | CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}), |
| 89 | CreateOutputsFrom({convLayer2}), |
| 90 | {substitutableCompiledLayer}); |
| 91 | // Create a Graph containing a layer to substitute in |
| 92 | Graph substitutableGraph; |
| 93 | Layer* const substitutionpreCompiledLayer = |
| 94 | substitutableGraph.AddLayer<PreCompiledLayer>(substitutionLayerDescriptor, "pre-compiled"); |
| 95 | |
| 96 | // Subgraph for a substitution layer |
| 97 | SubgraphViewSelector::SubgraphViewPtr substitutionSubgraph = |
| 98 | CreateSubgraphViewFrom(CreateInputsFrom({substitutionpreCompiledLayer}), |
| 99 | CreateOutputsFrom({substitutionpreCompiledLayer}), |
| 100 | {substitutionpreCompiledLayer}); |
| 101 | |
| 102 | // Sub in the graph |
| 103 | baseGraph.SubstituteSubgraph(*substitutableSubgraph, *substitutionSubgraph); |
| 104 | |
| 105 | view.AddFailedSubgraph(SubgraphView(*failedSubgraph)); |
| 106 | view.AddUntouchedSubgraph(SubgraphView(*untouchedSubgraph)); |
| 107 | |
| 108 | SubgraphViewSelector::SubgraphViewPtr baseSubgraph = |
| 109 | CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}), |
| 110 | CreateOutputsFrom({convLayer2}), |
| 111 | {substitutionpreCompiledLayer}); |
| 112 | view.AddSubstitution({*baseSubgraph, *substitutionSubgraph}); |
| 113 | |
| 114 | // Construct original subgraph to compare against |
| 115 | SubgraphViewSelector::SubgraphViewPtr originalSubgraph = |
| 116 | CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}), |
| 117 | CreateOutputsFrom({convLayer2}), |
| 118 | {convLayer1, convLayer2, substitutionpreCompiledLayer}); |
| 119 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 120 | CHECK(view.Validate(*originalSubgraph)); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 121 | } |
| 122 | |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 123 | |
| 124 | TEST_CASE("OptimizedViewsSubgraphLayerCountUsingGetINetwork") |
| 125 | { |
| 126 | OptimizationViews view; |
| 127 | |
| 128 | IConnectableLayer* const inputLayer = view.GetINetwork()->AddInputLayer(0, "input"); |
| 129 | |
| 130 | DepthwiseConvolution2dDescriptor convDescriptor; |
| 131 | PreCompiledDescriptor substitutionLayerDescriptor(1, 1); |
| 132 | CompiledBlobPtr blobPtr; |
| 133 | BackendId backend = Compute::CpuRef; |
| 134 | |
| 135 | Layer* convLayer1 = PolymorphicDowncast<Layer*>( |
| 136 | view.GetINetwork()->AddDepthwiseConvolution2dLayer(convDescriptor, |
| 137 | ConstTensor(), |
| 138 | Optional<ConstTensor>(), |
| 139 | "conv1")); |
| 140 | |
| 141 | Layer* convLayer2 = PolymorphicDowncast<Layer*>( |
| 142 | view.GetINetwork()->AddDepthwiseConvolution2dLayer(convDescriptor, |
| 143 | ConstTensor(), |
| 144 | Optional<ConstTensor>(), |
| 145 | "conv2")); |
| 146 | |
| 147 | IConnectableLayer* const outputLayer = view.GetINetwork()->AddOutputLayer(0, "output"); |
| 148 | |
| 149 | inputLayer->GetOutputSlot(0).Connect(convLayer1->GetInputSlot(0)); |
| 150 | convLayer1->GetOutputSlot(0).Connect(convLayer2->GetInputSlot(0)); |
| 151 | convLayer2->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); |
| 152 | |
| 153 | // Subgraph for a failed layer |
| 154 | SubgraphViewSelector::SubgraphViewPtr failedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}), |
| 155 | CreateOutputsFrom({convLayer1}), |
| 156 | {convLayer1}); |
| 157 | // Subgraph for an untouched layer |
| 158 | SubgraphViewSelector::SubgraphViewPtr untouchedSubgraph = CreateSubgraphViewFrom(CreateInputsFrom({convLayer2}), |
| 159 | CreateOutputsFrom({convLayer2}), |
| 160 | {convLayer2}); |
| 161 | |
| 162 | // Create a Network containing a layer to substitute in |
| 163 | NetworkImpl net; |
| 164 | Layer* substitutionpreCompiledLayer = PolymorphicDowncast<Layer*>( |
Cathal Corbett | 3ea0107 | 2022-01-06 10:29:43 +0000 | [diff] [blame] | 165 | net.AddPrecompiledLayer(substitutionLayerDescriptor, std::move(blobPtr), backend)); |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 166 | |
| 167 | // Subgraph for a substitution layer |
| 168 | SubgraphViewSelector::SubgraphViewPtr substitutionSubgraph = |
| 169 | CreateSubgraphViewFrom(CreateInputsFrom({substitutionpreCompiledLayer}), |
| 170 | CreateOutputsFrom({substitutionpreCompiledLayer}), |
| 171 | {substitutionpreCompiledLayer}); |
| 172 | |
| 173 | view.AddFailedSubgraph(SubgraphView(*failedSubgraph)); |
| 174 | view.AddUntouchedSubgraph(SubgraphView(*untouchedSubgraph)); |
| 175 | |
| 176 | SubgraphViewSelector::SubgraphViewPtr baseSubgraph = CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}), |
| 177 | CreateOutputsFrom({convLayer2}), |
| 178 | {substitutionpreCompiledLayer}); |
| 179 | view.AddSubstitution({*baseSubgraph, *substitutionSubgraph}); |
| 180 | |
| 181 | // Construct original subgraph to compare against |
| 182 | SubgraphViewSelector::SubgraphViewPtr originalSubgraph = |
| 183 | CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}), |
| 184 | CreateOutputsFrom({convLayer2}), |
| 185 | {convLayer1, convLayer2, substitutionpreCompiledLayer}); |
| 186 | |
| 187 | CHECK(view.Validate(*originalSubgraph)); |
| 188 | } |
| 189 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 190 | TEST_CASE("OptimizedViewsSubgraphLayerCountFailValidate") |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 191 | { |
| 192 | OptimizationViews view; |
| 193 | // Construct a graph with 3 layers |
Cathal Corbett | cbfd718 | 2021-12-15 17:12:59 +0000 | [diff] [blame] | 194 | Graph baseGraph; |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 195 | |
| 196 | Layer* const inputLayer = baseGraph.AddLayer<InputLayer>(0, "input"); |
| 197 | |
| 198 | Convolution2dDescriptor convDescriptor; |
| 199 | PreCompiledDescriptor substitutionLayerDescriptor(1, 1); |
| 200 | Layer* const convLayer1 = baseGraph.AddLayer<Convolution2dLayer>(convDescriptor, "conv1"); |
| 201 | Layer* const convLayer2 = baseGraph.AddLayer<Convolution2dLayer>(convDescriptor, "conv2"); |
| 202 | Layer* const substitutableCompiledLayer = |
| 203 | baseGraph.AddLayer<PreCompiledLayer>(substitutionLayerDescriptor, "pre-compiled"); |
| 204 | |
| 205 | Layer* const outputLayer = baseGraph.AddLayer<OutputLayer>(0, "output"); |
| 206 | |
| 207 | inputLayer->GetOutputSlot(0).Connect(convLayer1->GetInputSlot(0)); |
| 208 | convLayer1->GetOutputSlot(0).Connect(convLayer2->GetInputSlot(0)); |
| 209 | convLayer2->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); |
| 210 | |
| 211 | // Subgraph for an untouched layer |
| 212 | SubgraphViewSelector::SubgraphViewPtr untouchedSubgraph = |
| 213 | CreateSubgraphViewFrom(CreateInputsFrom({convLayer2}), |
| 214 | CreateOutputsFrom({convLayer2}), |
| 215 | {convLayer2}); |
| 216 | // Subgraph for a substitutable layer |
| 217 | SubgraphViewSelector::SubgraphViewPtr substitutableSubgraph = |
| 218 | CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}), |
| 219 | CreateOutputsFrom({convLayer2}), |
| 220 | {substitutableCompiledLayer}); |
| 221 | // Create a Graph containing a layer to substitute in |
| 222 | Graph substitutableGraph; |
| 223 | Layer* const substitutionpreCompiledLayer = |
| 224 | substitutableGraph.AddLayer<PreCompiledLayer>(substitutionLayerDescriptor, "pre-compiled"); |
| 225 | |
| 226 | // Subgraph for a substitution layer |
| 227 | SubgraphViewSelector::SubgraphViewPtr substitutionSubgraph = |
| 228 | CreateSubgraphViewFrom(CreateInputsFrom({substitutionpreCompiledLayer}), |
| 229 | CreateOutputsFrom({substitutionpreCompiledLayer}), |
| 230 | {substitutionpreCompiledLayer}); |
| 231 | |
| 232 | // Sub in the graph |
| 233 | baseGraph.SubstituteSubgraph(*substitutableSubgraph, *substitutionSubgraph); |
| 234 | |
| 235 | view.AddUntouchedSubgraph(SubgraphView(*untouchedSubgraph)); |
| 236 | |
| 237 | SubgraphViewSelector::SubgraphViewPtr baseSubgraph = |
| 238 | CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}), |
| 239 | CreateOutputsFrom({convLayer2}), |
| 240 | {substitutionpreCompiledLayer}); |
| 241 | view.AddSubstitution({*baseSubgraph, *substitutionSubgraph}); |
| 242 | |
| 243 | // Construct original subgraph to compare against |
| 244 | SubgraphViewSelector::SubgraphViewPtr originalSubgraph = |
| 245 | CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}), |
| 246 | CreateOutputsFrom({convLayer2}), |
| 247 | {convLayer1, convLayer2, substitutionpreCompiledLayer}); |
| 248 | |
| 249 | // Validate should fail as convLayer1 is not counted |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 250 | CHECK(!view.Validate(*originalSubgraph)); |
David Monahan | 005288d | 2019-05-14 10:42:38 +0100 | [diff] [blame] | 251 | } |
| 252 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 253 | TEST_CASE("OptimizeViewsValidateDeviceMockBackend") |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 254 | { |
| 255 | // build up the structure of the network |
| 256 | armnn::INetworkPtr net(armnn::INetwork::Create()); |
| 257 | |
| 258 | armnn::IConnectableLayer* input = net->AddInputLayer(0, "inLayer0"); |
| 259 | armnn::IConnectableLayer* input1 = net->AddInputLayer(1, "inLayer1"); |
| 260 | |
| 261 | armnn::IConnectableLayer* addition = net->AddAdditionLayer("addLayer"); |
| 262 | |
| 263 | armnn::IConnectableLayer* output = net->AddOutputLayer(0, "outLayer"); |
| 264 | |
| 265 | input->GetOutputSlot(0).Connect(addition->GetInputSlot(0)); |
| 266 | input1->GetOutputSlot(0).Connect(addition->GetInputSlot(1)); |
| 267 | addition->GetOutputSlot(0).Connect(output->GetInputSlot(0)); |
| 268 | |
| 269 | input->GetOutputSlot(0).SetTensorInfo(armnn::TensorInfo({ 1, 1, 4, 4 }, armnn::DataType::Float32)); |
| 270 | input1->GetOutputSlot(0).SetTensorInfo(armnn::TensorInfo({ 1, 1, 4, 4 }, armnn::DataType::Float32)); |
| 271 | addition->GetOutputSlot(0).SetTensorInfo(armnn::TensorInfo({ 1, 1, 4, 4 }, armnn::DataType::Float32)); |
| 272 | |
David Monahan | c1536d6 | 2020-02-12 15:52:35 +0000 | [diff] [blame] | 273 | armnn::MockBackendInitialiser initialiser; |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 274 | armnn::IRuntime::CreationOptions options; |
| 275 | armnn::IRuntimePtr runtime(armnn::IRuntime::Create(options)); |
| 276 | |
| 277 | std::vector<armnn::BackendId> backends = { MockBackend().GetIdStatic() }; |
| 278 | armnn::IOptimizedNetworkPtr optNet = armnn::Optimize(*net, backends, runtime->GetDeviceSpec()); |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 279 | CHECK(optNet); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 280 | |
| 281 | // Check the optimised graph |
Francis Murtagh | 3d2b4b2 | 2021-02-15 18:23:17 +0000 | [diff] [blame] | 282 | armnn::Graph& graph = GetGraphForTesting(optNet.get()); |
| 283 | CheckLayers(graph); |
David Monahan | 41f00f1 | 2019-05-27 09:44:52 +0100 | [diff] [blame] | 284 | } |
| 285 | |
Sadik Armagan | 1625efc | 2021-06-10 18:24:34 +0100 | [diff] [blame] | 286 | } |