diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2006-10-30 14:15:50 -0500 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2006-10-30 14:15:50 -0500 |
| commit | 13cbd4e94b7d65321d458ca70aeddbd6c9922538 (patch) | |
| tree | f0cbfe452016e07bd460ecd797a0a8b6adf58ccc /configs/common | |
| parent | bc93802fb8f65656c09cfb96f2e4c2febe0e569f (diff) | |
| parent | 883f0394f5eefea6fb541229564dcb8543d020fd (diff) | |
| download | gem5-13cbd4e94b7d65321d458ca70aeddbd6c9922538.tar.xz | |
Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/m5/newmem
--HG--
extra : convert_revision : 836fcb45f399ed4f860be2d0bfe2ac4709bfe2ef
Diffstat (limited to 'configs/common')
| -rw-r--r-- | configs/common/Options.py | 8 | ||||
| -rw-r--r-- | configs/common/Simulation.py | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/configs/common/Options.py b/configs/common/Options.py index d89023082..69f48dc3b 100644 --- a/configs/common/Options.py +++ b/configs/common/Options.py @@ -53,6 +53,8 @@ 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", type="int", - help="switch from timing CPU to Detailed CPU after a period of \ - <N> cycles warmup", default=5000000000) +parser.add_option("-s", "--standard_switch", action="store_true", + help="switch from timing CPU to Detailed CPU") +parser.add_option("-w", "--warmup", action="store", type="int", + help="if -s, then this is the warmup period. else, this is ignored", + default=5000000000) diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py index 59cf32303..899a291fc 100644 --- a/configs/common/Simulation.py +++ b/configs/common/Simulation.py @@ -116,7 +116,7 @@ def run(options, root, testsys): m5.switchCpus(switch_cpu_list) m5.resume(testsys) - exit_event = m5.simulate(options.standard_switch) + exit_event = m5.simulate(options.warmup) m5.switchCpus(switch_cpu_list1) num_checkpoints = 0 @@ -130,7 +130,6 @@ def run(options, root, testsys): when = int(when) period = int(period) - print "when is ", when, " period is ", period exit_event = m5.simulate(when) while exit_event.getCause() == "checkpoint": exit_event = m5.simulate(when - m5.curTick()) |