diff options
| author | Lisa Hsu <hsul@eecs.umich.edu> | 2006-11-08 15:05:23 -0500 |
|---|---|---|
| committer | Lisa Hsu <hsul@eecs.umich.edu> | 2006-11-08 15:05:23 -0500 |
| commit | 64c0d82dec8ae042d41b6dbaa17a40095bb09091 (patch) | |
| tree | 20a6c1aa0766d392783b402aff6949c84943d451 /configs/common | |
| parent | 5a46f336a1b98d1ddeed40bcb24e285394760bf3 (diff) | |
| download | gem5-64c0d82dec8ae042d41b6dbaa17a40095bb09091.tar.xz | |
simplify maxtick parsing in both the python and the c++.
configs/common/Simulation.py:
simplify maxtick code a little bit - instead of checking for -1, just set it at MaxTick.
src/python/m5/__init__.py:
make a new m5 param called MaxTick.
src/sim/host.hh:
fix the M5 def. of MaxTick
src/sim/main.cc:
Simplify the MaxTick/num_cycles parsing within main.cc
--HG--
extra : convert_revision : f800addfbc1323591c2e05b892276b439b671668
Diffstat (limited to 'configs/common')
| -rw-r--r-- | configs/common/Simulation.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py index afa147537..a67159a50 100644 --- a/configs/common/Simulation.py +++ b/configs/common/Simulation.py @@ -65,7 +65,7 @@ def run(options, root, testsys, cpu_class): print "simulating for: ", simtime maxtick = simtime else: - maxtick = -1 + maxtick = m5.MaxTick if options.checkpoint_dir: cptdir = options.checkpoint_dir @@ -191,7 +191,7 @@ def run(options, root, testsys, cpu_class): sim_ticks = when exit_cause = "maximum %d checkpoints dropped" % max_checkpoints while num_checkpoints < max_checkpoints: - if (sim_ticks + period) > maxtick and maxtick != -1: + if (sim_ticks + period) > maxtick: exit_event = m5.simulate(maxtick - sim_ticks) exit_cause = exit_event.getCause() break @@ -214,11 +214,7 @@ def run(options, root, testsys, cpu_class): exit_cause = "maximum %d checkpoints dropped" % max_checkpoints break - if maxtick == -1: - exit_event = m5.simulate(maxtick) - else: - exit_event = m5.simulate(maxtick - m5.curTick()) - + exit_event = m5.simulate(maxtick - m5.curTick()) exit_cause = exit_event.getCause() if exit_cause == '': |