derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Run realview(64) tests with VExpress_GEM5_Foundation

Browse Source 
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>
This commit is contained in:
Giacomo Travaglini
2020-04-01 11:14:04 +01:00
parent 52a96449f5
commit a8587923fe
15 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/configs/arm_generic.py
View File

@@ -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)

1
tests/configs/realview-minor-dual.py
View File

@@ -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,

1
tests/configs/realview-minor.py
View File

@@ -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()

1
tests/configs/realview-o3-checker.py
View File

@@ -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,

1
tests/configs/realview-o3-dual.py
View File

@@ -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,

1
tests/configs/realview-o3.py
View File

@@ -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()

1
tests/configs/realview-simple-atomic-checkpoint.py
View File

@@ -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()

1
tests/configs/realview-simple-atomic-dual.py
View File

@@ -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,

1
tests/configs/realview-simple-atomic.py
View File

@@ -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()

1
tests/configs/realview-simple-timing-dual-ruby.py
View File

@@ -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,

1
tests/configs/realview-simple-timing-dual.py
View File

@@ -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,

1
tests/configs/realview-simple-timing-ruby.py
View File

@@ -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,

1
tests/configs/realview-simple-timing.py
View File

@@ -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()

1
tests/configs/realview-switcheroo-full.py
View File

@@ -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)

1
tests/configs/realview-switcheroo-o3.py
View File

@@ -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()