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

cpu: Remove duplicate base inst and op stats

Browse Source 
This change removes any duplicated numInsts, numOps, ipc, and
cpi stats, and makes sure that numInsts is only tracked per
thread.

Change-Id: I45d0f6cb5c523e53c0602b5152a5108108476936
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69109
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
This commit is contained in:
Melissa Jost
2023-03-20 02:13:57 -07:00
committed by Bobby Bruce
parent 7403a298cc
commit f969c08ee2
9 changed files with 2 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/base.cc
View File

@@ -407,10 +407,6 @@ BaseCPU::probeInstCommit(const StaticInstPtr &inst, Addr pc)
BaseCPU::
BaseCPUStats::BaseCPUStats(statistics::Group *parent)
: statistics::Group(parent),
ADD_STAT(numInsts, statistics::units::Count::get(),
"Number of instructions committed (core level)"),
ADD_STAT(numOps, statistics::units::Count::get(),
"Number of ops (including micro ops) committed (core level)"),
ADD_STAT(numCycles, statistics::units::Cycle::get(),
"Number of cpu cycles simulated"),
ADD_STAT(cpi, statistics::units::Rate<

4
src/cpu/kvm/base.cc
View File

@@ -261,8 +261,6 @@ BaseKvmCPU::restartEqThread()
BaseKvmCPU::StatGroup::StatGroup(statistics::Group *parent)
: statistics::Group(parent),
ADD_STAT(committedInsts, statistics::units::Count::get(),
"Number of instructions committed"),
ADD_STAT(numVMExits, statistics::units::Count::get(),
"total number of KVM exits"),
ADD_STAT(numVMHalfEntries, statistics::units::Count::get(),
@@ -778,8 +776,6 @@ BaseKvmCPU::kvmRun(Tick ticks)
/* Update statistics */
baseStats.numCycles += simCyclesExecuted;;
stats.committedInsts += instsExecuted;
// update both old and new stats
commitStats[thread->threadId()]->numInsts += instsExecuted;
baseStats.numInsts += instsExecuted;
ctrInsts += instsExecuted;

1
src/cpu/kvm/base.hh
View File

@@ -804,7 +804,6 @@ class BaseKvmCPU : public BaseCPU
struct StatGroup : public statistics::Group
{
StatGroup(statistics::Group *parent);
statistics::Scalar committedInsts;
statistics::Scalar numVMExits;
statistics::Scalar numVMHalfEntries;
statistics::Scalar numExitSignal;

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

@@ -871,8 +871,6 @@ Execute::doInstCommitAccounting(MinorDynInstPtr inst)
{
thread->numInst++;
thread->threadStats.numInsts++;
cpu.stats.numInsts++;
// update both old and new stas
cpu.commitStats[inst->id.threadId]->numInsts++;
cpu.baseStats.numInsts++;
@@ -881,9 +879,7 @@ Execute::doInstCommitAccounting(MinorDynInstPtr inst)
}
thread->numOp++;
thread->threadStats.numOps++;
cpu.stats.numOps++;
cpu.commitStats[inst->id.threadId]->numOps++;
cpu.baseStats.numOps++;
cpu.commitStats[inst->id.threadId]
->committedInstType[inst->staticInst->opClass()]++;

19
src/cpu/minor/stats.cc
View File

@@ -45,28 +45,11 @@ namespace minor
MinorStats::MinorStats(BaseCPU *base_cpu)
: statistics::Group(base_cpu),
ADD_STAT(numInsts, statistics::units::Count::get(),
"Number of instructions committed"),
ADD_STAT(numOps, statistics::units::Count::get(),
"Number of ops (including micro ops) committed"),
ADD_STAT(quiesceCycles, statistics::units::Cycle::get(),
"Total number of cycles that CPU has spent quiesced or waiting "
"for an interrupt"),
ADD_STAT(cpi, statistics::units::Rate<
statistics::units::Cycle, statistics::units::Count>::get(),
"CPI: cycles per instruction"),
ADD_STAT(ipc, statistics::units::Rate<
statistics::units::Count, statistics::units::Cycle>::get(),
"IPC: instructions per cycle")
"for an interrupt")
{
quiesceCycles.prereq(quiesceCycles);
cpi.precision(6);
cpi = base_cpu->baseStats.numCycles / numInsts;
ipc.precision(6);
ipc = numInsts / base_cpu->baseStats.numCycles;
}
} // namespace minor

10
src/cpu/minor/stats.hh
View File

@@ -59,19 +59,9 @@ struct MinorStats : public statistics::Group
{
MinorStats(BaseCPU *parent);
/** Number of simulated instructions */
statistics::Scalar numInsts;
/** Number of simulated insts and microops */
statistics::Scalar numOps;
/** Number of cycles in quiescent state */
statistics::Scalar quiesceCycles;
/** CPI/IPC for total cycle counts and macro insts */
statistics::Formula cpi;
statistics::Formula ipc;
};
} // namespace minor

1
src/cpu/o3/commit.cc
View File

@@ -1343,7 +1343,6 @@ Commit::updateComInstStats(const DynInstPtr &inst)
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.

5
src/cpu/simple/base.cc
View File

@@ -154,10 +154,8 @@ BaseSimpleCPU::countInst()
if (!curStaticInst->isMicroop() || curStaticInst->isLastMicroop()) {
t_info.numInst++;
t_info.execContextStats.numInsts++;
}
t_info.numOp++;
t_info.execContextStats.numOps++;
}
void
@@ -183,9 +181,8 @@ BaseSimpleCPU::countCommitInst()
commitStats[t_info.thread->threadId()]->numInsts++;
baseStats.numInsts++;
}
// increment thread level and core level numOps count
// increment thread level numOps count
commitStats[t_info.thread->threadId()]->numOps++;
baseStats.numOps++;
}
Counter

8
src/cpu/simple/exec_context.hh
View File

@@ -86,10 +86,6 @@ class SimpleExecContext : public ExecContext
: statistics::Group(cpu,
csprintf("exec_context.thread_%i",
thread->threadId()).c_str()),
ADD_STAT(numInsts, statistics::units::Count::get(),
"Number of instructions committed"),
ADD_STAT(numOps, statistics::units::Count::get(),
"Number of ops (including micro ops) committed"),
ADD_STAT(numMatAluAccesses, statistics::units::Count::get(),
"Number of matrix alu accesses"),
ADD_STAT(numCallsReturns, statistics::units::Count::get(),
@@ -139,10 +135,6 @@ class SimpleExecContext : public ExecContext
.prereq(numBranchMispred);
}
// Number of simulated instructions
statistics::Scalar numInsts;
statistics::Scalar numOps;
// Number of matrix alu accesses
statistics::Scalar numMatAluAccesses;