diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2013-01-08 17:12:22 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2013-01-08 17:12:22 -0500 |
| commit | fe3fbe624e9524ba5fdc55586e40eaa700c81c78 (patch) | |
| tree | 8937be317d6997cc699b720d34d250cc353cc8db /configs/common/Simulation.py | |
| parent | fbeced6135151cc70f83b95603589bcca53f3efc (diff) | |
| download | gem5-fe3fbe624e9524ba5fdc55586e40eaa700c81c78.tar.xz | |
config: Fix issue with changeset: a4739b6f799d.
Diffstat (limited to 'configs/common/Simulation.py')
| -rw-r--r-- | configs/common/Simulation.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py index 406f9ef0f..b1e243975 100644 --- a/configs/common/Simulation.py +++ b/configs/common/Simulation.py @@ -231,7 +231,7 @@ def benchCheckpoints(options, maxtick, cptdir): exit_event = m5.simulate(maxtick - m5.curTick()) exit_cause = exit_event.getCause() - return exit_cause + return exit_event def repeatSwitch(testsys, repeat_switch_cpu_list, maxtick, switch_freq): print "starting switch loop" @@ -240,7 +240,7 @@ def repeatSwitch(testsys, repeat_switch_cpu_list, maxtick, switch_freq): exit_cause = exit_event.getCause() if exit_cause != "simulate() limit reached": - return exit_cause + return exit_event print "draining the system" m5.drain(testsys) @@ -254,7 +254,7 @@ def repeatSwitch(testsys, repeat_switch_cpu_list, maxtick, switch_freq): if (maxtick - m5.curTick()) <= switch_freq: exit_event = m5.simulate(maxtick - m5.curTick()) - return exit_event.getCause() + return exit_event def run(options, root, testsys, cpu_class): if options.maxtick: @@ -498,12 +498,12 @@ def run(options, root, testsys, cpu_class): # If checkpoints are being taken, then the checkpoint instruction # will occur in the benchmark code it self. if options.repeat_switch and maxtick > options.repeat_switch: - exit_cause = repeatSwitch(testsys, repeat_switch_cpu_list, + exit_event = repeatSwitch(testsys, repeat_switch_cpu_list, maxtick, options.repeat_switch) else: - exit_cause = benchCheckpoints(options, maxtick, cptdir) + exit_event = benchCheckpoints(options, maxtick, cptdir) - print 'Exiting @ tick %i because %s' % (m5.curTick(), exit_cause) + print 'Exiting @ tick %i because %s' % (m5.curTick(), exit_event.getCause()) if options.checkpoint_at_end: m5.checkpoint(joinpath(cptdir, "cpt.%d")) |