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

base-stats,misc: Rename Stats namespace as statistics

Browse Source 
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.

::Stats became ::statistics.

"statistics" was chosen over "stats" to avoid generating
conflicts with the already existing variables (there are
way too many "stats" in the codebase), which would make
this patch even more disturbing for the users.

Change-Id: If877b12d7dac356f86e3b3d941bf7558a4fd8719
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45421
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:
Daniel R. Carvalho
2021-05-06 20:00:51 -03:00
committed by Daniel Carvalho
parent fa505f1c23
commit 98ac080ec4
228 changed files with 3078 additions and 2970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/cpu/trace/trace_cpu.cc
View File

@@ -202,16 +202,16 @@ TraceCPU::checkAndSchedExitEvent()
}
}
TraceCPU::TraceStats::TraceStats(TraceCPU *trace) :
Stats::Group(trace),
ADD_STAT(numSchedDcacheEvent, Stats::units::Count::get(),
statistics::Group(trace),
ADD_STAT(numSchedDcacheEvent, statistics::units::Count::get(),
"Number of events scheduled to trigger data request generator"),
ADD_STAT(numSchedIcacheEvent, Stats::units::Count::get(),
ADD_STAT(numSchedIcacheEvent, statistics::units::Count::get(),
"Number of events scheduled to trigger instruction request "
"generator"),
ADD_STAT(numOps, Stats::units::Count::get(),
ADD_STAT(numOps, statistics::units::Count::get(),
"Number of micro-ops simulated by the Trace CPU"),
ADD_STAT(cpi, Stats::units::Rate<
Stats::units::Cycle, Stats::units::Count>::get(),
ADD_STAT(cpi, statistics::units::Rate<
statistics::units::Cycle, statistics::units::Count>::get(),
"Cycles per micro-op used as a proxy for CPI",
trace->baseStats.numCycles / numOps)
{
@@ -219,28 +219,28 @@ TraceCPU::checkAndSchedExitEvent()
}
TraceCPU::ElasticDataGen::
ElasticDataGenStatGroup::ElasticDataGenStatGroup(Stats::Group *parent,
ElasticDataGenStatGroup::ElasticDataGenStatGroup(statistics::Group *parent,
const std::string& _name) :
Stats::Group(parent, _name.c_str()),
ADD_STAT(maxDependents, Stats::units::Count::get(),
statistics::Group(parent, _name.c_str()),
ADD_STAT(maxDependents, statistics::units::Count::get(),
"Max number of dependents observed on a node"),
ADD_STAT(maxReadyListSize, Stats::units::Count::get(),
ADD_STAT(maxReadyListSize, statistics::units::Count::get(),
"Max size of the ready list observed"),
ADD_STAT(numSendAttempted, Stats::units::Count::get(),
ADD_STAT(numSendAttempted, statistics::units::Count::get(),
"Number of first attempts to send a request"),
ADD_STAT(numSendSucceeded, Stats::units::Count::get(),
ADD_STAT(numSendSucceeded, statistics::units::Count::get(),
"Number of successful first attempts"),
ADD_STAT(numSendFailed, Stats::units::Count::get(),
ADD_STAT(numSendFailed, statistics::units::Count::get(),
"Number of failed first attempts"),
ADD_STAT(numRetrySucceeded, Stats::units::Count::get(),
ADD_STAT(numRetrySucceeded, statistics::units::Count::get(),
"Number of successful retries"),
ADD_STAT(numSplitReqs, Stats::units::Count::get(),
ADD_STAT(numSplitReqs, statistics::units::Count::get(),
"Number of split requests"),
ADD_STAT(numSOLoads, Stats::units::Count::get(),
ADD_STAT(numSOLoads, statistics::units::Count::get(),
"Number of strictly ordered loads"),
ADD_STAT(numSOStores, Stats::units::Count::get(),
ADD_STAT(numSOStores, statistics::units::Count::get(),
"Number of strictly ordered stores"),
ADD_STAT(dataLastTick, Stats::units::Tick::get(),
ADD_STAT(dataLastTick, statistics::units::Tick::get(),
"Last tick simulated from the elastic data trace")
{
}
@@ -966,17 +966,17 @@ TraceCPU::ElasticDataGen::HardwareResource::printOccupancy()
}
TraceCPU::FixedRetryGen::FixedRetryGenStatGroup::FixedRetryGenStatGroup(
Stats::Group *parent, const std::string& _name) :
Stats::Group(parent, _name.c_str()),
ADD_STAT(numSendAttempted, Stats::units::Count::get(),
statistics::Group *parent, const std::string& _name) :
statistics::Group(parent, _name.c_str()),
ADD_STAT(numSendAttempted, statistics::units::Count::get(),
"Number of first attempts to send a request"),
ADD_STAT(numSendSucceeded, Stats::units::Count::get(),
ADD_STAT(numSendSucceeded, statistics::units::Count::get(),
"Number of successful first attempts"),
ADD_STAT(numSendFailed, Stats::units::Count::get(),
ADD_STAT(numSendFailed, statistics::units::Count::get(),
"Number of failed first attempts"),
ADD_STAT(numRetrySucceeded, Stats::units::Count::get(),
ADD_STAT(numRetrySucceeded, statistics::units::Count::get(),
"Number of successful retries"),
ADD_STAT(instLastTick, Stats::units::Tick::get(),
ADD_STAT(instLastTick, statistics::units::Tick::get(),
"Last tick simulated from the fixed inst trace")
{

48
src/cpu/trace/trace_cpu.hh
View File

@@ -506,18 +506,18 @@ class TraceCPU : public BaseCPU
/** Store an element read from the trace to send as the next packet. */
TraceElement currElement;
protected:
struct FixedRetryGenStatGroup : public Stats::Group
struct FixedRetryGenStatGroup : public statistics::Group
{
/** name is the extension to the name for these stats */
FixedRetryGenStatGroup(Stats::Group *parent,
FixedRetryGenStatGroup(statistics::Group *parent,
const std::string& _name);
/** Stats for instruction accesses replayed. */
Stats::Scalar numSendAttempted;
Stats::Scalar numSendSucceeded;
Stats::Scalar numSendFailed;
Stats::Scalar numRetrySucceeded;
statistics::Scalar numSendAttempted;
statistics::Scalar numSendSucceeded;
statistics::Scalar numSendFailed;
statistics::Scalar numRetrySucceeded;
/** Last simulated tick by the FixedRetryGen */
Stats::Scalar instLastTick;
statistics::Scalar instLastTick;
} fixedStats;
};
@@ -1004,23 +1004,23 @@ class TraceCPU : public BaseCPU
protected:
// Defining the a stat group
struct ElasticDataGenStatGroup : public Stats::Group
struct ElasticDataGenStatGroup : public statistics::Group
{
/** name is the extension to the name for these stats */
ElasticDataGenStatGroup(Stats::Group *parent,
ElasticDataGenStatGroup(statistics::Group *parent,
const std::string& _name);
/** Stats for data memory accesses replayed. */
Stats::Scalar maxDependents;
Stats::Scalar maxReadyListSize;
Stats::Scalar numSendAttempted;
Stats::Scalar numSendSucceeded;
Stats::Scalar numSendFailed;
Stats::Scalar numRetrySucceeded;
Stats::Scalar numSplitReqs;
Stats::Scalar numSOLoads;
Stats::Scalar numSOStores;
statistics::Scalar maxDependents;
statistics::Scalar maxReadyListSize;
statistics::Scalar numSendAttempted;
statistics::Scalar numSendSucceeded;
statistics::Scalar numSendFailed;
statistics::Scalar numRetrySucceeded;
statistics::Scalar numSplitReqs;
statistics::Scalar numSOLoads;
statistics::Scalar numSOStores;
/** Tick when ElasticDataGen completes execution */
Stats::Scalar dataLastTick;
statistics::Scalar dataLastTick;
} elasticStats;
};
@@ -1101,17 +1101,17 @@ class TraceCPU : public BaseCPU
* message is printed.
*/
uint64_t progressMsgThreshold;
struct TraceStats : public Stats::Group
struct TraceStats : public statistics::Group
{
TraceStats(TraceCPU *trace);
Stats::Scalar numSchedDcacheEvent;
Stats::Scalar numSchedIcacheEvent;
statistics::Scalar numSchedDcacheEvent;
statistics::Scalar numSchedIcacheEvent;
/** Stat for number of simulated micro-ops. */
Stats::Scalar numOps;
statistics::Scalar numOps;
/** Stat for the CPI. This is really cycles per
* micro-op and not inst. */
Stats::Formula cpi;
statistics::Formula cpi;
} traceStats;
public: