Generalize test models to be reused

Change-Id: I47705cfde2788fa74f8bbcd07100188e4690dbf2

9 files changed, 27 insertions, 21 deletions

diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/input.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/input.h
index 6ceab5d..44dcd43 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/input.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -48,4 +48,4 @@ unsigned char inputData[] __attribute__((aligned(16), section("input_data_sec"))
     0x98, 0xbc, 0x57, 0xb4, 0x26, 0x2a, 0x3e, 0x8e, 0x85, 0x26, 0xa7, 0x50, 0x5e, 0xa2, 0x12, 0x71, 0x9d, 0x5f, 0xe5,
     0x8f, 0x18, 0x86, 0x4f, 0x08, 0x49, 0xca, 0xe9, 0xbe, 0x49, 0x7a, 0x4d, 0x1e, 0xe7, 0x10, 0x55, 0x47, 0x85, 0x26,
     0xed, 0xbd, 0x53, 0x75, 0x13, 0xac, 0x0c, 0x99, 0xa5, 0x66, 0x7b, 0xe4, 0xe1, 0x18, 0x22, 0xb7, 0x37, 0x26, 0xbe,
-    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
\ No newline at end of file
+    0xea, 0xc7, 0x44, 0xcc, 0xce, 0x0e, 0x50, 0x66, 0x48, 0x6b, 0x8e, 0x2e, 0x65, 0x81, 0xc6};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h
index fb8950b..eb3ff23 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u65-256 --memory-mode Shared_Sram cnn_s_quantized.tflite
  * Hexdump: xxd -i cnn_s_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 50000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 50000;
 
 const char *modelName = "keyword_spotting_cnn_small_int8";
 
@@ -4063,4 +4065,4 @@ unsigned char networkModelData[] __attribute__((aligned(16), section("network_mo
     0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01, 0x00, 0x00,
     0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00,
     0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x65,
-    0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/output.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/output.h
index a1b0422..cf9d440 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/output.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_cnn_small_int8/output.h
@@ -18,9 +18,9 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_cnn_small_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/cnn_small/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/cnn_small/tflite_int8
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0xba, 0x80, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x45};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/input.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/input.h
index c075960..ae75244 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/input.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/input.h
@@ -18,7 +18,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -36,4 +36,4 @@ unsigned char inputData[] __attribute__((aligned(16), section("input_data_sec"))
     0x21, 0x90, 0xc5, 0x35, 0x6c, 0x3e, 0x7a, 0xf1, 0x53, 0xee, 0x90, 0x47, 0x4b, 0xf2, 0xfa, 0xa7, 0x76, 0x31,
     0x10, 0xbd, 0xf0, 0x04, 0x59, 0x45, 0x86, 0x0c, 0x6b, 0x72, 0xb5, 0x59, 0x0c, 0x05, 0x67, 0xfc, 0x8c, 0x80,
     0x82, 0x86, 0xbb, 0xbe, 0xbf, 0x5f, 0x80, 0x6e, 0x17, 0x2f, 0x6c, 0x5b, 0x7b, 0x04, 0xe3, 0x42, 0xbf, 0xf4,
-    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
\ No newline at end of file
+    0xac, 0x03, 0xdd, 0x18, 0x11, 0x61, 0xe8, 0x6f, 0x58, 0xc8, 0xa0, 0xef, 0x8e, 0x16, 0x2f, 0xc5};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h
index e8e51bb..95d8d09 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/model.h
@@ -18,12 +18,14 @@
 
 /*************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Vela optimisation: vela --accelerator-config ethos-u65-256 --memory-mode Shared_Sram dnn_m_quantized.tflite
  * Hexdump: xxd -i dnn_m_quantized_vela.tflite model.h
  ************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 2000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 2000;
 
 const char *modelName = "keyword_spotting_dnn_medium_int8";
 
@@ -10457,4 +10459,4 @@ unsigned char networkModelData[] __attribute__((aligned(16), section("network_mo
     0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00, 0x01,
     0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00,
     0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00,
-    0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/output.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/output.h
index 7458eff..f4c8a4b 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/output.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_dnn_medium_int8/output.h
@@ -18,10 +18,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_dnn_medium_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/dnn_medium/tflite_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/dnn_medium/tflite_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h
index a9f3cc5..47f72f3 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/input.h
@@ -19,7 +19,7 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("input.npy");i.tofile("input.bin");' && xxd -i input.bin > input.h
  ******************************************************************************************************************/
 
@@ -49,4 +49,4 @@ unsigned char inputData[] __attribute__((aligned(16), section("input_data_sec"))
     0xe3, 0x42, 0x94, 0x7e, 0x6f, 0xf8, 0x8e, 0x1d, 0xcc, 0x4e, 0xf2, 0xce, 0xa5, 0x92, 0x54, 0xfe, 0xce, 0xf0, 0xf2,
     0xb1, 0x2c, 0xa8, 0x6e, 0x5a, 0x16, 0xf4, 0xa8, 0x4f, 0xdb, 0x1f, 0x86, 0xe0, 0x7b, 0x87, 0xd6, 0x95, 0x54, 0x35,
     0x56, 0x66, 0xb4, 0x15, 0x96, 0xca, 0xd3, 0xf0, 0x39, 0x18, 0xb6, 0x70, 0xde, 0x5e, 0xbd, 0x04, 0x0e, 0x12, 0xf8,
-    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
\ No newline at end of file
+    0xd1, 0x2f, 0xbf, 0xb1, 0xfd, 0x10, 0x40, 0x50, 0x72, 0xc4, 0x83, 0x03, 0xca, 0x05, 0xcd};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
index 3d49e8d..f1bfb74 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/model.h
@@ -19,12 +19,14 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Vela optimisation: vela --accelerator-config ethos-u65-256 --memory-mode Shared_Sram ds_cnn_clustered_int8.tflite
  * Hexdump: xxd -i ds_cnn_clustered_int8_vela.tflite model.h
  ******************************************************************************************************************/
 
-#define TENSOR_ARENA_SIZE 300000
+#include <stddef.h>
+
+const size_t tensorArenaSize = 300000;
 
 const char *modelName = "keyword_spotting_ds_cnn_large_clustered_int8";
 
@@ -23871,4 +23873,4 @@ unsigned char networkModelData[] __attribute__((aligned(16), section("network_mo
     0x00, 0x00, 0x00, 0x56, 0x65, 0x6c, 0x61, 0x20, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x73, 0x65, 0x64, 0x00, 0x00,
     0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x10, 0x00, 0x0f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08,
     0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x00,
-    0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
\ No newline at end of file
+    0x00, 0x00, 0x65, 0x74, 0x68, 0x6f, 0x73, 0x2d, 0x75, 0x00};
diff --git a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h
index 4b9689f..44e333d 100644
--- a/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h
+++ b/applications/baremetal/models/ethos-u65-256/keyword_spotting_ds_cnn_large_clustered_int8/output.h
@@ -19,10 +19,10 @@
 
 /******************************************************************************************************************
  * Model: keyword_spotting_ds_cnn_large_clustered_int8
- * Source: https://github.com/ARM-software/ML-zoo/tree/master/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
+ * Source: https://github.com/ARM-software/ML-zoo/tree/22.02/models/keyword_spotting/ds_cnn_large/tflite_clustered_int8
  * Hexdump: python3 -c 'import numpy;i=numpy.load("output.npy");i.tofile("output.bin");' && xxd -i output.bin > output.h
  ******************************************************************************************************************/
 
 unsigned char expectedOutputData[] __attribute__((
     aligned(16),
-    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};
\ No newline at end of file
+    section("expected_output_data_sec"))) = {0x80, 0x3d, 0x80, 0x80, 0x80, 0x80, 0x82, 0x80, 0x80, 0x80, 0x80, 0xc1};