Arm backend: Streamline MLSDK deps and standardise setup logging (#15189)

* ensure download_ai_mlsdk_manifest only refreshes when URL/tag change
(avoids needless MLSDK downloads) and uses consistent cleanup
* centralise log_step usage, trim noisy logs, and add get_parallel_jobs
so repo sync/build steps pick the right concurrency everywhere
 * centralise log_step and parallelism across other setup scripts also.


Change-Id: I4edad30c7ced94afda0a217e3f7bf291e9e5e2f8


cc @freddan80 @per @zingo @oscarandersson8218 @digantdesai

Signed-off-by: Ryan O'Shea <[email protected]>

Author: ArmRyan

backends/arm/scripts/build_executor_runner.sh

@@ -12,6 +12,7 @@ et_root_dir=$(realpath ${et_root_dir})
 toolchain=arm-none-eabi-gcc
 setup_path_script=${et_root_dir}/examples/arm/ethos-u-scratch/setup_path.sh
 _setup_msg="please refer to ${et_root_dir}/examples/arm/setup.sh to properly install necessary tools."
+source "${script_dir}/utils.sh"
 
 pte_file=""
 target="ethos-u55-128"
@@ -185,7 +186,9 @@ cmake \
 
 echo "[${BASH_SOURCE[0]}] Configured CMAKE"
 
-cmake --build ${output_folder} -j$(nproc) -- arm_executor_runner
+parallel_jobs="$(get_parallel_jobs)"
+
+cmake --build ${output_folder} -j"${parallel_jobs}" -- arm_executor_runner
 
 echo "[${BASH_SOURCE[0]}] Generated ${toolchain} elf file:"
 find ${output_folder} -name "arm_executor_runner"

backends/arm/scripts/build_executor_runner_vkml.sh

@@ -11,14 +11,14 @@ et_root_dir=$(cd ${script_dir}/../../.. && pwd)
 et_root_dir=$(realpath ${et_root_dir})
 setup_path_script=${et_root_dir}/examples/arm/ethos-u-scratch/setup_path.sh
 _setup_msg="please refer to ${et_root_dir}/examples/arm/setup.sh to properly install necessary tools."
+source "${script_dir}/utils.sh"
 
 build_type="Release"
 build_with_etdump=false
 extra_build_flags=""
 output_folder="cmake-out-vkml"
 
-build_with_etdump_flags=" -DEXECUTORCH_ENABLE_EVENT_TRACER=OFF "
-
+build_with_etdump_flag="-DEXECUTORCH_ENABLE_EVENT_TRACER=OFF"
 help() {
     echo "Usage: $(basename $0) [options]"
     echo "Options:"
@@ -50,7 +50,7 @@ done
 source ${setup_path_script}
 
 mkdir -p "${output_folder}"
-output_folder=$(realpath ${output_folder})
+output_folder=$(realpath "${output_folder}")
 
 echo "--------------------------------------------------------------------------------"
 echo "Build Arm VKML executor runner: '${output_folder}' with extra build flags: ${extra_build_flags}"
@@ -59,11 +59,13 @@ echo "--------------------------------------------------------------------------
 cd ${et_root_dir}/examples/arm/executor_runner
 
 if [ "$build_with_etdump" = true ] ; then
-    build_with_etdump_flags=" -DEXECUTORCH_ENABLE_EVENT_TRACER=ON "
+    build_with_etdump_flag="-DEXECUTORCH_ENABLE_EVENT_TRACER=ON"
 fi
 
-echo "Building with extra flags: ${build_with_etdump_flags} ${extra_build_flags}"
+echo "Building with extra flags: ${build_with_etdump_flag} ${extra_build_flags}"
 cmake \
+    -S "${et_root_dir}" \
+    -B "${output_folder}" \
     -Wall \
     -Werror \
     -DCMAKE_BUILD_TYPE=${build_type}            \
@@ -78,13 +80,15 @@ cmake \
     -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON \
     -DEXECUTORCH_BUILD_KERNELS_QUANTIZED_AOT=ON \
     -DEXECUTORCH_ENABLE_LOGGING=ON \
-    -DPYTHON_EXECUTABLE=$(which python3)        \
-    ${extra_build_flags}                        \
-    -B ${output_folder} ${et_root_dir}
+    -DPYTHON_EXECUTABLE="$(which python3)"      \
+    ${build_with_etdump_flag}                   \
+    ${extra_build_flags}
 
 echo "[${BASH_SOURCE[0]}] Configured CMAKE"
 
-cmake --build ${output_folder} -j$(nproc)
+parallel_jobs="$(get_parallel_jobs)"
+
+cmake --build "${output_folder}" --parallel "${parallel_jobs}"
 
 echo "[${BASH_SOURCE[0]}] Built VKML runner: "
 find ${output_folder} -name "executor_runner"

backends/arm/scripts/build_executorch.sh

@@ -17,6 +17,8 @@ toolchain=arm-none-eabi-gcc
 setup_path_script=${et_root_dir}/examples/arm/ethos-u-scratch/setup_path.sh
 _setup_msg="please refer to ${et_root_dir}/examples/arm/setup.sh to properly install necessary tools."
 
+source "${script_dir}/utils.sh"
+
 et_build_root="${et_root_dir}/arm_test"
 build_type="Release"
 build_devtools=OFF
@@ -81,7 +83,9 @@ cmake -DCMAKE_TOOLCHAIN_FILE=${toolchain_cmake} \
 -DEXECUTORCH_BUILD_ARM_ETDUMP=$build_with_etdump \
 --preset arm-baremetal -B${et_build_dir}
 
-cmake --build ${et_build_dir} -j$(nproc) --target install --config ${build_type} --
+parallel_jobs="$(get_parallel_jobs)"
+
+cmake --build ${et_build_dir} -j"${parallel_jobs}" --target install --config ${build_type} --
 
 set +x
 

backends/arm/scripts/fvp_utils.sh

@@ -23,6 +23,9 @@ if [[ $? -ne 0 ]]; then
     exit 1
 fi
 
+script_dir=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
+source "${script_dir}/utils.sh"
+
 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"
@@ -42,7 +45,8 @@ elif [[ "${ARCH}" == "aarch64" ]] || [[ "${ARCH}" == "arm64" ]]; then
     corstone320_model_dir="Linux64_armv8l_GCC-9.3"
     corstone320_md5_checksum="3889f1d80a6d9861ea4aa6f1c88dd0ae"
 else
-    echo "[main] Error: only x86-64 & aarch64/arm64 architecture is supported for now!"; exit 1;
+    log_step "fvp" "Error: only x86-64 & aarch64/arm64 architecture is supported for now!"
+    exit 1
 fi
 
 function install_fvp() {
@@ -52,7 +56,7 @@ function install_fvp() {
     for fvp in "${fvps[@]}"; do
         cd "${root_dir}"
         if [[ ! -e "FVP_${fvp}.tgz" ]]; then
-            echo "[${FUNCNAME[0]}] Downloading FVP ${fvp}..."
+            log_step "fvp" "Downloading FVP ${fvp}"
             url_variable=${fvp}_url
             fvp_url=${!url_variable}
             curl --output "FVP_${fvp}.tgz" "${fvp_url}"
@@ -61,7 +65,7 @@ function install_fvp() {
             verify_md5 ${fvp_md5_checksum} FVP_${fvp}.tgz || exit 1
         fi
 
-        echo "[${FUNCNAME[0]}] Installing FVP ${fvp}..."
+        log_step "fvp" "Installing FVP ${fvp}"
         rm -rf FVP-${fvp}
         mkdir -p FVP-${fvp}
         cd FVP-${fvp}
@@ -76,7 +80,7 @@ function install_fvp() {
                 ./FVP_Corstone_SSE-320.sh --i-agree-to-the-contained-eula --force --destination ./ --quiet --no-interactive
                 ;;
             *)
-                echo "[${FUNCNAME[0]}] Error: Unknown FVP model ${fvp}. Exiting."
+                log_step "fvp" "Error: Unknown FVP model ${fvp}. Exiting."
                 exit 1
                 ;;
         esac
@@ -89,12 +93,12 @@ function check_fvp_eula () {
 
     if [[ "${eula_acceptance}" -eq 0 ]]; then
         if [[ ${eula_acceptance_by_variable} != "True" ]]; then
-            echo "Must pass argument '--i-agree-to-the-contained-eula' to agree to EULA associated with downloading the FVP."
-            echo "Alternativly set environment variable ARM_FVP_INSTALL_I_AGREE_TO_THE_CONTAINED_EULA=True."
-            echo "Exiting!"
+            log_step "fvp" "Must pass '--i-agree-to-the-contained-eula' to download the FVP"
+            log_step "fvp" "Alternatively set ARM_FVP_INSTALL_I_AGREE_TO_THE_CONTAINED_EULA=True"
+            log_step "fvp" "Exiting due to missing EULA acceptance"
             exit 1
         else
-            echo "Arm EULA for FVP agreed to with ARM_FVP_INSTALL_I_AGREE_TO_THE_CONTAINED_EULA=True environment variable"
+            log_step "fvp" "Arm EULA accepted via ARM_FVP_INSTALL_I_AGREE_TO_THE_CONTAINED_EULA=True"
         fi
     fi
 }
@@ -103,12 +107,10 @@ function setup_fvp() {
     if [[ "${OS}" != "Linux" ]]; then
         # Check if FVP is callable
         if command -v FVP_Corstone_SSE-300_Ethos-U55 &> /dev/null; then
-            echo "[${FUNCNAME[0]}] Info: FVP for MacOS seem to be installed. Continuing..."
+            log_step "fvp" "Detected pre-installed MacOS FVP binaries; continuing"
             return 0  # If true exit gracefully and proceed with setup
         else
-            echo "[${FUNCNAME[0]}] Warning: FVP only supported with Linux OS, skipping FVP setup..."
-            echo "[${FUNCNAME[0]}] Warning: For MacOS, using https://github.com/Arm-Examples/FVPs-on-Mac is recommended."
-            echo "[${FUNCNAME[0]}] Warning:   Follow the instructions and make sure the path is set correctly."
+            log_step "fvp" "Warning: FVP setup only supported on Linux; Mac users should install via https://github.com/Arm-Examples/FVPs-on-Mac and ensure binaries are on PATH"
             return 1  # Throw error. User need to install FVP according to ^^^
         fi
     fi