MLIA-671 Update generic inference runner to 22.08

Due to the new version of Corstone-310, the generic inference runner
has been updated to 22.08:
* The inference runner 22.08 doesn't have timing adapters because
  incompatible with new version of Corstone-310
* Remove some memory mode logic which is not needed anymore
* Corstone-310 allows to run Ethos-U65 simulation hence adding the
  binary for enabling this case
* Delete the inference runner 22.05
* Fix codebase and tests to cope with changes above

Change-Id: I3dc894d7cb49b09102a19b0d7f588694a0f3b99f

25 files changed, 73 insertions, 56 deletions

diff --git a/src/mlia/resources/backend_configs/systems/corstone-310-vht/backend-config.json b/src/mlia/resources/backend_configs/systems/corstone-310-vht/backend-config.json
index bbcadfd..dcb105a 100644
--- a/src/mlia/resources/backend_configs/systems/corstone-310-vht/backend-config.json
+++ b/src/mlia/resources/backend_configs/systems/corstone-310-vht/backend-config.json
@@ -34,5 +34,39 @@
         }
       ]
     }
+  },
+  {
+    "name": "Corstone-310: Cortex-M85+Ethos-U65",
+    "description": "Cortex-M85 and Ethos-U65 functional model implementations based on Corstone-310 design for MPS3 board.",
+    "annotations": {
+      "ip_class": "Ethos-U65",
+      "sim_type": "FM",
+      "variant": "Cortex-M85+Ethos-U65"
+    },
+    "commands": {
+      "run": [
+        "/opt/VHT/VHT_Corstone_SSE-310_Ethos-U65 -a {software.variables:eval_app} {user_params:input_file}@0x90000000 -C {user_params:mac} -C mps3_board.telnetterminal0.start_telnet=0 -C mps3_board.uart0.out_file='-' -C mps3_board.uart0.shutdown_on_eot=1 -C mps3_board.visualisation.disable-visualisation=1 --stat"
+      ]
+    },
+    "user_params": {
+      "run": [
+        {
+          "name": "--data",
+          "description": "Full file name for a custom model. Model must be in TensorFlow Lite format compiled with Vela.",
+          "values": [],
+          "alias": "input_file"
+        },
+        {
+          "name": "ethosu.num_macs=",
+          "description": "Arm Ethos-U65 configuration - the number represents MACs per cycle.",
+          "values": [
+            "256",
+            "512"
+          ],
+          "default_value": "512",
+          "alias": "mac"
+        }
+      ]
+    }
   }
 ]
diff --git a/src/mlia/resources/backend_configs/systems/corstone-310/backend-config.json b/src/mlia/resources/backend_configs/systems/corstone-310/backend-config.json
index e0b1d1d..6f4f89b 100644
--- a/src/mlia/resources/backend_configs/systems/corstone-310/backend-config.json
+++ b/src/mlia/resources/backend_configs/systems/corstone-310/backend-config.json
@@ -34,5 +34,39 @@
         }
       ]
     }
+  },
+  {
+    "name": "Corstone-310: Cortex-M85+Ethos-U65",
+    "description": "Cortex-M85 and Ethos-U65 functional model implementations based on Corstone-310 design for MPS3 board.",
+    "annotations": {
+      "ip_class": "Ethos-U65",
+      "sim_type": "FM",
+      "variant": "Cortex-M85+Ethos-U65"
+    },
+    "commands": {
+      "run": [
+        "FVP_Corstone_SSE-310_Ethos-U65 -a {software.variables:eval_app} {user_params:input_file}@0x90000000 -C {user_params:mac} -C mps3_board.telnetterminal0.start_telnet=0 -C mps3_board.uart0.out_file='-' -C mps3_board.uart0.shutdown_on_eot=1 -C mps3_board.visualisation.disable-visualisation=1 --stat"
+      ]
+    },
+    "user_params": {
+      "run": [
+        {
+          "name": "--data",
+          "description": "Full file name for a custom model. Model must be in TensorFlow Lite format compiled with Vela.",
+          "values": [],
+          "alias": "input_file"
+        },
+        {
+          "name": "ethosu.num_macs=",
+          "description": "Arm Ethos-U65 configuration - the number represents MACs per cycle.",
+          "values": [
+            "256",
+            "512"
+          ],
+          "default_value": "512",
+          "alias": "mac"
+        }
+      ]
+    }
   }
 ]
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Shared_Sram-TA/backend-config.json b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Shared_Sram-TA/backend-config.json
deleted file mode 100644
index 4856d27..0000000
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Shared_Sram-TA/backend-config.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "name": "Generic Inference Runner: Ethos-U55/65 Shared SRAM",
-    "description": "This application allows running inferences using custom NN TensorFlow Lite models on Ethos-U. No data pre-/post-processing is executed.",
-    "supported_systems": [
-      {
-        "name": "Corstone-300: Cortex-M55+Ethos-U55"
-      },
-      {
-        "name": "Corstone-300: Cortex-M55+Ethos-U65"
-      }
-    ],
-    "variables": {
-      "eval_app": "{software.config_dir}/ethos-u-inference_runner.axf"
-    }
-  }
-]
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Shared_Sram-TA/ethos-u-inference_runner.axf b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Shared_Sram-TA/ethos-u-inference_runner.axf
deleted file mode 100644
index 4c50e1f..0000000
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Shared_Sram-TA/ethos-u-inference_runner.axf
+++ /dev/null
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf
deleted file mode 100644
index 850e2eb..0000000
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf
+++ /dev/null
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Sram_Only-TA/backend-config.json b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U55-Default-noTA/backend-config.json
index 3b512ff..4d8c928 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Sram_Only-TA/backend-config.json
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U55-Default-noTA/backend-config.json
@@ -1,6 +1,6 @@
 [
   {
-    "name": "Generic Inference Runner: Ethos-U55 SRAM",
+    "name": "Generic Inference Runner: Ethos-U55",
     "description": "This application allows running inferences using custom NN TensorFlow Lite models on Ethos-U. No data pre-/post-processing is executed.",
     "supported_systems": [
       {
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Shared_Sram-TA/backend-config.json.license b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U55-Default-noTA/backend-config.json.license
index 9b83bfc..9b83bfc 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Shared_Sram-TA/backend-config.json.license
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U55-Default-noTA/backend-config.json.license
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U55-Default-noTA/ethos-u-inference_runner.axf b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U55-Default-noTA/ethos-u-inference_runner.axf
new file mode 100644
index 0000000..c5b4e3e
--- /dev/null
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U55-Default-noTA/ethos-u-inference_runner.axf
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Shared_Sram-TA/ethos-u-inference_runner.axf.license b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U55-Default-noTA/ethos-u-inference_runner.axf.license
index 8896f92..8896f92 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Shared_Sram-TA/ethos-u-inference_runner.axf.license
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U55-Default-noTA/ethos-u-inference_runner.axf.license
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U65-Dedicated_Sram-TA/backend-config.json b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U65-Default-noTA/backend-config.json
index fc0569f..22ba2d9 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U65-Dedicated_Sram-TA/backend-config.json
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U65-Default-noTA/backend-config.json
@@ -1,6 +1,6 @@
 [
   {
-    "name": "Generic Inference Runner: Ethos-U65 Dedicated SRAM",
+    "name": "Generic Inference Runner: Ethos-U65",
     "description": "This application allows running inferences using custom NN TensorFlow Lite models on Ethos-U. No data pre-/post-processing is executed.",
     "supported_systems": [
       {
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Sram_Only-TA/backend-config.json.license b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U65-Default-noTA/backend-config.json.license
index 9b83bfc..9b83bfc 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Sram_Only-TA/backend-config.json.license
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U65-Default-noTA/backend-config.json.license
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U65-Dedicated_Sram-TA/ethos-u-inference_runner.axf b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U65-Default-noTA/ethos-u-inference_runner.axf
index f881bb8..5ffc70c 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U65-Dedicated_Sram-TA/ethos-u-inference_runner.axf
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U65-Default-noTA/ethos-u-inference_runner.axf
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf.license b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U65-Default-noTA/ethos-u-inference_runner.axf.license
index 8896f92..8896f92 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf.license
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-300-22.08.02-ethos-U65-Default-noTA/ethos-u-inference_runner.axf.license
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Shared_Sram-TA/ethos-u-inference_runner.axf b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Shared_Sram-TA/ethos-u-inference_runner.axf
deleted file mode 100644
index 846ee33..0000000
--- a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Shared_Sram-TA/ethos-u-inference_runner.axf
+++ /dev/null
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/backend-config.json.license b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/backend-config.json.license
deleted file mode 100644
index 9b83bfc..0000000
--- a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/backend-config.json.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: Copyright 2022, Arm Limited and/or its affiliates.
-
-SPDX-License-Identifier: Apache-2.0
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf
deleted file mode 100644
index e3eab97..0000000
--- a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf
+++ /dev/null
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf.license b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf.license
deleted file mode 100644
index 8896f92..0000000
--- a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/ethos-u-inference_runner.axf.license
+++ /dev/null
@@ -1,31 +0,0 @@
-SPDX-FileCopyrightText: Copyright 2009-2022, Arm Limited and/or its affiliates.
-SPDX-FileCopyrightText: Copyright (c) 2006, 2008 Junio C Hamano
-SPDX-FileCopyrightText: Copyright 2011, The Dojo Foundation
-SPDX-FileCopyrightText: Copyright (c) 1999-2009 KEIL, 2009-2016 ARM Germany GmbH. All rights reserved.
-SPDX-FileCopyrightText: Copyright (c) 2006, 2007 CodeSourcery Inc
-SPDX-FileCopyrightText: Copyright (c) 2010 "Cowboy" Ben Alman
-SPDX-FileCopyrightText: Copyright 1997-2016 Freescale Semiconductor, Inc.
-SPDX-FileCopyrightText: Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
-SPDX-FileCopyrightText: Copyright 2011, John Resig
-SPDX-FileCopyrightText: Copyright 2016-2021 NXP
-SPDX-FileCopyrightText: Copyright (c) 2012 mbed.org
-SPDX-FileCopyrightText: Copyright (c) 2012-2017 Keil Software. All rights reserved.
-SPDX-FileCopyrightText: Copyright (C) 2009 by Dimitri van Heesch.
-SPDX-FileCopyrightText: Copyright (c) 2017-2021 IAR Systems
-SPDX-FileCopyrightText: Copyright (C) 2003-2008 Greg Valure
-SPDX-FileCopyrightText: Copyright 2015 gRPC authors.
-SPDX-FileCopyrightText: Copyright 2018 Dan Field. All rights reserved.
-SPDX-FileCopyrightText: Copyright 2014 Stefan.Eilemann@epfl.ch
-SPDX-FileCopyrightText: Copyright (c) 2016, the Dart project authors
-SPDX-FileCopyrightText: Copyright 2015 The Chromium Authors
-SPDX-FileCopyrightText: Copyright (C) 2019 Free Software Foundation, Inc.
-SPDX-FileCopyrightText: Copyright (c) 2021, Vasyl Gello.
-SPDX-FileCopyrightText: Copyright 2020 Jan Tojnar
-SPDX-FileCopyrightText: Copyright 2017-2022 The TensorFlow Authors. All Rights Reserved.
-SPDX-FileCopyrightText: Copyright 2014-2022 Google Inc. All rights reserved.
-SPDX-FileCopyrightText: Copyright 2015-2018 The Gemmlowp Authors. All rights reserved.
-SPDX-FileCopyrightText: Copyright (c) 2003-2019, Mark Borgerding. All rights reserved.
-SPDX-FileCopyrightText: Copyright 2019-2022 The Pigweed Authors
-SPDX-FileCopyrightText: Copyright 2019-2021 Google LLC. All Rights Reserved.
-
-SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause and CC-PDDC
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/backend-config.json b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U55-Default-noTA/backend-config.json
index a56e49d..f7ee996 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Sram_Only-TA/backend-config.json
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U55-Default-noTA/backend-config.json
@@ -1,6 +1,6 @@
 [
   {
-    "name": "Generic Inference Runner: Ethos-U55 SRAM",
+    "name": "Generic Inference Runner: Ethos-U55",
     "description": "This application allows running inferences using custom NN TensorFlow Lite models on Ethos-U. No data pre-/post-processing is executed.",
     "supported_systems": [
       {
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U65-Dedicated_Sram-TA/backend-config.json.license b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U55-Default-noTA/backend-config.json.license
index 9b83bfc..9b83bfc 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U65-Dedicated_Sram-TA/backend-config.json.license
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U55-Default-noTA/backend-config.json.license
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U55-Default-noTA/ethos-u-inference_runner.axf b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U55-Default-noTA/ethos-u-inference_runner.axf
new file mode 100644
index 0000000..2e2a574
--- /dev/null
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U55-Default-noTA/ethos-u-inference_runner.axf
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U65-Dedicated_Sram-TA/ethos-u-inference_runner.axf.license b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U55-Default-noTA/ethos-u-inference_runner.axf.license
index 8896f92..8896f92 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-300-22.05.01-ethos-U65-Dedicated_Sram-TA/ethos-u-inference_runner.axf.license
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U55-Default-noTA/ethos-u-inference_runner.axf.license
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Shared_Sram-TA/backend-config.json b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U65-Default-noTA/backend-config.json
index 0bdbd27..21d8239 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Shared_Sram-TA/backend-config.json
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U65-Default-noTA/backend-config.json
@@ -1,10 +1,10 @@
 [
   {
-    "name": "Generic Inference Runner: Ethos-U55/65 Shared SRAM",
+    "name": "Generic Inference Runner: Ethos-U65",
     "description": "This application allows running inferences using custom NN TensorFlow Lite models on Ethos-U. No data pre-/post-processing is executed.",
     "supported_systems": [
       {
-        "name": "Corstone-310: Cortex-M85+Ethos-U55"
+        "name": "Corstone-310: Cortex-M85+Ethos-U65"
       }
     ],
     "variables": {
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Shared_Sram-TA/backend-config.json.license b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U65-Default-noTA/backend-config.json.license
index 9b83bfc..9b83bfc 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Shared_Sram-TA/backend-config.json.license
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U65-Default-noTA/backend-config.json.license
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U65-Default-noTA/ethos-u-inference_runner.axf b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U65-Default-noTA/ethos-u-inference_runner.axf
new file mode 100644
index 0000000..20dff50
--- /dev/null
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U65-Default-noTA/ethos-u-inference_runner.axf
diff --git a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Shared_Sram-TA/ethos-u-inference_runner.axf.license b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U65-Default-noTA/ethos-u-inference_runner.axf.license
index 8896f92..8896f92 100644
--- a/src/mlia/resources/backends/applications/inference_runner-sse-310-22.05.01-ethos-U55-Shared_Sram-TA/ethos-u-inference_runner.axf.license
+++ b/src/mlia/resources/backends/applications/inference_runner-sse-310-22.08.02-ethos-U65-Default-noTA/ethos-u-inference_runner.axf.license