From: Tao Zhang <tao.zhang.0924@gmail.com>
Date: Tue, 8 Jan 2013 13:54:11 +0000 (-0500)
Subject: sim: Fix  early termination in multi-core simulation under SE mode.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=858d99b7cc6515aa6a0e75859aa7b5f460b40bb7;p=gem5.git

sim: Fix  early termination in multi-core simulation under SE mode.

When "-I" (maximum instruction number) and "-F" (fastforward instruction
number) are applied together, gem5 immediately exits after the cpu switching.
The reason is that multiple exit events may be generated in the same cycle by
Atomic CPU and inserted to mainEventQueue. However, mainEventQueue can only
serve one exit event in one cycle. Therefore, the rest exit events are left in
mainEventQueue without being descheduled or deleted, which causes gem5 exits
immediately after the system resumes by cpu switching.
---

diff --git a/src/sim/simulate.cc b/src/sim/simulate.cc
index 6962fab9f..fb785a91f 100644
--- a/src/sim/simulate.cc
+++ b/src/sim/simulate.cc
@@ -44,6 +44,10 @@
  * terminate the loop.  Exported to Python via SWIG.
  * @return The SimLoopExitEvent that caused the loop to exit.
  */
+
+// record the clock cycle for last exit event
+Tick lastExitTick = 0;
+
 SimLoopExitEvent *
 simulate(Tick num_cycles)
 {
@@ -67,6 +71,16 @@ simulate(Tick num_cycles)
 
         Event *exit_event = mainEventQueue.serviceOne();
         if (exit_event != NULL) {
+            /*
+             * if there are multiple exit events in the same cycle, drain the
+             * following exit events since gem5 only allows one * exit event in
+             * a cycle
+             */
+            if (lastExitTick == curTick())
+                continue;
+            else
+                lastExitTick = curTick();
+
             // hit some kind of exit event; return to Python
             // event must be subclass of SimLoopExitEvent...
             SimLoopExitEvent *se_event;