Something broke when trying to overload arm-none-eabi-gcc.cmake file, add example does not run anymore

Github Executorch · Github Executorch · commit a010e151768e · 2025-06-27T00:27:00.000Z
diff --git a/backends/arm/scripts/build_executor_runner.sh b/backends/arm/scripts/build_executor_runner.sh
@@ -135,7 +135,27 @@ if [ "$build_with_etdump" = true ] ; then
 fi
 
 echo "Building with BundleIO/etdump/extra flags: ${build_bundleio_flags} ${build_with_etdump_flags} ${extra_build_flags}"
+echo "toolchain_cmake set to ${toolchain_cmake}"
+echo "$(pwd)"
 
+echo "
+cmake \
+    -DCMAKE_BUILD_TYPE=${build_type}            \
+    -DCMAKE_TOOLCHAIN_FILE=${toolchain_cmake}   \
+    -DTARGET_CPU=${target_cpu}                  \
+    -DET_DIR_PATH:PATH=${et_root_dir}           \
+    -DET_BUILD_DIR_PATH:PATH=${et_build_dir}    \
+    -DET_PTE_FILE_PATH:PATH="${pte_file}"       \
+    -DETHOS_SDK_PATH:PATH=${ethos_u_root_dir}   \
+    -DETHOSU_TARGET_NPU_CONFIG=${target}        \
+    ${build_bundleio_flags}                     \
+    ${build_with_etdump_flags}                  \
+    -DPYTHON_EXECUTABLE=$(which python3)        \
+    -DSYSTEM_CONFIG=${system_config}            \
+    -DMEMORY_MODE=${memory_mode}                \
+    ${extra_build_flags}                        \
+    -B ${output_folder}/cmake-out
+"
 cmake \
     -DCMAKE_BUILD_TYPE=${build_type}            \
     -DCMAKE_TOOLCHAIN_FILE=${toolchain_cmake}   \
diff --git a/examples/arm/setup.sh b/examples/arm/setup.sh
@@ -17,17 +17,21 @@ et_dir=$(realpath $script_dir/../..)
 ARCH="$(uname -m)"
 OS="$(uname -s)"
 root_dir="${script_dir}/ethos-u-scratch"
-user_toolchain_url=""
-user_toolchain_dir=""
 eula_acceptance=0
 skip_toolchain_setup=0
+target_toolchain=""
 skip_fvp_setup=0
 skip_vela_setup=0
 
 
 # Figure out if setup.sh was called or sourced and save it into "is_script_sourced"
 (return 0 2>/dev/null) && is_script_sourced=1 || is_script_sourced=0
 
+# Global scope these so they can be set later
+toolchain_url=""
+toolchain_dir=""
+toolchain_md5_checksum=""
+
 if [[ "${ARCH}" == "x86_64" ]]; then
     # FVPs
     corstone300_url="https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/Corstone-300/FVP_Corstone_SSE-300_11.22_20_Linux64.tgz?rev=018659bd574f4e7b95fa647e7836ccf4&hash=22A79103C6FA5FFA7AFF3BE0447F3FF9"
@@ -37,11 +41,6 @@ if [[ "${ARCH}" == "x86_64" ]]; then
     corstone320_url="https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/Corstone-320/FVP_Corstone_SSE-320_11.27_25_Linux64.tgz?rev=a507bffc219a4d5792f1192ab7002d89&hash=D9A824AA8227D2E679C9B9787FF4E8B6FBE3D7C6"
     corstone320_model_dir="Linux64_GCC-9.3"
     corstone320_md5_checksum="3deb3c68f9b2d145833f15374203514d"
-
-    # toochain
-    toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz"
-    toolchain_dir="arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi"
-    toolchain_md5_checksum="0601a9588bc5b9c99ad2b56133b7f118"
 elif [[ "${ARCH}" == "aarch64" ]] || [[ "${ARCH}" == "arm64" ]]; then
     # FVPs
     corstone300_url="https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/Corstone-300/FVP_Corstone_SSE-300_11.22_20_Linux64_armv8l.tgz?rev=9cc6e9a32bb947ca9b21fa162144cb01&hash=7657A4CF27D42E892E3F08D452AAB073"
@@ -51,17 +50,6 @@ elif [[ "${ARCH}" == "aarch64" ]] || [[ "${ARCH}" == "arm64" ]]; then
     corstone320_url="https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/Corstone-320/FVP_Corstone_SSE-320_11.27_25_Linux64_armv8l.tgz?rev=b6ebe0923cb84f739e017385fd3c333c&hash=8965C4B98E2FF7F792A099B08831FE3CB6120493"
     corstone320_model_dir="Linux64_armv8l_GCC-9.3"
     corstone320_md5_checksum="3889f1d80a6d9861ea4aa6f1c88dd0ae"
-
-    # toochain
-    if [[ "${OS}" == "Darwin" ]]; then
-        toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi.tar.xz"
-        toolchain_dir="arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi"
-        toolchain_md5_checksum="f1c18320bb3121fa89dca11399273f4e"
-    elif [[ "${OS}" == "Linux" ]]; then
-        toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi.tar.xz"
-        toolchain_dir="arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi"
-        toolchain_md5_checksum="303102d97b877ebbeb36b3158994b218"
-    fi
 else
     echo "[main] Error: only x86-64 & aarch64/arm64 architecture is supported for now!"; exit 1;
 fi
@@ -75,7 +63,7 @@ vela_rev="8cac2b9a7204b57125a8718049519b091a98846c"
 ########
 
 function print_usage() {
-    echo "Usage: $(basename $0) <--i-agree-to-the-contained-eula> [--root-dir path-to-a-scratch-dir] [--user-toolchain-url toolchain-url] [--user-toolchain-dir toolchain-dir] [--skip-fvp-setup] [--skip-toolchain-setup] [--skip-vela-setup]"
+    echo "Usage: $(basename $0) <--i-agree-to-the-contained-eula> [--root-dir path-to-a-scratch-dir] [--target-toolchain toolchain name] [--skip-fvp-setup] [--skip-toolchain-setup] [--skip-vela-setup]"
     echo "Supplied args: $*"
 }
 
@@ -99,21 +87,14 @@ function check_options() {
                     exit 1
                 fi
                 ;;
-            --user-toolchain-url)
-                if [[ $is_script_sourced -eq 0 ]]; then
-                    user_toolchain_url=${2:-"${user_toolchain_url}"}
-                fi
-
-                if [[ $# -ge 2 ]]; then
-                    shift 2
-                else
-                    print_usage "$@"
-                    exit 1
-                fi
+            --skip-toolchain-setup)
+                skip_toolchain_setup=1
+                shift
                 ;;
-            --user-toolchain-dir)
+            --target-toolchain)
+                # Only change default root dir if the script is being executed and not sourced.
                 if [[ $is_script_sourced -eq 0 ]]; then
-                    user_toolchain_dir=${2:-"${user_toolchain_dir}"}
+                    target_toolchain=${2:-"${target_toolchain}"}
                 fi
 
                 if [[ $# -ge 2 ]]; then
@@ -123,10 +104,6 @@ function check_options() {
                     exit 1
                 fi
                 ;;
-            --skip-toolchain-setup)
-                skip_toolchain_setup=1
-                shift
-                ;;
             --skip-fvp-setup)
                 skip_fvp_setup=1
                 shift
@@ -223,32 +200,46 @@ function setup_fvp() {
     done
 }
 
+function select_toolchain() {
+    if [[ "${ARCH}" == "x86_64" ]]; then
+	if [[ "${target_toolchain}" == "zephyr" ]]; then
+	    # TODO can include support for zephyr toolchain for other host platforms later
+            toolchain_url="https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.2/toolchain_linux-x86_64_arm-zephyr-eabi.tar.xz"
+            toolchain_dir="arm-zephyr-eabi"
+            toolchain_md5_checksum="93128be0235cf5cf5f1ee561aa6eac5f"
+        else
+            toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz"
+            toolchain_dir="arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi"
+            toolchain_md5_checksum="0601a9588bc5b9c99ad2b56133b7f118"
+            echo "[main] Info using bare metal toolchain for default host OS ${OS} selection"
+	fi
+   elif [[ "${ARCH}" == "aarch64" ]] || [[ "${ARCH}" == "arm64" ]]; then
+        if [[ "${OS}" == "Darwin" ]]; then
+            toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi.tar.xz"
+            toolchain_dir="arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi"
+            toolchain_md5_checksum="f1c18320bb3121fa89dca11399273f4e"
+        elif [[ "${OS}" == "Linux" ]]; then
+            toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi.tar.xz"
+            toolchain_dir="arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi"
+            toolchain_md5_checksum="303102d97b877ebbeb36b3158994b218"
+        fi
+    else
+        echo "[main] Error: only x86-64 & aarch64/arm64 architecture is supported for now!"; exit 1;
+    fi
+}
 function setup_toolchain() {
     # Download and install the arm toolchain (default is arm-none-eabi)
+    # setting --target-toolchain to zephyr sets this to arm-zephyr-eabi
     cd "${root_dir}"
-    local selected_toolchain_url="${toolchain_url}"
-    local selected_toolchain_dir="${toolchain_dir}"
-    local selected_toolchain_md5="${toolchain_md5_checksum}"
-    local skip_md5_verify=0
-    if [[ -n "${user_toolchain_url}" ]]; then
-        selected_toolchain_url="${user_toolchain_url}"
-        selected_toolchain_dir="${user_toolchain_dir}"
-        selected_toolchain_md5=""
-	# TODO: For now we skip this if its a user specified url
-        # but eventually we should verify the checksums	
-        skip_md5_verify=1
-    fi
-    if [[ ! -e "${selected_toolchain_dir}.tar.xz" ]]; then
-        echo "[${FUNCNAME[0]}] Downloading toolchain ..."
-        curl --output "${selected_toolchain_dir}.tar.xz" -L "${selected_toolchain_url}"
-	if [[ ${skip_md5_verify} -eq 0 ]]; then 
-            verify_md5 ${selected_toolchain_md5} "${selected_toolchain_dir}.tar.xz" || exit 1
-	fi
+    if [[ ! -e "${toolchain_dir}.tar.xz" ]]; then
+        echo "[${FUNCNAME[0]}] Downloading ${toolchain_dir} toolchain ..."
+        curl --output "${toolchain_dir}.tar.xz" -L "${toolchain_url}"
+        verify_md5 ${toolchain_md5_checksum} "${toolchain_dir}.tar.xz" || exit 1
     fi
 
     echo "[${FUNCNAME[0]}] Installing toolchain ..."
-    rm -rf "${selected_toolchain_dir}"
-    tar xf "${selected_toolchain_dir}.tar.xz"
+    rm -rf "${toolchain_dir}"
+    tar xf "${toolchain_dir}.tar.xz"
 }
 
 function setup_vela() {
@@ -277,12 +268,8 @@ function create_setup_path(){
         echo "hash FVP_Corstone_SSE-320" >> ${setup_path_script}
     fi
 
-    local selected_toolchain_dir="${toolchain_dir}"
-    if [[ -n "${user_toolchain_url}" && -n "${user_toolchain_dir}" ]]; then
-        selected_toolchain_dir="${user_toolchain_dir}"
-    fi
     if [[ "${skip_toolchain_setup}" -eq 0 ]]; then
-        toolchain_bin_path="$(cd ${selected_toolchain_dir}/bin && pwd)"
+        toolchain_bin_path="$(cd ${toolchain_dir}/bin && pwd)"
         echo "export PATH=\${PATH}:${toolchain_bin_path}" >> ${setup_path_script}
     fi
 }
@@ -315,15 +302,17 @@ if [[ $is_script_sourced -eq 0 ]]; then
     setup_root_dir
     cd "${root_dir}"
     echo "[main] Using root dir ${root_dir} and options:"
-    echo "user_toolchain_url=${user_toolchain_url}"
-    echo "user_toolchain_dir=${user_toolchain_dir}"
     echo "skip-fvp-setup=${skip_fvp_setup}"
+    echo "target-toolchain=${target_toolchain}"
     echo "skip-toolchain-setup=${skip_toolchain_setup}"
     echo "skip-vela-setup=${skip_vela_setup}"
 
     # Import utils
     source $et_dir/backends/arm/scripts/utils.sh
 
+    # Select appropriate toolchain
+    select_toolchain
+
     # Setup toolchain
     if [[ "${skip_toolchain_setup}" -eq 0 ]]; then
         setup_toolchain
