From: Joel Hestness <jthestness@gmail.com>
Date: Tue, 9 Apr 2013 21:25:30 +0000 (-0500)
Subject: Configs: Fix handling of maxtick and take_checkpoints
X-Git-Tag: stable_2013_06_16~9
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82c6734f6b0a614d01cb7c64a6bc53a20ca906a1;p=gem5.git

Configs: Fix handling of maxtick and take_checkpoints

In Simulation.py, calls to m5.simulate(num_ticks) will run the simulated system
for num_ticks after the current tick. Fix calls to m5.simulate in
scriptCheckpoints() and benchCheckpoints() to appropriately handle the maxticks
variable.
---

diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index fc6ae0f5f..cecf030ad 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -183,7 +183,7 @@ def scriptCheckpoints(options, maxtick, cptdir):
         period = int(period)
         num_checkpoints = 0
 
-        exit_event = m5.simulate(when)
+        exit_event = m5.simulate(when - m5.curTick())
         exit_cause = exit_event.getCause()
         while exit_cause == "checkpoint":
             exit_event = m5.simulate(when - m5.curTick())
@@ -215,7 +215,7 @@ def scriptCheckpoints(options, maxtick, cptdir):
     return exit_event
 
 def benchCheckpoints(options, maxtick, cptdir):
-    exit_event = m5.simulate(maxtick)
+    exit_event = m5.simulate(maxtick - m5.curTick())
     exit_cause = exit_event.getCause()
 
     num_checkpoints = 0