diff options
author | Boyan Karatotev <boyan.karatotev@arm.com> | 2023-04-26 12:38:56 +0100 |
---|---|---|
committer | Boyan Karatotev <boyan.karatotev@arm.com> | 2023-05-03 15:41:48 +0100 |
commit | 16ec1a066e124c39a144ca4a08e493d35bb66f47 (patch) | |
tree | 23eef6ee9d86e9c6cf4c9ee21eb49d5a38915427 | |
parent | 24da661fa7ac4ecc2dd8b9de2c29806d6ff109dc (diff) |
chore: make a feature all-config
Each feature is currently tested in its own config, requiring a full
build and a run of a bunch of unrelated tests which is inefficient and
slows down CI. Since TF-A's fvp build (fvp-default) now enables all
features dynamically by default, this can happen in 1 single config.
Introduce it and remove all others.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: Iaa227664e3da26594e45e4b763f1d5dfca0f9e9c
17 files changed, 39 insertions, 142 deletions
diff --git a/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all b/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all new file mode 100644 index 00000000..b452bbf5 --- /dev/null +++ b/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.all @@ -0,0 +1,5 @@ +# +# Copyright (c) 2023 Arm Limited. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# diff --git a/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext b/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext deleted file mode 100644 index 1bbc7370..00000000 --- a/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.ete_trace_ext +++ /dev/null @@ -1,5 +0,0 @@ -# -# Copyright (c) 2021 Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# diff --git a/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.etm_trace_ext b/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.etm_trace_ext deleted file mode 100644 index 1bbc7370..00000000 --- a/group/tf-l2-boot-tests-misc/fvp-aarch64-only,fvp-default:fvp-tftf-fip.tftf-aemva.etm_trace_ext +++ /dev/null @@ -1,5 +0,0 @@ -# -# Copyright (c) 2021 Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# diff --git a/group/tftf-l2-fvp/fvp-default,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sve-debug b/group/tftf-l2-fvp/fvp-default,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sve-debug deleted file mode 100644 index aab47968..00000000 --- a/group/tftf-l2-fvp/fvp-default,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sve-debug +++ /dev/null @@ -1,6 +0,0 @@ -# -# Copyright (c) 2019-2020 Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - diff --git a/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu-debug b/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu-debug deleted file mode 100644 index 0a342ff2..00000000 --- a/group/tftf-l2-fvp/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a.amu-debug +++ /dev/null @@ -1,5 +0,0 @@ -# -# Copyright (c) 2020, Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# diff --git a/group/tftf-l2-fvp/fvp-sme,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sme-debug b/group/tftf-l2-fvp/fvp-sme,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sme-debug deleted file mode 100644 index b8939c8b..00000000 --- a/group/tftf-l2-fvp/fvp-sme,fvp-cpu-extensions:fvp-tftf-fip.tftf-aemv8a.sme-debug +++ /dev/null @@ -1,5 +0,0 @@ -# -# Copyright (c) 2022, Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh index 344f8820..595068d5 100644 --- a/model/base-aemv8a.sh +++ b/model/base-aemv8a.sh @@ -10,6 +10,8 @@ if is_arm_jenkins_env || upon "$local_ci"; then set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA" default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so" + default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so" + default_var ete_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/libete-plugin.so" else # OpenCI enviroment source "$ci_root/fvp_utils.sh" @@ -21,6 +23,8 @@ else # ScalableVectorExtension is located at /opt/model/*/plugins/${model_flavour} default_var sve_plugin_path "${models_dir/models/plugins}/ScalableVectorExtension.so" + default_var etm_plugin_path "${models_dir/models/plugins}/ETMv4ExamplePlugin.so" + default_var ete_plugin_path "${models_dir/models/plugins}/libete-plugin.so" fi default_var is_dual_cluster 1 diff --git a/run_config/fvp-aemv8a.all b/run_config/fvp-aemv8a.all new file mode 100644 index 00000000..df6fbe5d --- /dev/null +++ b/run_config/fvp-aemv8a.all @@ -0,0 +1,29 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2023, Arm Limited. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# + +generate_lava_job() { + local model="base-aemv8a" + + uart="0" file="tftf.exp" track_expect + uart="1" file="hold_uart.exp" track_expect + + model="$model" \ + ete_plugin="1" \ + etm_plugin="1" \ + sve_plugin="1" \ + etm_present="1" \ + amu_present="1" \ + has_sme="1" has_sme2="1" \ + supports_branch_record_buffer_control_regs="1" \ + supports_trace_buffer_control_regs="1" \ + supports_trace_filter_regs="2" \ + supports_system_trace_filter_regs="1" \ + arch_version="9.2" \ + gen_model_params + + model="$model" gen_fvp_yaml +} diff --git a/run_config/fvp-aemv8a.amu b/run_config/fvp-aemv8a.amu deleted file mode 100644 index b21ba216..00000000 --- a/run_config/fvp-aemv8a.amu +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2022, Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -generate_lava_job() { - local model="base-aemv8a" - - model="$model" \ - amu_present="1" \ - arch_version="8.4" \ - use_pchannel_for_threads="1" \ - gen_model_params - - model="$model" gen_fvp_yaml -} diff --git a/run_config/fvp-aemv8a.sme b/run_config/fvp-aemv8a.sme deleted file mode 100644 index f9cfcd90..00000000 --- a/run_config/fvp-aemv8a.sme +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2022, Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -generate_lava_job() { - local model="base-aemv8a" - - model="$model" \ - sve_plugin="1" has_sme="1" arch_version="9.2" \ - gen_model_params - model="$model" gen_fvp_yaml -} diff --git a/run_config/fvp-aemv8a.sme2 b/run_config/fvp-aemv8a.sme2 deleted file mode 100644 index 62f0fa94..00000000 --- a/run_config/fvp-aemv8a.sme2 +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2023, Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -generate_lava_job() { - local model="base-aemv8a" - - model="$model" \ - sve_plugin="1" has_sme="1" has_sme2="1" arch_version="9.2" \ - gen_model_params - model="$model" gen_fvp_yaml -} diff --git a/run_config/fvp-aemv8a.sve b/run_config/fvp-aemv8a.sve deleted file mode 100644 index 1811b252..00000000 --- a/run_config/fvp-aemv8a.sve +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2019-2022, Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -generate_lava_job() { - local model="base-aemv8a" - - model="$model" sve_plugin="1" gen_model_params - model="$model" gen_fvp_yaml -} diff --git a/run_config/fvp-aemva.ete_trace_ext b/run_config/fvp-aemva.ete_trace_ext deleted file mode 100644 index 923fa397..00000000 --- a/run_config/fvp-aemva.ete_trace_ext +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2021-2022, Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -generate_lava_job() { - local model="base-aemva" - - model="$model" \ - ete_plugin="1" \ - etm_present="1" \ - supports_trace_buffer_control_regs="1" \ - supports_trace_filter_regs="2" \ - gen_model_params - - model="$model" gen_fvp_yaml -} diff --git a/run_config/fvp-aemva.etm_trace_ext b/run_config/fvp-aemva.etm_trace_ext deleted file mode 100644 index 8debb5c5..00000000 --- a/run_config/fvp-aemva.etm_trace_ext +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2021-2022, Arm Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -generate_lava_job() { - local model="base-aemva" - - model="$model" \ - etm_plugin="1" \ - etm_present="1" \ - supports_trace_buffer_control_regs="1" \ - supports_trace_filter_regs="2" \ - gen_model_params - - model="$model" gen_fvp_yaml -} diff --git a/run_config/fvp-spm.sve+amu b/run_config/fvp-spm.sve+amu index d51e80f2..471c032c 100644 --- a/run_config/fvp-spm.sve+amu +++ b/run_config/fvp-spm.sve+amu @@ -17,6 +17,7 @@ generate_lava_job() { local model="base-aemv8a" uart="0" file="tftf.exp" track_expect + uart="1" file="hold_uart.exp" track_expect uart="2" file="spm-uart2.exp" track_expect # SPM(reference implementation of S-EL2 firmware) has SMMUv3 driver diff --git a/tf_config/fvp-sme b/tf_config/fvp-sme deleted file mode 100644 index 23cd2a2c..00000000 --- a/tf_config/fvp-sme +++ /dev/null @@ -1,8 +0,0 @@ -CROSS_COMPILE=aarch64-none-elf- -PLAT=fvp -ENABLE_FEAT_HCX=1 -CTX_INCLUDE_AARCH32_REGS=0 -ARM_ARCH_MAJOR=8 -ARM_ARCH_MINOR=6 -ENABLE_SVE_FOR_NS=1 -ENABLE_SME_FOR_NS=1 diff --git a/tf_config/fvp-sme2 b/tf_config/fvp-sme2 deleted file mode 100644 index 795c3239..00000000 --- a/tf_config/fvp-sme2 +++ /dev/null @@ -1,9 +0,0 @@ -ARM_ARCH_MAJOR=8 -ARM_ARCH_MINOR=6 -CROSS_COMPILE=aarch64-none-elf- -CTX_INCLUDE_AARCH32_REGS=0 -ENABLE_FEAT_HCX=1 -ENABLE_SME_FOR_NS=1 -ENABLE_SME2_FOR_NS=1 -ENABLE_SVE_FOR_NS=1 -PLAT=fvp |