cpu: Limit TrafficGen outstanding reqs

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

diff --git a/configs/common/Benchmarks.py b/configs/common/Benchmarks.py
index d881fafb0fab9f98d52f62f8908c2de82e04df50..3cf963bd50bcebbf8462412afcc8b27f3d39baa1 100644 (file)
--- a/configs/common/Benchmarks.py
+++ b/configs/common/Benchmarks.py
@@ -26,15 +26,21 @@
 #
 # Authors: Ali Saidi
 
-from SysPaths import script, disk, binary
+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, disk=None):
+    def __init__(self, script=None, mem=None, disk=None, rootdev=None,
+                 os_type='linux'):
         self.scriptname = script
         self.diskname = disk
         self.memsize = mem
+        self.root = rootdev
+        self.ostype = os_type
 
     def script(self):
         if self.scriptname:
@@ -56,11 +62,22 @@ class SysConfig:
         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-arm-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'))
+        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:
-            print "Don't know what default disk image to use for ISA %s" % \
-                buildEnv['TARGET_ISA']
-            sys.exit(1)
+            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
@@ -111,12 +128,20 @@ Benchmarks = {
     'ValStreamCopy':    [SysConfig('micro_streamcopy.rcS', '512MB')],
 
     'MutexTest':        [SysConfig('mutex-test.rcS', '128MB')],
-    'ArmAndroid':       [SysConfig('null.rcS', '256MB',
-                     'ARMv7a-Gingerbread-Android.SMP.mouse.nolock.clean.img')],
-    'bbench':           [SysConfig('bbench.rcS', '256MB',
-                            'ARMv7a-Gingerbread-Android.SMP.mouse.nolock.img')]
+    '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 = Benchmarks.keys()
+benchs = list(Benchmarks.keys())
 benchs.sort()
 DefinedBenchmarks = ", ".join(benchs)