From bab74550a94c83789f573db5b61430347cc65043 Mon Sep 17 00:00:00 2001 From: Adrian Lundell Date: Tue, 22 Apr 2025 11:37:26 +0200 Subject: [PATCH] Arm backend: Rename build_executorch_runner script New name is build_executor_runner which more accurately mirrors the functionality of building the executor_runner. Signed-off-by: Adrian Lundell Change-Id: I906deef75d1ae32fa349f373425bc51343024d18 --- .../{build_executorch_runner.sh => build_executor_runner.sh} | 0 backends/arm/scripts/pre-push | 2 +- backends/arm/test/test_model.py | 2 +- docs/source/backends-arm-ethos-u.md | 2 +- docs/source/tutorial-arm-ethos-u.md | 2 +- examples/arm/ethos_u_minimal_example.ipynb | 2 +- examples/arm/run.sh | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename backends/arm/scripts/{build_executorch_runner.sh => build_executor_runner.sh} (100%) diff --git a/backends/arm/scripts/build_executorch_runner.sh b/backends/arm/scripts/build_executor_runner.sh similarity index 100% rename from backends/arm/scripts/build_executorch_runner.sh rename to backends/arm/scripts/build_executor_runner.sh diff --git a/backends/arm/scripts/pre-push b/backends/arm/scripts/pre-push index 4eeb0f50d71..af8bc48cd9c 100755 --- a/backends/arm/scripts/pre-push +++ b/backends/arm/scripts/pre-push @@ -27,7 +27,7 @@ VERBS="Add|Fix|Update|Refactor|Improve|Remove|Change|Implement|Create|Modify|"\ "Handle|Ignore|Interpret|Instantiate|Invoke|Limit|Load|Modify|Permit|Print|"\ "Profile|Recalculate|Reconstruct|Redefine|Redesign|Reevaluate|Relocate|Remap|"\ "Render|Reposition|Request|Revert|Sanitize|Specify|Strengthen|Stub|Substitute|"\ -"Tag|Tweak|Unify|Unlock|Unset|Use|Validate|Verify" +"Tag|Tweak|Unify|Unlock|Unset|Use|Validate|Verify|Rename" # Remote branch REMOTE=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null) diff --git a/backends/arm/test/test_model.py b/backends/arm/test/test_model.py index f4a8b3e8f9c..c27c7146994 100755 --- a/backends/arm/test/test_model.py +++ b/backends/arm/test/test_model.py @@ -188,7 +188,7 @@ def build_ethosu_runtime( run_external_cmd( [ "bash", - os.path.join(script_path, "build_executorch_runner.sh"), + os.path.join(script_path, "build_executor_runner.sh"), f"--et_build_root={et_build_root}", f"--pte={pte_file}", "--bundleio", diff --git a/docs/source/backends-arm-ethos-u.md b/docs/source/backends-arm-ethos-u.md index 3bffe14a3f6..fe0efa0ed2a 100644 --- a/docs/source/backends-arm-ethos-u.md +++ b/docs/source/backends-arm-ethos-u.md @@ -95,7 +95,7 @@ A fully integer model is required for using the Arm Ethos-U backend. As discusse To run the model on-device, build the executorch library and EthosUDelegate using the script `executorch/backends/arm/scripts/build_executorch.sh`. Then build the arm executorch runtime using the script -`executorch/backends/arm/scripts/build_executorch_runner.sh --pte=mv2_arm_ethos_u55.pte --target=ethos-u55-128`. +`executorch/backends/arm/scripts/build_executor_runner.sh --pte=mv2_arm_ethos_u55.pte --target=ethos-u55-128`. Finally, run the elf file on FVP using the script `executorch/backends/arm/scripts/run_fvp.sh --elf=executorch/mv2_arm_ethos_u55/cmake-out/arm_executor_runner --target=ethos-u55-128`. diff --git a/docs/source/tutorial-arm-ethos-u.md b/docs/source/tutorial-arm-ethos-u.md index f872b116b8f..d16e3a0b5c3 100644 --- a/docs/source/tutorial-arm-ethos-u.md +++ b/docs/source/tutorial-arm-ethos-u.md @@ -327,7 +327,7 @@ The SDK dir is the same one prepared [earlier](#setup-the-arm-ethos-u-software-d Note, you have to generate a new `executor-runner` binary if you want to change the model or the `.pte` file. This constraint is from the constrained bare-metal runtime environment you have for Corstone-300/Corstone-320 platforms. -This is performed by the `backends/arm/scripts/build_executorch_runner.sh` script runned from `run.sh`. +This is performed by the `backends/arm/scripts/build_executor_runner.sh` script runned from `run.sh`. ```{tip} The `run.sh` script takes in `--target` option, which provides a way to provide a specific target, Corstone-300(ethos-u55-128) or Corstone-320(ethos-u85-128) diff --git a/examples/arm/ethos_u_minimal_example.ipynb b/examples/arm/ethos_u_minimal_example.ipynb index ab62d0dd2ce..9cfe8d2b5e7 100644 --- a/examples/arm/ethos_u_minimal_example.ipynb +++ b/examples/arm/ethos_u_minimal_example.ipynb @@ -234,7 +234,7 @@ "\n", "# Build executorch runner\n", "args = f\"--pte={pte_path} --target={target}\"\n", - "subprocess.run(os.path.join(script_dir, \"build_executorch_runner.sh\") + \" \" + args, shell=True, cwd=et_dir)\n", + "subprocess.run(os.path.join(script_dir, \"build_executor_runner.sh\") + \" \" + args, shell=True, cwd=et_dir)\n", "\n", "elf_path = os.path.join(cwd_dir, pte_base_name, \"cmake-out\", \"arm_executor_runner\")\n", "assert os.path.exists(elf_path), \"Build failed; no .elf-file found\"" diff --git a/examples/arm/run.sh b/examples/arm/run.sh index fd7cf2aa3ff..a9ceb7a31bc 100755 --- a/examples/arm/run.sh +++ b/examples/arm/run.sh @@ -226,7 +226,7 @@ for i in "${!test_model[@]}"; do else set -x # Rebuild the application as the pte is imported as a header/c array - backends/arm/scripts/build_executorch_runner.sh --et_build_root="${et_build_root}" --pte="${pte_file}" --build_type=${build_type} --target=${target} --system_config=${system_config} --memory_mode=${memory_mode} ${bundleio_flag} ${et_dump_flag} --extra_build_flags="${extra_build_flags}" --ethosu_tools_dir="${ethos_u_scratch_dir}" + backends/arm/scripts/build_executor_runner.sh --et_build_root="${et_build_root}" --pte="${pte_file}" --build_type=${build_type} --target=${target} --system_config=${system_config} --memory_mode=${memory_mode} ${bundleio_flag} ${et_dump_flag} --extra_build_flags="${extra_build_flags}" --ethosu_tools_dir="${ethos_u_scratch_dir}" if [ "$build_only" = false ] ; then # Execute the executor_runner on FVP Simulator elf_file="${output_folder}/${elf_folder}/cmake-out/arm_executor_runner"