2 files changed, 75 insertions, 18 deletions
diff --git a/configs/test/fs.py b/configs/test/fs.py
index fdbf86abe..55e7003a4 100644
--- a/configs/test/fs.py
+++ b/configs/test/fs.py
@@ -1,7 +1,18 @@
-from m5 import *
+import m5
+from m5.objects import *
 import os
 from SysPaths import *
 
+parser = optparse.OptionParser(option_list=m5.standardOptions)
+
+parser.add_option("-t", "--timing", action="store_true")
+
+(options, args) = parser.parse_args()
+
+if args:
+    print "Error: script doesn't take any positional arguments"
+    sys.exit(1)
+
 # Base for tests is directory containing this file.
 test_base = os.path.dirname(__file__)
 
@@ -181,7 +192,13 @@ class LinuxAlphaSystem(LinuxAlphaSystem):
                              read_only=True)
     simple_disk = SimpleDisk(disk=Parent.raw_image)
     intrctrl = IntrControl()
-    cpu = AtomicSimpleCPU(mem=Parent.magicbus2)
+    if options.timing:
+        cpu = TimingSimpleCPU()
+    else:
+        cpu = AtomicSimpleCPU()
+    cpu.mem = Parent.magicbus2
+    cpu.itb = AlphaITB()
+    cpu.dtb = AlphaDTB()
     sim_console = SimConsole(listener=ConsoleListener(port=3456))
     kernel = binary('vmlinux')
     pal = binary('ts_osfpal')
@@ -190,18 +207,15 @@ class LinuxAlphaSystem(LinuxAlphaSystem):
 #    readfile = os.path.join(test_base, 'halt.sh')
 
 
-BaseCPU.itb = AlphaITB()
-BaseCPU.dtb = AlphaDTB()
-BaseCPU.system = Parent.any
 
 class TsunamiRoot(System):
     pass
 
 
-def DualRoot(ClientSystem, ServerSystem):
+def DualRoot(clientSystem, serverSystem):
     self = Root()
-    self.client = ClientSystem()
-    self.server = ServerSystem()
+    self.client = clientSystem
+    self.server = serverSystem
 
     self.etherdump = EtherDump(file='ethertrace')
     self.etherlink = EtherLink(int1 = Parent.client.tsunami.etherint[0],
@@ -210,6 +224,11 @@ def DualRoot(ClientSystem, ServerSystem):
     self.clock = '5GHz'
     return self
 
-root = DualRoot(ClientSystem = LinuxAlphaSystem(readfile=script('netperf-stream-nt-client.rcS')),
-                ServerSystem = LinuxAlphaSystem(readfile=script('netperf-server.rcS')))
+root = DualRoot(LinuxAlphaSystem(readfile=script('netperf-stream-nt-client.rcS')),
+                LinuxAlphaSystem(readfile=script('netperf-server.rcS')))
+
+m5.instantiate(root)
+
+exit_event = m5.simulate()
 
+print 'Exiting @', m5.curTick(), 'because', exit_event.getCause()
diff --git a/configs/test/test.py b/configs/test/test.py
index 75e832f5e..8c5b06e6a 100644
--- a/configs/test/test.py
+++ b/configs/test/test.py
@@ -1,12 +1,50 @@
-from m5 import *
+# Simple test script
+#
+# Alpha: "m5 test.py"
+# MIPS: "m5 test.py -a Mips -c hello_mips"
 
-class HelloWorld(AlphaLiveProcess):
-    executable = '../configs/test/hello'
-    cmd = 'hello'
+import os, optparse, sys
+import m5
+from m5.objects import *
+
+# parse command-line arguments
+parser = optparse.OptionParser(option_list=m5.standardOptions)
+
+parser.add_option("-c", "--cmd", default="hello")
+parser.add_option("-t", "--timing", action="store_true")
+
+(options, args) = parser.parse_args()
+
+if args:
+    print "Error: script doesn't take any positional arguments"
+    sys.exit(1)
+
+# build configuration
+this_dir = os.path.dirname(__file__)
+
+process = LiveProcess()
+process.executable = os.path.join(this_dir, options.cmd)
+process.cmd = options.cmd
 
 magicbus = Bus()
 mem = PhysicalMemory()
-cpu = AtomicSimpleCPU(workload=HelloWorld(), mem=magicbus)
-system = System(physmem=mem, cpu=cpu)
-system.c1 =  Connector(side_a=mem, side_b=magicbus)
-root = Root(system=system)
+
+if options.timing:
+    cpu = TimingSimpleCPU()
+else:
+    cpu = AtomicSimpleCPU()
+cpu.workload = process
+cpu.mem = magicbus
+
+system = System(physmem = mem, cpu = cpu)
+system.c1 =  Connector(side_a = mem, side_b = magicbus)
+root = Root(system = system)
+
+# instantiate configuration
+m5.instantiate(root)
+
+# simulate until program terminates
+exit_event = m5.simulate()
+
+print 'Exiting @', m5.curTick(), 'because', exit_event.getCause()
+