summaryrefslogtreecommitdiff
path: root/configs/common/Simulation.py
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-09-13 16:36:25 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-09-13 16:36:25 -0700
commit4a4aa59632c918ad9e2941fb79fa05540d2b52af (patch)
treed3e5c80c0c73ad158183ea607010809f8e2b709e /configs/common/Simulation.py
parentbbc8a40857d47348753c59b91a93dd312fa1b809 (diff)
parente282d9601cb515f59eeb1701ec990f0985001ba9 (diff)
downloadgem5-4a4aa59632c918ad9e2941fb79fa05540d2b52af.tar.xz
Merge with head.
--HG-- extra : convert_revision : 22aafb1cead3f584e64c188dc8eb45e271f4e7e9
Diffstat (limited to 'configs/common/Simulation.py')
-rw-r--r--configs/common/Simulation.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 61b14f026..c65597367 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -130,7 +130,7 @@ def run(options, root, testsys, cpu_class):
m5.panic("checkpoint dir %s does not exist!" % cptdir)
dirs = listdir(cptdir)
- expr = re.compile('cpt.([0-9]*)')
+ expr = re.compile('cpt\.([0-9]*)')
cpts = []
for dir in dirs:
match = expr.match(dir)
@@ -166,7 +166,9 @@ def run(options, root, testsys, cpu_class):
if options.standard_switch:
exit_event = m5.simulate(options.warmup)
+ m5.drain(testsys)
m5.switchCpus(switch_cpu_list1)
+ m5.resume(testsys)
num_checkpoints = 0
exit_cause = ''