summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2006-10-30 13:33:38 -0500
committerLisa Hsu <hsul@eecs.umich.edu>2006-10-30 13:33:38 -0500
commit9be53b10b302a3b8ca8fcaa38bf318aa4dcc641c (patch)
tree73618710c83112cdf9e8f7b883a4750ae37d537c
parent628a3b1d01702d1e3888c40c4a02c38c636ae6d4 (diff)
parentb40af2328a254b109a08327475bb8f2aa906399b (diff)
downloadgem5-9be53b10b302a3b8ca8fcaa38bf318aa4dcc641c.tar.xz
Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/m5/newmem --HG-- extra : convert_revision : ce5f394a4a62f7452b9631763425f65b911387bb
-rw-r--r--configs/common/Options.py5
-rw-r--r--configs/common/Simulation.py5
2 files changed, 7 insertions, 3 deletions
diff --git a/configs/common/Options.py b/configs/common/Options.py
index d9c1cc64e..d89023082 100644
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -53,5 +53,6 @@ parser.add_option("-r", "--checkpoint_restore", action="store", type="int",
# CPU Switching - default switch model goes from a checkpoint
# to a timing simple CPU with caches to warm up, then to detailed CPU for
# data measurement
-parser.add_option("-s", "--standard_switch", action="store_true",
- help="switch from one cpu mode to another")
+parser.add_option("-s", "--standard_switch", action="store", type="int",
+ help="switch from timing CPU to Detailed CPU after a period of \
+ <N> cycles warmup", default=5000000000)
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index b927315ba..59cf32303 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -116,12 +116,15 @@ def run(options, root, testsys):
m5.switchCpus(switch_cpu_list)
m5.resume(testsys)
- exit_event = m5.simulate(3000000)
+ exit_event = m5.simulate(options.standard_switch)
m5.switchCpus(switch_cpu_list1)
num_checkpoints = 0
exit_cause = ''
+ ## Checkpoints being taken via the command line at <when> and at subsequent
+ ## periods of <period>. Checkpoint instructions received from the benchmark running
+ ## are ignored and skipped in favor of command line checkpoint instructions.
if options.take_checkpoints:
[when, period] = options.take_checkpoints.split(",", 1)
when = int(when)