changeset 89b6893554f5 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=89b6893554f5
description:
configs: clean up checkpoint code in Simulation.py
Small change to clean up some redundant code.
Should not have any functional impact.
diffstat:
configs/common/Simulation.py | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diffs (46 lines):
diff -r 383498e0a1cd -r 89b6893554f5 configs/common/Simulation.py
--- a/configs/common/Simulation.py Tue Aug 17 05:14:03 2010 -0700
+++ b/configs/common/Simulation.py Tue Aug 17 05:17:06 2010 -0700
@@ -200,32 +200,22 @@
if not isdir(cptdir):
fatal("checkpoint dir %s does not exist!", cptdir)
- if options.at_instruction:
- checkpoint_dir = joinpath(cptdir, "cpt.%s.%s" % \
- (options.bench, options.checkpoint_restore))
+ if options.at_instruction or options.simpoint:
+ inst = options.checkpoint_restore
+ if options.simpoint:
+ # assume workload 0 has the simpoint
+ if testsys.cpu[0].workload[0].simpoint == 0:
+ fatal('Unable to find simpoint')
+ inst += int(testsys.cpu[0].workload[0].simpoint)
+
+ checkpoint_dir = joinpath(cptdir,
+ "cpt.%s.%s" % (options.bench, inst))
if not exists(checkpoint_dir):
fatal("Unable to find checkpoint directory %s", checkpoint_dir)
print "Restoring checkpoint ..."
m5.restoreCheckpoint(checkpoint_dir)
print "Done."
- elif options.simpoint:
- # assume workload 0 has the simpoint
- if testsys.cpu[0].workload[0].simpoint == 0:
- fatal('Unable to find simpoint')
-
- options.checkpoint_restore += \
- int(testsys.cpu[0].workload[0].simpoint)
-
- checkpoint_dir = joinpath(cptdir, "cpt.%s.%d" % \
- (options.bench, options.checkpoint_restore))
- if not exists(checkpoint_dir):
- fatal("Unable to find checkpoint directory %s.%s",
- options.bench, options.checkpoint_restore)
-
- print "Restoring checkpoint ..."
- m5.restoreCheckpoint(checkpoint_dir)
- print "Done."
else:
dirs = listdir(cptdir)
expr = re.compile('cpt\.([0-9]*)')
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
