From: Nikos Nikoleris <nikos.nikoleris@gmail.com>
Date: Tue, 20 Jan 2015 20:15:27 +0000 (-0600)
Subject: cpu: commit probe notification on every microop or macroop
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a35283ac65f956a88c796972c77f0ac5d9d8a180;p=gem5.git

cpu: commit probe notification on every microop or macroop
The ppCommit should notify the attached listener every time the cpu commits
a microop or non microcoded insturction. The listener can then decide
whether it will process only the last microop (eg. SimPoint probe).

Committed by: Nilay Vaish <nilay@cs.wisc.edu>
---

diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index aeaebcdb8..d1298e3cc 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -580,10 +580,7 @@ AtomicSimpleCPU::tick()
                 // keep an instruction count
                 if (fault == NoFault) {
                     countInst();
-                    if (!curStaticInst->isMicroop() ||
-                         curStaticInst->isLastMicroop()) {
-                        ppCommit->notify(std::make_pair(thread, curStaticInst));
-                    }
+                    ppCommit->notify(std::make_pair(thread, curStaticInst));
                 }
                 else if (traceData && !DTRACE(ExecFaulting)) {
                     delete traceData;
diff --git a/src/cpu/simple/probes/simpoint.cc b/src/cpu/simple/probes/simpoint.cc
index f2c0be62b..2de3cd420 100644
--- a/src/cpu/simple/probes/simpoint.cc
+++ b/src/cpu/simple/probes/simpoint.cc
@@ -79,6 +79,9 @@ SimPoint::profile(const std::pair<SimpleThread*, StaticInstPtr>& p)
     SimpleThread* thread = p.first;
     const StaticInstPtr &inst = p.second;
 
+    if (inst->isMicroop() && !inst->isLastMicroop())
+        return;
+
     if (!currentBBVInstCount)
         currentBBV.first = thread->pcState().instAddr();