From 96737c8a9bcfc6c9c145d57439aaed2ce1de5fc5 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Tue, 17 Oct 2006 11:08:49 -0700 Subject: Rename 'Machine' to 'SysConfig'. Clean up a little. --HG-- extra : convert_revision : db5f36776209c76a593205c46b08aa147358f33a --- configs/common/Benchmarks.py | 88 ++++++++++++++++++++++---------------------- configs/common/FSConfig.py | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) (limited to 'configs/common') diff --git a/configs/common/Benchmarks.py b/configs/common/Benchmarks.py index bb1ac1ab5..1f272517a 100644 --- a/configs/common/Benchmarks.py +++ b/configs/common/Benchmarks.py @@ -28,7 +28,7 @@ from SysPaths import * -class Machine: +class SysConfig: def __init__(self, script=None, mem=None, disk=None): self.scriptname = script self.diskname = disk @@ -52,54 +52,54 @@ class Machine: else: return env.get('LINUX_IMAGE', disk('linux-latest.img')) -#Benchmarks are defined as a key in a dict which is a list of Machines +# 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 -# Currently there is only support for 1 or 2 machines -Benchmarks = {} -Benchmarks['PovrayBench'] = [Machine('povray-bench.rcS', '512MB', 'povray.img')] -Benchmarks['PovrayAutumn'] = [Machine('povray-autumn.rcS', '512MB', 'povray.img')] -Benchmarks['NetperfStream'] = [Machine('netperf-stream-client.rcS'), - Machine('netperf-server.rcS')] -Benchmarks['NetperfStreamNT'] = [Machine('netperf-stream-nt-client.rcS'), - Machine('netperf-server.rcS')] -Benchmarks['NetperfMaerts'] = [Machine('netperf-maerts-client.rcS'), - Machine('netperf-server.rcS')] -Benchmarks['SurgeStandard'] = [Machine('surge-server.rcS', '512MB'), - Machine('surge-client.rcS', '256MB')] -Benchmarks['SurgeSpecweb'] = [Machine('spec-surge-server.rcS', '512MB'), - Machine('spec-surge-client.rcS', '256MB')] -Benchmarks['Nhfsstone'] = [Machine('nfs-server-nhfsstone.rcS', '512MB'), - Machine('nfs-client-nhfsstone.rcS')] -Benchmarks['Nfs'] = [Machine('nfs-server.rcS', '900MB'), - Machine('nfs-client-dbench.rcS')] -Benchmarks['NfsTcp'] = [Machine('nfs-server.rcS', '900MB'), - Machine('nfs-client-tcp.rcS')] -Benchmarks['IScsiInitiator'] = [Machine('iscsi-client.rcS', '512MB'), - Machine('iscsi-server.rcS', '512MB')] -Benchmarks['IScsiTarget'] = [Machine('iscsi-server.rcS', '512MB'), - Machine('iscsi-client.rcS', '512MB')] -Benchmarks['Validation'] = [Machine('iscsi-server.rcS', '512MB'), - Machine('iscsi-client.rcS', '512MB')] -Benchmarks['Ping'] = [Machine('ping-server.rcS',), - Machine('ping-client.rcS')] +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')], + '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')], -Benchmarks['ValAccDelay'] = [Machine('devtime.rcS', '512MB')] -Benchmarks['ValAccDelay2'] = [Machine('devtimewmr.rcS', '512MB')] -Benchmarks['ValMemLat'] = [Machine('micro_memlat.rcS', '512MB')] -Benchmarks['ValMemLat2MB'] = [Machine('micro_memlat2mb.rcS', '512MB')] -Benchmarks['ValMemLat8MB'] = [Machine('micro_memlat8mb.rcS', '512MB')] -Benchmarks['ValMemLat'] = [Machine('micro_memlat8.rcS', '512MB')] -Benchmarks['ValTlbLat'] = [Machine('micro_tlblat.rcS', '512MB')] -Benchmarks['ValSysLat'] = [Machine('micro_syscall.rcS', '512MB')] -Benchmarks['ValCtxLat'] = [Machine('micro_ctx.rcS', '512MB')] -Benchmarks['ValStream'] = [Machine('micro_stream.rcS', '512MB')] -Benchmarks['ValStreamScale'] = [Machine('micro_streamscale.rcS', '512MB')] -Benchmarks['ValStreamCopy'] = [Machine('micro_streamcopy.rcS', '512MB')] + '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')], - -Benchmarks['bnAn'] = [Machine('/z/saidi/work/m5.newmem.head/configs/boot/bn-app.rcS', '128MB', '/z/saidi/work/bottleneck/bnimg.img')] + 'bnAn': [SysConfig('/z/saidi/work/m5.newmem.head/configs/boot/bn-app.rcS', + '128MB', '/z/saidi/work/bottleneck/bnimg.img')] +} benchs = Benchmarks.keys() benchs.sort() diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 470dc8867..05888b10b 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -49,7 +49,7 @@ def makeLinuxAlphaSystem(mem_mode, mdesc = None): self = LinuxAlphaSystem() if not mdesc: # generic system - mdesc = Machine() + mdesc = SysConfig() self.readfile = mdesc.script() self.iobus = Bus(bus_id=0) self.membus = Bus(bus_id=1) -- cgit v1.2.3