Melissa Jost has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67393?usp=email )
Change subject: cpu-o3: Use base instructions committed counters in O3CPU
......................................................................
cpu-o3: Use base instructions committed counters in O3CPU
Moved committedInsts from O3 cpu.* to BaseCPU as numInstsNotNOP because
it tracks the instructions committed that are not NOPs or prefetches.
This change also does the same for commitedOps. InstsCommitted from O3
commit.*, which tracks all instructions committed, has been removed.
CommitCPUStats::numInsts replaces it in O3. The same has been done for
opsCommitted. Because IPC and CPI calculations are handled in BaseCPU,
removed IPC and CPI stats from O3 cpu.*.
Change-Id: I9f122c9a9dafccd5342f18056f282f3dad8b1b1e
---
M src/cpu/base.cc
M src/cpu/base.hh
M src/cpu/o3/commit.cc
M src/cpu/o3/commit.hh
M src/cpu/o3/cpu.cc
M src/cpu/o3/cpu.hh
6 files changed, 34 insertions(+), 78 deletions(-)
diff --git a/src/cpu/base.cc b/src/cpu/base.cc
index 77ecfa9..fea720a 100644
--- a/src/cpu/base.cc
+++ b/src/cpu/base.cc
@@ -907,6 +907,10 @@
"Number of instructions committed (thread level)"),
ADD_STAT(numOps, statistics::units::Count::get(),
"Number of ops (including micro ops) committed (thread
level)"),
+ ADD_STAT(numInstsNotNOP, statistics::units::Count::get(),
+ "Number of instructions committed excluding NOPs or
prefetches"),
+ ADD_STAT(numOpsNotNOP, statistics::units::Count::get(),
+ "Number of Ops (including micro ops) Simulated"),
ADD_STAT(cpi, statistics::units::Rate<
statistics::units::Cycle, statistics::units::Count>::get(),
"CPI: cycles per instruction (thread level)"),
diff --git a/src/cpu/base.hh b/src/cpu/base.hh
index 15ae0de..ac8f13c 100644
--- a/src/cpu/base.hh
+++ b/src/cpu/base.hh
@@ -741,6 +741,10 @@
statistics::Scalar numInsts;
statistics::Scalar numOps;
+ /* Number of instructions committed that are not NOP or prefetches
*/
+ statistics::Scalar numInstsNotNOP;
+ statistics::Scalar numOpsNotNOP;
+
/* CPI/IPC for total cycle counts and macro insts */
statistics::Formula cpi;
statistics::Formula ipc;
diff --git a/src/cpu/o3/commit.cc b/src/cpu/o3/commit.cc
index 7419b2a..e1f0168 100644
--- a/src/cpu/o3/commit.cc
+++ b/src/cpu/o3/commit.cc
@@ -156,10 +156,6 @@
"The number of times a branch was mispredicted"),
ADD_STAT(numCommittedDist, statistics::units::Count::get(),
"Number of insts commited each cycle"),
- ADD_STAT(instsCommitted, statistics::units::Count::get(),
- "Number of instructions committed"),
- ADD_STAT(opsCommitted, statistics::units::Count::get(),
- "Number of ops (including micro ops) committed"),
ADD_STAT(amos, statistics::units::Count::get(),
"Number of atomic instructions committed"),
ADD_STAT(membars, statistics::units::Count::get(),
@@ -181,14 +177,6 @@
.init(0,commit->commitWidth,1)
.flags(statistics::pdf);
- instsCommitted
- .init(cpu->numThreads)
- .flags(total);
-
- opsCommitted
- .init(cpu->numThreads)
- .flags(total);
-
amos
.init(cpu->numThreads)
.flags(total);
@@ -1348,9 +1336,12 @@
{
ThreadID tid = inst->threadNumber;
- if (!inst->isMicroop() || inst->isLastMicroop())
- stats.instsCommitted[tid]++;
- stats.opsCommitted[tid]++;
+ if (!inst->isMicroop() || inst->isLastMicroop()) {
+ cpu->commitStats[tid]->numInsts++;
+ cpu->baseStats.numInsts++;
+ }
+ cpu->commitStats[tid]->numOps++;
+ cpu->baseStats.numOps++;
// To match the old model, don't count nops and instruction
// prefetches towards the total commit count.
diff --git a/src/cpu/o3/commit.hh b/src/cpu/o3/commit.hh
index 6591360..eccd023 100644
--- a/src/cpu/o3/commit.hh
+++ b/src/cpu/o3/commit.hh
@@ -479,10 +479,6 @@
/** Distribution of the number of committed instructions each
cycle. */
statistics::Distribution numCommittedDist;
- /** Total number of instructions committed. */
- statistics::Vector instsCommitted;
- /** Total number of ops (including micro ops) committed. */
- statistics::Vector opsCommitted;
/** Stat for the total number of committed atomics. */
statistics::Vector amos;
/** Total number of committed memory barriers. */
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 90df3b3..93c58fe 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -328,23 +328,7 @@
"to idling"),
ADD_STAT(quiesceCycles, statistics::units::Cycle::get(),
"Total number of cycles that CPU has spent quiesced or
waiting "
- "for an interrupt"),
- ADD_STAT(committedInsts, statistics::units::Count::get(),
- "Number of Instructions Simulated"),
- ADD_STAT(committedOps, statistics::units::Count::get(),
- "Number of Ops (including micro ops) Simulated"),
- ADD_STAT(cpi, statistics::units::Rate<
- statistics::units::Cycle,
statistics::units::Count>::get(),
- "CPI: Cycles Per Instruction"),
- ADD_STAT(totalCpi, statistics::units::Rate<
- statistics::units::Cycle,
statistics::units::Count>::get(),
- "CPI: Total CPI of All Threads"),
- ADD_STAT(ipc, statistics::units::Rate<
- statistics::units::Count,
statistics::units::Cycle>::get(),
- "IPC: Instructions Per Cycle"),
- ADD_STAT(totalIpc, statistics::units::Rate<
- statistics::units::Count,
statistics::units::Cycle>::get(),
- "IPC: Total IPC of All Threads")
+ "for an interrupt")
{
// Register any of the O3CPU's stats here.
timesIdled
@@ -356,33 +340,6 @@
quiesceCycles
.prereq(quiesceCycles);
- // Number of Instructions simulated
- // --------------------------------
- // Should probably be in Base CPU but need templated
- // MaxThreads so put in here instead
- committedInsts
- .init(cpu->numThreads)
- .flags(statistics::total);
-
- committedOps
- .init(cpu->numThreads)
- .flags(statistics::total);
-
- cpi
- .precision(6);
- cpi = cpu->baseStats.numCycles / committedInsts;
-
- totalCpi
- .precision(6);
- totalCpi = cpu->baseStats.numCycles / sum(committedInsts);
-
- ipc
- .precision(6);
- ipc = committedInsts / cpu->baseStats.numCycles;
-
- totalIpc
- .precision(6);
- totalIpc = sum(committedInsts) / cpu->baseStats.numCycles;
}
void
@@ -1170,14 +1127,14 @@
if (!inst->isMicroop() || inst->isLastMicroop()) {
thread[tid]->numInst++;
thread[tid]->threadStats.numInsts++;
- cpuStats.committedInsts[tid]++;
+ commitStats[tid]->numInstsNotNOP++;
// Check for instruction-count-based events.
thread[tid]->comInstEventQueue.serviceEvents(thread[tid]->numInst);
}
thread[tid]->numOp++;
thread[tid]->threadStats.numOps++;
- cpuStats.committedOps[tid]++;
+ commitStats[tid]->numOpsNotNOP++;
probeInstCommit(inst->staticInst, inst->pcState().instAddr());
}
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index 0777529..7dc3784 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -581,19 +581,6 @@
/** Stat for total number of cycles the CPU spends descheduled due
to a
* quiesce operation or waiting for an interrupt. */
statistics::Scalar quiesceCycles;
- /** Stat for the number of committed instructions per thread. */
- statistics::Vector committedInsts;
- /** Stat for the number of committed ops (including micro ops) per
- * thread. */
- statistics::Vector committedOps;
- /** Stat for the CPI per thread. */
- statistics::Formula cpi;
- /** Stat for the total CPI. */
- statistics::Formula totalCpi;
- /** Stat for the IPC per thread. */
- statistics::Formula ipc;
- /** Stat for the total IPC. */
- statistics::Formula totalIpc;
} cpuStats;
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67393?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I9f122c9a9dafccd5342f18056f282f3dad8b1b1e
Gerrit-Change-Number: 67393
Gerrit-PatchSet: 1
Gerrit-Owner: Melissa Jost <melissakj...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
