From: Andrew Bardsley <Andrew.Bardsley@arm.com>
Date: Tue, 26 May 2015 07:21:37 +0000 (-0400)
Subject: cpu: Fix a bug in counting issued instructions in MinorCPU
X-Git-Tag: stable_2015_09_03~24
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cea1d14a937f27fa49423bd01eb900e578993a43;p=gem5.git

cpu: Fix a bug in counting issued instructions in MinorCPU

The MinorCPU would count bubbles in Execute::issue as part of
the num_insts_issued and so sometimes reach the instruction
issue limit incorrectly.

Fixed by checking for a bubble in one new place.
---

diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index ea325e28c..001515eff 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -770,7 +770,7 @@ Execute::issue(bool only_issue_microops)
 
             if (discarded) {
                 num_insts_discarded++;
-            } else {
+            } else if (!inst->isBubble()) {
                 num_insts_issued++;
 
                 if (num_insts_issued == issueLimit)