Skip to content

Commit a8fb28f

Browse files
committed
Arm backend: Auto-configure Arm backend runner builds via presets
- Auto-derive arm_executor_runner build directories when --build-dir is omitted and configure them with the arm_baremetal preset. - Add validation helpers that ensure standalone builds were configured with the right targets, toolchains, and BundledIO/devtools toggles. - Teach the script to stage PTEs, reuse multi-config build trees, and drive FVP/BundleIO workflows from a single entry point. Change-Id: If52327a1bc512c87fd2ce5d9ce89c352919fd447 Signed-off-by: Usamah Zaheer <usamah.zaheer@arm.com>
1 parent 5c08e04 commit a8fb28f

3 files changed

Lines changed: 513 additions & 101 deletions

File tree

backends/arm/scripts/run_fvp.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ elif [[ ${target} == *"ethos-u55"* ]]; then
151151
-C mps3_board.telnetterminal0.start_telnet=0 \
152152
-C mps3_board.uart0.out_file='-' \
153153
-C mps3_board.uart0.shutdown_on_eot=1 \
154-
"${extra_args_u55[@]}" \
154+
${extra_args_u55[@]+"${extra_args_u55[@]}"} \
155155
-a "${elf_file}" \
156156
${data_file} \
157157
--timelimit ${timeout} 2>&1 | sed 's/\r$//' | tee ${log_file} || true # seconds
@@ -164,7 +164,7 @@ elif [[ ${target} == *"ethos-u85"* ]]; then
164164
-C mps4_board.telnetterminal0.start_telnet=0 \
165165
-C mps4_board.uart0.out_file='-' \
166166
-C mps4_board.uart0.shutdown_on_eot=1 \
167-
"${extra_args_u85[@]}" \
167+
${extra_args_u85[@]+"${extra_args_u85[@]}"} \
168168
-a "${elf_file}" \
169169
${data_file} \
170170
--timelimit ${timeout} 2>&1 | sed 's/\r$//' | tee ${log_file} || true # seconds

backends/arm/test/test_arm_baremetal.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,17 @@ test_pytest_models_vkml() {
256256
test_run_vkml() {
257257
echo "${TEST_SUITE_NAME}: Test VKML delegate examples with run.sh"
258258

259+
source backends/arm/test/setup_testing_vkml.sh
260+
259261
echo "${TEST_SUITE_NAME}: Test VKML"
260262
out_folder="arm_test/test_run"
263+
vkml_build_dir="${build_root_test_dir}"
261264

262-
examples/arm/run.sh --et_build_root=${out_folder} --target=vgf --model_name=add --output=${out_folder}/runner
263-
examples/arm/run.sh --et_build_root=${out_folder} --target=vgf --model_name=mul --output=${out_folder}/runner
265+
examples/arm/run.sh --build-dir="${vkml_build_dir}" --et_build_root=${out_folder} --target=vgf --model_name=add --output=${out_folder}/runner
266+
examples/arm/run.sh --build-dir="${vkml_build_dir}" --et_build_root=${out_folder} --target=vgf --model_name=mul --output=${out_folder}/runner
264267

265-
examples/arm/run.sh --et_build_root=${out_folder} --target=vgf --model_name=qadd --output=${out_folder}/runner
266-
examples/arm/run.sh --et_build_root=${out_folder} --target=vgf --model_name=qops --output=${out_folder}/runner
268+
examples/arm/run.sh --build-dir="${vkml_build_dir}" --et_build_root=${out_folder} --target=vgf --model_name=qadd --output=${out_folder}/runner
269+
examples/arm/run.sh --build-dir="${vkml_build_dir}" --et_build_root=${out_folder} --target=vgf --model_name=qops --output=${out_folder}/runner
267270

268271
echo "${TEST_SUITE_NAME}: PASS"
269272
}

0 commit comments

Comments
 (0)