diff options
Diffstat (limited to 'configs/common/Benchmarks.py')
| -rw-r--r-- | configs/common/Benchmarks.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/configs/common/Benchmarks.py b/configs/common/Benchmarks.py index 3cf963bd5..9ed321ccf 100644 --- a/configs/common/Benchmarks.py +++ b/configs/common/Benchmarks.py @@ -34,10 +34,10 @@ from os import environ as env from m5.defines import buildEnv class SysConfig: - def __init__(self, script=None, mem=None, disk=None, rootdev=None, + def __init__(self, script=None, mem=None, disks=None, rootdev=None, os_type='linux'): self.scriptname = script - self.diskname = disk + self.disknames = disks self.memsize = mem self.root = rootdev self.ostype = os_type @@ -54,17 +54,17 @@ class SysConfig: else: return '128MB' - def disk(self): - if self.diskname: - return disk(self.diskname) + def disks(self): + if self.disknames: + return [disk(diskname) for diskname in self.disknames] elif buildEnv['TARGET_ISA'] == 'alpha': - return env.get('LINUX_IMAGE', disk('linux-latest.img')) + return [env.get('LINUX_IMAGE', disk('linux-latest.img'))] elif buildEnv['TARGET_ISA'] == 'x86': - return env.get('LINUX_IMAGE', disk('x86root.img')) + return [env.get('LINUX_IMAGE', disk('x86root.img'))] elif buildEnv['TARGET_ISA'] == 'arm': - return env.get('LINUX_IMAGE', disk('linux-aarch32-ael.img')) + return [env.get('LINUX_IMAGE', disk('linux-aarch32-ael.img'))] elif buildEnv['TARGET_ISA'] == 'sparc': - return env.get('LINUX_IMAGE', disk('disk.s10hw2')) + return [env.get('LINUX_IMAGE', disk('disk.s10hw2'))] else: print("Don't know what default disk image to use for %s ISA" % buildEnv['TARGET_ISA']) @@ -83,8 +83,8 @@ class SysConfig: # The first defined machine is the test system, the others are driving systems Benchmarks = { - 'PovrayBench': [SysConfig('povray-bench.rcS', '512MB', 'povray.img')], - 'PovrayAutumn': [SysConfig('povray-autumn.rcS', '512MB', 'povray.img')], + 'PovrayBench': [SysConfig('povray-bench.rcS', '512MB', ['povray.img'])], + 'PovrayAutumn': [SysConfig('povray-autumn.rcS', '512MB', ['povray.img'])], 'NetperfStream': [SysConfig('netperf-stream-client.rcS'), SysConfig('netperf-server.rcS')], @@ -129,16 +129,16 @@ Benchmarks = { 'MutexTest': [SysConfig('mutex-test.rcS', '128MB')], 'ArmAndroid-GB': [SysConfig('null.rcS', '256MB', - 'ARMv7a-Gingerbread-Android.SMP.mouse.nolock.clean.img', + ['ARMv7a-Gingerbread-Android.SMP.mouse.nolock.clean.img'], None, 'android-gingerbread')], - 'bbench-gb': [SysConfig('bbench-gb.rcS', '256MB', - 'ARMv7a-Gingerbread-Android.SMP.mouse.nolock.img', + 'bbench-gb': [SysConfig('bbench-gb.rcS', '256MB', + ['ARMv7a-Gingerbread-Android.SMP.mouse.nolock.img'], None, 'android-gingerbread')], 'ArmAndroid-ICS': [SysConfig('null.rcS', '256MB', - 'ARMv7a-ICS-Android.SMP.nolock.clean.img', + ['ARMv7a-ICS-Android.SMP.nolock.clean.img'], None, 'android-ics')], 'bbench-ics': [SysConfig('bbench-ics.rcS', '256MB', - 'ARMv7a-ICS-Android.SMP.nolock.img', + ['ARMv7a-ICS-Android.SMP.nolock.img'], None, 'android-ics')] } |