Improve --one-shot code generation on MAX78002 (#148)

* Block --one-shot on unsupported devices
* Allow --one-shot in combination with --no-wfi

Author: Robert Muchsel

izer/backend/max7800x.py

@@ -206,6 +206,9 @@ def create_net(self) -> str:  # pylint: disable=too-many-locals,too-many-branche
         if snoop is not None and not tc.dev.SUPPORT_SNOOP:
             eprint("`snoop` is not supported on this device.")
 
+        if oneshot and not tc.dev.SUPPORT_ONESHOT:
+            eprint("`--one-shot` is not supported on this device.")
+
         if state.pipeline is None:
             state.pipeline = tc.dev.SUPPORT_PIPELINE
         pipeline = state.pipeline  # Cache

izer/toplevel.py

@@ -656,27 +656,33 @@ def main(
             memfile.write('    cnn_start(); // Run inference\n')
             if fifo:
                 memfile.write('    load_input(); // Load data input via FIFO\n')
-            if not riscv:
-                memfile.write('    SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk; // SLEEPDEEP=0\n')
-            memfile.write('    while (cnn_time == 0)\n')
-            if not riscv:
-                memfile.write('      __WFI(); // Wait for CNN\n')
+            if state.wfi:
+                if not riscv:
+                    memfile.write('    SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk; // SLEEPDEEP=0\n')
+                memfile.write('    while (cnn_time == 0)\n')
+                if not riscv:
+                    memfile.write('      __WFI(); // Wait for CNN\n')
+                else:
+                    memfile.write('      asm volatile("wfi"); // Wait for CNN\n')
             else:
-                memfile.write('      asm volatile("wfi"); // Wait for CNN\n')
+                memfile.write('    while (cnn_time == 0); // Spin wait\n')
             memfile.write('  }\n'
                           '  CNN_COMPLETE;\n\n')
 
         if oneshot > 0:
             memfile.write(f'  for (i = 0; i < {oneshot}; i++) {{\n')
             memfile.write('    cnn_continue();\n')
             if embedded_code or tc.dev.MODERN_SIM:
-                if not riscv:
-                    memfile.write('    SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk; // SLEEPDEEP=0\n')
-                memfile.write('    while (cnn_time == 0)\n')
-                if not riscv:
-                    memfile.write('      __WFI(); // Wait for CNN\n')
+                if state.wfi:
+                    if not riscv:
+                        memfile.write('    SCB->SCR &= ~SCB_SCR_SLEEPDEEP_Msk; // SLEEPDEEP=0\n')
+                    memfile.write('    while (cnn_time == 0)\n')
+                    if not riscv:
+                        memfile.write('      __WFI(); // Wait for CNN\n')
+                    else:
+                        memfile.write('      asm volatile("wfi"); // Wait for CNN\n')
                 else:
-                    memfile.write('      asm volatile("wfi"); // Wait for CNN\n')
+                    memfile.write('    while (cnn_time == 0); // Spin wait\n')
             else:
                 memfile.write('    cnn_wait();\n')
             memfile.write('  }\n\n')

izer/tornadocnn.py

@@ -38,6 +38,7 @@ class Dev:
     SUPPORT_FIFO_GO = False
     SUPPORT_SNOOP = False
     SUPPORT_STREAM_NONPAD_FINAL = False
+    SUPPORT_ONESHOT = False
     REQUIRE_REG_CLEAR = False
     REQUIRE_SEMA_LPWKEN = False
     REQUIRE_ONESHOT_CLEAR = True
@@ -459,6 +460,7 @@ class DevAI87(Dev):
     SUPPORT_FIFO_GO = True
     SUPPORT_SNOOP = True
     SUPPORT_STREAM_NONPAD_FINAL = True
+    SUPPORT_ONESHOT = True
     SUPPORTED_X2D_PADS = [0, 1, 2]
     SUPPORTED_X2D_OUTPUT_PADS = [1]
     REQUIRE_REG_CLEAR = True