extend snitch support

.gitmodules

@@ -6,4 +6,7 @@
 	url = https://github.com/pulp-platform/pulp-nnx.git
 [submodule "CMSIS-NN"]
 	path = TargetLibraries/CMSIS/third_party/CMSIS-NN
-	url = https://github.com/ARM-software/CMSIS-NN.git
+	url = https://github.com/ARM-software/CMSIS-NN.git
+[submodule "TargetLibraries/Snitch/third_party/pulp-nn-mixed"]
+	path = TargetLibraries/Snitch/third_party/pulp-nn-mixed
+	url = https://github.com/Victor-Jung/pulp-nn-mixed.git

DeeployTest/Platforms/Snitch/main.c

@@ -31,6 +31,10 @@
 #include "testinputs.h"
 #include "testoutputs.h"
 
+// #define NOPRINT
+// #define NOTEST
+// #define CI
+
 int main(void) {
 
   uint32_t core_id = snrt_global_core_idx();
@@ -48,8 +52,9 @@ int main(void) {
            snrt_global_compute_core_num(), snrt_cluster_num() * snrt_cluster_dm_core_num(), snrt_cluster_num());
 #endif
 
+#ifndef NOPRINT
     printf("Initializing...\r\n");
-
+#endif
     InitNetwork(core_id, 1);
 
 #ifndef CI
@@ -59,15 +64,17 @@ int main(void) {
              DeeployNetwork_inputs_bytes[buf]);
     }
     for (uint32_t buf = 0; buf < DeeployNetwork_num_outputs; buf++) {
-      printf("testInputVector%d @ %p\r\n", buf, testOutputVector[buf]);
+      printf("testOutputVector%d @ %p\r\n", buf, testOutputVector[buf]);
       printf("DeeployNetwork_output_%d @ %p and %u elements\r\n", buf, DeeployNetwork_outputs[buf],
              DeeployNetwork_outputs_bytes[buf]);
     }
 
     printf("Initialized\r\n");
 #endif
 
+#ifndef NOPRINT
     printf("Copy inputs...\r\n");
+#endif
 
     // WIESEP: Copy inputs to allocated memory
     for (uint32_t buf = 0; buf < DeeployNetwork_num_inputs; buf++) {
@@ -80,18 +87,31 @@ int main(void) {
 #endif
   }
 
+#ifndef NOPRINT
+  if (snrt_is_dm_core()) {
+    printf("Running network...\r\n");
+  }
+#endif
+
   snrt_cluster_hw_barrier();
 
+#ifndef BANSHEE_SIMULATION
   if (snrt_is_dm_core()) {
-    printf("Running network...\r\n");
+    ResetTimer();
+    StartTimer();
   }
+#endif // BANSHEE_SIMULATION
 
-  // ResetTimer();
-  // StartTimer();
-  if (snrt_is_compute_core()) {
-    RunNetwork(compute_core_id, num_compute_cores);
+  RunNetwork(compute_core_id, num_compute_cores);
+
+  uint32_t runtimeCycles = 0;
+#ifndef BANSHEE_SIMULATION
+  if (snrt_is_dm_core()) {
+    runtimeCycles = getCycles();
+    DUMP(runtimeCycles);
+    StopTimer();
   }
-  // StopTimer();
+#endif // BANSHEE_SIMULATION
 
   snrt_cluster_hw_barrier();
 
@@ -105,6 +125,8 @@ int main(void) {
 #ifndef CI
     printf("Output:\r\n");
 #endif
+
+#ifndef NOTEST
     int32_t tot_err = 0;
     uint32_t tot = 0;
     int32_t diff;
@@ -127,8 +149,12 @@ int main(void) {
         }
       }
     }
-    printf("Runtime: %u cycles\r\n", getCycles());
     printf("Errors: %u out of %u \r\n", tot_err, tot);
+#endif
+
+#ifndef NOPRINT
+    printf("Runtime: %u cycles\r\n", runtimeCycles);
+#endif
   }
 
   snrt_cluster_hw_barrier();

DeeployTest/Tests/TestAdderLarge/network.onnx

@@ -0,0 +1,22 @@
+	onnx1.14.0:�

+&
+input_0
+input_1output_0Add"AddAddNetZ#
+input_0
+

+

+

+�

+�
Z#
+input_1
+

+

+

+�

+�
b$
+output_0
+
+

+

+�

+�
B

DeeployTest/testRunner_tiled_snitch.py

@@ -37,9 +37,17 @@
                         default = 9,
                         help = 'Set number of cluster cores')
     parser.set_defaults(toolchain_install_dir = "/usr/pack/riscv-1.0-kgf/pulp-llvm-0.12.0")
+    parser.add_argument('--simulator',
+                        metavar = "<simulator>",
+                        dest = "simulator",
+                        type = str,
+                        choices = ["banshee", "vsim", "vsim.gui"],
+                        default = "banshee",
+                        help = "Select the simulator to use")
+
     args = parser.parse_args()
 
-    testRunner = TestRunner(platform = "Snitch", simulator = "banshee", tiling = True, argument_parser = parser)
+    testRunner = TestRunner(platform = "Snitch", simulator = args.simulator, tiling = True, argument_parser = parser)
 
     testRunner.cmake_args += f" -D NUM_CORES={args.cores}"