Fix Arm(R) Ethos(TM)-U55 NPU Demo app (apache#9323)

* Change tvmc arguments to -executor=aot -interface-api=c -unpacked-api=1. * Enable the demo running on the CI.
ylc · Jan 7, 2022 · c8962a5 · c8962a5
1 parent 554737b
commit c8962a5
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/apps/microtvm/ethosu/Makefile b/apps/microtvm/ethosu/Makefile
@@ -28,7 +28,7 @@ CMSIS_PATH ?= ${ETHOSU_PATH}/cmsis
 ETHOSU_PLATFORM_PATH ?= ${ETHOSU_PATH}/core_platform
 CORSTONE_300_PATH = ${ETHOSU_PLATFORM_PATH}/targets/corstone-300
 PKG_COMPILE_OPTS = -g -Wall -O2 -Wno-incompatible-pointer-types -Wno-format -mcpu=cortex-m55 -mthumb -mfloat-abi=hard -std=gnu99
-CMAKE = cmake
+CMAKE ?= cmake
 CC = arm-none-eabi-gcc
 AR = arm-none-eabi-ar
 RANLIB = arm-none-eabi-ranlib

diff --git a/apps/microtvm/ethosu/run_demo.sh b/apps/microtvm/ethosu/run_demo.sh
@@ -32,6 +32,10 @@ Usage: run_demo.sh [--ethosu_driver_path ETHOSU_DRIVER_PATH]
     Set path to CMSIS.
 --ethosu_platform_path ETHOSU_PLATFORM_PATH
     Set path to Arm(R) Ethos(TM)-U core platform.
+--fvp_path FVP_PATH
+   Set path to FVP.
+--cmake_path
+   Set path to cmake.
 EOF
 }
 
@@ -79,6 +83,30 @@ while (( $# )); do
             fi
             ;;
 
+        --fvp_path)
+            if [ $# -gt 1 ]
+            then
+                export PATH="$2/models/Linux64_GCC-6.4:$PATH"
+                shift 2
+            else
+                echo 'ERROR: --fvp_path requires a non-empty argument' >&2
+                show_usage >&2
+                exit 1
+            fi
+            ;;
+
+        --cmake_path)
+            if [ $# -gt 1 ]
+            then
+                export CMAKE="$2"
+                shift 2
+            else
+                echo 'ERROR: --cmake_path requires a non-empty argument' >&2
+                show_usage >&2
+                exit 1
+            fi
+            ;;            
+
         -*|--*)
             echo "Error: Unknown flag: $1" >&2
             show_usage >&2
@@ -100,8 +128,10 @@ mobilenet_url='https://storage.googleapis.com/download.tensorflow.org/models/mob
 curl --retry 64 -sSL ${mobilenet_url} | gunzip | tar -xvf - ./mobilenet_v1_1.0_224_quant.tflite
 
 # Compile model for Arm(R) Cortex(R)-M55 CPU and Ethos(TM)-U55 NPU
-tvmc compile --target="ethos-u -accelerator_config=ethos-u55-256, \
-    c -runtime=c --link-params -mcpu=cortex-m55 --executor=aot --interface-api=c --unpacked-api=1" \
+# An alternative to using "python3 -m tvm.driver.tvmc" is to call
+# "tvmc" directly once TVM has been pip installed.
+python3 -m tvm.driver.tvmc compile --target="ethos-u -accelerator_config=ethos-u55-256, \
+    c -runtime=c --link-params -mcpu=cortex-m55 -executor=aot -interface-api=c -unpacked-api=1" \
     --pass-config tir.disable_vectorize=1 ./mobilenet_v1_1.0_224_quant.tflite --output-format=mlf
 tar -xvf module.tar
 

diff --git a/tests/scripts/task_cpp_unittest.sh b/tests/scripts/task_cpp_unittest.sh
@@ -45,3 +45,11 @@ cd apps/bundle_deploy
 rm -rf build
 make test_dynamic test_static
 cd ../..
+
+# Test Arm(R) Cortex(R)-M55 CPU and Ethos(TM)-U55 NPU demo app
+FVP_PATH="/opt/arm/FVP_Corstone_SSE-300_Ethos-U55"
+if test -d $FVP_PATH && pip3 list | grep vela; then
+    cd apps/microtvm/ethosu
+    ./run_demo.sh --fvp_path $FVP_PATH --cmake_path /opt/arm/cmake/bin/cmake
+    cd ../../..
+fi