a6d98140ca
All ISAs except SPARC can now take multiple disk images by passing the --disk-image option multiple times. Before this patch, several ISAs automatically mounted a secondary disk called "linux-bigswap2.img", which had to be in M5_PATH even if the end user did not want more than one disk. This was the case for for example for X86 but not ARM. This change was done to: * allow ARM to have a second disk image in fs.py, which was not possible, and allow other ISAs like X86 and ARM to take any number of disk images * provide a simpler, more intuitive CLI interface that does not require magic disk images to be present in M5_PATH to work for ISAs such as X86. Linux does not need that secondary image to boot correctly, so it is more friendly to support a minimal setup that requires the least amount of binaries to boot, and let supply the second image manually only if they need it. * make fs.py --disk-image work more similarly across all ISAs SPARC was left with a single disk only because its setup was a bit more complex and would require further testing. Change-Id: I8b6e08ae6daf0a5b6cd1d57d285a9677f01eb7ad Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23671 Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com> Tested-by: kokoro <noreply+kokoro@google.com>
148 lines
6.8 KiB
Python
148 lines
6.8 KiB
Python
# Copyright (c) 2006-2007 The Regents of The University of Michigan
|
|
# All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions are
|
|
# met: redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer;
|
|
# redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
# documentation and/or other materials provided with the distribution;
|
|
# neither the name of the copyright holders nor the names of its
|
|
# contributors may be used to endorse or promote products derived from
|
|
# this software without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
# Authors: Ali Saidi
|
|
|
|
from __future__ import print_function
|
|
from __future__ import absolute_import
|
|
|
|
from .SysPaths import script, disk, binary
|
|
from os import environ as env
|
|
from m5.defines import buildEnv
|
|
|
|
class SysConfig:
|
|
def __init__(self, script=None, mem=None, disks=None, rootdev=None,
|
|
os_type='linux'):
|
|
self.scriptname = script
|
|
self.disknames = disks
|
|
self.memsize = mem
|
|
self.root = rootdev
|
|
self.ostype = os_type
|
|
|
|
def script(self):
|
|
if self.scriptname:
|
|
return script(self.scriptname)
|
|
else:
|
|
return ''
|
|
|
|
def mem(self):
|
|
if self.memsize:
|
|
return self.memsize
|
|
else:
|
|
return '128MB'
|
|
|
|
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'))]
|
|
elif buildEnv['TARGET_ISA'] == 'x86':
|
|
return [env.get('LINUX_IMAGE', disk('x86root.img'))]
|
|
elif buildEnv['TARGET_ISA'] == 'arm':
|
|
return [env.get('LINUX_IMAGE', disk('linux-aarch32-ael.img'))]
|
|
elif buildEnv['TARGET_ISA'] == 'sparc':
|
|
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'])
|
|
exit(1)
|
|
|
|
def rootdev(self):
|
|
if self.root:
|
|
return self.root
|
|
else:
|
|
return '/dev/sda1'
|
|
|
|
def os_type(self):
|
|
return self.ostype
|
|
|
|
# Benchmarks are defined as a key in a dict which is a list of SysConfigs
|
|
# 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'])],
|
|
|
|
'NetperfStream': [SysConfig('netperf-stream-client.rcS'),
|
|
SysConfig('netperf-server.rcS')],
|
|
'NetperfStreamUdp': [SysConfig('netperf-stream-udp-client.rcS'),
|
|
SysConfig('netperf-server.rcS')],
|
|
'NetperfUdpLocal': [SysConfig('netperf-stream-udp-local.rcS')],
|
|
'NetperfStreamNT': [SysConfig('netperf-stream-nt-client.rcS'),
|
|
SysConfig('netperf-server.rcS')],
|
|
'NetperfMaerts': [SysConfig('netperf-maerts-client.rcS'),
|
|
SysConfig('netperf-server.rcS')],
|
|
'SurgeStandard': [SysConfig('surge-server.rcS', '512MB'),
|
|
SysConfig('surge-client.rcS', '256MB')],
|
|
'SurgeSpecweb': [SysConfig('spec-surge-server.rcS', '512MB'),
|
|
SysConfig('spec-surge-client.rcS', '256MB')],
|
|
'Nhfsstone': [SysConfig('nfs-server-nhfsstone.rcS', '512MB'),
|
|
SysConfig('nfs-client-nhfsstone.rcS')],
|
|
'Nfs': [SysConfig('nfs-server.rcS', '900MB'),
|
|
SysConfig('nfs-client-dbench.rcS')],
|
|
'NfsTcp': [SysConfig('nfs-server.rcS', '900MB'),
|
|
SysConfig('nfs-client-tcp.rcS')],
|
|
'IScsiInitiator': [SysConfig('iscsi-client.rcS', '512MB'),
|
|
SysConfig('iscsi-server.rcS', '512MB')],
|
|
'IScsiTarget': [SysConfig('iscsi-server.rcS', '512MB'),
|
|
SysConfig('iscsi-client.rcS', '512MB')],
|
|
'Validation': [SysConfig('iscsi-server.rcS', '512MB'),
|
|
SysConfig('iscsi-client.rcS', '512MB')],
|
|
'Ping': [SysConfig('ping-server.rcS',),
|
|
SysConfig('ping-client.rcS')],
|
|
|
|
'ValAccDelay': [SysConfig('devtime.rcS', '512MB')],
|
|
'ValAccDelay2': [SysConfig('devtimewmr.rcS', '512MB')],
|
|
'ValMemLat': [SysConfig('micro_memlat.rcS', '512MB')],
|
|
'ValMemLat2MB': [SysConfig('micro_memlat2mb.rcS', '512MB')],
|
|
'ValMemLat8MB': [SysConfig('micro_memlat8mb.rcS', '512MB')],
|
|
'ValMemLat': [SysConfig('micro_memlat8.rcS', '512MB')],
|
|
'ValTlbLat': [SysConfig('micro_tlblat.rcS', '512MB')],
|
|
'ValSysLat': [SysConfig('micro_syscall.rcS', '512MB')],
|
|
'ValCtxLat': [SysConfig('micro_ctx.rcS', '512MB')],
|
|
'ValStream': [SysConfig('micro_stream.rcS', '512MB')],
|
|
'ValStreamScale': [SysConfig('micro_streamscale.rcS', '512MB')],
|
|
'ValStreamCopy': [SysConfig('micro_streamcopy.rcS', '512MB')],
|
|
|
|
'MutexTest': [SysConfig('mutex-test.rcS', '128MB')],
|
|
'ArmAndroid-GB': [SysConfig('null.rcS', '256MB',
|
|
['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'],
|
|
None, 'android-gingerbread')],
|
|
'ArmAndroid-ICS': [SysConfig('null.rcS', '256MB',
|
|
['ARMv7a-ICS-Android.SMP.nolock.clean.img'],
|
|
None, 'android-ics')],
|
|
'bbench-ics': [SysConfig('bbench-ics.rcS', '256MB',
|
|
['ARMv7a-ICS-Android.SMP.nolock.img'],
|
|
None, 'android-ics')]
|
|
}
|
|
|
|
benchs = list(Benchmarks.keys())
|
|
benchs.sort()
|
|
DefinedBenchmarks = ", ".join(benchs)
|