diff options
author | Ali Saidi <Ali.Saidi@ARM.com> | 2014-10-29 23:18:27 -0500 |
---|---|---|
committer | Ali Saidi <Ali.Saidi@ARM.com> | 2014-10-29 23:18:27 -0500 |
commit | f2db2a96d181f796e6e475121f10230b9d1d007f (patch) | |
tree | e4a98f593cd5f3fc2c695a543723f5e6ee4def39 /tests/configs/arm_generic.py | |
parent | 5bfa521c46e489c06ac3ae44b97421f5ccb30bb7 (diff) | |
download | gem5-f2db2a96d181f796e6e475121f10230b9d1d007f.tar.xz |
arm, tests: Update config files to more recent kernels and create 64-bit regressions.
This changes the default ARM system to a Versatile Express-like system that supports
2GB of memory and PCI devices and updates the default kernels/file-systems for
AArch64 ARM systems (64-bit) to support up to 32GB of memory and PCI devices. Some
platforms that are no longer supported have been pruned from the configuration files.
In addition a set of 64-bit ARM regressions have been added to the regression system.
Diffstat (limited to 'tests/configs/arm_generic.py')
-rw-r--r-- | tests/configs/arm_generic.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/tests/configs/arm_generic.py b/tests/configs/arm_generic.py index b880919e6..04823973d 100644 --- a/tests/configs/arm_generic.py +++ b/tests/configs/arm_generic.py @@ -44,6 +44,7 @@ import FSConfig from Caches import * from base_config import * from O3_ARM_v7a import * +from Benchmarks import SysConfig class ArmSESystemUniprocessor(BaseSESystemUniprocessor): """Syscall-emulation builder for ARM uniprocessor systems. @@ -70,16 +71,21 @@ class LinuxArmSystemBuilder(object): ARM-specific create_system method to a class deriving from one of the generic base systems. """ - def __init__(self, machine_type): + def __init__(self, machine_type, **kwargs): """ Arguments: machine_type -- String describing the platform to simulate + num_cpus -- integer number of CPUs in the system """ self.machine_type = machine_type + self.num_cpus = kwargs.get('num_cpus', 1) + self.mem_size = kwargs.get('mem_size', '256MB') def create_system(self): + sc = SysConfig(None, self.mem_size, None) system = FSConfig.makeArmSystem(self.mem_mode, - self.machine_type, None, False) + self.machine_type, self.num_cpus, + sc, False) # We typically want the simulator to panic if the kernel # panics or oopses. This prevents the simulator from running @@ -94,7 +100,7 @@ class LinuxArmFSSystem(LinuxArmSystemBuilder, BaseFSSystem): """Basic ARM full system builder.""" - def __init__(self, machine_type='RealView_PBX', **kwargs): + def __init__(self, machine_type='VExpress_EMM', **kwargs): """Initialize an ARM system that supports full system simulation. Note: Keyword arguments that are not listed below will be @@ -104,7 +110,7 @@ class LinuxArmFSSystem(LinuxArmSystemBuilder, machine_type -- String describing the platform to simulate """ BaseSystem.__init__(self, **kwargs) - LinuxArmSystemBuilder.__init__(self, machine_type) + LinuxArmSystemBuilder.__init__(self, machine_type, **kwargs) def create_caches_private(self, cpu): # Use the more representative cache configuration @@ -121,13 +127,13 @@ class LinuxArmFSSystemUniprocessor(LinuxArmSystemBuilder, test cases. """ - def __init__(self, machine_type='RealView_PBX', **kwargs): + def __init__(self, machine_type='VExpress_EMM', **kwargs): BaseFSSystemUniprocessor.__init__(self, **kwargs) - LinuxArmSystemBuilder.__init__(self, machine_type) + LinuxArmSystemBuilder.__init__(self, machine_type, **kwargs) class LinuxArmFSSwitcheroo(LinuxArmSystemBuilder, BaseFSSwitcheroo): """Uniprocessor ARM system prepared for CPU switching""" - def __init__(self, machine_type='RealView_PBX', **kwargs): + def __init__(self, machine_type='VExpress_EMM', **kwargs): BaseFSSwitcheroo.__init__(self, **kwargs) - LinuxArmSystemBuilder.__init__(self, machine_type) + LinuxArmSystemBuilder.__init__(self, machine_type, **kwargs) |