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

2
src/arch/arm/linux/fs_workload.cc
View File

@@ -357,7 +357,7 @@ DumpStats::process(ThreadContext *tc)
taskFile->stream()->flush();
// Dump and reset statistics
Stats::schedStatEvent(true, true, curTick(), 0);
statistics::schedStatEvent(true, true, curTick(), 0);
}
} // namespace ArmISA

53
src/arch/arm/table_walker.cc
View File

@@ -2420,78 +2420,79 @@ TableWalker::pageSizeNtoStatBin(uint8_t N)
}
}
TableWalker::TableWalkerStats::TableWalkerStats(Stats::Group *parent)
: Stats::Group(parent),
ADD_STAT(walks, Stats::units::Count::get(),
TableWalker::TableWalkerStats::TableWalkerStats(statistics::Group *parent)
: statistics::Group(parent),
ADD_STAT(walks, statistics::units::Count::get(),
"Table walker walks requested"),
ADD_STAT(walksShortDescriptor, Stats::units::Count::get(),
ADD_STAT(walksShortDescriptor, statistics::units::Count::get(),
"Table walker walks initiated with short descriptors"),
ADD_STAT(walksLongDescriptor, Stats::units::Count::get(),
ADD_STAT(walksLongDescriptor, statistics::units::Count::get(),
"Table walker walks initiated with long descriptors"),
ADD_STAT(walksShortTerminatedAtLevel, Stats::units::Count::get(),
ADD_STAT(walksShortTerminatedAtLevel, statistics::units::Count::get(),
"Level at which table walker walks with short descriptors "
"terminate"),
ADD_STAT(walksLongTerminatedAtLevel, Stats::units::Count::get(),
ADD_STAT(walksLongTerminatedAtLevel, statistics::units::Count::get(),
"Level at which table walker walks with long descriptors "
"terminate"),
ADD_STAT(squashedBefore, Stats::units::Count::get(),
ADD_STAT(squashedBefore, statistics::units::Count::get(),
"Table walks squashed before starting"),
ADD_STAT(squashedAfter, Stats::units::Count::get(),
ADD_STAT(squashedAfter, statistics::units::Count::get(),
"Table walks squashed after completion"),
ADD_STAT(walkWaitTime, Stats::units::Tick::get(),
ADD_STAT(walkWaitTime, statistics::units::Tick::get(),
"Table walker wait (enqueue to first request) latency"),
ADD_STAT(walkServiceTime, Stats::units::Tick::get(),
ADD_STAT(walkServiceTime, statistics::units::Tick::get(),
"Table walker service (enqueue to completion) latency"),
ADD_STAT(pendingWalks, Stats::units::Tick::get(),
ADD_STAT(pendingWalks, statistics::units::Tick::get(),
"Table walker pending requests distribution"),
ADD_STAT(pageSizes, Stats::units::Count::get(),
ADD_STAT(pageSizes, statistics::units::Count::get(),
"Table walker page sizes translated"),
ADD_STAT(requestOrigin, Stats::units::Count::get(),
ADD_STAT(requestOrigin, statistics::units::Count::get(),
"Table walker requests started/completed, data/inst")
{
walksShortDescriptor
.flags(Stats::nozero);
.flags(statistics::nozero);
walksLongDescriptor
.flags(Stats::nozero);
.flags(statistics::nozero);
walksShortTerminatedAtLevel
.init(2)
.flags(Stats::nozero);
.flags(statistics::nozero);
walksShortTerminatedAtLevel.subname(0, "Level1");
walksShortTerminatedAtLevel.subname(1, "Level2");
walksLongTerminatedAtLevel
.init(4)
.flags(Stats::nozero);
.flags(statistics::nozero);
walksLongTerminatedAtLevel.subname(0, "Level0");
walksLongTerminatedAtLevel.subname(1, "Level1");
walksLongTerminatedAtLevel.subname(2, "Level2");
walksLongTerminatedAtLevel.subname(3, "Level3");
squashedBefore
.flags(Stats::nozero);
.flags(statistics::nozero);
squashedAfter
.flags(Stats::nozero);
.flags(statistics::nozero);
walkWaitTime
.init(16)
.flags(Stats::pdf | Stats::nozero | Stats::nonan);
.flags(statistics::pdf | statistics::nozero | statistics::nonan);
walkServiceTime
.init(16)
.flags(Stats::pdf | Stats::nozero | Stats::nonan);
.flags(statistics::pdf | statistics::nozero | statistics::nonan);
pendingWalks
.init(16)
.flags(Stats::pdf | Stats::dist | Stats::nozero | Stats::nonan);
.flags(statistics::pdf | statistics::dist | statistics::nozero |
statistics::nonan);
pageSizes // see DDI 0487A D4-1661
.init(10)
.flags(Stats::total | Stats::pdf | Stats::dist | Stats::nozero);
.flags(statistics::total | statistics::pdf | statistics::dist |
statistics::nozero);
pageSizes.subname(0, "4KiB");
pageSizes.subname(1, "16KiB");
pageSizes.subname(2, "64KiB");
@@ -2505,7 +2506,7 @@ TableWalker::TableWalkerStats::TableWalkerStats(Stats::Group *parent)
requestOrigin
.init(2,2) // Instruction/Data, requests/completed
.flags(Stats::total);
.flags(statistics::total);
requestOrigin.subname(0,"Requested");
requestOrigin.subname(1,"Completed");
requestOrigin.ysubname(0,"Data");

29
src/arch/arm/table_walker.hh
View File

@@ -941,21 +941,22 @@ class TableWalker : public ClockedObject
bool _haveLargeAsid64;
/** Statistics */
struct TableWalkerStats : public Stats::Group
struct TableWalkerStats : public statistics::Group
{
TableWalkerStats(Stats::Group *parent);
Stats::Scalar walks;
Stats::Scalar walksShortDescriptor;
Stats::Scalar walksLongDescriptor;
Stats::Vector walksShortTerminatedAtLevel;
Stats::Vector walksLongTerminatedAtLevel;
Stats::Scalar squashedBefore;
Stats::Scalar squashedAfter;
Stats::Histogram walkWaitTime;
Stats::Histogram walkServiceTime;
Stats::Histogram pendingWalks; // essentially "L" of queueing theory
Stats::Vector pageSizes;
Stats::Vector2d requestOrigin;
TableWalkerStats(statistics::Group *parent);
statistics::Scalar walks;
statistics::Scalar walksShortDescriptor;
statistics::Scalar walksLongDescriptor;
statistics::Vector walksShortTerminatedAtLevel;
statistics::Vector walksLongTerminatedAtLevel;
statistics::Scalar squashedBefore;
statistics::Scalar squashedAfter;
statistics::Histogram walkWaitTime;
statistics::Histogram walkServiceTime;
// Essentially "L" of queueing theory
statistics::Histogram pendingWalks;
statistics::Vector pageSizes;
statistics::Vector2d requestOrigin;
} stats;
mutable unsigned pendingReqs;

48
src/arch/arm/tlb.cc
View File

@@ -525,47 +525,47 @@ TLB::takeOverFrom(BaseTLB *_otlb)
}
}
TLB::TlbStats::TlbStats(Stats::Group *parent)
: Stats::Group(parent),
ADD_STAT(instHits, Stats::units::Count::get(), "ITB inst hits"),
ADD_STAT(instMisses, Stats::units::Count::get(), "ITB inst misses"),
ADD_STAT(readHits, Stats::units::Count::get(), "DTB read hits"),
ADD_STAT(readMisses, Stats::units::Count::get(), "DTB read misses"),
ADD_STAT(writeHits, Stats::units::Count::get(), "DTB write hits"),
ADD_STAT(writeMisses, Stats::units::Count::get(), "DTB write misses"),
ADD_STAT(inserts, Stats::units::Count::get(),
TLB::TlbStats::TlbStats(statistics::Group *parent)
: statistics::Group(parent),
ADD_STAT(instHits, statistics::units::Count::get(), "ITB inst hits"),
ADD_STAT(instMisses, statistics::units::Count::get(), "ITB inst misses"),
ADD_STAT(readHits, statistics::units::Count::get(), "DTB read hits"),
ADD_STAT(readMisses, statistics::units::Count::get(), "DTB read misses"),
ADD_STAT(writeHits, statistics::units::Count::get(), "DTB write hits"),
ADD_STAT(writeMisses, statistics::units::Count::get(), "DTB write misses"),
ADD_STAT(inserts, statistics::units::Count::get(),
"Number of times an entry is inserted into the TLB"),
ADD_STAT(flushTlb, Stats::units::Count::get(),
ADD_STAT(flushTlb, statistics::units::Count::get(),
"Number of times complete TLB was flushed"),
ADD_STAT(flushTlbMva, Stats::units::Count::get(),
ADD_STAT(flushTlbMva, statistics::units::Count::get(),
"Number of times TLB was flushed by MVA"),
ADD_STAT(flushTlbMvaAsid, Stats::units::Count::get(),
ADD_STAT(flushTlbMvaAsid, statistics::units::Count::get(),
"Number of times TLB was flushed by MVA & ASID"),
ADD_STAT(flushTlbAsid, Stats::units::Count::get(),
ADD_STAT(flushTlbAsid, statistics::units::Count::get(),
"Number of times TLB was flushed by ASID"),
ADD_STAT(flushedEntries, Stats::units::Count::get(),
ADD_STAT(flushedEntries, statistics::units::Count::get(),
"Number of entries that have been flushed from TLB"),
ADD_STAT(alignFaults, Stats::units::Count::get(),
ADD_STAT(alignFaults, statistics::units::Count::get(),
"Number of TLB faults due to alignment restrictions"),
ADD_STAT(prefetchFaults, Stats::units::Count::get(),
ADD_STAT(prefetchFaults, statistics::units::Count::get(),
"Number of TLB faults due to prefetch"),
ADD_STAT(domainFaults, Stats::units::Count::get(),
ADD_STAT(domainFaults, statistics::units::Count::get(),
"Number of TLB faults due to domain restrictions"),
ADD_STAT(permsFaults, Stats::units::Count::get(),
ADD_STAT(permsFaults, statistics::units::Count::get(),
"Number of TLB faults due to permissions restrictions"),
ADD_STAT(readAccesses, Stats::units::Count::get(), "DTB read accesses",
ADD_STAT(readAccesses, statistics::units::Count::get(), "DTB read accesses",
readHits + readMisses),
ADD_STAT(writeAccesses, Stats::units::Count::get(), "DTB write accesses",
ADD_STAT(writeAccesses, statistics::units::Count::get(), "DTB write accesses",
writeHits + writeMisses),
ADD_STAT(instAccesses, Stats::units::Count::get(), "ITB inst accesses",
ADD_STAT(instAccesses, statistics::units::Count::get(), "ITB inst accesses",
instHits + instMisses),
ADD_STAT(hits, Stats::units::Count::get(),
ADD_STAT(hits, statistics::units::Count::get(),
"Total TLB (inst and data) hits",
readHits + writeHits + instHits),
ADD_STAT(misses, Stats::units::Count::get(),
ADD_STAT(misses, statistics::units::Count::get(),
"Total TLB (inst and data) misses",
readMisses + writeMisses + instMisses),
ADD_STAT(accesses, Stats::units::Count::get(),
ADD_STAT(accesses, statistics::units::Count::get(),
"Total TLB (inst and data) accesses",
readAccesses + writeAccesses + instAccesses)
{

48
src/arch/arm/tlb.hh
View File

@@ -170,33 +170,33 @@ class TLB : public BaseTLB
TlbTestInterface *test;
struct TlbStats : public Stats::Group
struct TlbStats : public statistics::Group
{
TlbStats(Stats::Group *parent);
TlbStats(statistics::Group *parent);
// Access Stats
mutable Stats::Scalar instHits;
mutable Stats::Scalar instMisses;
mutable Stats::Scalar readHits;
mutable Stats::Scalar readMisses;
mutable Stats::Scalar writeHits;
mutable Stats::Scalar writeMisses;
mutable Stats::Scalar inserts;
mutable Stats::Scalar flushTlb;
mutable Stats::Scalar flushTlbMva;
mutable Stats::Scalar flushTlbMvaAsid;
mutable Stats::Scalar flushTlbAsid;
mutable Stats::Scalar flushedEntries;
mutable Stats::Scalar alignFaults;
mutable Stats::Scalar prefetchFaults;
mutable Stats::Scalar domainFaults;
mutable Stats::Scalar permsFaults;
mutable statistics::Scalar instHits;
mutable statistics::Scalar instMisses;
mutable statistics::Scalar readHits;
mutable statistics::Scalar readMisses;
mutable statistics::Scalar writeHits;
mutable statistics::Scalar writeMisses;
mutable statistics::Scalar inserts;
mutable statistics::Scalar flushTlb;
mutable statistics::Scalar flushTlbMva;
mutable statistics::Scalar flushTlbMvaAsid;
mutable statistics::Scalar flushTlbAsid;
mutable statistics::Scalar flushedEntries;
mutable statistics::Scalar alignFaults;
mutable statistics::Scalar prefetchFaults;
mutable statistics::Scalar domainFaults;
mutable statistics::Scalar permsFaults;
Stats::Formula readAccesses;
Stats::Formula writeAccesses;
Stats::Formula instAccesses;
Stats::Formula hits;
Stats::Formula misses;
Stats::Formula accesses;
statistics::Formula readAccesses;
statistics::Formula writeAccesses;
statistics::Formula instAccesses;
statistics::Formula hits;
statistics::Formula misses;
statistics::Formula accesses;
} stats;
/** PMU probe for TLB refills */

22
src/arch/riscv/tlb.cc
View File

@@ -509,19 +509,19 @@ TLB::unserialize(CheckpointIn &cp)
}
}
TLB::TlbStats::TlbStats(Stats::Group *parent)
: Stats::Group(parent),
ADD_STAT(readHits, Stats::units::Count::get(), "read hits"),
ADD_STAT(readMisses, Stats::units::Count::get(), "read misses"),
ADD_STAT(readAccesses, Stats::units::Count::get(), "read accesses"),
ADD_STAT(writeHits, Stats::units::Count::get(), "write hits"),
ADD_STAT(writeMisses, Stats::units::Count::get(), "write misses"),
ADD_STAT(writeAccesses, Stats::units::Count::get(), "write accesses"),
ADD_STAT(hits, Stats::units::Count::get(),
TLB::TlbStats::TlbStats(statistics::Group *parent)
: statistics::Group(parent),
ADD_STAT(readHits, statistics::units::Count::get(), "read hits"),
ADD_STAT(readMisses, statistics::units::Count::get(), "read misses"),
ADD_STAT(readAccesses, statistics::units::Count::get(), "read accesses"),
ADD_STAT(writeHits, statistics::units::Count::get(), "write hits"),
ADD_STAT(writeMisses, statistics::units::Count::get(), "write misses"),
ADD_STAT(writeAccesses, statistics::units::Count::get(), "write accesses"),
ADD_STAT(hits, statistics::units::Count::get(),
"Total TLB (read and write) hits", readHits + writeHits),
ADD_STAT(misses, Stats::units::Count::get(),
ADD_STAT(misses, statistics::units::Count::get(),
"Total TLB (read and write) misses", readMisses + writeMisses),
ADD_STAT(accesses, Stats::units::Count::get(),
ADD_STAT(accesses, statistics::units::Count::get(),
"Total TLB (read and write) accesses",
readAccesses + writeAccesses)
{

26
src/arch/riscv/tlb.hh
View File

@@ -66,22 +66,22 @@ class TLB : public BaseTLB
Walker *walker;
struct TlbStats : public Stats::Group
struct TlbStats : public statistics::Group
{
TlbStats(Stats::Group *parent);
TlbStats(statistics::Group *parent);
Stats::Scalar readHits;
Stats::Scalar readMisses;
Stats::Scalar read_acv;
Stats::Scalar readAccesses;
Stats::Scalar writeHits;
Stats::Scalar writeMisses;
Stats::Scalar write_acv;
Stats::Scalar writeAccesses;
statistics::Scalar readHits;
statistics::Scalar readMisses;
statistics::Scalar read_acv;
statistics::Scalar readAccesses;
statistics::Scalar writeHits;
statistics::Scalar writeMisses;
statistics::Scalar write_acv;
statistics::Scalar writeAccesses;
Stats::Formula hits;
Stats::Formula misses;
Stats::Formula accesses;
statistics::Formula hits;
statistics::Formula misses;
statistics::Formula accesses;
} stats;
public:

12
src/arch/x86/tlb.cc
View File

@@ -518,15 +518,15 @@ TLB::getWalker()
return walker;
}
TLB::TlbStats::TlbStats(Stats::Group *parent)
: Stats::Group(parent),
ADD_STAT(rdAccesses, Stats::units::Count::get(),
TLB::TlbStats::TlbStats(statistics::Group *parent)
: statistics::Group(parent),
ADD_STAT(rdAccesses, statistics::units::Count::get(),
"TLB accesses on read requests"),
ADD_STAT(wrAccesses, Stats::units::Count::get(),
ADD_STAT(wrAccesses, statistics::units::Count::get(),
"TLB accesses on write requests"),
ADD_STAT(rdMisses, Stats::units::Count::get(),
ADD_STAT(rdMisses, statistics::units::Count::get(),
"TLB misses on read requests"),
ADD_STAT(wrMisses, Stats::units::Count::get(),
ADD_STAT(wrMisses, statistics::units::Count::get(),
"TLB misses on write requests")
{
}

12
src/arch/x86/tlb.hh
View File

@@ -101,14 +101,14 @@ namespace X86ISA
AddrRange m5opRange;
struct TlbStats : public Stats::Group
struct TlbStats : public statistics::Group
{
TlbStats(Stats::Group *parent);
TlbStats(statistics::Group *parent);
Stats::Scalar rdAccesses;
Stats::Scalar wrAccesses;
Stats::Scalar rdMisses;
Stats::Scalar wrMisses;
statistics::Scalar rdAccesses;
statistics::Scalar wrAccesses;
statistics::Scalar rdMisses;
statistics::Scalar wrMisses;
} stats;
Fault translateInt(bool read, RequestPtr req, ThreadContext *tc);