summaryrefslogtreecommitdiff
path: root/configs/test
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-06-16 17:53:33 -0400
committerKevin Lim <ktlim@umich.edu>2006-06-16 17:53:33 -0400
commit4e07f6ca52828247fe1741b1e6c5269ad5291187 (patch)
treeaf786c3cfcdd5640b5840ffdfab64bb55b9e49f9 /configs/test
parent51a5b826373e2c08ba173854a19597d59e0e3c90 (diff)
parent0bbd909f02e72a321a65b933104c5ef1e157116b (diff)
downloadgem5-4e07f6ca52828247fe1741b1e6c5269ad5291187.tar.xz
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge --HG-- extra : convert_revision : 488b9a9965dd86ca73dc9e510e5b3122cbd357f9
Diffstat (limited to 'configs/test')
-rw-r--r--configs/test/test.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/configs/test/test.py b/configs/test/test.py
index 251755e71..76791d9d7 100644
--- a/configs/test/test.py
+++ b/configs/test/test.py
@@ -14,6 +14,7 @@ parser = optparse.OptionParser(option_list=m5.standardOptions)
parser.add_option("-c", "--cmd", default="hello")
parser.add_option("-t", "--timing", action="store_true")
parser.add_option("-f", "--full", action="store_true")
+parser.add_option("-m", "--maxtick", type="int")
(options, args) = parser.parse_args()
@@ -34,7 +35,7 @@ mem = PhysicalMemory()
if options.timing:
cpu = TimingSimpleCPU()
elif options.full:
- cpu = DetailedCPU()
+ cpu = DetailedO3CPU()
else:
cpu = AtomicSimpleCPU()
cpu.workload = process
@@ -48,7 +49,10 @@ root = Root(system = system)
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 @ cycle', m5.curTick(), 'because', exit_event.getCause()