derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpu: convert thread_state to new style stats

Browse Source 
Change-Id: Ib8cc8633ca5fced63918a7a6d10e15126f7c7459
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33400
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
eavivi
2020-08-25 17:18:28 -07:00
committed by Eden Avivi
parent cc48c6fa47
commit 7bab96da67
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/minor/execute.cc
View File

@@ -865,7 +865,7 @@ Execute::doInstCommitAccounting(MinorDynInstPtr inst)
if (!inst->staticInst->isMicroop() || inst->staticInst->isLastMicroop())
{
thread->numInst++;
thread->numInsts++;
thread->threadStats.numInsts++;
cpu.stats.numInsts++;
cpu.system->totalNumInsts++;
@@ -873,7 +873,7 @@ Execute::doInstCommitAccounting(MinorDynInstPtr inst)
thread->comInstEventQueue.serviceEvents(thread->numInst);
}
thread->numOp++;
thread->numOps++;
thread->threadStats.numOps++;
cpu.stats.numOps++;
cpu.stats.committedInstType[inst->id.threadId]
[inst->staticInst->opClass()]++;

4
src/cpu/o3/cpu.cc
View File

@@ -1512,7 +1512,7 @@ FullO3CPU<Impl>::instDone(ThreadID tid, const DynInstPtr &inst)
// Keep an instruction count.
if (!inst->isMicroop() || inst->isLastMicroop()) {
thread[tid]->numInst++;
thread[tid]->numInsts++;
thread[tid]->threadStats.numInsts++;
committedInsts[tid]++;
system->totalNumInsts++;
@@ -1520,7 +1520,7 @@ FullO3CPU<Impl>::instDone(ThreadID tid, const DynInstPtr &inst)
thread[tid]->comInstEventQueue.serviceEvents(thread[tid]->numInst);
}
thread[tid]->numOp++;
thread[tid]->numOps++;
thread[tid]->threadStats.numOps++;
committedOps[tid]++;
probeInstCommit(inst->staticInst, inst->instAddr());

13
src/cpu/thread_state.cc
View File

@@ -39,7 +39,8 @@
#include "sim/system.hh"
ThreadState::ThreadState(BaseCPU *cpu, ThreadID _tid, Process *_process)
: numInst(0), numOp(0), numLoad(0), startNumLoad(0),
: numInst(0), numOp(0), threadStats(cpu, this),
numLoad(0), startNumLoad(0),
_status(ThreadContext::Halted), baseCpu(cpu),
_contextId(0), _threadId(_tid), lastActivate(0), lastSuspend(0),
process(_process), physProxy(NULL), virtProxy(NULL),
@@ -116,3 +117,13 @@ ThreadState::getVirtProxy()
assert(virtProxy != NULL);
return *virtProxy;
}
ThreadState::ThreadStateStats::ThreadStateStats(BaseCPU *cpu,
ThreadState *thread)
: Stats::Group(cpu, csprintf("thread%i", thread->threadId()).c_str()),
ADD_STAT(numInsts, "Number of Instructions committed"),
ADD_STAT(numOps, "Number of Ops committed"),
ADD_STAT(numMemRefs, "Number of Memory References")
{
}

19
src/cpu/thread_state.hh
View File

@@ -106,14 +106,19 @@ struct ThreadState : public Serializable {
/** Number of instructions committed. */
Counter numInst;
/** Stat for number instructions committed. */
Stats::Scalar numInsts;
/** Number of ops (including micro ops) committed. */
/** Number of ops (including micro ops) committed. */
Counter numOp;
/** Stat for number ops (including micro ops) committed. */
Stats::Scalar numOps;
/** Stat for number of memory references. */
Stats::Scalar numMemRefs;
// Defining the stat group
struct ThreadStateStats : public Stats::Group
{
ThreadStateStats(BaseCPU *cpu, ThreadState *thread);
/** Stat for number instructions committed. */
Stats::Scalar numInsts;
/** Stat for number ops (including micro ops) committed. */
Stats::Scalar numOps;
/** Stat for number of memory references. */
Stats::Scalar numMemRefs;
} threadStats;
/** Number of simulated loads, used for tracking events based on
* the number of loads committed.