chore(2.8): update FVP version for 2.8 release
Updates common FVP model version from 11.17/21 to 11.19/14.
Moves FVP_Base_AEMvA ETE and FVP_Base_RevC-2xAEMvA to common FVP
model version.
Keeps FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502 and
FVP_Base_AEMv8A-GIC600AE as 11.17/21 versions as they do not
exist for 11.19/14. Also keeping FVP_Base_Cortex-A710x4 and
FVP_Base_Cortex-X2x4 to version 11.17/21.
Updates data instance for cortex-a55x4-a76x2 and
cortex-a55x4-a75x4.
Update FVP models array and add R-class FVP support to OpenCI.
Signed-off-by: Lauren Wehrmeister <lauren.wehrmeister@arm.com>
Change-Id: I502ffa8798866d69e5613ea89ae068b2b01c2d78
diff --git a/fvp_utils.sh b/fvp_utils.sh
index 8ee9a7f..5825712 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -42,8 +42,13 @@
# FVP containers and model paths
fvp_arm_std_library_11_12="fvp:fvp_arm_std_library_${model_version_11_12}_${model_build_11_12};/opt/model/FVP_ARM_Std_Library/models/${model_flavour_11_12}"
+fvp_arm_std_library_11_16="fvp:fvp_arm_std_library_${model_version_11_16}_${model_build_11_16};/opt/model/FVP_ARM_Std_Library/FVP_Base"
+fvp_arm_std_library_11_17="fvp:fvp_arm_std_library_${model_version_11_17}_${model_build_11_17};/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_aemva="fvp:fvp_base_aemva_${model_version}_${model_build};/opt/model/FVP_Base_AEMvA/models/${model_flavour}"
fvp_base_revc_2xaemva="fvp:fvp_base_revc-2xaemva_${model_version}_${model_build};/opt/model/Base_RevC_AEMvA_pkg/models/${model_flavour}"
+fvp_base_aemv8a_gic600ae="fvp:fvp_base_aemv8a-gic600ae_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_Base_AEMv8A-GIC600AE_pkg/models/${model_flavour_11_17}"
+fvp_base_aemv8a_aemv8a_aemv8a_aemv8a_ccn502="fvp:fvp_base_aemv8a-aemv8a-aemv8a-aemv8a-ccn502_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502_pkg/models/${model_flavour_11_17}"
foundation_platform="fvp:foundation_platform_${model_version}_${model_build};/opt/model/Foundation_Platformpkg/models/${model_flavour}"
fvp_base_aemv8r="fvp:fvp_base_aemv8r_${model_version}_${model_build};/opt/model/AEMv8R_base_pkg/models/${model_flavour}"
@@ -54,43 +59,43 @@
declare -A fvp_models
fvp_models=(
[base-aemv8a-quad]=";;;"
-[base-aemv8a-revb]=";;;"
-[base-aemv8a-latest-revb]=";;;"
+[base-aemv8a-revb]="${fvp_arm_std_library};FVP_Base_AEMvA-AEMvA"
+[base-aemv8a-latest-revb]="${fvp_arm_std_library};FVP_Base_AEMvA-AEMvA"
[base-aemva]=";;;"
[base-aemv8a-gic600ae]=";;;"
[foundationv8]="${foundation_platform};Foundation_Platform"
[base-aemv8a]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
-[baser-aemv8r]=";;;"
[cortex-a32x4]="${fvp_arm_std_library_11_12};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-a55x4]="${fvp_arm_std_library};FVP_Base_Cortex-A55"
[cortex-a55x4-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4+Cortex-A75x4"
[cortex-a55x4-a76x2]="${fvp_arm_std_library};FVP_Base_Cortex-A55x4+Cortex-A76x2"
[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-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A57x4-A53x4"
-[cortex-a65aex8]="${fvp_arm_std_library};FVP_Base_Cortex-A65AEx8"
-[cortex-a65x4]="${fvp_arm_std_library};FVP_Base_Cortex-A65x4"
+[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-A72x4"
[cortex-a72x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A72x4-A53x4"
[cortex-a73x4]="${fvp_arm_std_library};FVP_Base_Cortex-A73x4"
[cortex-a73x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A73x4-A53x4"
-[cortex-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A75x4"
-[cortex-a76aex4]="${fvp_arm_std_library};FVP_Base_Cortex-A76AEx4"
-[cortex-a76aex2]="${fvp_arm_std_library};FVP_Base_Cortex-A76AEx2"
-[cortex-a76x4]="${fvp_arm_std_library};FVP_Base_Cortex-A76x4"
-[cortex-a77x4]="${fvp_arm_std_library};FVP_Base_Cortex-A77x4"
-[cortex-a78x4]="${fvp_arm_std_library};FVP_Base_Cortex-A78x4"
-[cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78Cx4"
-[cortex-x2]="${fvp_arm_std_library};FVP_Base_Cortex-X2x4"
-[neoverse_e1x1]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x1"
-[neoverse_e1x2]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x2"
-[neoverse_e1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-E1x4"
-[neoverse_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1x4"
-[neoverse_n2]="${fvp_arm_std_library_11_12};FVP_Base_Neoverse-N1x4"
-[neoverse-v1x4]=";;;"
-[cortexa710x4]=";;;"
+[cortex-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A75"
+[cortex-a76aex4]="${fvp_arm_std_library};FVP_Base_Cortex-A76AE"
+[cortex-a76aex2]="${fvp_arm_std_library};FVP_Base_Cortex-A76AE"
+[cortex-a76x4]="${fvp_arm_std_library};FVP_Base_Cortex-A76"
+[cortex-a77x4]="${fvp_arm_std_library};FVP_Base_Cortex-A77"
+[cortex-a78x4]="${fvp_arm_std_library};FVP_Base_Cortex-A78"
+[cortex-a78cx4]="${fvp_arm_std_library};FVP_Base_Cortex-A78C"
+[cortex-x2]="${fvp_arm_std_library_11_17};FVP_Base_Cortex-X2x4"
+[cortex-a710]="${fvp_arm_std_library_11_17};FVP_Base_Cortex-A710x4"
+[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_n1]="${fvp_arm_std_library};FVP_Base_Neoverse-N1"
+[neoverse_n2]="${fvp_arm_std_library_11_16};FVP_Base_Neoverse-N1x4"
+[neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
[css-rdv1]=";;;"
[css-rde1edge]=";;;"
[css-rdn1edge]=";;;"
diff --git a/model/base-aemv8a-gic600ae.sh b/model/base-aemv8a-gic600ae.sh
index 7e83038..cdf5608 100644
--- a/model/base-aemv8a-gic600ae.sh
+++ b/model/base-aemv8a-gic600ae.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2021, Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022, 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_AEMv8A-GIC600AE"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_AEMv8A-GIC600AE"
default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/0.0/6415/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
diff --git a/model/base-aemv8a-latest-revb.sh b/model/base-aemv8a-latest-revb.sh
index dcd0683..cbcbcdf 100644
--- a/model/base-aemv8a-latest-revb.sh
+++ b/model/base-aemv8a-latest-revb.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, 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_AEMv8A-AEMv8A"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMvA-AEMvA"
default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
diff --git a/model/base-aemv8a-quad.sh b/model/base-aemv8a-quad.sh
index ee00815..1401332 100644
--- a/model/base-aemv8a-quad.sh
+++ b/model/base-aemv8a-quad.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 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_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502"
default_var cluster_0_num_cores 4
default_var cluster_1_num_cores 4
diff --git a/model/base-aemv8a-revb.sh b/model/base-aemv8a-revb.sh
index fff750b..2f9a24d 100644
--- a/model/base-aemv8a-revb.sh
+++ b/model/base-aemv8a-revb.sh
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
# Use revb model
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMv8A-AEMv8A"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMvA-AEMvA"
default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
diff --git a/model/base-aemva.sh b/model/base-aemva.sh
index 6a5e956..ef356cc 100644
--- a/model/base-aemva.sh
+++ b/model/base-aemva.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -11,7 +11,7 @@
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/ETE/0.0/79/external/lib/Linux64_GCC-6.4/libete-plugin.so"
+default_var ete_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/libete-plugin.so"
default_var is_dual_cluster 0
diff --git a/model/cortex-a55x4.sh b/model/cortex-a55x4.sh
index 2d97a36..53c5f9e 100644
--- a/model/cortex-a55x4.sh
+++ b/model/cortex-a55x4.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 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-A55x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A55"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a65aex8.sh b/model/cortex-a65aex8.sh
index ab16f01..63cf3e5 100644
--- a/model/cortex-a65aex8.sh
+++ b/model/cortex-a65aex8.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, 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-A65AEx8"
+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 1398ca8..bf37456 100644
--- a/model/cortex-a65x4.sh
+++ b/model/cortex-a65x4.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, 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-A65x4"
+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-a710.sh b/model/cortex-a710.sh
index 29d5978..bdea36b 100644
--- a/model/cortex-a710.sh
+++ b/model/cortex-a710.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022 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-A710x4"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_Cortex-A710x4"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a75x4.sh b/model/cortex-a75x4.sh
index 56d3e73..887d176 100644
--- a/model/cortex-a75x4.sh
+++ b/model/cortex-a75x4.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 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-A75x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A75"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a76aex4.sh b/model/cortex-a76aex4.sh
index d24bf3b..7fddd52 100644
--- a/model/cortex-a76aex4.sh
+++ b/model/cortex-a76aex4.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 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-A76AEx4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A76AE"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a76x4.sh b/model/cortex-a76x4.sh
index d30dce4..222da1f 100644
--- a/model/cortex-a76x4.sh
+++ b/model/cortex-a76x4.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 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-A76x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A76"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a77x4.sh b/model/cortex-a77x4.sh
index 575dc53..7fb0f3e 100644
--- a/model/cortex-a77x4.sh
+++ b/model/cortex-a77x4.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 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-A77x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A77"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/cortex-a78cx4.sh b/model/cortex-a78cx4.sh
index db56fcd..4030ffc 100644
--- a/model/cortex-a78cx4.sh
+++ b/model/cortex-a78cx4.sh
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A78Cx4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A78C"
# Option not supported on A78C FVP yet.
export no_quantum=""
diff --git a/model/cortex-a78x4.sh b/model/cortex-a78x4.sh
index a37851d..e1bf704 100644
--- a/model/cortex-a78x4.sh
+++ b/model/cortex-a78x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, 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-A78x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-A78"
# Option not supported on A78 FVP yet.
export no_quantum=""
diff --git a/model/cortex-x2.sh b/model/cortex-x2.sh
index 8d4bda9..741d609 100644
--- a/model/cortex-x2.sh
+++ b/model/cortex-x2.sh
@@ -5,6 +5,6 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Cortex-X2x4"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_Cortex-X2x4"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/fvp_common.sh b/model/fvp_common.sh
index f9ce3a8..19a06a3 100644
--- a/model/fvp_common.sh
+++ b/model/fvp_common.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019-2021, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -26,6 +26,7 @@
reset_var secure_memory
reset_var secure_ram_fill
reset_var wait_debugger
+reset_var cluster_0_num_cores
if [ "$bl2_at_el3" ]; then
@@ -52,6 +53,8 @@
${bl2_at_el3+--data ${data_instance}=$bl2_bin@${bl2_addr:?}}
+${cluster_0_num_cores+-C cluster0.NUM_CORES=$cluster_0_num_cores}
+
${reset_to_bl31+--data ${data_instance}=$bl31_bin@${bl31_addr:?}}
${preload_bl33+--data ${data_instance}=$preload_bl33_bin@${bl33_addr:?}}
diff --git a/model/neoverse-v1x4.sh b/model/neoverse-v1x4.sh
index e512b89..7314f5a 100644
--- a/model/neoverse-v1x4.sh
+++ b/model/neoverse-v1x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, 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_Neoverse-V1x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-V1"
# Option not supported on Neoverse FVP yet.
export no_quantum=""
diff --git a/model/neoverse_e1x1.sh b/model/neoverse_e1x1.sh
index 264f86f..0589397 100644
--- a/model/neoverse_e1x1.sh
+++ b/model/neoverse_e1x1.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, 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_Neoverse-E1x1"
+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/neoverse_e1x2.sh b/model/neoverse_e1x2.sh
index 98df385..97b17c2 100644
--- a/model/neoverse_e1x2.sh
+++ b/model/neoverse_e1x2.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, 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_Neoverse-E1x2"
+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/neoverse_e1x4.sh b/model/neoverse_e1x4.sh
index f974547..d90d230 100644
--- a/model/neoverse_e1x4.sh
+++ b/model/neoverse_e1x4.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, 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_Neoverse-E1x4"
+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/neoverse_n1.sh b/model/neoverse_n1.sh
index 6a1279d..be30173 100644
--- a/model/neoverse_n1.sh
+++ b/model/neoverse_n1.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 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_Neoverse-N1x4"
+set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_Neoverse-N1"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/neoverse_n2.sh b/model/neoverse_n2.sh
index 9ccd124..0722535 100644
--- a/model/neoverse_n2.sh
+++ b/model/neoverse_n2.sh
@@ -5,6 +5,6 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/Models/$model_version_11_12/$model_build_11_12/models/$model_flavour_11_12/FVP_Base_Neoverse-N2x4"
+set_model_path "$warehouse/SysGen/Models/$model_version_11_16/$model_build_11_16/external/models/$model_flavour_11_16/FVP_Base_Neoverse-N1x4"
source "$ci_root/model/fvp_common.sh"
diff --git a/model/tc2.sh b/model/tc2.sh
index 5b6e4b4..1bd85a9 100644
--- a/model/tc2.sh
+++ b/model/tc2.sh
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC2"
+set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_TC2_RSS"
cat <<EOF >"$model_param_file"
${fip_bin+-C board.flashloader0.fname=$fip_bin}
diff --git a/run_config/fvp-aemv8a.aarch32.gicv2 b/run_config/fvp-aemv8a.aarch32.gicv2
index 71743cf..9929ba1 100644
--- a/run_config/fvp-aemv8a.aarch32.gicv2
+++ b/run_config/fvp-aemv8a.aarch32.gicv2
@@ -9,21 +9,12 @@
local model="base-aemv8a"
model="$model" \
- aarch32="1" \
- cache_state_modelled="0" \
- gicv3_gicv2_only="1" \
- model_build="6557" \
- model_flavour="Linux64_GCC-6.4" \
- model_version="0.0" \
- mpidr_layout="0" \
- supports_multi_threading="0" \
- gen_model_params
+ aarch32="1" \
+ cache_state_modelled="0" \
+ gicv3_gicv2_only="1" \
+ mpidr_layout="0" \
+ supports_multi_threading="0" \
+ gen_model_params
- # TODO: switch to aarch32.gicv2 based RevC model once it is available
- # publicly
- model="base-aemv8a-revb" \
- model_build="21" \
- model_flavour="Linux64_GCC-6.4" \
- model_version="11.14" \
- gen_fvp_yaml
+ model="base-aemv8a-revb" gen_fvp_yaml
}
diff --git a/run_config/fvp-aemva.ete_trace_ext b/run_config/fvp-aemva.ete_trace_ext
index 1ca10b1..923fa39 100644
--- a/run_config/fvp-aemva.ete_trace_ext
+++ b/run_config/fvp-aemva.ete_trace_ext
@@ -11,9 +11,6 @@
model="$model" \
ete_plugin="1" \
etm_present="1" \
- model_build="6684" \
- model_flavour="Linux64_GCC-6.4" \
- model_version="0.0" \
supports_trace_buffer_control_regs="1" \
supports_trace_filter_regs="2" \
gen_model_params
diff --git a/run_config/fvp-aemva.ete_trace_ext.bl31_panic b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
index 86f1ae5..a8e24c9 100644
--- a/run_config/fvp-aemva.ete_trace_ext.bl31_panic
+++ b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
@@ -14,9 +14,6 @@
model="$model" \
ete_plugin="1" \
etm_present="1" \
- model_build="6684" \
- model_flavour="Linux64_GCC-6.4" \
- model_version="0.0" \
supports_trace_buffer_control_regs="1" \
supports_trace_filter_regs="2" \
gen_model_params
diff --git a/run_config/fvp-cortexa55x4 b/run_config/fvp-cortexa55x4
index 0f97d7a..42e401a 100644
--- a/run_config/fvp-cortexa55x4
+++ b/run_config/fvp-cortexa55x4
@@ -10,6 +10,9 @@
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cluster_0_num_cores="4" \
+ cache_state_modelled="0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-cortexa55x4a75x4 b/run_config/fvp-cortexa55x4a75x4
index 9c8a461..497f86c 100644
--- a/run_config/fvp-cortexa55x4a75x4
+++ b/run_config/fvp-cortexa55x4a75x4
@@ -8,6 +8,9 @@
generate_lava_job() {
local model="cortex-a55x4-a75x4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cache_state_modelled="0" \
+ data_instance="cluster0.subcluster0.cpu0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-cortexa55x4a76x2 b/run_config/fvp-cortexa55x4a76x2
index ef8ba5b..a1fe083 100644
--- a/run_config/fvp-cortexa55x4a76x2
+++ b/run_config/fvp-cortexa55x4a76x2
@@ -10,6 +10,9 @@
uart="0" set_expect_variable "num_cpus" "6"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cache_state_modelled="0" \
+ data_instance="cluster0.subcluster0.cpu0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-cortexa65aex8 b/run_config/fvp-cortexa65aex8
index 8ef8ed1..8a3e28c 100644
--- a/run_config/fvp-cortexa65aex8
+++ b/run_config/fvp-cortexa65aex8
@@ -10,6 +10,9 @@
uart="0" set_expect_variable "num_cpus" "16"
- model="$model" data_instance="cluster0.cpu0.thread0" gen_model_params
+ model="$model" \
+ cluster_0_num_cores="8" \
+ data_instance="cluster0.cpu0.thread0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-cortexa65x4 b/run_config/fvp-cortexa65x4
index fa87415..d7a83fd 100644
--- a/run_config/fvp-cortexa65x4
+++ b/run_config/fvp-cortexa65x4
@@ -13,6 +13,9 @@
uart="0" set_expect_variable "num_cpus" "8"
- model="$model" data_instance="cluster0.cpu0.thread0" gen_model_params
+ model="$model" \
+ data_instance="cluster0.cpu0.thread0" \
+ cluster_0_num_cores="4" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-cortexa75x4 b/run_config/fvp-cortexa75x4
index 973df37..07374a6 100644
--- a/run_config/fvp-cortexa75x4
+++ b/run_config/fvp-cortexa75x4
@@ -10,6 +10,9 @@
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cluster_0_num_cores="4" \
+ cache_state_modelled="0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-cortexa76aex4 b/run_config/fvp-cortexa76aex4
index 89bd07c..789d68d 100644
--- a/run_config/fvp-cortexa76aex4
+++ b/run_config/fvp-cortexa76aex4
@@ -10,6 +10,9 @@
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cluster_0_num_cores="4" \
+ cache_state_modelled="0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-cortexa76x4 b/run_config/fvp-cortexa76x4
index c421023..6adab4e 100644
--- a/run_config/fvp-cortexa76x4
+++ b/run_config/fvp-cortexa76x4
@@ -10,6 +10,9 @@
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cluster_0_num_cores="4" \
+ cache_state_modelled="0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-cortexa77x4 b/run_config/fvp-cortexa77x4
index c7fd3c9..7571838 100644
--- a/run_config/fvp-cortexa77x4
+++ b/run_config/fvp-cortexa77x4
@@ -10,6 +10,9 @@
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cluster_0_num_cores="4" \
+ cache_state_modelled="0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-cortexa78cx4 b/run_config/fvp-cortexa78cx4
index 0f6aa80..f2e562d 100644
--- a/run_config/fvp-cortexa78cx4
+++ b/run_config/fvp-cortexa78cx4
@@ -10,6 +10,9 @@
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cluster_0_num_cores="4" \
+ cache_state_modelled="0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-cortexa78x4 b/run_config/fvp-cortexa78x4
index ec4c7fa..0b538e7 100644
--- a/run_config/fvp-cortexa78x4
+++ b/run_config/fvp-cortexa78x4
@@ -1,10 +1,18 @@
#!/usr/bin/env bash
+#
+# Copyright (c) 2022, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
generate_lava_job() {
local model="cortex-a78x4"
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cluster_0_num_cores="4" \
+ cache_state_modelled="0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-neoverse_e1x1 b/run_config/fvp-neoverse_e1x1
index 5e9331c..39a48e4 100644
--- a/run_config/fvp-neoverse_e1x1
+++ b/run_config/fvp-neoverse_e1x1
@@ -11,9 +11,10 @@
uart="0" set_expect_variable "num_cpus" "2"
model="$model" \
- cache_state_modelled="1" \
- data_instance="cluster0.cpu0.thread0" \
- gen_model_params
+ cluster_0_num_cores="1" \
+ cache_state_modelled="1" \
+ data_instance="cluster0.cpu0.thread0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-neoverse_e1x2 b/run_config/fvp-neoverse_e1x2
index ab09004..8095bc8 100644
--- a/run_config/fvp-neoverse_e1x2
+++ b/run_config/fvp-neoverse_e1x2
@@ -11,9 +11,10 @@
uart="0" set_expect_variable "num_cpus" "4"
model="$model" \
- cache_state_modelled="1" \
- data_instance="cluster0.cpu0.thread0" \
- gen_model_params
+ cluster_0_num_cores="2" \
+ cache_state_modelled="1" \
+ data_instance="cluster0.cpu0.thread0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-neoverse_e1x4 b/run_config/fvp-neoverse_e1x4
index f647dd5..6c9b4bc 100644
--- a/run_config/fvp-neoverse_e1x4
+++ b/run_config/fvp-neoverse_e1x4
@@ -11,9 +11,10 @@
uart="0" set_expect_variable "num_cpus" "8"
model="$model" \
- cache_state_modelled="1" \
- data_instance="cluster0.cpu0.thread0" \
- gen_model_params
+ cluster_0_num_cores="4" \
+ cache_state_modelled="1" \
+ data_instance="cluster0.cpu0.thread0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-neoverse_n1x4 b/run_config/fvp-neoverse_n1x4
index 16c5fd9..d1e4f49 100644
--- a/run_config/fvp-neoverse_n1x4
+++ b/run_config/fvp-neoverse_n1x4
@@ -10,6 +10,9 @@
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cluster_0_num_cores="4" \
+ cache_state_modelled="0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-neoversev1x4 b/run_config/fvp-neoversev1x4
index aed7b6b..72c50ad 100644
--- a/run_config/fvp-neoversev1x4
+++ b/run_config/fvp-neoversev1x4
@@ -10,6 +10,9 @@
uart="0" set_expect_variable "num_cpus" "4"
- model="$model" cache_state_modelled="0" gen_model_params
+ model="$model" \
+ cluster_0_num_cores="4" \
+ cache_state_modelled="0" \
+ gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/run_config/fvp-tc2 b/run_config/fvp-tc2
index 297ad0f..d63748b 100644
--- a/run_config/fvp-tc2
+++ b/run_config/fvp-tc2
@@ -13,6 +13,6 @@
set_run_env "ports_script" "$ci_root/model/tc-ports.awk"
set_run_env "num_uarts" "3"
- model="$model" model_build="17" model_version="11.18" gen_model_params
+ model="$model" gen_model_params
model="$model" gen_fvp_yaml
}
diff --git a/script/run_local_ci.sh b/script/run_local_ci.sh
index 1f7b29d..fd71153 100755
--- a/script/run_local_ci.sh
+++ b/script/run_local_ci.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -146,7 +146,7 @@
else
print_success "$config_string" >&5
if [ -d "$workspace/artefacts/release" ] && \
- [ -f "$workspace/artefacts/release/tr-FVP_Base_RevC_2xAEMv8A.cluster0.cpu0.log" ]; then
+ [ -f "$workspace/artefacts/release/tr-FVP_Base_RevC_2xAEMvA.cluster0.cpu0.log" ]; then
cp $workspace/artefacts/release/*.log $workspace/artefacts/debug
fi
# Setting environmental variables for run of code coverage
diff --git a/utils.sh b/utils.sh
index a981f68..8f44c73 100644
--- a/utils.sh
+++ b/utils.sh
@@ -350,9 +350,19 @@
model_build_11_12="38"
model_flavour_11_12="Linux64_GCC-6.4"
+# 11.16 Model revisions
+model_version_11_16="11.16"
+model_build_11_16="16"
+model_flavour_11_16="Linux64_GCC-6.4"
+
+# 11.17 Model revisions
+model_version_11_17="11.17"
+model_build_11_17="21"
+model_flavour_11_17="Linux64_GCC-9.3"
+
# Model revisions
-model_version="${model_version:-11.17}"
-model_build="${model_build:-21}"
+model_version="${model_version:-11.19}"
+model_build="${model_build:-14}"
model_flavour="${model_flavour:-Linux64_GCC-9.3}"
# Model snapshots from filer are not normally not accessible from developer