Arm backend: Fix error message if toolchain is bad (#13275)

Fixes #12858
Fixes #12859

Signed-off-by: Zingo Andersen <[email protected]>

Author: zingo

backends/arm/scripts/build_executor_runner.sh

@@ -47,11 +47,11 @@ help() {
     echo "  --output=<FOLDER>               Output folder Default: <MODEL>/<MODEL>_<TARGET INFO>.pte"
     echo "  --et_build_root=<FOLDER>        Build output root folder to use, defaults to ${et_build_root}"
     echo "  --ethosu_tools_dir=<FOLDER>     Path to your Ethos-U tools dir if you not using default: ${ethosu_tools_dir}"
-    echo "  --toolchain=<TOOLCHAIN>         Toolchain can be specified (e.g. bare metal as arm-none-eabi-gcc or zephyr as arm-zephyr-eabi-gcc"
+    echo "  --toolchain=<TOOLCHAIN>         Toolchain can be specified (e.g. bare metal as arm-none-eabi-gcc or zephyr as arm-zephyr-eabi-gcc Default: ${toolchain}"
     echo "  --select_ops_list=<OPS>         Comma separated list of portable (non delagated) kernels to include Default: ${select_ops_list}"
     echo "                                     NOTE: This is used when select_ops_model is not possible to use, e.g. for semihosting or bundleio."
     echo "                                     See https://docs.pytorch.org/executorch/stable/kernel-library-selective-build.html for more information."
-   exit 0
+    exit 0
 }
 
 for arg in "$@"; do
@@ -80,7 +80,7 @@ if [[ ${toolchain} == "arm-none-eabi-gcc" ]]; then
 elif [[ ${toolchain} == "arm-zephyr-eabi-gcc" ]]; then 
     toolchain_cmake=${et_root_dir}/examples/zephyr/x86_64-linux-arm-zephyr-eabi-gcc.cmake
 else
-    echo "Error: Invalid toolchain selection, provided: ${tolchain}"
+    echo "Error: Invalid toolchain selection, provided: ${toolchain}"
     echo "    Valid options are {arm-none-eabi-gcc, arm-zephyr-eabi-gcc}"
     exit 1;
 fi

backends/arm/scripts/build_executorch.sh

@@ -29,7 +29,7 @@ help() {
     echo "  --build_type=<TYPE>       Build with Release, Debug or RelWithDebInfo, default is ${build_type}"
     echo "  --devtools                Build Devtools libs"
     echo "  --etdump                  Adds Devtools etdump support to track timing, etdump area will be base64 encoded in the log"
-    echo "  --toolchain=<TOOLCHAIN>   Toolchain can be specified (e.g. bare metal as arm-none-eabi-gcc or zephyr as arm-zephyr-eabi-gcc"
+    echo "  --toolchain=<TOOLCHAIN>   Toolchain can be specified (e.g. bare metal as arm-none-eabi-gcc or zephyr as arm-zephyr-eabi-gcc Default: ${toolchain}"
     exit 0
 }
 
@@ -51,7 +51,7 @@ if [[ ${toolchain} == "arm-none-eabi-gcc" ]]; then
 elif [[ ${toolchain} == "arm-zephyr-eabi-gcc" ]]; then
     toolchain_cmake=${et_root_dir}/examples/zephyr/x86_64-linux-arm-zephyr-eabi-gcc.cmake
 else
-    echo "Error: Invalid toolchain selection, provided: ${tolchain}"
+    echo "Error: Invalid toolchain selection, provided: ${toolchain}"
     echo "    Valid options are {arm-none-eabi-gcc, arm-zephyr-eabi-gcc}"
     exit 1;
 fi

backends/arm/scripts/build_portable_kernels.sh

@@ -4,4 +4,4 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-echo "DEPRECATED: build_portable_kernels.sh is deprecated and will be removed. The kernel registration library is now built directly with the arm_executor_runner."
+echo "DEPRECATED: build_portable_kernels.sh is deprecated and will be removed. The kernel registration library is now built directly with the arm_executor_runner."

examples/arm/run.sh

@@ -65,6 +65,7 @@ function help() {
     echo "                                            NOTE: If given, this option must match the given target. This option also sets timing adapter values customized for specific hardware, see ./executor_runner/CMakeLists.txt."
     echo "  --config=<FILEPATH>                    System configuration file that specifies system configurations (vela.ini)"
     echo "  --memory_mode=<MODE>                   Memory mode to select from the Vela configuration file (see vela.ini), e.g. Shared_Sram/Sram_Only. Default: 'Shared_Sram' for Ethos-U55 targets, 'Sram_Only' for Ethos-U85 targets"
+    echo "  --toolchain=<TOOLCHAIN>                Toolchain can be specified (e.g. bare metal as arm-none-eabi-gcc or zephyr as arm-zephyr-eabi-gcc Default: ${toolchain}"
     echo "  --et_build_root=<FOLDER>               Executorch build output root folder to use, defaults to ${et_build_root}"
     echo "  --scratch-dir=<FOLDER>                 Path to your Ethos-U scrach dir if you not using default ${ethos_u_scratch_dir}"
     exit 0
@@ -106,7 +107,7 @@ if [[ ${toolchain} == "arm-none-eabi-gcc" ]]; then
 elif [[ ${toolchain} == "arm-zephyr-eabi-gcc" ]]; then 
     toolchain_cmake=${et_root_dir}/examples/zephyr/x86_64-linux-arm-zephyr-eabi-gcc.cmake
 else
-    echo "Error: Invalid toolchain selection, provided: ${tolchain}"
+    echo "Error: Invalid toolchain selection, provided: ${toolchain}"
     echo "    Valid options are {arm-none-eabi-gcc, arm-zephyr-eabi-gcc}"
     exit 1;
 fi