fixed for physical devices

apache · May 21, 2021 · 8c7a4be · 8c7a4be
1 parent 90ae471
commit 8c7a4be
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 122 deletions.
diff --git a/apps/microtvm/zephyr/aot_demo/boards/nrf5340dk_nrf5340_cpuapp.conf b/apps/microtvm/zephyr/aot_demo/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -20,7 +20,7 @@
 # For intrinsics used by generated optimized operators.
 CONFIG_CMSIS_DSP=y
 
-# Required for Cortex-M33 devices.
+# For AOT runtime which requires lots of function call.
 CONFIG_MAIN_STACK_SIZE=18000
 
 # For random number generation.

diff --git a/apps/microtvm/zephyr/aot_demo/boards/nucleo_f746zg.conf b/apps/microtvm/zephyr/aot_demo/boards/nucleo_f746zg.conf
diff --git a/apps/microtvm/zephyr/aot_demo/boards/qemu_riscv32.conf b/apps/microtvm/zephyr/aot_demo/boards/qemu_riscv32.conf
diff --git a/apps/microtvm/zephyr/aot_demo/boards/qemu_riscv64.conf b/apps/microtvm/zephyr/aot_demo/boards/qemu_riscv64.conf
diff --git a/apps/microtvm/zephyr/aot_demo/boards/qemu_x86.conf b/apps/microtvm/zephyr/aot_demo/boards/qemu_x86.conf
@@ -21,6 +21,5 @@
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_TIMER_RANDOM_GENERATOR=y
 
-# Default stack size is 1k, this is required for debug mode and
-# for AOT mode.
-CONFIG_MAIN_STACK_SIZE=18000
+# Default stack size is 1k, this is required for debug mode. 
+CONFIG_MAIN_STACK_SIZE=2000
diff --git a/apps/microtvm/zephyr/aot_demo/boards/stm32f746g_disco.conf b/apps/microtvm/zephyr/aot_demo/boards/stm32f746g_disco.conf
diff --git a/apps/microtvm/zephyr/aot_demo/src/main.c b/apps/microtvm/zephyr/aot_demo/src/main.c
@@ -176,7 +176,7 @@ void main(void) {
   write_serial(g_wakeup_sequence, 12);
 
   // Wait for start command
-  while(true) {
+  while (true) {
     int bytes_read = uart_rx_buf_read(main_rx_buf, sizeof(main_rx_buf));
     if (bytes_read > 0) {
       memcpy((char*)cmd_buf + g_cmd_buf_ind, main_rx_buf, bytes_read);

diff --git a/tests/micro/zephyr/test_zephyr_aot.py b/tests/micro/zephyr/test_zephyr_aot.py
@@ -142,11 +142,17 @@ def _create_header_file(tensor_name, npy_data, output_path):
 
 def _read_line(fd):
     data = ""
-    new_c = ""
-    while new_c != "\n":
-        new_c = fd.read(1, timeout_sec=10)
-        new_c = new_c.decode("ascii")
-        data = data + new_c
+    new_line = False
+    while True:
+        if new_line:
+            break
+        new_data = fd.read(1, timeout_sec=10)
+        for item in new_data:
+            new_c = chr(item)
+            data = data + new_c
+            if new_c == "\n":
+                new_line = True
+                break
     return data