fvp: migrate FVP to 11.28.23 release
Migrate FVP models in CI To 11.28.23. The following done part
of migration efforts.
- Move std, revc, base, rd_1_ae, tc4 FVP's to use latest FVP's.
- Some FVP's have removed x4 in the file names, so modify
them to have NUM_CORES=4 model param. But retain the config names
with x4 indicating they are used as quad core configuration.
- Remove FVP Cortex-A72x4-A53x4 test and model usage, this model
is been deprecated in 11.28.23 release, But we do have
Cortex-A73x4-A53x4 and in use in CI so we are not missing out
any coverage from heterogeneous Big.Little combination.
Change-Id: Id50a01a050a0f04eb8c4f314ce3d17a247a76e7c
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 30b5eec..7faa220 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -48,18 +48,16 @@
default_model_dtb="dtb.bin"
# FVP containers and model paths
-fvp_arm_std_library_11_24="fvp:fvp_arm_std_library_${model_version_11_24}_${model_build_11_24};/opt/model/FVP_ARM_Std_Library/FVP_Base"
-
fvp_arm_std_library="fvp:fvp_arm_std_library_${model_version}_${model_build};/opt/model/FVP_ARM_Std_Library/FVP_Base"
fvp_base_revc_2xaemva="fvp:fvp_base_revc-2xaemva_${model_version}_${model_build};/opt/model/Base_RevC_AEMvA_pkg/models/${model_flavour}"
fvp_base_aemv8r="fvp:fvp_base_aemv8r_${model_version}_${model_build};/opt/model/AEMv8R_base_pkg/models/${model_flavour}"
-fvp_rd_1_ae="fvp:fvp_rd_1_ae_11.27_20;/opt/model/FVP_RD_1_AE/models/${model_flavour}"
+fvp_rd_1_ae="fvp:fvp_rd_1_ae_${model_version}_${model_build};/opt/model/FVP_RD_1_AE/models/${model_flavour}"
# CSS model list
fvp_morello="fvp:fvp_morello_0.11_33;/opt/model/FVP_Morello/models/Linux64_GCC-6.4"
-fvp_rd_v1="fvp:fvp_rd_v1_${model_version}_${model_build};/opt/model/FVP_RD_V1/models/${model_flavour}"
+fvp_rd_v1="fvp:fvp_rd_v1_11.26_11;/opt/model/FVP_RD_V1/models/${model_flavour}"
fvp_tc3="fvp:fvp_tc3_11.26_16_linux64;/opt/model/FVP_TC3/models/${model_flavour}"
-fvp_tc4="fvp:fvp_tc4_0.0_8404;/opt/model/FVP_TC4/models/${model_flavour}"
+fvp_tc4="fvp:fvp_tc4_${model_version}_${model_build};/opt/model/FVP_TC4/models/${model_flavour}"
# FVP associate array, run_config are keys and fvp container parameters are the values
# Container parameters syntax: <model name>;<model dir>;<model bin>
@@ -71,19 +69,18 @@
[base-aemv8a-latest-revb]="${fvp_arm_std_library};FVP_Base_AEMvA-AEMvA"
[base-aemva]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
[base-aemv8a]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
-[cortex-a32x4]="${fvp_arm_std_library};FVP_Base_Cortex-A32x4"
-[cortex-a35x4]="${fvp_arm_std_library};FVP_Base_Cortex-A35x4"
-[cortex-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A53x4"
+[cortex-a32x4]="${fvp_arm_std_library};FVP_Base_Cortex-A32"
+[cortex-a35x4]="${fvp_arm_std_library};FVP_Base_Cortex-A35"
+[cortex-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A53"
[cortex-a55x4]="${fvp_arm_std_library};FVP_Base_Cortex-A55"
[cortex-a57x1-a53x1]="${fvp_arm_std_library};FVP_Base_Cortex-A57x1-A53x1"
[cortex-a57x2-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x2-A53x4"
-[cortex-a57x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4"
+[cortex-a57x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57"
[cortex-a57x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4-A53x4"
-[cortex-a65aex8]="${fvp_arm_std_library_11_24};FVP_Base_Cortex-A65AE"
-[cortex-a65x4]="${fvp_arm_std_library_11_24};FVP_Base_Cortex-A65"
-[cortex-a72x4]="${fvp_arm_std_library};FVP_Base_Cortex-A72x4"
-[cortex-a72x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A72x4-A53x4"
-[cortex-a73x4]="${fvp_arm_std_library};FVP_Base_Cortex-A73x4"
+[cortex-a65aex8]="${fvp_arm_std_library};FVP_Base_Cortex-A65AE"
+[cortex-a65x4]="${fvp_arm_std_library};FVP_Base_Cortex-A65"
+[cortex-a72x4]="${fvp_arm_std_library};FVP_Base_Cortex-A72"
+[cortex-a73x4]="${fvp_arm_std_library};FVP_Base_Cortex-A73"
[cortex-a73x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A73x4-A53x4"
[cortex-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A75"
[cortex-a76aex4]="${fvp_arm_std_library};FVP_Base_Cortex-A76AE"
@@ -97,7 +94,7 @@
[cortex-x4]="${fvp_arm_std_library};FVP_Base_Cortex-X4"
[cortex-x925]="${fvp_arm_std_library};FVP_Base_Cortex-X925"
[cortex-a710x8]="${fvp_arm_std_library};FVP_Base_Cortex-A710"
-[neoverse_e1]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
+[neoverse_e1]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
[neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1"
[neoverse_n2]="${fvp_arm_std_library};FVP_Base_Neoverse-N2"
[neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
diff --git a/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4a53x4-debug b/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4a53x4-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa72x4a53x4-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/model/cortex-a32x4.sh b/model/cortex-a32x4.sh
index 31df685..a66e9d2 100644
--- a/model/cortex-a32x4.sh
+++ b/model/cortex-a32x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2024 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A32x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/models/$model_flavour/FVP_Base_Cortex-A32"
source "$ci_root/model/fvp_common.sh"
@@ -15,4 +15,6 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
EOF
diff --git a/model/cortex-a35x4.sh b/model/cortex-a35x4.sh
index 1816ce0..642de7b 100644
--- a/model/cortex-a35x4.sh
+++ b/model/cortex-a35x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2023 Arm Limited. All rights reserved.
+# Copyright (c) 2023-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A35x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A35"
source "$ci_root/model/fvp_common.sh"
@@ -15,6 +15,8 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
${bmcov_plugin+--plugin=$bmcov_plugin_path}
${reset_to_spmin+-C cluster0.cpu0.RVBARADDR=${bl32_addr:?}}
diff --git a/model/cortex-a53x4.sh b/model/cortex-a53x4.sh
index 7d38d96..1b9d729 100644
--- a/model/cortex-a53x4.sh
+++ b/model/cortex-a53x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A53x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A53"
source "$ci_root/model/fvp_common.sh"
@@ -15,6 +15,8 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
${reset_to_spmin+-C cluster0.cpu0.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu1.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu2.RVBARADDR=${bl32_addr:?}}
diff --git a/model/cortex-a57x4.sh b/model/cortex-a57x4.sh
index c740dff..1f0b085 100644
--- a/model/cortex-a57x4.sh
+++ b/model/cortex-a57x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A57x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A57"
source "$ci_root/model/fvp_common.sh"
@@ -15,6 +15,8 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
${reset_to_spmin+-C cluster0.cpu0.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu1.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu2.RVBARADDR=${bl32_addr:?}}
diff --git a/model/cortex-a65aex8.sh b/model/cortex-a65aex8.sh
index babd4c9..24c9269 100644
--- a/model/cortex-a65aex8.sh
+++ b/model/cortex-a65aex8.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2024, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Cortex-A65AE"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65AE"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a65x4.sh b/model/cortex-a65x4.sh
index 5f24cd1..fd97c3a 100644
--- a/model/cortex-a65x4.sh
+++ b/model/cortex-a65x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "/$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Cortex-A65"
+set_model_path "/$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A65"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a72x4.sh b/model/cortex-a72x4.sh
index 0db883e..663d10d 100644
--- a/model/cortex-a72x4.sh
+++ b/model/cortex-a72x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A72x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A72"
source "$ci_root/model/fvp_common.sh"
@@ -15,6 +15,8 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
${reset_to_spmin+-C cluster0.cpu0.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu1.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu2.RVBARADDR=${bl32_addr:?}}
diff --git a/model/cortex-a73x4.sh b/model/cortex-a73x4.sh
index be61565..bdbce81 100644
--- a/model/cortex-a73x4.sh
+++ b/model/cortex-a73x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025 Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A73x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A73"
source "$ci_root/model/fvp_common.sh"
@@ -15,6 +15,8 @@
-C bp.terminal_2.start_port=5002
-C bp.terminal_3.start_port=5003
+-C cluster0.NUM_CORES=4
+
${reset_to_spmin+-C cluster0.cpu0.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu1.RVBARADDR=${bl32_addr:?}}
${reset_to_spmin+-C cluster0.cpu2.RVBARADDR=${bl32_addr:?}}
diff --git a/model/neoverse_e1.sh b/model/neoverse_e1.sh
index c1858d8..7411986 100644
--- a/model/neoverse_e1.sh
+++ b/model/neoverse_e1.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020-2024, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version_11_24/$model_build_11_24/external/models/$model_flavour/FVP_Base_Neoverse-E1"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-E1"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/tc4.sh b/model/tc4.sh
index e9c7c56..25f03a6 100644
--- a/model/tc4.sh
+++ b/model/tc4.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2022-2024, Arm Limited. All rights reserved.
+# Copyright (c) 2022-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/SubSystemModels/0.0/8404/models/$model_flavour/FVP_TC4"
+set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC4"
cat <<EOF >"$model_param_file"
${fip_gpt_bin+-C board.flashloader0.fname=$fip_gpt_bin}
-C board.pl011_uart2.unbuffered_output=1
diff --git a/run_config/fvp-cortexa72x4a53x4 b/run_config/fvp-cortexa72x4a53x4
deleted file mode 100644
index 391234a..0000000
--- a/run_config/fvp-cortexa72x4a53x4
+++ /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="cortex-a72x4-a53x4"
-
- model="$model" gen_model_params
- model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-linux.rd1ae b/run_config/fvp-linux.rd1ae
index 770e2db..d48319f 100644
--- a/run_config/fvp-linux.rd1ae
+++ b/run_config/fvp-linux.rd1ae
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2024, Arm Limited. All rights reserved.
+# Copyright (c) 2024-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -49,12 +49,7 @@
set_run_env "ports_script" "$ci_root/model/rd1ae-ports.awk"
set_run_env "num_uarts" "3"
- model="$model" \
- model_build="20" \
- model_flavour="Linux64_GCC-9.3" \
- model_version="11.27" \
- gen_model_params
-
+ model="$model" gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/utils.sh b/utils.sh
index f65654f..84b5a41 100644
--- a/utils.sh
+++ b/utils.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2024, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2025, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -542,12 +542,8 @@
jenkins_url="${JENKINS_PUBLIC_URL%/*}"
jenkins_url="${jenkins_url:-https://ci.trustedfirmware.org/}"
-# Model revisions
-model_version_11_24="${model_version:-11.24}"
-model_build_11_24="${model_build:-24}"
-
-model_version="${model_version:-11.26}"
-model_build="${model_build:-11}"
+model_version="${model_version:-11.28}"
+model_build="${model_build:-23}"
model_flavour="${model_flavour:-Linux64_GCC-9.3}"
# Model snapshots from filer are not normally not accessible from developer