configs: cache: add cache line size option

[gem5.git] / configs / common / Benchmarks.py

diff --git a/configs/common/Benchmarks.py b/configs/common/Benchmarks.py
index eda0e80f93ce84de917e4afc19533aa9bd26a72e..d1c69d3f8cef0a1313c0237e41fedbf71f58e282 100644 (file)
--- a/configs/common/Benchmarks.py
+++ b/configs/common/Benchmarks.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2006 The Regents of The University of Michigan
+# 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
@@ -27,6 +27,7 @@
 # Authors: Ali Saidi
 
 from SysPaths import *
+from m5.defines import buildEnv
 
 class SysConfig:
     def __init__(self, script=None, mem=None, disk=None):
@@ -49,8 +50,14 @@ class SysConfig:
     def disk(self):
         if self.diskname:
             return disk(self.diskname)
-        else:
+        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'))
+        else:
+            print "Don't know what default disk image to use for ISA %s" % \
+                buildEnv['TARGET_ISA']
+            sys.exit(1)
 
 # 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
@@ -59,43 +66,46 @@ Benchmarks = {
     'PovrayBench':  [SysConfig('povray-bench.rcS', '512MB', 'povray.img')],
     'PovrayAutumn': [SysConfig('povray-autumn.rcS', '512MB', 'povray.img')],
 
-    'NetperfStream':   [SysConfig('netperf-stream-client.rcS'),
+    'NetperfStream':    [SysConfig('netperf-stream-client.rcS'),
+                         SysConfig('netperf-server.rcS')],
+    'NetperfStreamUdp': [SysConfig('netperf-stream-udp-client.rcS'),
                          SysConfig('netperf-server.rcS')],
-    'NetperfStreamNT': [SysConfig('netperf-stream-nt-client.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'),
+    'NetperfMaerts':    [SysConfig('netperf-maerts-client.rcS'),
                          SysConfig('netperf-server.rcS')],
-    'SurgeStandard':   [SysConfig('surge-server.rcS', '512MB'),
+    'SurgeStandard':    [SysConfig('surge-server.rcS', '512MB'),
                          SysConfig('surge-client.rcS', '256MB')],
-    'SurgeSpecweb':    [SysConfig('spec-surge-server.rcS', '512MB'),
+    'SurgeSpecweb':     [SysConfig('spec-surge-server.rcS', '512MB'),
                          SysConfig('spec-surge-client.rcS', '256MB')],
-    'Nhfsstone':       [SysConfig('nfs-server-nhfsstone.rcS', '512MB'),
+    'Nhfsstone':        [SysConfig('nfs-server-nhfsstone.rcS', '512MB'),
                          SysConfig('nfs-client-nhfsstone.rcS')],
-    'Nfs':             [SysConfig('nfs-server.rcS', '900MB'),
+    'Nfs':              [SysConfig('nfs-server.rcS', '900MB'),
                          SysConfig('nfs-client-dbench.rcS')],
-    'NfsTcp':          [SysConfig('nfs-server.rcS', '900MB'),
+    'NfsTcp':           [SysConfig('nfs-server.rcS', '900MB'),
                          SysConfig('nfs-client-tcp.rcS')],
-    'IScsiInitiator':  [SysConfig('iscsi-client.rcS', '512MB'),
+    'IScsiInitiator':   [SysConfig('iscsi-client.rcS', '512MB'),
                          SysConfig('iscsi-server.rcS', '512MB')],
-    'IScsiTarget':     [SysConfig('iscsi-server.rcS', '512MB'),
+    'IScsiTarget':      [SysConfig('iscsi-server.rcS', '512MB'),
                          SysConfig('iscsi-client.rcS', '512MB')],
-    'Validation':      [SysConfig('iscsi-server.rcS', '512MB'),
+    'Validation':       [SysConfig('iscsi-server.rcS', '512MB'),
                          SysConfig('iscsi-client.rcS', '512MB')],
-    'Ping':            [SysConfig('ping-server.rcS',),
+    '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')],
+    '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')],