From 1fbe466345b43caabece9730c1f0456f1b57b82f Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Tue, 17 Aug 2010 05:06:22 -0700 Subject: sim: make Python Root object a singleton Enforce that the Python Root SimObject is instantiated only once. The C++ Root object already panics if more than one is created. This change avoids the need to track what the root object is, since it's available from Root.getInstance() (if it exists). It's now redundant to have the user pass the root object to functions like instantiate(), checkpoint(), and restoreCheckpoint(), so that arg is gone. Users who use configs/common/Simulate.py should not notice. --- configs/common/Simulation.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'configs/common') diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py index 905e435d3..0393b0dfa 100644 --- a/configs/common/Simulation.py +++ b/configs/common/Simulation.py @@ -190,7 +190,7 @@ def run(options, root, testsys, cpu_class): for i in xrange(np): testsys.cpu[i].max_insts_any_thread = offset - m5.instantiate(root) + m5.instantiate() if options.checkpoint_restore != None: from os.path import isdir, exists @@ -207,7 +207,7 @@ def run(options, root, testsys, cpu_class): fatal("Unable to find checkpoint directory %s", checkpoint_dir) print "Restoring checkpoint ..." - m5.restoreCheckpoint(root, checkpoint_dir) + m5.restoreCheckpoint(checkpoint_dir) print "Done." elif options.simpoint: # assume workload 0 has the simpoint @@ -224,7 +224,7 @@ def run(options, root, testsys, cpu_class): options.bench, options.checkpoint_restore) print "Restoring checkpoint ..." - m5.restoreCheckpoint(root,checkpoint_dir) + m5.restoreCheckpoint(checkpoint_dir) print "Done." else: dirs = listdir(cptdir) @@ -246,8 +246,8 @@ def run(options, root, testsys, cpu_class): maxtick = maxtick - int(cpts[cpt_num - 1]) ## Restore the checkpoint - m5.restoreCheckpoint(root, - joinpath(cptdir, "cpt.%s" % cpts[cpt_num - 1])) + m5.restoreCheckpoint(joinpath(cptdir, + "cpt.%s" % cpts[cpt_num - 1])) if options.standard_switch or cpu_class: if options.standard_switch: @@ -324,7 +324,7 @@ def run(options, root, testsys, cpu_class): if exit_event.getCause() == \ "a thread reached the max instruction count": - m5.checkpoint(root, joinpath(cptdir, "cpt.%s.%d" % \ + m5.checkpoint(joinpath(cptdir, "cpt.%s.%d" % \ (options.bench, checkpoint_inst))) print "Checkpoint written." num_checkpoints += 1 @@ -341,7 +341,7 @@ def run(options, root, testsys, cpu_class): exit_event = m5.simulate(when - m5.curTick()) if exit_event.getCause() == "simulate() limit reached": - m5.checkpoint(root, joinpath(cptdir, "cpt.%d")) + m5.checkpoint(joinpath(cptdir, "cpt.%d")) num_checkpoints += 1 sim_ticks = when @@ -358,7 +358,7 @@ def run(options, root, testsys, cpu_class): while exit_event.getCause() == "checkpoint": exit_event = m5.simulate(sim_ticks - m5.curTick()) if exit_event.getCause() == "simulate() limit reached": - m5.checkpoint(root, joinpath(cptdir, "cpt.%d")) + m5.checkpoint(joinpath(cptdir, "cpt.%d")) num_checkpoints += 1 if exit_event.getCause() != "simulate() limit reached": @@ -371,7 +371,7 @@ def run(options, root, testsys, cpu_class): exit_event = m5.simulate(maxtick) while exit_event.getCause() == "checkpoint": - m5.checkpoint(root, joinpath(cptdir, "cpt.%d")) + m5.checkpoint(joinpath(cptdir, "cpt.%d")) num_checkpoints += 1 if num_checkpoints == max_checkpoints: exit_cause = "maximum %d checkpoints dropped" % max_checkpoints @@ -385,5 +385,5 @@ def run(options, root, testsys, cpu_class): print 'Exiting @ cycle %i because %s' % (m5.curTick(), exit_cause) if options.checkpoint_at_end: - m5.checkpoint(root, joinpath(cptdir, "cpt.%d")) + m5.checkpoint(joinpath(cptdir, "cpt.%d")) -- cgit v1.2.3