commit 72fceece92d739ab72a040d4f08f845e66aa1578
author Govindraj Raja <govindraj.raja@arm.com> Tue Jun 18 13:34:17 2024 -0500
committer Paul Sokolovsky <paul.sokolovsky@linaro.org> Sat Aug 31 00:52:08 2024 +0200
tree 12a62b8590feb65f2c18dcfea0c2dbf12f113a2a
parent 32abd7d43e7825b97891ad5a7a0503c267aca7c2

refactor(fvp): move certain tests to 11.24 FVP

There is known bug in FVP-11.25 and 11.26 that doesn't power down
secondary cores correctly when core threads are used.

So to avoid the test failure on 11.26 use 11.24 FVP.

Change-Id: I579aef3e11b177a8d3ef10e793441e6490ad6bd3
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
(cherry picked from commit 02e14fa8767ad2f7a8bf82325b1957f0fab84329)

fvp_utils.sh

diff --git a/fvp_utils.sh b/fvp_utils.sh
index 012f20a..081491a 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -45,6 +45,8 @@
 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}"
@@ -75,8 +77,8 @@
 [cortex-a57x2-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x2-A53x4"
 [cortex-a57x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4"
 [cortex-a57x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4-A53x4"
-[cortex-a65aex8]="${fvp_arm_std_library};FVP_Base_Cortex-A65AE"
-[cortex-a65x4]="${fvp_arm_std_library};FVP_Base_Cortex-A65"
+[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"
@@ -91,9 +93,9 @@
 [cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78C"
 [cortex-x2]="${fvp_arm_std_library};FVP_Base_Cortex-X2"
 [cortex-a710]="${fvp_arm_std_library};FVP_Base_Cortex-A710"
-[neoverse_e1x1]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
-[neoverse_e1x2]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
-[neoverse_e1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-E1"
+[neoverse_e1x1]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
+[neoverse_e1x2]="${fvp_arm_std_library_11_24};FVP_Base_Neoverse-E1"
+[neoverse_e1x4]="${fvp_arm_std_library_11_24};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"