Skip to content

Commit a4c3897

Browse files
zingozingo
authored
Arm backend: Rename test_arm_baremetal.sh to test_arm_backend.sh (#19665)
Rename tests script as it tests both Arm Ethos-U and VGF backend ### Test plan This script is tested by the GitHub jobs Signed-off-by: Zingo Andersen <Zingo.Andersen@arm.com>
1 parent 3a13e41 commit a4c3897

5 files changed

Lines changed: 399 additions & 389 deletions

File tree

‎.github/workflows/pull.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -717,10 +717,10 @@ jobs:
717717
strategy:
718718
matrix:
719719
include:
720-
- test_arm_baremetal: test_pytest_ops_no_target
721-
- test_arm_baremetal: test_pytest_ops_tosa
722-
- test_arm_baremetal: test_pytest_models_tosa
723-
- test_arm_baremetal: test_run_tosa
720+
- test_arm_backend: test_pytest_ops_no_target
721+
- test_arm_backend: test_pytest_ops_tosa
722+
- test_arm_backend: test_pytest_models_tosa
723+
- test_arm_backend: test_run_tosa
724724
fail-fast: false
725725
with:
726726
runner: linux.2xlarge
@@ -738,10 +738,10 @@ jobs:
738738
739739
.ci/scripts/setup-arm-baremetal-tools.sh --disable-ethos-u-deps
740740
741-
ARM_TEST=${{ matrix.test_arm_baremetal }}
741+
ARM_TEST=${{ matrix.test_arm_backend }}
742742
743-
# Test test_arm_baremetal.sh with test
744-
backends/arm/test/test_arm_baremetal.sh "${ARM_TEST}"
743+
# Test test_arm_backend.sh with test
744+
backends/arm/test/test_arm_backend.sh "${ARM_TEST}"
745745
746746
test-llama-runner-qnn-linux:
747747
name: test-llama-runner-qnn-linux

‎.github/workflows/trunk.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,14 @@ jobs:
349349
strategy:
350350
matrix:
351351
include:
352-
- test_arm_baremetal: test_pytest_ops_ethos_u55
353-
- test_arm_baremetal: test_pytest_models_ethos_u55
354-
- test_arm_baremetal: test_run_ethos_u55
355-
- test_arm_baremetal: test_pytest_ops_ethos_u85
356-
- test_arm_baremetal: test_pytest_models_ethos_u85
357-
- test_arm_baremetal: test_run_ethos_u85
358-
- test_arm_baremetal: test_smaller_stories_llama
359-
- test_arm_baremetal: test_memory_allocation
352+
- test_arm_backend: test_pytest_ops_ethos_u55
353+
- test_arm_backend: test_pytest_models_ethos_u55
354+
- test_arm_backend: test_run_ethos_u55
355+
- test_arm_backend: test_pytest_ops_ethos_u85
356+
- test_arm_backend: test_pytest_models_ethos_u85
357+
- test_arm_backend: test_run_ethos_u85
358+
- test_arm_backend: test_smaller_stories_llama
359+
- test_arm_backend: test_memory_allocation
360360
fail-fast: false
361361
with:
362362
runner: linux.2xlarge.memory
@@ -378,15 +378,15 @@ jobs:
378378
# Hopefully this is high enough for this setup.
379379
sudo sysctl fs.inotify.max_user_watches=1048576 # 1024 * 1024
380380
381-
ARM_TEST=${{ matrix.test_arm_baremetal }}
381+
ARM_TEST=${{ matrix.test_arm_backend }}
382382
383383
# Output test report on pytest runs so that github can surface failing tests.
384384
if [[ -n "${RUNNER_TEST_RESULTS_DIR:-}" ]]; then
385385
export PYTEST_ADDOPTS="--junit-xml=${RUNNER_TEST_RESULTS_DIR}/${ARM_TEST}.xml ${PYTEST_ADDOPTS:-}"
386386
fi
387387
388-
# Test test_arm_baremetal.sh with test
389-
backends/arm/test/test_arm_baremetal.sh "${ARM_TEST}"
388+
# Test test_arm_backend.sh with test
389+
backends/arm/test/test_arm_backend.sh "${ARM_TEST}"
390390
391391
test-arm-backend-vkml:
392392
name: test-arm-backend-vkml
@@ -397,7 +397,7 @@ jobs:
397397
strategy:
398398
matrix:
399399
include:
400-
- test_arm_baremetal: test_pytest_ops_vkml
400+
- test_arm_backend: test_pytest_ops_vkml
401401
fail-fast: false
402402
with:
403403
runner: linux.2xlarge.memory
@@ -418,14 +418,14 @@ jobs:
418418
# Hopefully this is high enough for this setup.
419419
sudo sysctl fs.inotify.max_user_watches=1048576 # 1024 * 1024
420420
421-
ARM_TEST=${{ matrix.test_arm_baremetal }}
421+
ARM_TEST=${{ matrix.test_arm_backend }}
422422
423423
# Output test report on pytest runs so that github can surface failing tests.
424424
if [[ -n "${RUNNER_TEST_RESULTS_DIR:-}" ]]; then
425425
export PYTEST_ADDOPTS="--junit-xml=${RUNNER_TEST_RESULTS_DIR}/${ARM_TEST}.xml ${PYTEST_ADDOPTS:-}"
426426
fi
427427
428-
backends/arm/test/test_arm_baremetal.sh "${ARM_TEST}"
428+
backends/arm/test/test_arm_backend.sh "${ARM_TEST}"
429429
430430
test-arm-ootb-linux:
431431
name: test-arm-ootb-linux

‎backends/arm/README.md‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -186,34 +186,34 @@ ssh -p 2222 root@127.0.0.1 -t "/tmp/executor_runner -model_path /tmp/add_arm_del
186186

187187
There are two approaches for running the tests for the Arm backend. This section will explain these two approaches:
188188

189-
### Using test_arm_baremetal.sh
189+
### Using test_arm_backend.sh
190190

191-
The backend provides a script `backends/arm/test/test_arm_baremetal.sh`, which is used in the `trunk` CI workflow.
191+
The backend provides a script `backends/arm/test/test_arm_backend.sh`, which is used in the `trunk` CI workflow.
192192
This approach is useful for checking your change against this workflow on your own machine.
193193
These scripts also install the necessary dependencies to run the tests.
194194
Below is an overview of some of the testing options this script provides:
195195

196196
| Command | Description |
197197
| ---------------------------------------------------- | ------------------------------------------------------------ |
198-
| `test_arm_baremetal.sh test_pytest_ops_no_target` | Runs operator unit tests for non-target specific use-cases. |
199-
| `test_arm_baremetal.sh test_pytest_models_no_target` | Runs model unit tests for non-target specific use-cases. |
200-
| `test_arm_baremetal.sh test_pytest_ops_tosa` | Runs operator unit tests for TOSA specific use-cases. |
201-
| `test_arm_baremetal.sh test_pytest_models_tosa` | Runs model unit tests for TOSA specific use-cases. |
202-
| `test_arm_baremetal.sh test_run_tosa` | Runs end-to-end unit tests for TOSA specific use-cases. |
203-
| `test_arm_baremetal.sh test_pytest_ops_ethos_u55` | Runs operator unit tests for Ethos-U55 specific use-cases. |
204-
| `test_arm_baremetal.sh test_pytest_models_ethos_u55` | Runs model unit tests for Ethos-U55 specific use-cases. |
205-
| `test_arm_baremetal.sh test_run_ethos_u55` | Runs end-to-end unit tests for Ethos-U55 specific use-cases. |
206-
| `test_arm_baremetal.sh test_pytest_ops_ethos_u85` | Runs operator unit tests for Ethos-U85 specific use-cases. |
207-
| `test_arm_baremetal.sh test_pytest_models_ethos_u85` | Runs model unit tests for Ethos-U85 specific use-cases. |
208-
| `test_arm_baremetal.sh test_run_ethos_u85` | Runs end-to-end unit tests for Ethos-U85 specific use-cases. |
209-
| `test_arm_baremetal.sh test_pytest_ops_vkml` | Runs operator unit tests for VGF specific use-cases. |
210-
| `test_arm_baremetal.sh test_pytest_models_vkml` | Runs model unit tests for VGF specific use-cases. |
211-
| `test_arm_baremetal.sh test_run_vkml` | Runs end-to-end unit tests for VGF specific use-cases. |
212-
| `test_arm_baremetal.sh test_model_smollm2-135M` | Runs some models with Corstone FVP. |
213-
| `test_arm_baremetal.sh test_smaller_stories_llama` | Runs E2E model tests on Corstone FVP. |
214-
| `test_arm_baremetal.sh test_memory_allocation` | Runs memory allocation tests for Ethos-U specific targets |
215-
216-
For more information, please refer to the `backends/arm/test/test_arm_baremetal.sh` script.
198+
| `test_arm_backend.sh test_pytest_ops_no_target` | Runs operator unit tests for non-target specific use-cases. |
199+
| `test_arm_backend.sh test_pytest_models_no_target` | Runs model unit tests for non-target specific use-cases. |
200+
| `test_arm_backend.sh test_pytest_ops_tosa` | Runs operator unit tests for TOSA specific use-cases. |
201+
| `test_arm_backend.sh test_pytest_models_tosa` | Runs model unit tests for TOSA specific use-cases. |
202+
| `test_arm_backend.sh test_run_tosa` | Runs end-to-end unit tests for TOSA specific use-cases. |
203+
| `test_arm_backend.sh test_pytest_ops_ethos_u55` | Runs operator unit tests for Ethos-U55 specific use-cases. |
204+
| `test_arm_backend.sh test_pytest_models_ethos_u55` | Runs model unit tests for Ethos-U55 specific use-cases. |
205+
| `test_arm_backend.sh test_run_ethos_u55` | Runs end-to-end unit tests for Ethos-U55 specific use-cases. |
206+
| `test_arm_backend.sh test_pytest_ops_ethos_u85` | Runs operator unit tests for Ethos-U85 specific use-cases. |
207+
| `test_arm_backend.sh test_pytest_models_ethos_u85` | Runs model unit tests for Ethos-U85 specific use-cases. |
208+
| `test_arm_backend.sh test_run_ethos_u85` | Runs end-to-end unit tests for Ethos-U85 specific use-cases. |
209+
| `test_arm_backend.sh test_pytest_ops_vkml` | Runs operator unit tests for VGF specific use-cases. |
210+
| `test_arm_backend.sh test_pytest_models_vkml` | Runs model unit tests for VGF specific use-cases. |
211+
| `test_arm_backend.sh test_run_vkml` | Runs end-to-end unit tests for VGF specific use-cases. |
212+
| `test_arm_backend.sh test_model_smollm2_135M` | Runs some models with Corstone FVP. |
213+
| `test_arm_backend.sh test_smaller_stories_llama` | Runs E2E model tests on Corstone FVP. |
214+
| `test_arm_backend.sh test_memory_allocation` | Runs memory allocation tests for Ethos-U specific targets |
215+
216+
For more information, please refer to the `backends/arm/test/test_arm_backend.sh` script.
217217

218218
### Using pytest
219219

0 commit comments

Comments
 (0)