Merge ktlim@zamp:/z/ktlim2/clean/newmem-merge

[gem5.git] / configs / test / test.py

diff --git a/configs/test/test.py b/configs/test/test.py
index 8bdea16ac6eb2b4b8c76dbd964c048c8c8c6a426..2047d65af81e17f3d54aee4f980d3f28cf2290d6 100644 (file)
--- a/configs/test/test.py
+++ b/configs/test/test.py
@@ -6,15 +6,20 @@
 import os, optparse, sys
 import m5
 from m5.objects import *
+from FullO3Config import *
 
 # parse command-line arguments
 parser = optparse.OptionParser(option_list=m5.standardOptions)
 
 parser.add_option("-c", "--cmd", default="hello")
-parser.add_option("-a", "--arch", choices=["Alpha", "Mips"], default="Alpha")
+parser.add_option("-o", "--options", default="")
+parser.add_option("-i", "--input", default="")
 parser.add_option("-t", "--timing", action="store_true")
+parser.add_option("-d", "--detailed", action="store_true")
+parser.add_option("-m", "--maxtick", type="int")
 
 (options, args) = parser.parse_args()
+m5.setStandardOptions(options)
 
 if args:
     print "Error: script doesn't take any positional arguments"
@@ -23,32 +28,36 @@ if args:
 # build configuration
 this_dir = os.path.dirname(__file__)
 
-print "arch =", options.arch
-process_class = eval(options.arch + "LiveProcess")
-
-process = process_class()
+process = LiveProcess()
 process.executable = os.path.join(this_dir, options.cmd)
-process.cmd = options.cmd
+process.cmd = options.cmd + " " + options.options
+if options.input != "":
+    process.input = options.input
 
 magicbus = Bus()
 mem = PhysicalMemory()
 
 if options.timing:
     cpu = TimingSimpleCPU()
+elif options.detailed:
+    cpu = DetailedO3CPU()
 else:
     cpu = AtomicSimpleCPU()
 cpu.workload = process
 cpu.mem = magicbus
 
 system = System(physmem = mem, cpu = cpu)
-system.c1 =  Connector(side_a = mem, side_b = magicbus)
+mem.port = magicbus.port
 root = Root(system = system)
 
 # instantiate configuration
 m5.instantiate(root)
 
 # simulate until program terminates
-exit_event = m5.simulate()
+if options.maxtick:
+    exit_event = m5.simulate(options.maxtick)
+else:
+    exit_event = m5.simulate()
 
-print 'Exiting @', m5.curTick(), 'because', exit_event.getCause()
+print 'Exiting @ tick', m5.curTick(), 'because', exit_event.getCause()