tests: Run realview(64) tests with VExpress_GEM5_Foundation

This patch is updating the arm regression configs so that the newer
VExpress_GEM5_Foundation platform is used instead VExpress_GEM5_V1
for running regressions.
The platform has the same memory map as V1, except for a different
position of PCI regions in the memory map and more importantly
the use of GICv3 instead of GICv2

Change-Id: I48ff56dce38d482be7f1acf162f17725286f54fe
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27714
Tested-by: Gem5 Cloud Project GCB service account <345032938727@cloudbuild.gserviceaccount.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>

diff --git a/tests/configs/arm_generic.py b/tests/configs/arm_generic.py
index 6606de6bd1ec09f6d35a23a00372c623f4b98f10..4ca479981abafd171f348fda50757a3756af2265 100644 (file)
--- a/tests/configs/arm_generic.py
+++ b/tests/configs/arm_generic.py
@@ -94,6 +94,7 @@ class LinuxArmSystemBuilder(object):
 
         default_kernels = {
             "VExpress_GEM5_V1": gem5_kernel,
+            "VExpress_GEM5_Foundation": gem5_kernel,
         }
 
         sc = SysConfig(None, self.mem_size, [disk_image], "/dev/sda")
@@ -122,7 +123,7 @@ class LinuxArmFSSystem(LinuxArmSystemBuilder,
     """Basic ARM full system builder."""
 
     def __init__(self,
-                 machine_type='VExpress_GEM5_V1',
+                 machine_type='VExpress_GEM5_Foundation',
                  aarch64_kernel=True,
                  **kwargs):
         """Initialize an ARM system that supports full system simulation.
@@ -153,7 +154,7 @@ class LinuxArmFSSystemUniprocessor(LinuxArmSystemBuilder,
     """
 
     def __init__(self,
-                 machine_type='VExpress_GEM5_V1',
+                 machine_type='VExpress_GEM5_Foundation',
                  aarch64_kernel=True,
                  **kwargs):
         BaseFSSystemUniprocessor.__init__(self, **kwargs)
@@ -164,7 +165,7 @@ class LinuxArmFSSwitcheroo(LinuxArmSystemBuilder, BaseFSSwitcheroo):
     """Uniprocessor ARM system prepared for CPU switching"""
 
     def __init__(self,
-                 machine_type='VExpress_GEM5_V1',
+                 machine_type='VExpress_GEM5_Foundation',
                  aarch64_kernel=True,
                  **kwargs):
         BaseFSSwitcheroo.__init__(self, **kwargs)

diff --git a/tests/configs/realview-minor-dual.py b/tests/configs/realview-minor-dual.py
index 036ec322d9836f6449ac77157ff1b4851f8cdf26..bb4fe172e9478166a1b7d219d194fa0fb4f94d24 100644 (file)
--- a/tests/configs/realview-minor-dual.py
+++ b/tests/configs/realview-minor-dual.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystem(aarch64_kernel=False,
+                        machine_type='VExpress_GEM5_V1',
                         mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=MinorCPU,

diff --git a/tests/configs/realview-minor.py b/tests/configs/realview-minor.py
index 4db30ac2f307ee4797ea5d71523c2085568c73e1..0bee6cafb2a6b3c73b7f8f9beab45c3a102d4f4e 100644 (file)
--- a/tests/configs/realview-minor.py
+++ b/tests/configs/realview-minor.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=MinorCPU).create_root()

diff --git a/tests/configs/realview-o3-checker.py b/tests/configs/realview-o3-checker.py
index 3f20d07dcf43b9211fc2f515f2d954fc2ef7060c..4809581a7beb8acade082863b9a15f81c9ed6a43 100644 (file)
--- a/tests/configs/realview-o3-checker.py
+++ b/tests/configs/realview-o3-checker.py
@@ -38,6 +38,7 @@ from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=O3_ARM_v7a_3,

diff --git a/tests/configs/realview-o3-dual.py b/tests/configs/realview-o3-dual.py
index 6e569c90f6eb8eb8978c3d10732a4a1d1ec79450..52695e87406b193e076ea4032ae84fd034248a41 100644 (file)
--- a/tests/configs/realview-o3-dual.py
+++ b/tests/configs/realview-o3-dual.py
@@ -38,6 +38,7 @@ from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
 root = LinuxArmFSSystem(aarch64_kernel=False,
+                        machine_type='VExpress_GEM5_V1',
                         mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=O3_ARM_v7a_3,

diff --git a/tests/configs/realview-o3.py b/tests/configs/realview-o3.py
index b6806733047a3f854dfcc88bbe209dd5a80990f4..e984049a774391db752dcbd509b9aa43f16bcc23 100644 (file)
--- a/tests/configs/realview-o3.py
+++ b/tests/configs/realview-o3.py
@@ -38,6 +38,7 @@ from arm_generic import *
 from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=O3_ARM_v7a_3).create_root()

diff --git a/tests/configs/realview-simple-atomic-checkpoint.py b/tests/configs/realview-simple-atomic-checkpoint.py
index 9c61deb0601afeefb5d570300b505882e591bde2..d994ca5052c1146ca35670af723d8538c41ec309 100644 (file)
--- a/tests/configs/realview-simple-atomic-checkpoint.py
+++ b/tests/configs/realview-simple-atomic-checkpoint.py
@@ -40,6 +40,7 @@ from arm_generic import *
 import checkpoint
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='atomic',
                                     mem_class=SimpleMemory,
                                     cpu_class=AtomicSimpleCPU).create_root()

diff --git a/tests/configs/realview-simple-atomic-dual.py b/tests/configs/realview-simple-atomic-dual.py
index 6ba49772224579d4eb5d848138d0a9e283d1a383..47bbcc772b345589d634ac4b834468f936e8d671 100644 (file)
--- a/tests/configs/realview-simple-atomic-dual.py
+++ b/tests/configs/realview-simple-atomic-dual.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystem(aarch64_kernel=False,
+                        machine_type='VExpress_GEM5_V1',
                         mem_mode='atomic',
                         mem_class=SimpleMemory,
                         cpu_class=AtomicSimpleCPU,

diff --git a/tests/configs/realview-simple-atomic.py b/tests/configs/realview-simple-atomic.py
index 79835999b861f9ef39338a08b29037d5fd4fb5b9..659c18e1b70c8fe203c5291fdfa24bc1b2e83e82 100644 (file)
--- a/tests/configs/realview-simple-atomic.py
+++ b/tests/configs/realview-simple-atomic.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='atomic',
                                     mem_class=SimpleMemory,
                                     cpu_class=AtomicSimpleCPU).create_root()

diff --git a/tests/configs/realview-simple-timing-dual-ruby.py b/tests/configs/realview-simple-timing-dual-ruby.py
index 8cb452d30a449dc399448edc93a16698d83f73fe..63860c5b5b8965ab45eea6b8fd83e3cba78b52f4 100644 (file)
--- a/tests/configs/realview-simple-timing-dual-ruby.py
+++ b/tests/configs/realview-simple-timing-dual-ruby.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystem(aarch64_kernel=False,
+                        machine_type='VExpress_GEM5_V1',
                         mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=TimingSimpleCPU,

diff --git a/tests/configs/realview-simple-timing-dual.py b/tests/configs/realview-simple-timing-dual.py
index 7f3d384ff1a1f6e43c21dd4bad0bc72af3f40059..59ce2c70e068081d7d0da0e736bb3418cfd19a7b 100644 (file)
--- a/tests/configs/realview-simple-timing-dual.py
+++ b/tests/configs/realview-simple-timing-dual.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystem(aarch64_kernel=False,
+                        machine_type='VExpress_GEM5_V1',
                         mem_mode='timing',
                         mem_class=DDR3_1600_8x8,
                         cpu_class=TimingSimpleCPU,

diff --git a/tests/configs/realview-simple-timing-ruby.py b/tests/configs/realview-simple-timing-ruby.py
index 099b401277daa8dbbe3ba466a78c52cde1b9c637..94e4274668c1f90817723db448a58b771998be33 100644 (file)
--- a/tests/configs/realview-simple-timing-ruby.py
+++ b/tests/configs/realview-simple-timing-ruby.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=TimingSimpleCPU,

diff --git a/tests/configs/realview-simple-timing.py b/tests/configs/realview-simple-timing.py
index d60a25db841e4e93bb14e8d10d83259556fa102c..e130e20a9fe79fcc862033b57b45171b11e73d1c 100644 (file)
--- a/tests/configs/realview-simple-timing.py
+++ b/tests/configs/realview-simple-timing.py
@@ -37,6 +37,7 @@ from m5.objects import *
 from arm_generic import *
 
 root = LinuxArmFSSystemUniprocessor(aarch64_kernel=False,
+                                    machine_type='VExpress_GEM5_V1',
                                     mem_mode='timing',
                                     mem_class=DDR3_1600_8x8,
                                     cpu_class=TimingSimpleCPU).create_root()

diff --git a/tests/configs/realview-switcheroo-full.py b/tests/configs/realview-switcheroo-full.py
index 7747f9b83c1837bd29aa9dbd0234a7c7c6600d68..9d8ac5784e226bdbc7bf41529fceb6328d7bf3b0 100644 (file)
--- a/tests/configs/realview-switcheroo-full.py
+++ b/tests/configs/realview-switcheroo-full.py
@@ -38,6 +38,7 @@ from arm_generic import *
 import switcheroo
 
 root = LinuxArmFSSwitcheroo(
+    machine_type='VExpress_GEM5_V1',
     aarch64_kernel=False,
     mem_class=DDR3_1600_8x8,
     cpu_classes=(AtomicSimpleCPU, TimingSimpleCPU, MinorCPU, DerivO3CPU)

diff --git a/tests/configs/realview-switcheroo-o3.py b/tests/configs/realview-switcheroo-o3.py
index b6bbec15928dda148e39b045a420c6b128f31536..7424f403536e663f71f1ff099726430b680f8ee6 100644 (file)
--- a/tests/configs/realview-switcheroo-o3.py
+++ b/tests/configs/realview-switcheroo-o3.py
@@ -39,6 +39,7 @@ import switcheroo
 
 root = LinuxArmFSSwitcheroo(
     aarch64_kernel=False,
+    machine_type='VExpress_GEM5_V1',
     mem_class=DDR3_1600_8x8,
     cpu_classes=(DerivO3CPU, DerivO3CPU)
     ).create_root()