From: Dam Sunwoo <dam.sunwoo@arm.com>
Date: Fri, 24 Jan 2014 21:29:29 +0000 (-0600)
Subject: cpu: remove faulty simpoint basic block inst count assertion
X-Git-Tag: stable_2014_08_26~216
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f1cd6b1ba8ce66f04793133233ac0135c6b11646;p=gem5.git

cpu: remove faulty simpoint basic block inst count assertion

This patch removes an assertion in the simpoint profiling code that
asserts that a previously-seen basic block has the exact same number
of instructions executed as before. This can be false if the basic
block generates aborts or takes interrupts at different locations
within the basic block. The basic block profiling are not affected
significantly as these events are rare in general.
---

diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index d29903c2f..13c4b9bd3 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -618,7 +618,6 @@ AtomicSimpleCPU::profileSimPoint()
             // If basic block is seen before, just increment the count by the
             // number of insts in basic block.
             BBInfo& info = map_itr->second;
-            assert(info.insts == currentBBVInstCount);
             info.count += currentBBVInstCount;
         }
         currentBBVInstCount = 0;