Benchmarks.py (3089:0ea2eb13c4de) Benchmarks.py (3304:c5917aeb8e2f)
1# Copyright (c) 2006 The Regents of The University of Michigan
2# All rights reserved.
3#
4# Redistribution and use in source and binary forms, with or without
5# modification, are permitted provided that the following conditions are
6# met: redistributions of source code must retain the above copyright
7# notice, this list of conditions and the following disclaimer;
8# redistributions in binary form must reproduce the above copyright

--- 14 unchanged lines hidden (view full) ---

23# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26#
27# Authors: Ali Saidi
28
29from SysPaths import *
30
1# Copyright (c) 2006 The Regents of The University of Michigan
2# All rights reserved.
3#
4# Redistribution and use in source and binary forms, with or without
5# modification, are permitted provided that the following conditions are
6# met: redistributions of source code must retain the above copyright
7# notice, this list of conditions and the following disclaimer;
8# redistributions in binary form must reproduce the above copyright

--- 14 unchanged lines hidden (view full) ---

23# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26#
27# Authors: Ali Saidi
28
29from SysPaths import *
30
31class Machine:
31class SysConfig:
32 def __init__(self, script=None, mem=None, disk=None):
33 self.scriptname = script
34 self.diskname = disk
35 self.memsize = mem
36
37 def script(self):
38 if self.scriptname:
39 return script(self.scriptname)

--- 7 unchanged lines hidden (view full) ---

47 return '128MB'
48
49 def disk(self):
50 if self.diskname:
51 return disk(self.diskname)
52 else:
53 return env.get('LINUX_IMAGE', disk('linux-latest.img'))
54
32 def __init__(self, script=None, mem=None, disk=None):
33 self.scriptname = script
34 self.diskname = disk
35 self.memsize = mem
36
37 def script(self):
38 if self.scriptname:
39 return script(self.scriptname)

--- 7 unchanged lines hidden (view full) ---

47 return '128MB'
48
49 def disk(self):
50 if self.diskname:
51 return disk(self.diskname)
52 else:
53 return env.get('LINUX_IMAGE', disk('linux-latest.img'))
54
55#Benchmarks are defined as a key in a dict which is a list of Machines
55# Benchmarks are defined as a key in a dict which is a list of SysConfigs
56# The first defined machine is the test system, the others are driving systems
56# The first defined machine is the test system, the others are driving systems
57# Currently there is only support for 1 or 2 machines
58
57
59Benchmarks = {}
60Benchmarks['PovrayBench'] = [Machine('povray-bench.rcS', '512MB', 'povray.img')]
61Benchmarks['PovrayAutumn'] = [Machine('povray-autumn.rcS', '512MB', 'povray.img')]
62Benchmarks['NetperfStream'] = [Machine('netperf-stream-client.rcS'),
63 Machine('netperf-server.rcS')]
64Benchmarks['NetperfStreamNT'] = [Machine('netperf-stream-nt-client.rcS'),
65 Machine('netperf-server.rcS')]
66Benchmarks['NetperfMaerts'] = [Machine('netperf-maerts-client.rcS'),
67 Machine('netperf-server.rcS')]
68Benchmarks['SurgeStandard'] = [Machine('surge-server.rcS', '512MB'),
69 Machine('surge-client.rcS', '256MB')]
70Benchmarks['SurgeSpecweb'] = [Machine('spec-surge-server.rcS', '512MB'),
71 Machine('spec-surge-client.rcS', '256MB')]
72Benchmarks['Nhfsstone'] = [Machine('nfs-server-nhfsstone.rcS', '512MB'),
73 Machine('nfs-client-nhfsstone.rcS')]
74Benchmarks['Nfs'] = [Machine('nfs-server.rcS', '900MB'),
75 Machine('nfs-client-dbench.rcS')]
76Benchmarks['NfsTcp'] = [Machine('nfs-server.rcS', '900MB'),
77 Machine('nfs-client-tcp.rcS')]
78Benchmarks['IScsiInitiator'] = [Machine('iscsi-client.rcS', '512MB'),
79 Machine('iscsi-server.rcS', '512MB')]
80Benchmarks['IScsiTarget'] = [Machine('iscsi-server.rcS', '512MB'),
81 Machine('iscsi-client.rcS', '512MB')]
82Benchmarks['Validation'] = [Machine('iscsi-server.rcS', '512MB'),
83 Machine('iscsi-client.rcS', '512MB')]
84Benchmarks['Ping'] = [Machine('ping-server.rcS',),
85 Machine('ping-client.rcS')]
58Benchmarks = {
59 'PovrayBench': [SysConfig('povray-bench.rcS', '512MB', 'povray.img')],
60 'PovrayAutumn': [SysConfig('povray-autumn.rcS', '512MB', 'povray.img')],
86
61
62 'NetperfStream': [SysConfig('netperf-stream-client.rcS'),
63 SysConfig('netperf-server.rcS')],
64 'NetperfStreamNT': [SysConfig('netperf-stream-nt-client.rcS'),
65 SysConfig('netperf-server.rcS')],
66 'NetperfMaerts': [SysConfig('netperf-maerts-client.rcS'),
67 SysConfig('netperf-server.rcS')],
68 'SurgeStandard': [SysConfig('surge-server.rcS', '512MB'),
69 SysConfig('surge-client.rcS', '256MB')],
70 'SurgeSpecweb': [SysConfig('spec-surge-server.rcS', '512MB'),
71 SysConfig('spec-surge-client.rcS', '256MB')],
72 'Nhfsstone': [SysConfig('nfs-server-nhfsstone.rcS', '512MB'),
73 SysConfig('nfs-client-nhfsstone.rcS')],
74 'Nfs': [SysConfig('nfs-server.rcS', '900MB'),
75 SysConfig('nfs-client-dbench.rcS')],
76 'NfsTcp': [SysConfig('nfs-server.rcS', '900MB'),
77 SysConfig('nfs-client-tcp.rcS')],
78 'IScsiInitiator': [SysConfig('iscsi-client.rcS', '512MB'),
79 SysConfig('iscsi-server.rcS', '512MB')],
80 'IScsiTarget': [SysConfig('iscsi-server.rcS', '512MB'),
81 SysConfig('iscsi-client.rcS', '512MB')],
82 'Validation': [SysConfig('iscsi-server.rcS', '512MB'),
83 SysConfig('iscsi-client.rcS', '512MB')],
84 'Ping': [SysConfig('ping-server.rcS',),
85 SysConfig('ping-client.rcS')],
87
86
88Benchmarks['ValAccDelay'] = [Machine('devtime.rcS', '512MB')]
89Benchmarks['ValAccDelay2'] = [Machine('devtimewmr.rcS', '512MB')]
90Benchmarks['ValMemLat'] = [Machine('micro_memlat.rcS', '512MB')]
91Benchmarks['ValMemLat2MB'] = [Machine('micro_memlat2mb.rcS', '512MB')]
92Benchmarks['ValMemLat8MB'] = [Machine('micro_memlat8mb.rcS', '512MB')]
93Benchmarks['ValMemLat'] = [Machine('micro_memlat8.rcS', '512MB')]
94Benchmarks['ValTlbLat'] = [Machine('micro_tlblat.rcS', '512MB')]
95Benchmarks['ValSysLat'] = [Machine('micro_syscall.rcS', '512MB')]
96Benchmarks['ValCtxLat'] = [Machine('micro_ctx.rcS', '512MB')]
97Benchmarks['ValStream'] = [Machine('micro_stream.rcS', '512MB')]
98Benchmarks['ValStreamScale'] = [Machine('micro_streamscale.rcS', '512MB')]
99Benchmarks['ValStreamCopy'] = [Machine('micro_streamcopy.rcS', '512MB')]
87 'ValAccDelay': [SysConfig('devtime.rcS', '512MB')],
88 'ValAccDelay2': [SysConfig('devtimewmr.rcS', '512MB')],
89 'ValMemLat': [SysConfig('micro_memlat.rcS', '512MB')],
90 'ValMemLat2MB': [SysConfig('micro_memlat2mb.rcS', '512MB')],
91 'ValMemLat8MB': [SysConfig('micro_memlat8mb.rcS', '512MB')],
92 'ValMemLat': [SysConfig('micro_memlat8.rcS', '512MB')],
93 'ValTlbLat': [SysConfig('micro_tlblat.rcS', '512MB')],
94 'ValSysLat': [SysConfig('micro_syscall.rcS', '512MB')],
95 'ValCtxLat': [SysConfig('micro_ctx.rcS', '512MB')],
96 'ValStream': [SysConfig('micro_stream.rcS', '512MB')],
97 'ValStreamScale': [SysConfig('micro_streamscale.rcS', '512MB')],
98 'ValStreamCopy': [SysConfig('micro_streamcopy.rcS', '512MB')],
100
99
100 'bnAn': [SysConfig('/z/saidi/work/m5.newmem.head/configs/boot/bn-app.rcS',
101 '128MB', '/z/saidi/work/bottleneck/bnimg.img')]
102}
101
103
102Benchmarks['bnAn'] = [Machine('/z/saidi/work/m5.newmem.head/configs/boot/bn-app.rcS', '128MB', '/z/saidi/work/bottleneck/bnimg.img')]
103
104benchs = Benchmarks.keys()
105benchs.sort()
106DefinedBenchmarks = ", ".join(benchs)
104benchs = Benchmarks.keys()
105benchs.sort()
106DefinedBenchmarks = ", ".join(benchs)