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 05fdb7786d09c2304a8992be3535490fbebb30a3..2047d65af81e17f3d54aee4f980d3f28cf2290d6 100644 (file)
--- a/configs/test/test.py
+++ b/configs/test/test.py
@@ -12,11 +12,14 @@ from FullO3Config import *
 parser = optparse.OptionParser(option_list=m5.standardOptions)
 
 parser.add_option("-c", "--cmd", default="hello")
+parser.add_option("-o", "--options", default="")
+parser.add_option("-i", "--input", default="")
 parser.add_option("-t", "--timing", action="store_true")
-parser.add_option("-f", "--full", 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"
@@ -27,14 +30,16 @@ this_dir = os.path.dirname(__file__)
 
 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.full:
+elif options.detailed:
     cpu = DetailedO3CPU()
 else:
     cpu = AtomicSimpleCPU()
@@ -42,7 +47,7 @@ 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
@@ -54,5 +59,5 @@ if options.maxtick:
 else:
     exit_event = m5.simulate()
 
-print 'Exiting @', m5.curTick(), 'because', exit_event.getCause()
+print 'Exiting @ tick', m5.curTick(), 'because', exit_event.getCause()