From 30164780682a5c0960ef910350df1cbcaee3e59e Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Thu, 6 May 2021 15:25:50 -0300 Subject: [PATCH] base-stats: Rename Units namespace as units As part of recent decisions regarding namespace naming conventions, all namespaces will be changed to snake case. Stats::Units became Stats::units. Change-Id: I9ce855b291db122d952098a090a2984b42152850 Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45415 Maintainer: Jason Lowe-Power Tested-by: kokoro Reviewed-by: Hoa Nguyen --- src/arch/arm/table_walker.cc | 24 +-- src/arch/arm/tlb.cc | 44 +++--- src/arch/riscv/tlb.cc | 18 +-- src/arch/x86/tlb.cc | 8 +- src/base/statistics.cc | 8 +- src/base/statistics.hh | 110 +++++++------- src/base/stats/group.hh | 2 +- src/base/stats/info.hh | 2 +- src/base/stats/units.hh | 52 ++++--- src/base/stats/units.test.cc | 74 ++++----- src/cpu/base.cc | 18 +-- src/cpu/kvm/base.cc | 20 +-- src/cpu/minor/fetch2.cc | 12 +- src/cpu/minor/stats.cc | 20 +-- src/cpu/o3/commit.cc | 34 ++--- src/cpu/o3/cpu.cc | 50 +++--- src/cpu/o3/decode.cc | 20 +-- src/cpu/o3/fetch.cc | 46 +++--- src/cpu/o3/iew.cc | 66 ++++---- src/cpu/o3/inst_queue.cc | 64 ++++---- src/cpu/o3/lsq_unit.cc | 14 +- src/cpu/o3/mem_dep_unit.cc | 8 +- src/cpu/o3/probe/elastic_trace.cc | 18 +-- src/cpu/o3/rename.cc | 48 +++--- src/cpu/o3/rob.cc | 4 +- src/cpu/pred/bpred_unit.cc | 24 +-- src/cpu/pred/loop_predictor.cc | 4 +- src/cpu/pred/statistical_corrector.cc | 4 +- src/cpu/pred/tage_base.cc | 24 +-- src/cpu/simple/exec_context.hh | 66 ++++---- src/cpu/testers/memtest/memtest.cc | 4 +- src/cpu/testers/traffic_gen/base.cc | 36 ++--- src/cpu/thread_state.cc | 6 +- src/cpu/trace/trace_cpu.cc | 40 ++--- src/dev/arm/flash_device.cc | 12 +- src/dev/arm/hdlcd.cc | 2 +- src/dev/arm/smmu_v3.cc | 12 +- src/dev/arm/smmu_v3_caches.cc | 44 +++--- src/dev/arm/ufs_device.cc | 50 +++--- src/dev/net/etherdevice.cc | 128 ++++++++-------- src/dev/net/sinic.cc | 10 +- src/dev/pci/copy_engine.cc | 4 +- src/dev/storage/ide_disk.cc | 12 +- src/learning_gem5/part2/simple_cache.cc | 8 +- src/mem/abstract_mem.cc | 28 ++-- src/mem/cache/base.cc | 112 +++++++------- src/mem/cache/compressors/base.cc | 14 +- .../compressors/base_dictionary_compressor.cc | 2 +- src/mem/cache/compressors/multi.cc | 2 +- src/mem/cache/prefetch/base.cc | 2 +- src/mem/cache/prefetch/queued.cc | 10 +- src/mem/cache/tags/base.cc | 32 ++-- src/mem/cache/tags/fa_lru.cc | 6 +- src/mem/cache/tags/sector_tags.cc | 2 +- src/mem/coherent_xbar.cc | 6 +- src/mem/comm_monitor.cc | 48 +++--- src/mem/mem_ctrl.cc | 86 +++++------ src/mem/mem_interface.cc | 142 +++++++++--------- src/mem/probes/mem_footprint.cc | 8 +- src/mem/probes/stack_dist.cc | 10 +- src/mem/qos/mem_ctrl.cc | 16 +- src/mem/qos/mem_sink.cc | 4 +- src/mem/snoop_filter.cc | 12 +- src/mem/xbar.cc | 10 +- src/sim/clock_domain.cc | 2 +- src/sim/power/power_model.cc | 8 +- src/sim/power/thermal_domain.cc | 2 +- src/sim/power_domain.cc | 4 +- src/sim/power_state.cc | 8 +- src/sim/process.cc | 2 +- src/sim/root.cc | 18 +-- src/sim/voltage_domain.cc | 2 +- src/sim/workload.hh | 4 +- 73 files changed, 939 insertions(+), 937 deletions(-) diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc index e135cb8720..34077a472d 100644 --- a/src/arch/arm/table_walker.cc +++ b/src/arch/arm/table_walker.cc @@ -2423,31 +2423,31 @@ TableWalker::pageSizeNtoStatBin(uint8_t N) TableWalker::TableWalkerStats::TableWalkerStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(walks, Stats::Units::Count::get(), + ADD_STAT(walks, Stats::units::Count::get(), "Table walker walks requested"), - ADD_STAT(walksShortDescriptor, Stats::Units::Count::get(), + ADD_STAT(walksShortDescriptor, Stats::units::Count::get(), "Table walker walks initiated with short descriptors"), - ADD_STAT(walksLongDescriptor, Stats::Units::Count::get(), + ADD_STAT(walksLongDescriptor, Stats::units::Count::get(), "Table walker walks initiated with long descriptors"), - ADD_STAT(walksShortTerminatedAtLevel, Stats::Units::Count::get(), + ADD_STAT(walksShortTerminatedAtLevel, Stats::units::Count::get(), "Level at which table walker walks with short descriptors " "terminate"), - ADD_STAT(walksLongTerminatedAtLevel, Stats::Units::Count::get(), + ADD_STAT(walksLongTerminatedAtLevel, Stats::units::Count::get(), "Level at which table walker walks with long descriptors " "terminate"), - ADD_STAT(squashedBefore, Stats::Units::Count::get(), + ADD_STAT(squashedBefore, Stats::units::Count::get(), "Table walks squashed before starting"), - ADD_STAT(squashedAfter, Stats::Units::Count::get(), + ADD_STAT(squashedAfter, Stats::units::Count::get(), "Table walks squashed after completion"), - ADD_STAT(walkWaitTime, Stats::Units::Tick::get(), + ADD_STAT(walkWaitTime, Stats::units::Tick::get(), "Table walker wait (enqueue to first request) latency"), - ADD_STAT(walkServiceTime, Stats::Units::Tick::get(), + ADD_STAT(walkServiceTime, Stats::units::Tick::get(), "Table walker service (enqueue to completion) latency"), - ADD_STAT(pendingWalks, Stats::Units::Tick::get(), + ADD_STAT(pendingWalks, Stats::units::Tick::get(), "Table walker pending requests distribution"), - ADD_STAT(pageSizes, Stats::Units::Count::get(), + ADD_STAT(pageSizes, Stats::units::Count::get(), "Table walker page sizes translated"), - ADD_STAT(requestOrigin, Stats::Units::Count::get(), + ADD_STAT(requestOrigin, Stats::units::Count::get(), "Table walker requests started/completed, data/inst") { walksShortDescriptor diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc index cd8155cd38..b1333e696a 100644 --- a/src/arch/arm/tlb.cc +++ b/src/arch/arm/tlb.cc @@ -527,45 +527,45 @@ 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(), + 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(), "Number of times an entry is inserted into the TLB"), - ADD_STAT(flushTlb, Stats::Units::Count::get(), + ADD_STAT(flushTlb, Stats::units::Count::get(), "Number of times complete TLB was flushed"), - ADD_STAT(flushTlbMva, Stats::Units::Count::get(), + ADD_STAT(flushTlbMva, Stats::units::Count::get(), "Number of times TLB was flushed by MVA"), - ADD_STAT(flushTlbMvaAsid, Stats::Units::Count::get(), + ADD_STAT(flushTlbMvaAsid, Stats::units::Count::get(), "Number of times TLB was flushed by MVA & ASID"), - ADD_STAT(flushTlbAsid, Stats::Units::Count::get(), + ADD_STAT(flushTlbAsid, Stats::units::Count::get(), "Number of times TLB was flushed by ASID"), - ADD_STAT(flushedEntries, Stats::Units::Count::get(), + ADD_STAT(flushedEntries, Stats::units::Count::get(), "Number of entries that have been flushed from TLB"), - ADD_STAT(alignFaults, Stats::Units::Count::get(), + ADD_STAT(alignFaults, Stats::units::Count::get(), "Number of TLB faults due to alignment restrictions"), - ADD_STAT(prefetchFaults, Stats::Units::Count::get(), + ADD_STAT(prefetchFaults, Stats::units::Count::get(), "Number of TLB faults due to prefetch"), - ADD_STAT(domainFaults, Stats::Units::Count::get(), + ADD_STAT(domainFaults, Stats::units::Count::get(), "Number of TLB faults due to domain restrictions"), - ADD_STAT(permsFaults, Stats::Units::Count::get(), + ADD_STAT(permsFaults, Stats::units::Count::get(), "Number of TLB faults due to permissions restrictions"), - ADD_STAT(readAccesses, Stats::Units::Count::get(), "DTB read accesses", + ADD_STAT(readAccesses, Stats::units::Count::get(), "DTB read accesses", readHits + readMisses), - ADD_STAT(writeAccesses, Stats::Units::Count::get(), "DTB write accesses", + ADD_STAT(writeAccesses, Stats::units::Count::get(), "DTB write accesses", writeHits + writeMisses), - ADD_STAT(instAccesses, Stats::Units::Count::get(), "ITB inst accesses", + ADD_STAT(instAccesses, Stats::units::Count::get(), "ITB inst accesses", instHits + instMisses), - ADD_STAT(hits, Stats::Units::Count::get(), + ADD_STAT(hits, Stats::units::Count::get(), "Total TLB (inst and data) hits", readHits + writeHits + instHits), - ADD_STAT(misses, Stats::Units::Count::get(), + ADD_STAT(misses, Stats::units::Count::get(), "Total TLB (inst and data) misses", readMisses + writeMisses + instMisses), - ADD_STAT(accesses, Stats::Units::Count::get(), + ADD_STAT(accesses, Stats::units::Count::get(), "Total TLB (inst and data) accesses", readAccesses + writeAccesses + instAccesses) { diff --git a/src/arch/riscv/tlb.cc b/src/arch/riscv/tlb.cc index 8be7836555..eac2ef2152 100644 --- a/src/arch/riscv/tlb.cc +++ b/src/arch/riscv/tlb.cc @@ -511,17 +511,17 @@ 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(), + 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(), "Total TLB (read and write) hits", readHits + writeHits), - ADD_STAT(misses, Stats::Units::Count::get(), + ADD_STAT(misses, Stats::units::Count::get(), "Total TLB (read and write) misses", readMisses + writeMisses), - ADD_STAT(accesses, Stats::Units::Count::get(), + ADD_STAT(accesses, Stats::units::Count::get(), "Total TLB (read and write) accesses", readAccesses + writeAccesses) { diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc index 62fbf0fc0c..a76c7ee8d1 100644 --- a/src/arch/x86/tlb.cc +++ b/src/arch/x86/tlb.cc @@ -520,13 +520,13 @@ TLB::getWalker() TLB::TlbStats::TlbStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(rdAccesses, Stats::Units::Count::get(), + ADD_STAT(rdAccesses, Stats::units::Count::get(), "TLB accesses on read requests"), - ADD_STAT(wrAccesses, Stats::Units::Count::get(), + ADD_STAT(wrAccesses, Stats::units::Count::get(), "TLB accesses on write requests"), - ADD_STAT(rdMisses, Stats::Units::Count::get(), + ADD_STAT(rdMisses, Stats::units::Count::get(), "TLB misses on read requests"), - ADD_STAT(wrMisses, Stats::Units::Count::get(), + ADD_STAT(wrMisses, Stats::units::Count::get(), "TLB misses on write requests") { } diff --git a/src/base/statistics.cc b/src/base/statistics.cc index 8edcf45076..26a6e515eb 100644 --- a/src/base/statistics.cc +++ b/src/base/statistics.cc @@ -133,12 +133,12 @@ InfoAccess::info() const Formula::Formula(Group *parent, const char *name, const char *desc) : DataWrapVec( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { } -Formula::Formula(Group *parent, const char *name, const Units::Base *unit, +Formula::Formula(Group *parent, const char *name, const units::Base *unit, const char *desc) : DataWrapVec(parent, name, unit, desc) { @@ -147,12 +147,12 @@ Formula::Formula(Group *parent, const char *name, const Units::Base *unit, Formula::Formula(Group *parent, const char *name, const char *desc, const Temp &r) : DataWrapVec( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { *this = r; } -Formula::Formula(Group *parent, const char *name, const Units::Base *unit, +Formula::Formula(Group *parent, const char *name, const units::Base *unit, const char *desc, const Temp &r) : DataWrapVec(parent, name, unit, desc) { diff --git a/src/base/statistics.hh b/src/base/statistics.hh index 495f683d48..95f8c63e85 100644 --- a/src/base/statistics.hh +++ b/src/base/statistics.hh @@ -243,7 +243,7 @@ class DataWrap : public InfoAccess DataWrap(const DataWrap &) = delete; DataWrap &operator=(const DataWrap &) = delete; - DataWrap(Group *parent, const char *name, const Units::Base *unit, + DataWrap(Group *parent, const char *name, const units::Base *unit, const char *desc) { auto info = new Info(self()); @@ -309,7 +309,7 @@ class DataWrap : public InfoAccess * @return A reference to this stat. */ Derived & - unit(const Units::Base *_unit) + unit(const units::Base *_unit) { this->info()->unit = _unit; return this->self(); @@ -374,7 +374,7 @@ class DataWrapVec : public DataWrap typedef InfoProxyType Info; DataWrapVec(Group *parent = nullptr, const char *name = nullptr, - const Units::Base *unit=Units::Unspecified::get(), + const units::Base *unit=units::Unspecified::get(), const char *desc = nullptr) : DataWrap(parent, name, unit, desc) {} @@ -456,7 +456,7 @@ class DataWrapVec2d : public DataWrapVec typedef InfoProxyType Info; DataWrapVec2d(Group *parent, const char *name, - const Units::Base *unit, const char *desc) + const units::Base *unit, const char *desc) : DataWrapVec(parent, name, unit, desc) { } @@ -551,7 +551,7 @@ class ScalarBase : public DataWrap public: ScalarBase(Group *parent = nullptr, const char *name = nullptr, - const Units::Base *unit=Units::Unspecified::get(), + const units::Base *unit=units::Unspecified::get(), const char *desc = nullptr) : DataWrap(parent, name, unit, desc) { @@ -709,7 +709,7 @@ class ValueBase : public DataWrap public: ValueBase(Group *parent, const char *name, - const Units::Base *unit, + const units::Base *unit, const char *desc) : DataWrap(parent, name, unit, desc), proxy(NULL) @@ -1013,7 +1013,7 @@ class VectorBase : public DataWrapVec public: VectorBase(Group *parent, const char *name, - const Units::Base *unit, + const units::Base *unit, const char *desc) : DataWrapVec(parent, name, unit, desc), storage(nullptr), _size(0) @@ -1156,7 +1156,7 @@ class Vector2dBase : public DataWrapVec2d public: Vector2dBase(Group *parent, const char *name, - const Units::Base *unit, + const units::Base *unit, const char *desc) : DataWrapVec2d(parent, name, unit, desc), x(0), y(0), _size(0), storage(nullptr) @@ -1317,7 +1317,7 @@ class DistBase : public DataWrap public: DistBase(Group *parent, const char *name, - const Units::Base *unit, + const units::Base *unit, const char *desc) : DataWrap(parent, name, unit, desc) { @@ -1415,7 +1415,7 @@ class VectorDistBase : public DataWrapVec public: VectorDistBase(Group *parent, const char *name, - const Units::Base *unit, + const units::Base *unit, const char *desc) : DataWrapVec(parent, name, unit, desc), storage(NULL) @@ -1947,17 +1947,17 @@ class Scalar : public ScalarBase Scalar(Group *parent = nullptr) : ScalarBase( - parent, nullptr, Units::Unspecified::get(), nullptr) + parent, nullptr, units::Unspecified::get(), nullptr) { } Scalar(Group *parent, const char *name, const char *desc = nullptr) : ScalarBase( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { } - Scalar(Group *parent, const char *name, const Units::Base *unit, + Scalar(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : ScalarBase(parent, name, unit, desc) { @@ -1975,17 +1975,17 @@ class Average : public ScalarBase Average(Group *parent = nullptr) : ScalarBase( - parent, nullptr, Units::Unspecified::get(), nullptr) + parent, nullptr, units::Unspecified::get(), nullptr) { } Average(Group *parent, const char *name, const char *desc = nullptr) : ScalarBase( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { } - Average(Group *parent, const char *name, const Units::Base *unit, + Average(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : ScalarBase(parent, name, unit, desc) { @@ -1996,16 +1996,16 @@ class Value : public ValueBase { public: Value(Group *parent = nullptr) - : ValueBase(parent, nullptr, Units::Unspecified::get(), nullptr) + : ValueBase(parent, nullptr, units::Unspecified::get(), nullptr) { } Value(Group *parent, const char *name, const char *desc = nullptr) - : ValueBase(parent, name, Units::Unspecified::get(), desc) + : ValueBase(parent, name, units::Unspecified::get(), desc) { } - Value(Group *parent, const char *name, const Units::Base *unit, + Value(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : ValueBase(parent, name, unit, desc) { @@ -2021,17 +2021,17 @@ class Vector : public VectorBase public: Vector(Group *parent = nullptr) : VectorBase( - parent, nullptr, Units::Unspecified::get(), nullptr) + parent, nullptr, units::Unspecified::get(), nullptr) { } Vector(Group *parent, const char *name, const char *desc = nullptr) : VectorBase( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { } - Vector(Group *parent, const char *name, const Units::Base *unit, + Vector(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : VectorBase(parent, name, unit, desc) { @@ -2047,17 +2047,17 @@ class AverageVector : public VectorBase public: AverageVector(Group *parent = nullptr) : VectorBase( - parent, nullptr, Units::Unspecified::get(), nullptr) + parent, nullptr, units::Unspecified::get(), nullptr) { } AverageVector(Group *parent, const char *name, const char *desc = nullptr) : VectorBase( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { } - AverageVector(Group *parent, const char *name, const Units::Base *unit, + AverageVector(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : VectorBase(parent, name, unit, desc) { @@ -2073,17 +2073,17 @@ class Vector2d : public Vector2dBase public: Vector2d(Group *parent = nullptr) : Vector2dBase( - parent, nullptr, Units::Unspecified::get(), nullptr) + parent, nullptr, units::Unspecified::get(), nullptr) { } Vector2d(Group *parent, const char *name, const char *desc = nullptr) : Vector2dBase( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { } - Vector2d(Group *parent, const char *name, const Units::Base *unit, + Vector2d(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : Vector2dBase(parent, name, unit, desc) { @@ -2099,17 +2099,17 @@ class Distribution : public DistBase public: Distribution(Group *parent = nullptr) : DistBase( - parent, nullptr, Units::Unspecified::get(), nullptr) + parent, nullptr, units::Unspecified::get(), nullptr) { } Distribution(Group *parent, const char *name, const char *desc = nullptr) : DistBase( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { } - Distribution(Group *parent, const char *name, const Units::Base *unit, + Distribution(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : DistBase(parent, name, unit, desc) { @@ -2141,18 +2141,18 @@ class Histogram : public DistBase public: Histogram(Group *parent = nullptr) : DistBase( - parent, nullptr, Units::Unspecified::get(), nullptr) + parent, nullptr, units::Unspecified::get(), nullptr) { } Histogram(Group *parent, const char *name, const char *desc = nullptr) : DistBase( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { } - Histogram(Group *parent, const char *name, const Units::Base *unit, + Histogram(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : DistBase(parent, name, unit, desc) { @@ -2185,7 +2185,7 @@ class StandardDeviation : public DistBase */ StandardDeviation(Group *parent = nullptr) : DistBase( - parent, nullptr, Units::Unspecified::get(), nullptr) + parent, nullptr, units::Unspecified::get(), nullptr) { SampleStor::Params *params = new SampleStor::Params; this->doInit(); @@ -2195,14 +2195,14 @@ class StandardDeviation : public DistBase StandardDeviation(Group *parent, const char *name, const char *desc = nullptr) : DistBase( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { SampleStor::Params *params = new SampleStor::Params; this->doInit(); this->setParams(params); } - StandardDeviation(Group *parent, const char *name, const Units::Base *unit, + StandardDeviation(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : DistBase(parent, name, unit, desc) { @@ -2224,7 +2224,7 @@ class AverageDeviation : public DistBase */ AverageDeviation(Group *parent = nullptr) : DistBase( - parent, nullptr, Units::Unspecified::get(), nullptr) + parent, nullptr, units::Unspecified::get(), nullptr) { AvgSampleStor::Params *params = new AvgSampleStor::Params; this->doInit(); @@ -2234,14 +2234,14 @@ class AverageDeviation : public DistBase AverageDeviation(Group *parent, const char *name, const char *desc = nullptr) : DistBase( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { AvgSampleStor::Params *params = new AvgSampleStor::Params; this->doInit(); this->setParams(params); } - AverageDeviation(Group *parent, const char *name, const Units::Base *unit, + AverageDeviation(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : DistBase(parent, name, unit, desc) { @@ -2260,19 +2260,19 @@ class VectorDistribution : public VectorDistBase public: VectorDistribution(Group *parent = nullptr) : VectorDistBase(parent, nullptr, - Units::Unspecified::get(), nullptr) + units::Unspecified::get(), nullptr) { } VectorDistribution(Group *parent, const char *name, const char *desc = nullptr) : VectorDistBase( - parent, name, Units::Unspecified::get(), desc) + parent, name, units::Unspecified::get(), desc) { } VectorDistribution(Group *parent, const char *name, - const Units::Base *unit, + const units::Base *unit, const char *desc = nullptr) : VectorDistBase(parent, name, unit, desc) @@ -2307,19 +2307,19 @@ class VectorStandardDeviation public: VectorStandardDeviation(Group *parent = nullptr) : VectorDistBase(parent, nullptr, - Units::Unspecified::get(), nullptr) + units::Unspecified::get(), nullptr) { } VectorStandardDeviation(Group *parent, const char *name, const char *desc = nullptr) : VectorDistBase(parent, name, - Units::Unspecified::get(), desc) + units::Unspecified::get(), desc) { } VectorStandardDeviation(Group *parent, const char *name, - const Units::Base *unit, + const units::Base *unit, const char *desc = nullptr) : VectorDistBase(parent, name, unit, desc) @@ -2351,19 +2351,19 @@ class VectorAverageDeviation public: VectorAverageDeviation(Group *parent = nullptr) : VectorDistBase(parent, - nullptr, Units::Unspecified::get(), nullptr) + nullptr, units::Unspecified::get(), nullptr) { } VectorAverageDeviation(Group *parent, const char *name, const char *desc = nullptr) : VectorDistBase(parent, name, - Units::Unspecified::get(), desc) + units::Unspecified::get(), desc) { } VectorAverageDeviation(Group *parent, const char *name, - const Units::Base *unit, + const units::Base *unit, const char *desc = nullptr) : VectorDistBase(parent, name, unit, desc) @@ -2462,7 +2462,7 @@ class SparseHistBase : public DataWrap public: SparseHistBase(Group *parent, const char *name, - const Units::Base *unit, + const units::Base *unit, const char *desc) : DataWrap(parent, name, unit, desc) { @@ -2510,18 +2510,18 @@ class SparseHistogram : public SparseHistBase public: SparseHistogram(Group *parent = nullptr) : SparseHistBase(parent, nullptr, - Units::Unspecified::get(), nullptr) + units::Unspecified::get(), nullptr) { } SparseHistogram(Group *parent, const char *name, const char *desc = nullptr) : SparseHistBase(parent, name, - Units::Unspecified::get(), desc) + units::Unspecified::get(), desc) { } - SparseHistogram(Group *parent, const char *name, const Units::Base *unit, + SparseHistogram(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr) : SparseHistBase(parent, name, unit, desc) @@ -2563,13 +2563,13 @@ class Formula : public DataWrapVec Formula(Group *parent = nullptr, const char *name = nullptr, const char *desc = nullptr); - Formula(Group *parent, const char *name, const Units::Base *unit, + Formula(Group *parent, const char *name, const units::Base *unit, const char *desc = nullptr); Formula(Group *parent, const char *name, const char *desc, const Temp &r); - Formula(Group *parent, const char *name, const Units::Base *unit, + Formula(Group *parent, const char *name, const units::Base *unit, const char *desc, const Temp &r); /** diff --git a/src/base/stats/group.hh b/src/base/stats/group.hh index db6783adab..d7e28098f1 100644 --- a/src/base/stats/group.hh +++ b/src/base/stats/group.hh @@ -60,7 +60,7 @@ * * Group() * : ADD_STAT(scalar0, "Description of scalar0"), - * scalar1(this, "scalar1", Stats::Units::Unspecified::get(), + * scalar1(this, "scalar1", Stats::units::Unspecified::get(), * "Description of scalar1") * { * } diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh index c58875d804..ee70341996 100644 --- a/src/base/stats/info.hh +++ b/src/base/stats/info.hh @@ -75,7 +75,7 @@ class Info /** The separator string used for vectors, dist, etc. */ static std::string separatorString; /** The unit of the stat. */ - const Units::Base* unit = Units::Unspecified::get(); + const units::Base* unit = units::Unspecified::get(); /** The description of the stat. */ std::string desc; /** The formatting flags. */ diff --git a/src/base/stats/units.hh b/src/base/stats/units.hh index 8f15e8089c..b6046a48e9 100644 --- a/src/base/stats/units.hh +++ b/src/base/stats/units.hh @@ -38,39 +38,39 @@ * Convenience macros to declare the unit of a stat. */ #define UNIT_CYCLE GEM5_DEPRECATED_MACRO( \ - UNIT_CYCLE, Stats::Units::Cycle::get(), \ - "Use Stats::Units::Cycle::get()") + UNIT_CYCLE, Stats::units::Cycle::get(), \ + "Use Stats::units::Cycle::get()") #define UNIT_TICK GEM5_DEPRECATED_MACRO( \ - UNIT_TICK, Stats::Units::Tick::get(), "Use Stats::Units::Tick::get()") + UNIT_TICK, Stats::units::Tick::get(), "Use Stats::units::Tick::get()") #define UNIT_SECOND GEM5_DEPRECATED_MACRO( \ - UNIT_SECOND, Stats::Units::Second::get(), \ - "Use Stats::Units::Second::get()") + UNIT_SECOND, Stats::units::Second::get(), \ + "Use Stats::units::Second::get()") #define UNIT_BIT GEM5_DEPRECATED_MACRO( \ - UNIT_BIT, Stats::Units::Bit::get(), "Use Stats::Units::Bit::get()") + UNIT_BIT, Stats::units::Bit::get(), "Use Stats::units::Bit::get()") #define UNIT_BYTE GEM5_DEPRECATED_MACRO( \ - UNIT_BYTE, Stats::Units::Byte::get(), "Use Stats::Units::Byte::get()") + UNIT_BYTE, Stats::units::Byte::get(), "Use Stats::units::Byte::get()") #define UNIT_JOULE GEM5_DEPRECATED_MACRO( \ - UNIT_JOULE, Stats::Units::Joule::get(), \ - "Use Stats::Units::Joule::get()") + UNIT_JOULE, Stats::units::Joule::get(), \ + "Use Stats::units::Joule::get()") #define UNIT_VOLT GEM5_DEPRECATED_MACRO( \ - UNIT_VOLD, Stats::Units::Volt::get(), "Use Stats::Units::Volt::get()") + UNIT_VOLD, Stats::units::Volt::get(), "Use Stats::units::Volt::get()") #define UNIT_CELSIUS GEM5_DEPRECATED_MACRO( \ - UNIT_CELSIUS, Stats::Units::DegreeCelsius::get(), \ - "Use Stats::Units::DegreeCelsius::get()") + UNIT_CELSIUS, Stats::units::DegreeCelsius::get(), \ + "Use Stats::units::DegreeCelsius::get()") #define UNIT_RATE(T1, T2) GEM5_DEPRECATED_MACRO( \ - UNIT_RATE, (Stats::Units::Rate::get()), \ - "Use Stats::Units::Rate::get()") + UNIT_RATE, (Stats::units::Rate::get()), \ + "Use Stats::units::Rate::get()") #define UNIT_RATIO GEM5_DEPRECATED_MACRO( \ - UNIT_RATIO, Stats::Units::Ratio::get(), \ - "Use Stats::Units::Ratio::get()") + UNIT_RATIO, Stats::units::Ratio::get(), \ + "Use Stats::units::Ratio::get()") #define UNIT_COUNT GEM5_DEPRECATED_MACRO( \ - UNIT_COUNT, Stats::Units::Count::get(), \ - "Use Stats::Units::Count::get()") + UNIT_COUNT, Stats::units::Count::get(), \ + "Use Stats::units::Count::get()") #define UNIT_WATT GEM5_DEPRECATED_MACRO( \ - UNIT_WATT, Stats::Units::Watt::get(), "Use Stats::Units::Watt::get()") + UNIT_WATT, Stats::units::Watt::get(), "Use Stats::units::Watt::get()") #define UNIT_UNSPECIFIED GEM5_DEPRECATED_MACRO( \ - UNIT_UNSPECIFIED, Stats::Units::Unspecified::get(), \ - "Use Stats::Units::Unspecified::get()") + UNIT_UNSPECIFIED, Stats::units::Unspecified::get(), \ + "Use Stats::units::Unspecified::get()") namespace Stats { @@ -105,7 +105,9 @@ namespace Stats { * - The new unit is significant enough to be not included in Count unit. * (e.g. Cycle unit, Tick unit) */ -namespace Units { +GEM5_DEPRECATED_NAMESPACE(Units, units); +namespace units +{ /** * The Base class is the parent class of all unit classes. @@ -336,9 +338,9 @@ template class Rate : public Base { static_assert(std::is_base_of::value, - "Rate(T1,T2) must have T1 and T2 derived from Stats::Units::Base"); + "Rate(T1,T2) must have T1 and T2 derived from Stats::units::Base"); static_assert(std::is_base_of::value, - "Rate(T1,T2) must have T1 and T2 derived from Stats::Units::Base"); + "Rate(T1,T2) must have T1 and T2 derived from Stats::units::Base"); static_assert(!std::is_same::value || std::is_same::value || std::is_same::value, "Rate(T1,T2) must have T1 and T2 of different types; " @@ -367,7 +369,7 @@ class Rate : public Base } }; -} // namespace Units +} // namespace units } // namespace Stats diff --git a/src/base/stats/units.test.cc b/src/base/stats/units.test.cc index ed842b8f21..9353cffe21 100644 --- a/src/base/stats/units.test.cc +++ b/src/base/stats/units.test.cc @@ -33,103 +33,103 @@ TEST(StatsUnitsTest, Cycle) { - Stats::Units::Cycle *unit = Stats::Units::Cycle::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Cycle::toString()); + Stats::units::Cycle *unit = Stats::units::Cycle::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Cycle::toString()); } TEST(StatsUnitsTest, Tick) { - Stats::Units::Tick *unit = Stats::Units::Tick::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Tick::toString()); + Stats::units::Tick *unit = Stats::units::Tick::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Tick::toString()); } TEST(StatsUnitsTest, Second) { - Stats::Units::Second *unit = Stats::Units::Second::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Second::toString()); + Stats::units::Second *unit = Stats::units::Second::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Second::toString()); } TEST(StatsUnitsTest, Bit) { - Stats::Units::Bit *unit = Stats::Units::Bit::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Bit::toString()); + Stats::units::Bit *unit = Stats::units::Bit::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Bit::toString()); } TEST(StatsUnitsTest, Byte) { - Stats::Units::Byte *unit = Stats::Units::Byte::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Byte::toString()); + Stats::units::Byte *unit = Stats::units::Byte::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Byte::toString()); } TEST(StatsUnitsTest, Watt) { - Stats::Units::Watt *unit = Stats::Units::Watt::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Watt::toString()); + Stats::units::Watt *unit = Stats::units::Watt::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Watt::toString()); } TEST(StatsUnitsTest, Joule) { - Stats::Units::Joule *unit = Stats::Units::Joule::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Joule::toString()); + Stats::units::Joule *unit = Stats::units::Joule::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Joule::toString()); } TEST(StatsUnitsTest, Volt) { - Stats::Units::Volt *unit = Stats::Units::Volt::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Volt::toString()); + Stats::units::Volt *unit = Stats::units::Volt::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Volt::toString()); } TEST(StatsUnitsTest, DegreeCelsius) { - Stats::Units::DegreeCelsius *unit = Stats::Units::DegreeCelsius::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::DegreeCelsius::toString()); + Stats::units::DegreeCelsius *unit = Stats::units::DegreeCelsius::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::DegreeCelsius::toString()); } TEST(StatsUnitsTest, Count) { - Stats::Units::Count *unit = Stats::Units::Count::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Count::toString()); + Stats::units::Count *unit = Stats::units::Count::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Count::toString()); } TEST(StatsUnitsTest, Rate1) { - Stats::Units::Rate *unit = - Stats::Units::Rate::get(); + Stats::units::Rate *unit = + Stats::units::Rate::get(); ASSERT_EQ(unit->getUnitString(), "(Count/Count)"); - ASSERT_EQ(unit->getUnitString(), (Stats::Units::Rate::toString())); + ASSERT_EQ(unit->getUnitString(), (Stats::units::Rate::toString())); } TEST(StatsUnitsTest, Rate2) { - Stats::Units::Rate *unit = - Stats::Units::Rate::get(); + Stats::units::Rate *unit = + Stats::units::Rate::get(); ASSERT_EQ(unit->getUnitString(), "(Tick/Second)"); - ASSERT_EQ(unit->getUnitString(), (Stats::Units::Rate::toString())); + ASSERT_EQ(unit->getUnitString(), (Stats::units::Rate::toString())); } TEST(StatsUnitsTest, RateOfRates) { - typedef Stats::Units::Rate + typedef Stats::units::Rate BitPerSecond; - typedef Stats::Units::Rate + typedef Stats::units::Rate CountPerCycle; - Stats::Units::Rate *unit = - Stats::Units::Rate::get(); + Stats::units::Rate *unit = + Stats::units::Rate::get(); ASSERT_EQ(unit->getUnitString(), "((Bit/Second)/(Count/Cycle))"); ASSERT_EQ(unit->getUnitString(), - (Stats::Units::Rate::toString())); + (Stats::units::Rate::toString())); } TEST(StatsUnitsTest, Ratio) { - Stats::Units::Ratio *unit = Stats::Units::Ratio::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Ratio::toString()); + Stats::units::Ratio *unit = Stats::units::Ratio::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Ratio::toString()); } TEST(StatsUnitsTest, Unspecified) { - Stats::Units::Unspecified *unit = Stats::Units::Unspecified::get(); - ASSERT_EQ(unit->getUnitString(), Stats::Units::Unspecified::toString()); + Stats::units::Unspecified *unit = Stats::units::Unspecified::get(); + ASSERT_EQ(unit->getUnitString(), Stats::units::Unspecified::toString()); } diff --git a/src/cpu/base.cc b/src/cpu/base.cc index 494e79355e..dffe4c9ce1 100644 --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -370,11 +370,11 @@ BaseCPU::probeInstCommit(const StaticInstPtr &inst, Addr pc) BaseCPU:: BaseCPUStats::BaseCPUStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(numCycles, Stats::Units::Cycle::get(), + ADD_STAT(numCycles, Stats::units::Cycle::get(), "Number of cpu cycles simulated"), - ADD_STAT(numWorkItemsStarted, Stats::Units::Count::get(), + ADD_STAT(numWorkItemsStarted, Stats::units::Count::get(), "Number of work items this cpu started"), - ADD_STAT(numWorkItemsCompleted, Stats::Units::Count::get(), + ADD_STAT(numWorkItemsCompleted, Stats::units::Count::get(), "Number of work items this cpu completed") { } @@ -734,15 +734,15 @@ BaseCPU::waitForRemoteGDB() const BaseCPU::GlobalStats::GlobalStats(::Stats::Group *parent) : ::Stats::Group(parent), - ADD_STAT(simInsts, Stats::Units::Count::get(), + ADD_STAT(simInsts, Stats::units::Count::get(), "Number of instructions simulated"), - ADD_STAT(simOps, Stats::Units::Count::get(), + ADD_STAT(simOps, Stats::units::Count::get(), "Number of ops (including micro ops) simulated"), - ADD_STAT(hostInstRate, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Second>::get(), + ADD_STAT(hostInstRate, Stats::units::Rate< + Stats::units::Count, Stats::units::Second>::get(), "Simulator instruction rate (inst/s)"), - ADD_STAT(hostOpRate, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Second>::get(), + ADD_STAT(hostOpRate, Stats::units::Rate< + Stats::units::Count, Stats::units::Second>::get(), "Simulator op (including micro ops) rate (op/s)") { simInsts diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc index 124bbd2c4b..f3a5bdc371 100644 --- a/src/cpu/kvm/base.cc +++ b/src/cpu/kvm/base.cc @@ -260,25 +260,25 @@ BaseKvmCPU::startupThread() BaseKvmCPU::StatGroup::StatGroup(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(committedInsts, Stats::Units::Count::get(), + ADD_STAT(committedInsts, Stats::units::Count::get(), "Number of instructions committed"), - ADD_STAT(numVMExits, Stats::Units::Count::get(), + ADD_STAT(numVMExits, Stats::units::Count::get(), "total number of KVM exits"), - ADD_STAT(numVMHalfEntries, Stats::Units::Count::get(), + ADD_STAT(numVMHalfEntries, Stats::units::Count::get(), "number of KVM entries to finalize pending operations"), - ADD_STAT(numExitSignal, Stats::Units::Count::get(), + ADD_STAT(numExitSignal, Stats::units::Count::get(), "exits due to signal delivery"), - ADD_STAT(numMMIO, Stats::Units::Count::get(), + ADD_STAT(numMMIO, Stats::units::Count::get(), "number of VM exits due to memory mapped IO"), - ADD_STAT(numCoalescedMMIO, Stats::Units::Count::get(), + ADD_STAT(numCoalescedMMIO, Stats::units::Count::get(), "number of coalesced memory mapped IO requests"), - ADD_STAT(numIO, Stats::Units::Count::get(), + ADD_STAT(numIO, Stats::units::Count::get(), "number of VM exits due to legacy IO"), - ADD_STAT(numHalt, Stats::Units::Count::get(), + ADD_STAT(numHalt, Stats::units::Count::get(), "number of VM exits due to wait for interrupt instructions"), - ADD_STAT(numInterrupts, Stats::Units::Count::get(), + ADD_STAT(numInterrupts, Stats::units::Count::get(), "number of interrupts delivered"), - ADD_STAT(numHypercalls, Stats::Units::Count::get(), "number of hypercalls") + ADD_STAT(numHypercalls, Stats::units::Count::get(), "number of hypercalls") { } diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc index 40c339f8bd..57ba03fe4a 100644 --- a/src/cpu/minor/fetch2.cc +++ b/src/cpu/minor/fetch2.cc @@ -605,17 +605,17 @@ Fetch2::isDrained() Fetch2::Fetch2Stats::Fetch2Stats(MinorCPU *cpu) : Stats::Group(cpu, "fetch2"), - ADD_STAT(intInstructions, Stats::Units::Count::get(), + ADD_STAT(intInstructions, Stats::units::Count::get(), "Number of integer instructions successfully decoded"), - ADD_STAT(fpInstructions, Stats::Units::Count::get(), + ADD_STAT(fpInstructions, Stats::units::Count::get(), "Number of floating point instructions successfully decoded"), - ADD_STAT(vecInstructions, Stats::Units::Count::get(), + ADD_STAT(vecInstructions, Stats::units::Count::get(), "Number of SIMD instructions successfully decoded"), - ADD_STAT(loadInstructions, Stats::Units::Count::get(), + ADD_STAT(loadInstructions, Stats::units::Count::get(), "Number of memory load instructions successfully decoded"), - ADD_STAT(storeInstructions, Stats::Units::Count::get(), + ADD_STAT(storeInstructions, Stats::units::Count::get(), "Number of memory store instructions successfully decoded"), - ADD_STAT(amoInstructions, Stats::Units::Count::get(), + ADD_STAT(amoInstructions, Stats::units::Count::get(), "Number of memory atomic instructions successfully decoded") { intInstructions diff --git a/src/cpu/minor/stats.cc b/src/cpu/minor/stats.cc index 36d16a78bf..c6cfb42605 100644 --- a/src/cpu/minor/stats.cc +++ b/src/cpu/minor/stats.cc @@ -42,25 +42,25 @@ namespace Minor MinorStats::MinorStats(BaseCPU *base_cpu) : Stats::Group(base_cpu), - ADD_STAT(numInsts, Stats::Units::Count::get(), + ADD_STAT(numInsts, Stats::units::Count::get(), "Number of instructions committed"), - ADD_STAT(numOps, Stats::Units::Count::get(), + ADD_STAT(numOps, Stats::units::Count::get(), "Number of ops (including micro ops) committed"), - ADD_STAT(numDiscardedOps, Stats::Units::Count::get(), + ADD_STAT(numDiscardedOps, Stats::units::Count::get(), "Number of ops (including micro ops) which were discarded before " "commit"), - ADD_STAT(numFetchSuspends, Stats::Units::Count::get(), + ADD_STAT(numFetchSuspends, Stats::units::Count::get(), "Number of times Execute suspended instruction fetching"), - ADD_STAT(quiesceCycles, Stats::Units::Cycle::get(), + ADD_STAT(quiesceCycles, Stats::units::Cycle::get(), "Total number of cycles that CPU has spent quiesced or waiting " "for an interrupt"), - ADD_STAT(cpi, Stats::Units::Rate< - Stats::Units::Cycle, Stats::Units::Count>::get(), + ADD_STAT(cpi, Stats::units::Rate< + Stats::units::Cycle, Stats::units::Count>::get(), "CPI: cycles per instruction"), - ADD_STAT(ipc, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Cycle>::get(), + ADD_STAT(ipc, Stats::units::Rate< + Stats::units::Count, Stats::units::Cycle>::get(), "IPC: instructions per cycle"), - ADD_STAT(committedInstType, Stats::Units::Count::get(), + ADD_STAT(committedInstType, Stats::units::Count::get(), "Class of committed instruction") { quiesceCycles.prereq(quiesceCycles); diff --git a/src/cpu/o3/commit.cc b/src/cpu/o3/commit.cc index 5ab91a24e2..869c9ae620 100644 --- a/src/cpu/o3/commit.cc +++ b/src/cpu/o3/commit.cc @@ -145,39 +145,39 @@ Commit::regProbePoints() Commit::CommitStats::CommitStats(CPU *cpu, Commit *commit) : Stats::Group(cpu, "commit"), - ADD_STAT(commitSquashedInsts, Stats::Units::Count::get(), + ADD_STAT(commitSquashedInsts, Stats::units::Count::get(), "The number of squashed insts skipped by commit"), - ADD_STAT(commitNonSpecStalls, Stats::Units::Count::get(), + ADD_STAT(commitNonSpecStalls, Stats::units::Count::get(), "The number of times commit has been forced to stall to " "communicate backwards"), - ADD_STAT(branchMispredicts, Stats::Units::Count::get(), + ADD_STAT(branchMispredicts, Stats::units::Count::get(), "The number of times a branch was mispredicted"), - ADD_STAT(numCommittedDist, Stats::Units::Count::get(), + ADD_STAT(numCommittedDist, Stats::units::Count::get(), "Number of insts commited each cycle"), - ADD_STAT(instsCommitted, Stats::Units::Count::get(), + ADD_STAT(instsCommitted, Stats::units::Count::get(), "Number of instructions committed"), - ADD_STAT(opsCommitted, Stats::Units::Count::get(), + ADD_STAT(opsCommitted, Stats::units::Count::get(), "Number of ops (including micro ops) committed"), - ADD_STAT(memRefs, Stats::Units::Count::get(), + ADD_STAT(memRefs, Stats::units::Count::get(), "Number of memory references committed"), - ADD_STAT(loads, Stats::Units::Count::get(), "Number of loads committed"), - ADD_STAT(amos, Stats::Units::Count::get(), + ADD_STAT(loads, Stats::units::Count::get(), "Number of loads committed"), + ADD_STAT(amos, Stats::units::Count::get(), "Number of atomic instructions committed"), - ADD_STAT(membars, Stats::Units::Count::get(), + ADD_STAT(membars, Stats::units::Count::get(), "Number of memory barriers committed"), - ADD_STAT(branches, Stats::Units::Count::get(), + ADD_STAT(branches, Stats::units::Count::get(), "Number of branches committed"), - ADD_STAT(vectorInstructions, Stats::Units::Count::get(), + ADD_STAT(vectorInstructions, Stats::units::Count::get(), "Number of committed Vector instructions."), - ADD_STAT(floating, Stats::Units::Count::get(), + ADD_STAT(floating, Stats::units::Count::get(), "Number of committed floating point instructions."), - ADD_STAT(integer, Stats::Units::Count::get(), + ADD_STAT(integer, Stats::units::Count::get(), "Number of committed integer instructions."), - ADD_STAT(functionCalls, Stats::Units::Count::get(), + ADD_STAT(functionCalls, Stats::units::Count::get(), "Number of function calls committed."), - ADD_STAT(committedInstType, Stats::Units::Count::get(), + ADD_STAT(committedInstType, Stats::units::Count::get(), "Class of committed instruction"), - ADD_STAT(commitEligibleSamples, Stats::Units::Cycle::get(), + ADD_STAT(commitEligibleSamples, Stats::units::Cycle::get(), "number cycles where commit BW limit reached") { using namespace Stats; diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index cfee8cd793..915a3dba2e 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -372,54 +372,54 @@ CPU::regProbePoints() CPU::CPUStats::CPUStats(CPU *cpu) : Stats::Group(cpu), - ADD_STAT(timesIdled, Stats::Units::Count::get(), + ADD_STAT(timesIdled, Stats::units::Count::get(), "Number of times that the entire CPU went into an idle state " "and unscheduled itself"), - ADD_STAT(idleCycles, Stats::Units::Cycle::get(), + ADD_STAT(idleCycles, Stats::units::Cycle::get(), "Total number of cycles that the CPU has spent unscheduled due " "to idling"), - ADD_STAT(quiesceCycles, Stats::Units::Cycle::get(), + ADD_STAT(quiesceCycles, Stats::units::Cycle::get(), "Total number of cycles that CPU has spent quiesced or waiting " "for an interrupt"), - ADD_STAT(committedInsts, Stats::Units::Count::get(), + ADD_STAT(committedInsts, Stats::units::Count::get(), "Number of Instructions Simulated"), - ADD_STAT(committedOps, Stats::Units::Count::get(), + ADD_STAT(committedOps, Stats::units::Count::get(), "Number of Ops (including micro ops) Simulated"), - ADD_STAT(cpi, Stats::Units::Rate< - Stats::Units::Cycle, Stats::Units::Count>::get(), + ADD_STAT(cpi, Stats::units::Rate< + Stats::units::Cycle, Stats::units::Count>::get(), "CPI: Cycles Per Instruction"), - ADD_STAT(totalCpi, Stats::Units::Rate< - Stats::Units::Cycle, Stats::Units::Count>::get(), + ADD_STAT(totalCpi, Stats::units::Rate< + Stats::units::Cycle, Stats::units::Count>::get(), "CPI: Total CPI of All Threads"), - ADD_STAT(ipc, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Cycle>::get(), + ADD_STAT(ipc, Stats::units::Rate< + Stats::units::Count, Stats::units::Cycle>::get(), "IPC: Instructions Per Cycle"), - ADD_STAT(totalIpc, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Cycle>::get(), + ADD_STAT(totalIpc, Stats::units::Rate< + Stats::units::Count, Stats::units::Cycle>::get(), "IPC: Total IPC of All Threads"), - ADD_STAT(intRegfileReads, Stats::Units::Count::get(), + ADD_STAT(intRegfileReads, Stats::units::Count::get(), "Number of integer regfile reads"), - ADD_STAT(intRegfileWrites, Stats::Units::Count::get(), + ADD_STAT(intRegfileWrites, Stats::units::Count::get(), "Number of integer regfile writes"), - ADD_STAT(fpRegfileReads, Stats::Units::Count::get(), + ADD_STAT(fpRegfileReads, Stats::units::Count::get(), "Number of floating regfile reads"), - ADD_STAT(fpRegfileWrites, Stats::Units::Count::get(), + ADD_STAT(fpRegfileWrites, Stats::units::Count::get(), "Number of floating regfile writes"), - ADD_STAT(vecRegfileReads, Stats::Units::Count::get(), + ADD_STAT(vecRegfileReads, Stats::units::Count::get(), "number of vector regfile reads"), - ADD_STAT(vecRegfileWrites, Stats::Units::Count::get(), + ADD_STAT(vecRegfileWrites, Stats::units::Count::get(), "number of vector regfile writes"), - ADD_STAT(vecPredRegfileReads, Stats::Units::Count::get(), + ADD_STAT(vecPredRegfileReads, Stats::units::Count::get(), "number of predicate regfile reads"), - ADD_STAT(vecPredRegfileWrites, Stats::Units::Count::get(), + ADD_STAT(vecPredRegfileWrites, Stats::units::Count::get(), "number of predicate regfile writes"), - ADD_STAT(ccRegfileReads, Stats::Units::Count::get(), + ADD_STAT(ccRegfileReads, Stats::units::Count::get(), "number of cc regfile reads"), - ADD_STAT(ccRegfileWrites, Stats::Units::Count::get(), + ADD_STAT(ccRegfileWrites, Stats::units::Count::get(), "number of cc regfile writes"), - ADD_STAT(miscRegfileReads, Stats::Units::Count::get(), + ADD_STAT(miscRegfileReads, Stats::units::Count::get(), "number of misc regfile reads"), - ADD_STAT(miscRegfileWrites, Stats::Units::Count::get(), + ADD_STAT(miscRegfileWrites, Stats::units::Count::get(), "number of misc regfile writes") { // Register any of the O3CPU's stats here. diff --git a/src/cpu/o3/decode.cc b/src/cpu/o3/decode.cc index 16445f23d8..6815a22589 100644 --- a/src/cpu/o3/decode.cc +++ b/src/cpu/o3/decode.cc @@ -119,26 +119,26 @@ Decode::name() const Decode::DecodeStats::DecodeStats(CPU *cpu) : Stats::Group(cpu, "decode"), - ADD_STAT(idleCycles, Stats::Units::Cycle::get(), + ADD_STAT(idleCycles, Stats::units::Cycle::get(), "Number of cycles decode is idle"), - ADD_STAT(blockedCycles, Stats::Units::Cycle::get(), + ADD_STAT(blockedCycles, Stats::units::Cycle::get(), "Number of cycles decode is blocked"), - ADD_STAT(runCycles, Stats::Units::Cycle::get(), + ADD_STAT(runCycles, Stats::units::Cycle::get(), "Number of cycles decode is running"), - ADD_STAT(unblockCycles, Stats::Units::Cycle::get(), + ADD_STAT(unblockCycles, Stats::units::Cycle::get(), "Number of cycles decode is unblocking"), - ADD_STAT(squashCycles, Stats::Units::Cycle::get(), + ADD_STAT(squashCycles, Stats::units::Cycle::get(), "Number of cycles decode is squashing"), - ADD_STAT(branchResolved, Stats::Units::Count::get(), + ADD_STAT(branchResolved, Stats::units::Count::get(), "Number of times decode resolved a branch"), - ADD_STAT(branchMispred, Stats::Units::Count::get(), + ADD_STAT(branchMispred, Stats::units::Count::get(), "Number of times decode detected a branch misprediction"), - ADD_STAT(controlMispred, Stats::Units::Count::get(), + ADD_STAT(controlMispred, Stats::units::Count::get(), "Number of times decode detected an instruction incorrectly " "predicted as a control"), - ADD_STAT(decodedInsts, Stats::Units::Count::get(), + ADD_STAT(decodedInsts, Stats::units::Count::get(), "Number of instructions handled by decode"), - ADD_STAT(squashedInsts, Stats::Units::Count::get(), + ADD_STAT(squashedInsts, Stats::units::Count::get(), "Number of squashed instructions handled by decode") { idleCycles.prereq(idleCycles); diff --git a/src/cpu/o3/fetch.cc b/src/cpu/o3/fetch.cc index 72f43125bd..8b0febbbcf 100644 --- a/src/cpu/o3/fetch.cc +++ b/src/cpu/o3/fetch.cc @@ -157,54 +157,54 @@ Fetch::regProbePoints() Fetch::FetchStatGroup::FetchStatGroup(CPU *cpu, Fetch *fetch) : Stats::Group(cpu, "fetch"), - ADD_STAT(icacheStallCycles, Stats::Units::Cycle::get(), + ADD_STAT(icacheStallCycles, Stats::units::Cycle::get(), "Number of cycles fetch is stalled on an Icache miss"), - ADD_STAT(insts, Stats::Units::Count::get(), + ADD_STAT(insts, Stats::units::Count::get(), "Number of instructions fetch has processed"), - ADD_STAT(branches, Stats::Units::Count::get(), + ADD_STAT(branches, Stats::units::Count::get(), "Number of branches that fetch encountered"), - ADD_STAT(predictedBranches, Stats::Units::Count::get(), + ADD_STAT(predictedBranches, Stats::units::Count::get(), "Number of branches that fetch has predicted taken"), - ADD_STAT(cycles, Stats::Units::Cycle::get(), + ADD_STAT(cycles, Stats::units::Cycle::get(), "Number of cycles fetch has run and was not squashing or " "blocked"), - ADD_STAT(squashCycles, Stats::Units::Cycle::get(), + ADD_STAT(squashCycles, Stats::units::Cycle::get(), "Number of cycles fetch has spent squashing"), - ADD_STAT(tlbCycles, Stats::Units::Cycle::get(), + ADD_STAT(tlbCycles, Stats::units::Cycle::get(), "Number of cycles fetch has spent waiting for tlb"), - ADD_STAT(idleCycles, Stats::Units::Cycle::get(), + ADD_STAT(idleCycles, Stats::units::Cycle::get(), "Number of cycles fetch was idle"), - ADD_STAT(blockedCycles, Stats::Units::Cycle::get(), + ADD_STAT(blockedCycles, Stats::units::Cycle::get(), "Number of cycles fetch has spent blocked"), - ADD_STAT(miscStallCycles, Stats::Units::Cycle::get(), + ADD_STAT(miscStallCycles, Stats::units::Cycle::get(), "Number of cycles fetch has spent waiting on interrupts, or bad " "addresses, or out of MSHRs"), - ADD_STAT(pendingDrainCycles, Stats::Units::Cycle::get(), + ADD_STAT(pendingDrainCycles, Stats::units::Cycle::get(), "Number of cycles fetch has spent waiting on pipes to drain"), - ADD_STAT(noActiveThreadStallCycles, Stats::Units::Cycle::get(), + ADD_STAT(noActiveThreadStallCycles, Stats::units::Cycle::get(), "Number of stall cycles due to no active thread to fetch from"), - ADD_STAT(pendingTrapStallCycles, Stats::Units::Cycle::get(), + ADD_STAT(pendingTrapStallCycles, Stats::units::Cycle::get(), "Number of stall cycles due to pending traps"), - ADD_STAT(pendingQuiesceStallCycles, Stats::Units::Cycle::get(), + ADD_STAT(pendingQuiesceStallCycles, Stats::units::Cycle::get(), "Number of stall cycles due to pending quiesce instructions"), - ADD_STAT(icacheWaitRetryStallCycles, Stats::Units::Cycle::get(), + ADD_STAT(icacheWaitRetryStallCycles, Stats::units::Cycle::get(), "Number of stall cycles due to full MSHR"), - ADD_STAT(cacheLines, Stats::Units::Count::get(), + ADD_STAT(cacheLines, Stats::units::Count::get(), "Number of cache lines fetched"), - ADD_STAT(icacheSquashes, Stats::Units::Count::get(), + ADD_STAT(icacheSquashes, Stats::units::Count::get(), "Number of outstanding Icache misses that were squashed"), - ADD_STAT(tlbSquashes, Stats::Units::Count::get(), + ADD_STAT(tlbSquashes, Stats::units::Count::get(), "Number of outstanding ITLB misses that were squashed"), - ADD_STAT(nisnDist, Stats::Units::Count::get(), + ADD_STAT(nisnDist, Stats::units::Count::get(), "Number of instructions fetched each cycle (Total)"), - ADD_STAT(idleRate, Stats::Units::Ratio::get(), + ADD_STAT(idleRate, Stats::units::Ratio::get(), "Ratio of cycles fetch was idle", idleCycles / cpu->baseStats.numCycles), - ADD_STAT(branchRate, Stats::Units::Ratio::get(), + ADD_STAT(branchRate, Stats::units::Ratio::get(), "Number of branch fetches per cycle", branches / cpu->baseStats.numCycles), - ADD_STAT(rate, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Cycle>::get(), + ADD_STAT(rate, Stats::units::Rate< + Stats::units::Count, Stats::units::Cycle>::get(), "Number of inst fetches per cycle", insts / cpu->baseStats.numCycles) { diff --git a/src/cpu/o3/iew.cc b/src/cpu/o3/iew.cc index a4297cc1e7..eb6127d343 100644 --- a/src/cpu/o3/iew.cc +++ b/src/cpu/o3/iew.cc @@ -141,51 +141,51 @@ IEW::regProbePoints() IEW::IEWStats::IEWStats(CPU *cpu) : Stats::Group(cpu), - ADD_STAT(idleCycles, Stats::Units::Cycle::get(), + ADD_STAT(idleCycles, Stats::units::Cycle::get(), "Number of cycles IEW is idle"), - ADD_STAT(squashCycles, Stats::Units::Cycle::get(), + ADD_STAT(squashCycles, Stats::units::Cycle::get(), "Number of cycles IEW is squashing"), - ADD_STAT(blockCycles, Stats::Units::Cycle::get(), + ADD_STAT(blockCycles, Stats::units::Cycle::get(), "Number of cycles IEW is blocking"), - ADD_STAT(unblockCycles, Stats::Units::Cycle::get(), + ADD_STAT(unblockCycles, Stats::units::Cycle::get(), "Number of cycles IEW is unblocking"), - ADD_STAT(dispatchedInsts, Stats::Units::Count::get(), + ADD_STAT(dispatchedInsts, Stats::units::Count::get(), "Number of instructions dispatched to IQ"), - ADD_STAT(dispSquashedInsts, Stats::Units::Count::get(), + ADD_STAT(dispSquashedInsts, Stats::units::Count::get(), "Number of squashed instructions skipped by dispatch"), - ADD_STAT(dispLoadInsts, Stats::Units::Count::get(), + ADD_STAT(dispLoadInsts, Stats::units::Count::get(), "Number of dispatched load instructions"), - ADD_STAT(dispStoreInsts, Stats::Units::Count::get(), + ADD_STAT(dispStoreInsts, Stats::units::Count::get(), "Number of dispatched store instructions"), - ADD_STAT(dispNonSpecInsts, Stats::Units::Count::get(), + ADD_STAT(dispNonSpecInsts, Stats::units::Count::get(), "Number of dispatched non-speculative instructions"), - ADD_STAT(iqFullEvents, Stats::Units::Count::get(), + ADD_STAT(iqFullEvents, Stats::units::Count::get(), "Number of times the IQ has become full, causing a stall"), - ADD_STAT(lsqFullEvents, Stats::Units::Count::get(), + ADD_STAT(lsqFullEvents, Stats::units::Count::get(), "Number of times the LSQ has become full, causing a stall"), - ADD_STAT(memOrderViolationEvents, Stats::Units::Count::get(), + ADD_STAT(memOrderViolationEvents, Stats::units::Count::get(), "Number of memory order violations"), - ADD_STAT(predictedTakenIncorrect, Stats::Units::Count::get(), + ADD_STAT(predictedTakenIncorrect, Stats::units::Count::get(), "Number of branches that were predicted taken incorrectly"), - ADD_STAT(predictedNotTakenIncorrect, Stats::Units::Count::get(), + ADD_STAT(predictedNotTakenIncorrect, Stats::units::Count::get(), "Number of branches that were predicted not taken incorrectly"), - ADD_STAT(branchMispredicts, Stats::Units::Count::get(), + ADD_STAT(branchMispredicts, Stats::units::Count::get(), "Number of branch mispredicts detected at execute", predictedTakenIncorrect + predictedNotTakenIncorrect), executedInstStats(cpu), - ADD_STAT(instsToCommit, Stats::Units::Count::get(), + ADD_STAT(instsToCommit, Stats::units::Count::get(), "Cumulative count of insts sent to commit"), - ADD_STAT(writebackCount, Stats::Units::Count::get(), + ADD_STAT(writebackCount, Stats::units::Count::get(), "Cumulative count of insts written-back"), - ADD_STAT(producerInst, Stats::Units::Count::get(), + ADD_STAT(producerInst, Stats::units::Count::get(), "Number of instructions producing a value"), - ADD_STAT(consumerInst, Stats::Units::Count::get(), + ADD_STAT(consumerInst, Stats::units::Count::get(), "Number of instructions consuming a value"), - ADD_STAT(wbRate, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Cycle>::get(), + ADD_STAT(wbRate, Stats::units::Rate< + Stats::units::Count, Stats::units::Cycle>::get(), "Insts written-back per cycle"), - ADD_STAT(wbFanout, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(wbFanout, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average fanout of values written-back") { instsToCommit @@ -215,24 +215,24 @@ IEW::IEWStats::IEWStats(CPU *cpu) IEW::IEWStats::ExecutedInstStats::ExecutedInstStats(CPU *cpu) : Stats::Group(cpu), - ADD_STAT(numInsts, Stats::Units::Count::get(), + ADD_STAT(numInsts, Stats::units::Count::get(), "Number of executed instructions"), - ADD_STAT(numLoadInsts, Stats::Units::Count::get(), + ADD_STAT(numLoadInsts, Stats::units::Count::get(), "Number of load instructions executed"), - ADD_STAT(numSquashedInsts, Stats::Units::Count::get(), + ADD_STAT(numSquashedInsts, Stats::units::Count::get(), "Number of squashed instructions skipped in execute"), - ADD_STAT(numSwp, Stats::Units::Count::get(), + ADD_STAT(numSwp, Stats::units::Count::get(), "Number of swp insts executed"), - ADD_STAT(numNop, Stats::Units::Count::get(), + ADD_STAT(numNop, Stats::units::Count::get(), "Number of nop insts executed"), - ADD_STAT(numRefs, Stats::Units::Count::get(), + ADD_STAT(numRefs, Stats::units::Count::get(), "Number of memory reference insts executed"), - ADD_STAT(numBranches, Stats::Units::Count::get(), + ADD_STAT(numBranches, Stats::units::Count::get(), "Number of branches executed"), - ADD_STAT(numStoreInsts, Stats::Units::Count::get(), + ADD_STAT(numStoreInsts, Stats::units::Count::get(), "Number of stores executed"), - ADD_STAT(numRate, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Cycle>::get(), + ADD_STAT(numRate, Stats::units::Rate< + Stats::units::Count, Stats::units::Cycle>::get(), "Inst execution rate", numInsts / cpu->baseStats.numCycles) { numLoadInsts diff --git a/src/cpu/o3/inst_queue.cc b/src/cpu/o3/inst_queue.cc index b1b2400adc..268739be8f 100644 --- a/src/cpu/o3/inst_queue.cc +++ b/src/cpu/o3/inst_queue.cc @@ -172,44 +172,44 @@ InstructionQueue::name() const InstructionQueue::IQStats::IQStats(CPU *cpu, const unsigned &total_width) : Stats::Group(cpu), - ADD_STAT(instsAdded, Stats::Units::Count::get(), + ADD_STAT(instsAdded, Stats::units::Count::get(), "Number of instructions added to the IQ (excludes non-spec)"), - ADD_STAT(nonSpecInstsAdded, Stats::Units::Count::get(), + ADD_STAT(nonSpecInstsAdded, Stats::units::Count::get(), "Number of non-speculative instructions added to the IQ"), - ADD_STAT(instsIssued, Stats::Units::Count::get(), + ADD_STAT(instsIssued, Stats::units::Count::get(), "Number of instructions issued"), - ADD_STAT(intInstsIssued, Stats::Units::Count::get(), + ADD_STAT(intInstsIssued, Stats::units::Count::get(), "Number of integer instructions issued"), - ADD_STAT(floatInstsIssued, Stats::Units::Count::get(), + ADD_STAT(floatInstsIssued, Stats::units::Count::get(), "Number of float instructions issued"), - ADD_STAT(branchInstsIssued, Stats::Units::Count::get(), + ADD_STAT(branchInstsIssued, Stats::units::Count::get(), "Number of branch instructions issued"), - ADD_STAT(memInstsIssued, Stats::Units::Count::get(), + ADD_STAT(memInstsIssued, Stats::units::Count::get(), "Number of memory instructions issued"), - ADD_STAT(miscInstsIssued, Stats::Units::Count::get(), + ADD_STAT(miscInstsIssued, Stats::units::Count::get(), "Number of miscellaneous instructions issued"), - ADD_STAT(squashedInstsIssued, Stats::Units::Count::get(), + ADD_STAT(squashedInstsIssued, Stats::units::Count::get(), "Number of squashed instructions issued"), - ADD_STAT(squashedInstsExamined, Stats::Units::Count::get(), + ADD_STAT(squashedInstsExamined, Stats::units::Count::get(), "Number of squashed instructions iterated over during squash; " "mainly for profiling"), - ADD_STAT(squashedOperandsExamined, Stats::Units::Count::get(), + ADD_STAT(squashedOperandsExamined, Stats::units::Count::get(), "Number of squashed operands that are examined and possibly " "removed from graph"), - ADD_STAT(squashedNonSpecRemoved, Stats::Units::Count::get(), + ADD_STAT(squashedNonSpecRemoved, Stats::units::Count::get(), "Number of squashed non-spec instructions that were removed"), - ADD_STAT(numIssuedDist, Stats::Units::Count::get(), + ADD_STAT(numIssuedDist, Stats::units::Count::get(), "Number of insts issued each cycle"), - ADD_STAT(statFuBusy, Stats::Units::Count::get(), + ADD_STAT(statFuBusy, Stats::units::Count::get(), "attempts to use FU when none available"), - ADD_STAT(statIssuedInstType, Stats::Units::Count::get(), + ADD_STAT(statIssuedInstType, Stats::units::Count::get(), "Number of instructions issued per FU type, per thread"), - ADD_STAT(issueRate, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Cycle>::get(), + ADD_STAT(issueRate, Stats::units::Rate< + Stats::units::Count, Stats::units::Cycle>::get(), "Inst issue rate", instsIssued / cpu->baseStats.numCycles), - ADD_STAT(fuBusy, Stats::Units::Count::get(), "FU busy when requested"), - ADD_STAT(fuBusyRate, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(fuBusy, Stats::units::Count::get(), "FU busy when requested"), + ADD_STAT(fuBusyRate, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "FU busy rate (busy events/executed inst)") { instsAdded @@ -320,29 +320,29 @@ InstructionQueue::IQStats::IQStats(CPU *cpu, const unsigned &total_width) InstructionQueue::IQIOStats::IQIOStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(intInstQueueReads, Stats::Units::Count::get(), + ADD_STAT(intInstQueueReads, Stats::units::Count::get(), "Number of integer instruction queue reads"), - ADD_STAT(intInstQueueWrites, Stats::Units::Count::get(), + ADD_STAT(intInstQueueWrites, Stats::units::Count::get(), "Number of integer instruction queue writes"), - ADD_STAT(intInstQueueWakeupAccesses, Stats::Units::Count::get(), + ADD_STAT(intInstQueueWakeupAccesses, Stats::units::Count::get(), "Number of integer instruction queue wakeup accesses"), - ADD_STAT(fpInstQueueReads, Stats::Units::Count::get(), + ADD_STAT(fpInstQueueReads, Stats::units::Count::get(), "Number of floating instruction queue reads"), - ADD_STAT(fpInstQueueWrites, Stats::Units::Count::get(), + ADD_STAT(fpInstQueueWrites, Stats::units::Count::get(), "Number of floating instruction queue writes"), - ADD_STAT(fpInstQueueWakeupAccesses, Stats::Units::Count::get(), + ADD_STAT(fpInstQueueWakeupAccesses, Stats::units::Count::get(), "Number of floating instruction queue wakeup accesses"), - ADD_STAT(vecInstQueueReads, Stats::Units::Count::get(), + ADD_STAT(vecInstQueueReads, Stats::units::Count::get(), "Number of vector instruction queue reads"), - ADD_STAT(vecInstQueueWrites, Stats::Units::Count::get(), + ADD_STAT(vecInstQueueWrites, Stats::units::Count::get(), "Number of vector instruction queue writes"), - ADD_STAT(vecInstQueueWakeupAccesses, Stats::Units::Count::get(), + ADD_STAT(vecInstQueueWakeupAccesses, Stats::units::Count::get(), "Number of vector instruction queue wakeup accesses"), - ADD_STAT(intAluAccesses, Stats::Units::Count::get(), + ADD_STAT(intAluAccesses, Stats::units::Count::get(), "Number of integer alu accesses"), - ADD_STAT(fpAluAccesses, Stats::Units::Count::get(), + ADD_STAT(fpAluAccesses, Stats::units::Count::get(), "Number of floating point alu accesses"), - ADD_STAT(vecAluAccesses, Stats::Units::Count::get(), + ADD_STAT(vecAluAccesses, Stats::units::Count::get(), "Number of vector alu accesses") { using namespace Stats; diff --git a/src/cpu/o3/lsq_unit.cc b/src/cpu/o3/lsq_unit.cc index 37788beab3..bb1833abc6 100644 --- a/src/cpu/o3/lsq_unit.cc +++ b/src/cpu/o3/lsq_unit.cc @@ -260,20 +260,20 @@ LSQUnit::name() const LSQUnit::LSQUnitStats::LSQUnitStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(forwLoads, Stats::Units::Count::get(), + ADD_STAT(forwLoads, Stats::units::Count::get(), "Number of loads that had data forwarded from stores"), - ADD_STAT(squashedLoads, Stats::Units::Count::get(), + ADD_STAT(squashedLoads, Stats::units::Count::get(), "Number of loads squashed"), - ADD_STAT(ignoredResponses, Stats::Units::Count::get(), + ADD_STAT(ignoredResponses, Stats::units::Count::get(), "Number of memory responses ignored because the instruction is " "squashed"), - ADD_STAT(memOrderViolation, Stats::Units::Count::get(), + ADD_STAT(memOrderViolation, Stats::units::Count::get(), "Number of memory ordering violations"), - ADD_STAT(squashedStores, Stats::Units::Count::get(), + ADD_STAT(squashedStores, Stats::units::Count::get(), "Number of stores squashed"), - ADD_STAT(rescheduledLoads, Stats::Units::Count::get(), + ADD_STAT(rescheduledLoads, Stats::units::Count::get(), "Number of loads that were rescheduled"), - ADD_STAT(blockedByCache, Stats::Units::Count::get(), + ADD_STAT(blockedByCache, Stats::units::Count::get(), "Number of times an access to memory failed due to the cache " "being blocked") { diff --git a/src/cpu/o3/mem_dep_unit.cc b/src/cpu/o3/mem_dep_unit.cc index b6f30d4708..a466f4554e 100644 --- a/src/cpu/o3/mem_dep_unit.cc +++ b/src/cpu/o3/mem_dep_unit.cc @@ -102,13 +102,13 @@ MemDepUnit::init(const O3CPUParams ¶ms, ThreadID tid, CPU *cpu) MemDepUnit::MemDepUnitStats::MemDepUnitStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(insertedLoads, Stats::Units::Count::get(), + ADD_STAT(insertedLoads, Stats::units::Count::get(), "Number of loads inserted to the mem dependence unit."), - ADD_STAT(insertedStores, Stats::Units::Count::get(), + ADD_STAT(insertedStores, Stats::units::Count::get(), "Number of stores inserted to the mem dependence unit."), - ADD_STAT(conflictingLoads, Stats::Units::Count::get(), + ADD_STAT(conflictingLoads, Stats::units::Count::get(), "Number of conflicting loads."), - ADD_STAT(conflictingStores, Stats::Units::Count::get(), + ADD_STAT(conflictingStores, Stats::units::Count::get(), "Number of conflicting stores.") { } diff --git a/src/cpu/o3/probe/elastic_trace.cc b/src/cpu/o3/probe/elastic_trace.cc index c60980ebcf..1c8d051889 100644 --- a/src/cpu/o3/probe/elastic_trace.cc +++ b/src/cpu/o3/probe/elastic_trace.cc @@ -886,27 +886,27 @@ ElasticTrace::writeDepTrace(uint32_t num_to_write) ElasticTrace::ElasticTraceStats::ElasticTraceStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(numRegDep, Stats::Units::Count::get(), + ADD_STAT(numRegDep, Stats::units::Count::get(), "Number of register dependencies recorded during tracing"), - ADD_STAT(numOrderDepStores, Stats::Units::Count::get(), + ADD_STAT(numOrderDepStores, Stats::units::Count::get(), "Number of commit order (rob) dependencies for a store " "recorded on a past load/store during tracing"), - ADD_STAT(numIssueOrderDepLoads, Stats::Units::Count::get(), + ADD_STAT(numIssueOrderDepLoads, Stats::units::Count::get(), "Number of loads that got assigned issue order dependency " "because they were dependency-free"), - ADD_STAT(numIssueOrderDepStores, Stats::Units::Count::get(), + ADD_STAT(numIssueOrderDepStores, Stats::units::Count::get(), "Number of stores that got assigned issue order dependency " "because they were dependency-free"), - ADD_STAT(numIssueOrderDepOther, Stats::Units::Count::get(), + ADD_STAT(numIssueOrderDepOther, Stats::units::Count::get(), "Number of non load/store insts that got assigned issue order " "dependency because they were dependency-free"), - ADD_STAT(numFilteredNodes, Stats::Units::Count::get(), + ADD_STAT(numFilteredNodes, Stats::units::Count::get(), "No. of nodes filtered out before writing the output trace"), - ADD_STAT(maxNumDependents, Stats::Units::Count::get(), + ADD_STAT(maxNumDependents, Stats::units::Count::get(), "Maximum number or dependents on any instruction"), - ADD_STAT(maxTempStoreSize, Stats::Units::Count::get(), + ADD_STAT(maxTempStoreSize, Stats::units::Count::get(), "Maximum size of the temporary store during the run"), - ADD_STAT(maxPhysRegDepMapSize, Stats::Units::Count::get(), + ADD_STAT(maxPhysRegDepMapSize, Stats::units::Count::get(), "Maximum size of register dependency map") { } diff --git a/src/cpu/o3/rename.cc b/src/cpu/o3/rename.cc index 4b48ca3832..4766452012 100644 --- a/src/cpu/o3/rename.cc +++ b/src/cpu/o3/rename.cc @@ -93,53 +93,53 @@ Rename::name() const Rename::RenameStats::RenameStats(Stats::Group *parent) : Stats::Group(parent, "rename"), - ADD_STAT(squashCycles, Stats::Units::Cycle::get(), + ADD_STAT(squashCycles, Stats::units::Cycle::get(), "Number of cycles rename is squashing"), - ADD_STAT(idleCycles, Stats::Units::Cycle::get(), + ADD_STAT(idleCycles, Stats::units::Cycle::get(), "Number of cycles rename is idle"), - ADD_STAT(blockCycles, Stats::Units::Cycle::get(), + ADD_STAT(blockCycles, Stats::units::Cycle::get(), "Number of cycles rename is blocking"), - ADD_STAT(serializeStallCycles, Stats::Units::Cycle::get(), + ADD_STAT(serializeStallCycles, Stats::units::Cycle::get(), "count of cycles rename stalled for serializing inst"), - ADD_STAT(runCycles, Stats::Units::Cycle::get(), + ADD_STAT(runCycles, Stats::units::Cycle::get(), "Number of cycles rename is running"), - ADD_STAT(unblockCycles, Stats::Units::Cycle::get(), + ADD_STAT(unblockCycles, Stats::units::Cycle::get(), "Number of cycles rename is unblocking"), - ADD_STAT(renamedInsts, Stats::Units::Count::get(), + ADD_STAT(renamedInsts, Stats::units::Count::get(), "Number of instructions processed by rename"), - ADD_STAT(squashedInsts, Stats::Units::Count::get(), + ADD_STAT(squashedInsts, Stats::units::Count::get(), "Number of squashed instructions processed by rename"), - ADD_STAT(ROBFullEvents, Stats::Units::Count::get(), + ADD_STAT(ROBFullEvents, Stats::units::Count::get(), "Number of times rename has blocked due to ROB full"), - ADD_STAT(IQFullEvents, Stats::Units::Count::get(), + ADD_STAT(IQFullEvents, Stats::units::Count::get(), "Number of times rename has blocked due to IQ full"), - ADD_STAT(LQFullEvents, Stats::Units::Count::get(), + ADD_STAT(LQFullEvents, Stats::units::Count::get(), "Number of times rename has blocked due to LQ full" ), - ADD_STAT(SQFullEvents, Stats::Units::Count::get(), + ADD_STAT(SQFullEvents, Stats::units::Count::get(), "Number of times rename has blocked due to SQ full"), - ADD_STAT(fullRegistersEvents, Stats::Units::Count::get(), + ADD_STAT(fullRegistersEvents, Stats::units::Count::get(), "Number of times there has been no free registers"), - ADD_STAT(renamedOperands, Stats::Units::Count::get(), + ADD_STAT(renamedOperands, Stats::units::Count::get(), "Number of destination operands rename has renamed"), - ADD_STAT(lookups, Stats::Units::Count::get(), + ADD_STAT(lookups, Stats::units::Count::get(), "Number of register rename lookups that rename has made"), - ADD_STAT(intLookups, Stats::Units::Count::get(), + ADD_STAT(intLookups, Stats::units::Count::get(), "Number of integer rename lookups"), - ADD_STAT(fpLookups, Stats::Units::Count::get(), + ADD_STAT(fpLookups, Stats::units::Count::get(), "Number of floating rename lookups"), - ADD_STAT(vecLookups, Stats::Units::Count::get(), + ADD_STAT(vecLookups, Stats::units::Count::get(), "Number of vector rename lookups"), - ADD_STAT(vecPredLookups, Stats::Units::Count::get(), + ADD_STAT(vecPredLookups, Stats::units::Count::get(), "Number of vector predicate rename lookups"), - ADD_STAT(committedMaps, Stats::Units::Count::get(), + ADD_STAT(committedMaps, Stats::units::Count::get(), "Number of HB maps that are committed"), - ADD_STAT(undoneMaps, Stats::Units::Count::get(), + ADD_STAT(undoneMaps, Stats::units::Count::get(), "Number of HB maps that are undone due to squashing"), - ADD_STAT(serializing, Stats::Units::Count::get(), + ADD_STAT(serializing, Stats::units::Count::get(), "count of serializing insts renamed"), - ADD_STAT(tempSerializing, Stats::Units::Count::get(), + ADD_STAT(tempSerializing, Stats::units::Count::get(), "count of temporary serializing insts renamed"), - ADD_STAT(skidInsts, Stats::Units::Count::get(), + ADD_STAT(skidInsts, Stats::units::Count::get(), "count of insts added to the skid buffer") { squashCycles.prereq(squashCycles); diff --git a/src/cpu/o3/rob.cc b/src/cpu/o3/rob.cc index 8255ccaaca..5c4682d1c5 100644 --- a/src/cpu/o3/rob.cc +++ b/src/cpu/o3/rob.cc @@ -520,8 +520,8 @@ ROB::readTailInst(ThreadID tid) ROB::ROBStats::ROBStats(Stats::Group *parent) : Stats::Group(parent, "rob"), - ADD_STAT(reads, Stats::Units::Count::get(), "The number of ROB reads"), - ADD_STAT(writes, Stats::Units::Count::get(), "The number of ROB writes") + ADD_STAT(reads, Stats::units::Count::get(), "The number of ROB reads"), + ADD_STAT(writes, Stats::units::Count::get(), "The number of ROB writes") { } diff --git a/src/cpu/pred/bpred_unit.cc b/src/cpu/pred/bpred_unit.cc index 48d0b1d12f..f8965f0616 100644 --- a/src/cpu/pred/bpred_unit.cc +++ b/src/cpu/pred/bpred_unit.cc @@ -69,27 +69,27 @@ BPredUnit::BPredUnit(const Params ¶ms) BPredUnit::BPredUnitStats::BPredUnitStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(lookups, Stats::Units::Count::get(), "Number of BP lookups"), - ADD_STAT(condPredicted, Stats::Units::Count::get(), + ADD_STAT(lookups, Stats::units::Count::get(), "Number of BP lookups"), + ADD_STAT(condPredicted, Stats::units::Count::get(), "Number of conditional branches predicted"), - ADD_STAT(condIncorrect, Stats::Units::Count::get(), + ADD_STAT(condIncorrect, Stats::units::Count::get(), "Number of conditional branches incorrect"), - ADD_STAT(BTBLookups, Stats::Units::Count::get(), + ADD_STAT(BTBLookups, Stats::units::Count::get(), "Number of BTB lookups"), - ADD_STAT(BTBHits, Stats::Units::Count::get(), "Number of BTB hits"), - ADD_STAT(BTBHitRatio, Stats::Units::Ratio::get(), "BTB Hit Ratio", + ADD_STAT(BTBHits, Stats::units::Count::get(), "Number of BTB hits"), + ADD_STAT(BTBHitRatio, Stats::units::Ratio::get(), "BTB Hit Ratio", BTBHits / BTBLookups), - ADD_STAT(RASUsed, Stats::Units::Count::get(), + ADD_STAT(RASUsed, Stats::units::Count::get(), "Number of times the RAS was used to get a target."), - ADD_STAT(RASIncorrect, Stats::Units::Count::get(), + ADD_STAT(RASIncorrect, Stats::units::Count::get(), "Number of incorrect RAS predictions."), - ADD_STAT(indirectLookups, Stats::Units::Count::get(), + ADD_STAT(indirectLookups, Stats::units::Count::get(), "Number of indirect predictor lookups."), - ADD_STAT(indirectHits, Stats::Units::Count::get(), + ADD_STAT(indirectHits, Stats::units::Count::get(), "Number of indirect target hits."), - ADD_STAT(indirectMisses, Stats::Units::Count::get(), + ADD_STAT(indirectMisses, Stats::units::Count::get(), "Number of indirect misses."), - ADD_STAT(indirectMispredicted, Stats::Units::Count::get(), + ADD_STAT(indirectMispredicted, Stats::units::Count::get(), "Number of mispredicted indirect branches.") { BTBHitRatio.precision(6); diff --git a/src/cpu/pred/loop_predictor.cc b/src/cpu/pred/loop_predictor.cc index b4a74b6717..d49022912b 100644 --- a/src/cpu/pred/loop_predictor.cc +++ b/src/cpu/pred/loop_predictor.cc @@ -347,10 +347,10 @@ LoopPredictor::condBranchUpdate(ThreadID tid, Addr branch_pc, bool taken, LoopPredictor::LoopPredictorStats::LoopPredictorStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(correct, Stats::Units::Count::get(), + ADD_STAT(correct, Stats::units::Count::get(), "Number of times the loop predictor is the provider and the " "prediction is correct"), - ADD_STAT(wrong, Stats::Units::Count::get(), + ADD_STAT(wrong, Stats::units::Count::get(), "Number of times the loop predictor is the provider and the " "prediction is wrong") { diff --git a/src/cpu/pred/statistical_corrector.cc b/src/cpu/pred/statistical_corrector.cc index 815f725007..ac794637d0 100644 --- a/src/cpu/pred/statistical_corrector.cc +++ b/src/cpu/pred/statistical_corrector.cc @@ -400,10 +400,10 @@ StatisticalCorrector::getSizeInBits() const StatisticalCorrector::StatisticalCorrectorStats::StatisticalCorrectorStats( Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(correct, Stats::Units::Count::get(), + ADD_STAT(correct, Stats::units::Count::get(), "Number of time the SC predictor is the provider and the " "prediction is correct"), - ADD_STAT(wrong, Stats::Units::Count::get(), + ADD_STAT(wrong, Stats::units::Count::get(), "Number of time the SC predictor is the provider and the " "prediction is wrong") { diff --git a/src/cpu/pred/tage_base.cc b/src/cpu/pred/tage_base.cc index 09c5629adc..0935078a2e 100644 --- a/src/cpu/pred/tage_base.cc +++ b/src/cpu/pred/tage_base.cc @@ -719,39 +719,39 @@ TAGEBase::getGHR(ThreadID tid, BranchInfo *bi) const TAGEBase::TAGEBaseStats::TAGEBaseStats( Stats::Group *parent, unsigned nHistoryTables) : Stats::Group(parent), - ADD_STAT(longestMatchProviderCorrect, Stats::Units::Count::get(), + ADD_STAT(longestMatchProviderCorrect, Stats::units::Count::get(), "Number of times TAGE Longest Match is the provider and the " "prediction is correct"), - ADD_STAT(altMatchProviderCorrect, Stats::Units::Count::get(), + ADD_STAT(altMatchProviderCorrect, Stats::units::Count::get(), "Number of times TAGE Alt Match is the provider and the " "prediction is correct"), - ADD_STAT(bimodalAltMatchProviderCorrect, Stats::Units::Count::get(), + ADD_STAT(bimodalAltMatchProviderCorrect, Stats::units::Count::get(), "Number of times TAGE Alt Match is the bimodal and it is the " "provider and the prediction is correct"), - ADD_STAT(bimodalProviderCorrect, Stats::Units::Count::get(), + ADD_STAT(bimodalProviderCorrect, Stats::units::Count::get(), "Number of times there are no hits on the TAGE tables and the " "bimodal prediction is correct"), - ADD_STAT(longestMatchProviderWrong, Stats::Units::Count::get(), + ADD_STAT(longestMatchProviderWrong, Stats::units::Count::get(), "Number of times TAGE Longest Match is the provider and the " "prediction is wrong"), - ADD_STAT(altMatchProviderWrong, Stats::Units::Count::get(), + ADD_STAT(altMatchProviderWrong, Stats::units::Count::get(), "Number of times TAGE Alt Match is the provider and the " "prediction is wrong"), - ADD_STAT(bimodalAltMatchProviderWrong, Stats::Units::Count::get(), + ADD_STAT(bimodalAltMatchProviderWrong, Stats::units::Count::get(), "Number of times TAGE Alt Match is the bimodal and it is the " "provider and the prediction is wrong"), - ADD_STAT(bimodalProviderWrong, Stats::Units::Count::get(), + ADD_STAT(bimodalProviderWrong, Stats::units::Count::get(), "Number of times there are no hits on the TAGE tables and the " "bimodal prediction is wrong"), - ADD_STAT(altMatchProviderWouldHaveHit, Stats::Units::Count::get(), + ADD_STAT(altMatchProviderWouldHaveHit, Stats::units::Count::get(), "Number of times TAGE Longest Match is the provider, the " "prediction is wrong and Alt Match prediction was correct"), - ADD_STAT(longestMatchProviderWouldHaveHit, Stats::Units::Count::get(), + ADD_STAT(longestMatchProviderWouldHaveHit, Stats::units::Count::get(), "Number of times TAGE Alt Match is the provider, the " "prediction is wrong and Longest Match prediction was correct"), - ADD_STAT(longestMatchProvider, Stats::Units::Count::get(), + ADD_STAT(longestMatchProvider, Stats::units::Count::get(), "TAGE provider for longest match"), - ADD_STAT(altMatchProvider, Stats::Units::Count::get(), + ADD_STAT(altMatchProvider, Stats::units::Count::get(), "TAGE provider for alt match") { longestMatchProvider.init(nHistoryTables + 1); diff --git a/src/cpu/simple/exec_context.hh b/src/cpu/simple/exec_context.hh index 07edd8cddf..21b85715c3 100644 --- a/src/cpu/simple/exec_context.hh +++ b/src/cpu/simple/exec_context.hh @@ -85,71 +85,71 @@ class SimpleExecContext : public ExecContext : Stats::Group(cpu, csprintf("exec_context.thread_%i", thread->threadId()).c_str()), - ADD_STAT(numInsts, Stats::Units::Count::get(), + ADD_STAT(numInsts, Stats::units::Count::get(), "Number of instructions committed"), - ADD_STAT(numOps, Stats::Units::Count::get(), + ADD_STAT(numOps, Stats::units::Count::get(), "Number of ops (including micro ops) committed"), - ADD_STAT(numIntAluAccesses, Stats::Units::Count::get(), + ADD_STAT(numIntAluAccesses, Stats::units::Count::get(), "Number of integer alu accesses"), - ADD_STAT(numFpAluAccesses, Stats::Units::Count::get(), + ADD_STAT(numFpAluAccesses, Stats::units::Count::get(), "Number of float alu accesses"), - ADD_STAT(numVecAluAccesses, Stats::Units::Count::get(), + ADD_STAT(numVecAluAccesses, Stats::units::Count::get(), "Number of vector alu accesses"), - ADD_STAT(numCallsReturns, Stats::Units::Count::get(), + ADD_STAT(numCallsReturns, Stats::units::Count::get(), "Number of times a function call or return occured"), - ADD_STAT(numCondCtrlInsts, Stats::Units::Count::get(), + ADD_STAT(numCondCtrlInsts, Stats::units::Count::get(), "Number of instructions that are conditional controls"), - ADD_STAT(numIntInsts, Stats::Units::Count::get(), + ADD_STAT(numIntInsts, Stats::units::Count::get(), "Number of integer instructions"), - ADD_STAT(numFpInsts, Stats::Units::Count::get(), + ADD_STAT(numFpInsts, Stats::units::Count::get(), "Number of float instructions"), - ADD_STAT(numVecInsts, Stats::Units::Count::get(), + ADD_STAT(numVecInsts, Stats::units::Count::get(), "Number of vector instructions"), - ADD_STAT(numIntRegReads, Stats::Units::Count::get(), + ADD_STAT(numIntRegReads, Stats::units::Count::get(), "Number of times the integer registers were read"), - ADD_STAT(numIntRegWrites, Stats::Units::Count::get(), + ADD_STAT(numIntRegWrites, Stats::units::Count::get(), "Number of times the integer registers were written"), - ADD_STAT(numFpRegReads, Stats::Units::Count::get(), + ADD_STAT(numFpRegReads, Stats::units::Count::get(), "Number of times the floating registers were read"), - ADD_STAT(numFpRegWrites, Stats::Units::Count::get(), + ADD_STAT(numFpRegWrites, Stats::units::Count::get(), "Number of times the floating registers were written"), - ADD_STAT(numVecRegReads, Stats::Units::Count::get(), + ADD_STAT(numVecRegReads, Stats::units::Count::get(), "Number of times the vector registers were read"), - ADD_STAT(numVecRegWrites, Stats::Units::Count::get(), + ADD_STAT(numVecRegWrites, Stats::units::Count::get(), "Number of times the vector registers were written"), - ADD_STAT(numVecPredRegReads, Stats::Units::Count::get(), + ADD_STAT(numVecPredRegReads, Stats::units::Count::get(), "Number of times the predicate registers were read"), - ADD_STAT(numVecPredRegWrites, Stats::Units::Count::get(), + ADD_STAT(numVecPredRegWrites, Stats::units::Count::get(), "Number of times the predicate registers were written"), - ADD_STAT(numCCRegReads, Stats::Units::Count::get(), + ADD_STAT(numCCRegReads, Stats::units::Count::get(), "Number of times the CC registers were read"), - ADD_STAT(numCCRegWrites, Stats::Units::Count::get(), + ADD_STAT(numCCRegWrites, Stats::units::Count::get(), "Number of times the CC registers were written"), - ADD_STAT(numMemRefs, Stats::Units::Count::get(), + ADD_STAT(numMemRefs, Stats::units::Count::get(), "Number of memory refs"), - ADD_STAT(numLoadInsts, Stats::Units::Count::get(), + ADD_STAT(numLoadInsts, Stats::units::Count::get(), "Number of load instructions"), - ADD_STAT(numStoreInsts, Stats::Units::Count::get(), + ADD_STAT(numStoreInsts, Stats::units::Count::get(), "Number of store instructions"), - ADD_STAT(numIdleCycles, Stats::Units::Cycle::get(), + ADD_STAT(numIdleCycles, Stats::units::Cycle::get(), "Number of idle cycles"), - ADD_STAT(numBusyCycles, Stats::Units::Cycle::get(), + ADD_STAT(numBusyCycles, Stats::units::Cycle::get(), "Number of busy cycles"), - ADD_STAT(notIdleFraction, Stats::Units::Ratio::get(), + ADD_STAT(notIdleFraction, Stats::units::Ratio::get(), "Percentage of non-idle cycles"), - ADD_STAT(idleFraction, Stats::Units::Ratio::get(), + ADD_STAT(idleFraction, Stats::units::Ratio::get(), "Percentage of idle cycles"), - ADD_STAT(icacheStallCycles, Stats::Units::Cycle::get(), + ADD_STAT(icacheStallCycles, Stats::units::Cycle::get(), "ICache total stall cycles"), - ADD_STAT(dcacheStallCycles, Stats::Units::Cycle::get(), + ADD_STAT(dcacheStallCycles, Stats::units::Cycle::get(), "DCache total stall cycles"), - ADD_STAT(numBranches, Stats::Units::Count::get(), + ADD_STAT(numBranches, Stats::units::Count::get(), "Number of branches fetched"), - ADD_STAT(numPredictedBranches, Stats::Units::Count::get(), + ADD_STAT(numPredictedBranches, Stats::units::Count::get(), "Number of branches predicted as taken"), - ADD_STAT(numBranchMispred, Stats::Units::Count::get(), + ADD_STAT(numBranchMispred, Stats::units::Count::get(), "Number of branch mispredictions"), - ADD_STAT(statExecutedInstType, Stats::Units::Count::get(), + ADD_STAT(statExecutedInstType, Stats::units::Count::get(), "Class of executed instruction.") { numCCRegReads diff --git a/src/cpu/testers/memtest/memtest.cc b/src/cpu/testers/memtest/memtest.cc index 2759eff0c7..edd79cb98b 100644 --- a/src/cpu/testers/memtest/memtest.cc +++ b/src/cpu/testers/memtest/memtest.cc @@ -191,9 +191,9 @@ MemTest::completeRequest(PacketPtr pkt, bool functional) } MemTest::MemTestStats::MemTestStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(numReads, Stats::Units::Count::get(), + ADD_STAT(numReads, Stats::units::Count::get(), "number of read accesses completed"), - ADD_STAT(numWrites, Stats::Units::Count::get(), + ADD_STAT(numWrites, Stats::units::Count::get(), "number of write accesses completed") { diff --git a/src/cpu/testers/traffic_gen/base.cc b/src/cpu/testers/traffic_gen/base.cc index 863b346c0b..0dd61998f3 100644 --- a/src/cpu/testers/traffic_gen/base.cc +++ b/src/cpu/testers/traffic_gen/base.cc @@ -332,34 +332,34 @@ BaseTrafficGen::noProgress() BaseTrafficGen::StatGroup::StatGroup(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(numSuppressed, Stats::Units::Count::get(), + ADD_STAT(numSuppressed, Stats::units::Count::get(), "Number of suppressed packets to non-memory space"), - ADD_STAT(numPackets, Stats::Units::Count::get(), + ADD_STAT(numPackets, Stats::units::Count::get(), "Number of packets generated"), - ADD_STAT(numRetries, Stats::Units::Count::get(), "Number of retries"), - ADD_STAT(retryTicks, Stats::Units::Tick::get(), + ADD_STAT(numRetries, Stats::units::Count::get(), "Number of retries"), + ADD_STAT(retryTicks, Stats::units::Tick::get(), "Time spent waiting due to back-pressure"), - ADD_STAT(bytesRead, Stats::Units::Byte::get(), "Number of bytes read"), - ADD_STAT(bytesWritten, Stats::Units::Byte::get(), + ADD_STAT(bytesRead, Stats::units::Byte::get(), "Number of bytes read"), + ADD_STAT(bytesWritten, Stats::units::Byte::get(), "Number of bytes written"), - ADD_STAT(totalReadLatency, Stats::Units::Tick::get(), + ADD_STAT(totalReadLatency, Stats::units::Tick::get(), "Total latency of read requests"), - ADD_STAT(totalWriteLatency, Stats::Units::Tick::get(), + ADD_STAT(totalWriteLatency, Stats::units::Tick::get(), "Total latency of write requests"), - ADD_STAT(totalReads, Stats::Units::Count::get(), "Total num of reads"), - ADD_STAT(totalWrites, Stats::Units::Count::get(), "Total num of writes"), - ADD_STAT(avgReadLatency, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(totalReads, Stats::units::Count::get(), "Total num of reads"), + ADD_STAT(totalWrites, Stats::units::Count::get(), "Total num of writes"), + ADD_STAT(avgReadLatency, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Avg latency of read requests", totalReadLatency / totalReads), - ADD_STAT(avgWriteLatency, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(avgWriteLatency, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Avg latency of write requests", totalWriteLatency / totalWrites), - ADD_STAT(readBW, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(readBW, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Read bandwidth", bytesRead / simSeconds), - ADD_STAT(writeBW, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(writeBW, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Write bandwidth", bytesWritten / simSeconds) { } diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc index 740f8a5d7c..5100e0c40f 100644 --- a/src/cpu/thread_state.cc +++ b/src/cpu/thread_state.cc @@ -117,10 +117,10 @@ ThreadState::getVirtProxy() ThreadState::ThreadStateStats::ThreadStateStats(BaseCPU *cpu, const ThreadID& tid) : Stats::Group(cpu, csprintf("thread_%i", tid).c_str()), - ADD_STAT(numInsts, Stats::Units::Count::get(), + ADD_STAT(numInsts, Stats::units::Count::get(), "Number of Instructions committed"), - ADD_STAT(numOps, Stats::Units::Count::get(), "Number of Ops committed"), - ADD_STAT(numMemRefs, Stats::Units::Count::get(), + ADD_STAT(numOps, Stats::units::Count::get(), "Number of Ops committed"), + ADD_STAT(numMemRefs, Stats::units::Count::get(), "Number of Memory References") { diff --git a/src/cpu/trace/trace_cpu.cc b/src/cpu/trace/trace_cpu.cc index a9f3292275..c478637283 100644 --- a/src/cpu/trace/trace_cpu.cc +++ b/src/cpu/trace/trace_cpu.cc @@ -203,15 +203,15 @@ TraceCPU::checkAndSchedExitEvent() } TraceCPU::TraceStats::TraceStats(TraceCPU *trace) : Stats::Group(trace), - ADD_STAT(numSchedDcacheEvent, Stats::Units::Count::get(), + ADD_STAT(numSchedDcacheEvent, Stats::units::Count::get(), "Number of events scheduled to trigger data request generator"), - ADD_STAT(numSchedIcacheEvent, Stats::Units::Count::get(), + ADD_STAT(numSchedIcacheEvent, Stats::units::Count::get(), "Number of events scheduled to trigger instruction request " "generator"), - ADD_STAT(numOps, Stats::Units::Count::get(), + ADD_STAT(numOps, Stats::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, Stats::units::Rate< + Stats::units::Cycle, Stats::units::Count>::get(), "Cycles per micro-op used as a proxy for CPI", trace->baseStats.numCycles / numOps) { @@ -222,25 +222,25 @@ TraceCPU::ElasticDataGen:: ElasticDataGenStatGroup::ElasticDataGenStatGroup(Stats::Group *parent, const std::string& _name) : Stats::Group(parent, _name.c_str()), - ADD_STAT(maxDependents, Stats::Units::Count::get(), + ADD_STAT(maxDependents, Stats::units::Count::get(), "Max number of dependents observed on a node"), - ADD_STAT(maxReadyListSize, Stats::Units::Count::get(), + ADD_STAT(maxReadyListSize, Stats::units::Count::get(), "Max size of the ready list observed"), - ADD_STAT(numSendAttempted, Stats::Units::Count::get(), + ADD_STAT(numSendAttempted, Stats::units::Count::get(), "Number of first attempts to send a request"), - ADD_STAT(numSendSucceeded, Stats::Units::Count::get(), + ADD_STAT(numSendSucceeded, Stats::units::Count::get(), "Number of successful first attempts"), - ADD_STAT(numSendFailed, Stats::Units::Count::get(), + ADD_STAT(numSendFailed, Stats::units::Count::get(), "Number of failed first attempts"), - ADD_STAT(numRetrySucceeded, Stats::Units::Count::get(), + ADD_STAT(numRetrySucceeded, Stats::units::Count::get(), "Number of successful retries"), - ADD_STAT(numSplitReqs, Stats::Units::Count::get(), + ADD_STAT(numSplitReqs, Stats::units::Count::get(), "Number of split requests"), - ADD_STAT(numSOLoads, Stats::Units::Count::get(), + ADD_STAT(numSOLoads, Stats::units::Count::get(), "Number of strictly ordered loads"), - ADD_STAT(numSOStores, Stats::Units::Count::get(), + ADD_STAT(numSOStores, Stats::units::Count::get(), "Number of strictly ordered stores"), - ADD_STAT(dataLastTick, Stats::Units::Tick::get(), + ADD_STAT(dataLastTick, Stats::units::Tick::get(), "Last tick simulated from the elastic data trace") { } @@ -968,15 +968,15 @@ 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(), + ADD_STAT(numSendAttempted, Stats::units::Count::get(), "Number of first attempts to send a request"), - ADD_STAT(numSendSucceeded, Stats::Units::Count::get(), + ADD_STAT(numSendSucceeded, Stats::units::Count::get(), "Number of successful first attempts"), - ADD_STAT(numSendFailed, Stats::Units::Count::get(), + ADD_STAT(numSendFailed, Stats::units::Count::get(), "Number of failed first attempts"), - ADD_STAT(numRetrySucceeded, Stats::Units::Count::get(), + ADD_STAT(numRetrySucceeded, Stats::units::Count::get(), "Number of successful retries"), - ADD_STAT(instLastTick, Stats::Units::Tick::get(), + ADD_STAT(instLastTick, Stats::units::Tick::get(), "Last tick simulated from the fixed inst trace") { diff --git a/src/dev/arm/flash_device.cc b/src/dev/arm/flash_device.cc index a6d48bb7c7..a8a732a649 100644 --- a/src/dev/arm/flash_device.cc +++ b/src/dev/arm/flash_device.cc @@ -458,17 +458,17 @@ FlashDevice::getUnknownPages(uint32_t index) FlashDevice:: FlashDeviceStats::FlashDeviceStats(Stats::Group *parent) : Stats::Group(parent, "FlashDevice"), - ADD_STAT(totalGCActivations, Stats::Units::Count::get(), + ADD_STAT(totalGCActivations, Stats::units::Count::get(), "Number of Garbage collector activations"), - ADD_STAT(writeAccess, Stats::Units::Count::get(), + ADD_STAT(writeAccess, Stats::units::Count::get(), "Histogram of write addresses"), - ADD_STAT(readAccess, Stats::Units::Count::get(), + ADD_STAT(readAccess, Stats::units::Count::get(), "Histogram of read addresses"), - ADD_STAT(fileSystemAccess, Stats::Units::Count::get(), + ADD_STAT(fileSystemAccess, Stats::units::Count::get(), "Histogram of file system accesses"), - ADD_STAT(writeLatency, Stats::Units::Tick::get(), + ADD_STAT(writeLatency, Stats::units::Tick::get(), "Histogram of write latency"), - ADD_STAT(readLatency, Stats::Units::Tick::get(), + ADD_STAT(readLatency, Stats::units::Tick::get(), "Histogram of read latency") { using namespace Stats; diff --git a/src/dev/arm/hdlcd.cc b/src/dev/arm/hdlcd.cc index ca1f13c0dc..0e541c90bd 100644 --- a/src/dev/arm/hdlcd.cc +++ b/src/dev/arm/hdlcd.cc @@ -81,7 +81,7 @@ HDLcd::HDLcd(const HDLcdParams &p) HDLcd:: HDLcdStats::HDLcdStats(Stats::Group *parent) : Stats::Group(parent, "HDLcd"), - ADD_STAT(underruns, Stats::Units::Count::get(), + ADD_STAT(underruns, Stats::units::Count::get(), "Number of buffer underruns") { using namespace Stats; diff --git a/src/dev/arm/smmu_v3.cc b/src/dev/arm/smmu_v3.cc index 3671e7b4d4..dcb938c08f 100644 --- a/src/dev/arm/smmu_v3.cc +++ b/src/dev/arm/smmu_v3.cc @@ -747,13 +747,13 @@ SMMUv3::init() SMMUv3::SMMUv3Stats::SMMUv3Stats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(steL1Fetches, Stats::Units::Count::get(), "STE L1 fetches"), - ADD_STAT(steFetches, Stats::Units::Count::get(), "STE fetches"), - ADD_STAT(cdL1Fetches, Stats::Units::Count::get(), "CD L1 fetches"), - ADD_STAT(cdFetches, Stats::Units::Count::get(), "CD fetches"), - ADD_STAT(translationTimeDist, Stats::Units::Tick::get(), + ADD_STAT(steL1Fetches, Stats::units::Count::get(), "STE L1 fetches"), + ADD_STAT(steFetches, Stats::units::Count::get(), "STE fetches"), + ADD_STAT(cdL1Fetches, Stats::units::Count::get(), "CD L1 fetches"), + ADD_STAT(cdFetches, Stats::units::Count::get(), "CD fetches"), + ADD_STAT(translationTimeDist, Stats::units::Tick::get(), "Time to translate address"), - ADD_STAT(ptwTimeDist, Stats::Units::Tick::get(), + ADD_STAT(ptwTimeDist, Stats::units::Tick::get(), "Time to walk page tables") { using namespace Stats; diff --git a/src/dev/arm/smmu_v3_caches.cc b/src/dev/arm/smmu_v3_caches.cc index 1011cf0ac2..43fb297f3b 100644 --- a/src/dev/arm/smmu_v3_caches.cc +++ b/src/dev/arm/smmu_v3_caches.cc @@ -85,23 +85,23 @@ SMMUv3BaseCache:: SMMUv3BaseCacheStats::SMMUv3BaseCacheStats( Stats::Group *parent, const std::string &name) : Stats::Group(parent, name.c_str()), - ADD_STAT(averageLookups, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Second>::get(), + ADD_STAT(averageLookups, Stats::units::Rate< + Stats::units::Count, Stats::units::Second>::get(), "Average number lookups per second"), - ADD_STAT(totalLookups, Stats::Units::Count::get(), + ADD_STAT(totalLookups, Stats::units::Count::get(), "Total number of lookups"), - ADD_STAT(averageMisses, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Second>::get(), + ADD_STAT(averageMisses, Stats::units::Rate< + Stats::units::Count, Stats::units::Second>::get(), "Average number misses per second"), - ADD_STAT(totalMisses, Stats::Units::Count::get(), + ADD_STAT(totalMisses, Stats::units::Count::get(), "Total number of misses"), - ADD_STAT(averageUpdates, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Second>::get(), + ADD_STAT(averageUpdates, Stats::units::Rate< + Stats::units::Count, Stats::units::Second>::get(), "Average number updates per second"), - ADD_STAT(totalUpdates, Stats::Units::Count::get(), + ADD_STAT(totalUpdates, Stats::units::Count::get(), "Total number of updates"), - ADD_STAT(averageHitRate, Stats::Units::Ratio::get(), "Average hit rate"), - ADD_STAT(insertions, Stats::Units::Count::get(), + ADD_STAT(averageHitRate, Stats::units::Ratio::get(), "Average hit rate"), + ADD_STAT(insertions, Stats::units::Count::get(), "Number of insertions (not replacements)") { using namespace Stats; @@ -1229,13 +1229,13 @@ WalkCache::pickEntryIdxToReplace(const Set &set, WalkCache:: WalkCacheStats::WalkCacheStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(totalLookupsByStageLevel, Stats::Units::Count::get(), + ADD_STAT(totalLookupsByStageLevel, Stats::units::Count::get(), "Total number of lookups"), - ADD_STAT(totalMissesByStageLevel, Stats::Units::Count::get(), + ADD_STAT(totalMissesByStageLevel, Stats::units::Count::get(), "Total number of misses"), - ADD_STAT(totalUpdatesByStageLevel, Stats::Units::Count::get(), + ADD_STAT(totalUpdatesByStageLevel, Stats::units::Count::get(), "Total number of updates"), - ADD_STAT(insertionsByStageLevel, Stats::Units::Count::get(), + ADD_STAT(insertionsByStageLevel, Stats::units::Count::get(), "Number of insertions (not replacements)") { using namespace Stats; @@ -1268,8 +1268,8 @@ WalkCacheStats::WalkCacheStats(Stats::Group *parent) auto avg_lookup = new Stats::Formula( this, csprintf("averageLookups_S%dL%d", s+1, l).c_str(), - Stats::Units::Rate::get(), + Stats::units::Rate::get(), "Average number lookups per second"); avg_lookup->flags(pdf); averageLookupsByStageLevel.push_back(avg_lookup); @@ -1280,8 +1280,8 @@ WalkCacheStats::WalkCacheStats(Stats::Group *parent) auto avg_misses = new Stats::Formula( this, csprintf("averageMisses_S%dL%d", s+1, l).c_str(), - Stats::Units::Rate::get(), + Stats::units::Rate::get(), "Average number misses per second"); avg_misses->flags(pdf); averageMissesByStageLevel.push_back(avg_misses); @@ -1292,8 +1292,8 @@ WalkCacheStats::WalkCacheStats(Stats::Group *parent) auto avg_updates = new Stats::Formula( this, csprintf("averageUpdates_S%dL%d", s+1, l).c_str(), - Stats::Units::Rate::get(), + Stats::units::Rate::get(), "Average number updates per second"); avg_updates->flags(pdf); averageUpdatesByStageLevel.push_back(avg_updates); @@ -1304,7 +1304,7 @@ WalkCacheStats::WalkCacheStats(Stats::Group *parent) auto avg_hitrate = new Stats::Formula( this, csprintf("averageHitRate_S%dL%d", s+1, l).c_str(), - Stats::Units::Ratio::get(), "Average hit rate"); + Stats::units::Ratio::get(), "Average hit rate"); avg_hitrate->flags(pdf); averageHitRateByStageLevel.push_back(avg_hitrate); diff --git a/src/dev/arm/ufs_device.cc b/src/dev/arm/ufs_device.cc index 42693e6063..c35b0a305d 100644 --- a/src/dev/arm/ufs_device.cc +++ b/src/dev/arm/ufs_device.cc @@ -756,56 +756,56 @@ UFSHostDevice::UFSHostDevice(const UFSHostDeviceParams &p) : UFSHostDevice:: UFSHostDeviceStats::UFSHostDeviceStats(UFSHostDevice *parent) : Stats::Group(parent, "UFSDiskHost"), - ADD_STAT(currentSCSIQueue, Stats::Units::Count::get(), + ADD_STAT(currentSCSIQueue, Stats::units::Count::get(), "Most up to date length of the command queue"), - ADD_STAT(currentReadSSDQueue, Stats::Units::Count::get(), + ADD_STAT(currentReadSSDQueue, Stats::units::Count::get(), "Most up to date length of the read SSD queue"), - ADD_STAT(currentWriteSSDQueue, Stats::Units::Count::get(), + ADD_STAT(currentWriteSSDQueue, Stats::units::Count::get(), "Most up to date length of the write SSD queue"), /** Amount of data read/written */ - ADD_STAT(totalReadSSD, Stats::Units::Byte::get(), + ADD_STAT(totalReadSSD, Stats::units::Byte::get(), "Number of bytes read from SSD"), - ADD_STAT(totalWrittenSSD, Stats::Units::Byte::get(), + ADD_STAT(totalWrittenSSD, Stats::units::Byte::get(), "Number of bytes written to SSD"), - ADD_STAT(totalReadDiskTransactions, Stats::Units::Count::get(), + ADD_STAT(totalReadDiskTransactions, Stats::units::Count::get(), "Number of transactions from disk"), - ADD_STAT(totalWriteDiskTransactions, Stats::Units::Count::get(), + ADD_STAT(totalWriteDiskTransactions, Stats::units::Count::get(), "Number of transactions to disk"), - ADD_STAT(totalReadUFSTransactions, Stats::Units::Count::get(), + ADD_STAT(totalReadUFSTransactions, Stats::units::Count::get(), "Number of transactions from device"), - ADD_STAT(totalWriteUFSTransactions, Stats::Units::Count::get(), + ADD_STAT(totalWriteUFSTransactions, Stats::units::Count::get(), "Number of transactions to device"), /** Average bandwidth for reads and writes */ - ADD_STAT(averageReadSSDBW, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(averageReadSSDBW, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Average read bandwidth", totalReadSSD / simSeconds), - ADD_STAT(averageWriteSSDBW, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(averageWriteSSDBW, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Average write bandwidth", totalWrittenSSD / simSeconds), - ADD_STAT(averageSCSIQueue, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Tick>::get(), + ADD_STAT(averageSCSIQueue, Stats::units::Rate< + Stats::units::Count, Stats::units::Tick>::get(), "Average command queue length"), - ADD_STAT(averageReadSSDQueue, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Tick>::get(), + ADD_STAT(averageReadSSDQueue, Stats::units::Rate< + Stats::units::Count, Stats::units::Tick>::get(), "Average read queue length"), - ADD_STAT(averageWriteSSDQueue, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Tick>::get(), + ADD_STAT(averageWriteSSDQueue, Stats::units::Rate< + Stats::units::Count, Stats::units::Tick>::get(), "Average write queue length"), /** Number of doorbells rung*/ - ADD_STAT(curDoorbell, Stats::Units::Count::get(), + ADD_STAT(curDoorbell, Stats::units::Count::get(), "Most up to date number of doorbells used", parent->activeDoorbells), - ADD_STAT(maxDoorbell, Stats::Units::Count::get(), + ADD_STAT(maxDoorbell, Stats::units::Count::get(), "Maximum number of doorbells utilized"), - ADD_STAT(averageDoorbell, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Tick>::get(), + ADD_STAT(averageDoorbell, Stats::units::Rate< + Stats::units::Count, Stats::units::Tick>::get(), "Average number of Doorbells used"), /** Latency*/ - ADD_STAT(transactionLatency, Stats::Units::Tick::get(), + ADD_STAT(transactionLatency, Stats::units::Tick::get(), "Histogram of transaction times"), - ADD_STAT(idleTimes, Stats::Units::Tick::get(), "Histogram of idle times") + ADD_STAT(idleTimes, Stats::units::Tick::get(), "Histogram of idle times") { using namespace Stats; diff --git a/src/dev/net/etherdevice.cc b/src/dev/net/etherdevice.cc index b5722a3ab7..c99f08d651 100644 --- a/src/dev/net/etherdevice.cc +++ b/src/dev/net/etherdevice.cc @@ -32,131 +32,131 @@ EtherDevice::EtherDeviceStats::EtherDeviceStats(Stats::Group *parent) : Stats::Group(parent, "EtherDevice"), - ADD_STAT(postedInterrupts, Stats::Units::Count::get(), + ADD_STAT(postedInterrupts, Stats::units::Count::get(), "Number of posts to CPU"), - ADD_STAT(txBytes, Stats::Units::Byte::get(), + ADD_STAT(txBytes, Stats::units::Byte::get(), "Bytes Transmitted"), - ADD_STAT(rxBytes, Stats::Units::Byte::get(), "Bytes Received"), - ADD_STAT(txPackets, Stats::Units::Count::get(), + ADD_STAT(rxBytes, Stats::units::Byte::get(), "Bytes Received"), + ADD_STAT(txPackets, Stats::units::Count::get(), "Number of Packets Transmitted"), - ADD_STAT(rxPackets, Stats::Units::Count::get(), + ADD_STAT(rxPackets, Stats::units::Count::get(), "Number of Packets Received"), - ADD_STAT(txBandwidth, Stats::Units::Rate< - Stats::Units::Bit, Stats::Units::Second>::get(), + ADD_STAT(txBandwidth, Stats::units::Rate< + Stats::units::Bit, Stats::units::Second>::get(), "Transmit Bandwidth", txBytes * Stats::constant(8) / simSeconds), - ADD_STAT(rxBandwidth, Stats::Units::Rate< - Stats::Units::Bit, Stats::Units::Second>::get(), + ADD_STAT(rxBandwidth, Stats::units::Rate< + Stats::units::Bit, Stats::units::Second>::get(), "Receive Bandwidth", rxBytes * Stats::constant(8) / simSeconds), - ADD_STAT(txIpChecksums, Stats::Units::Count::get(), + ADD_STAT(txIpChecksums, Stats::units::Count::get(), "Number of tx IP Checksums done by device"), - ADD_STAT(rxIpChecksums, Stats::Units::Count::get(), + ADD_STAT(rxIpChecksums, Stats::units::Count::get(), "Number of rx IP Checksums done by device"), - ADD_STAT(txTcpChecksums, Stats::Units::Count::get(), + ADD_STAT(txTcpChecksums, Stats::units::Count::get(), "Number of tx TCP Checksums done by device"), - ADD_STAT(rxTcpChecksums, Stats::Units::Count::get(), + ADD_STAT(rxTcpChecksums, Stats::units::Count::get(), "Number of rx TCP Checksums done by device"), - ADD_STAT(txUdpChecksums, Stats::Units::Count::get(), + ADD_STAT(txUdpChecksums, Stats::units::Count::get(), "Number of tx UDP Checksums done by device"), - ADD_STAT(rxUdpChecksums, Stats::Units::Count::get(), + ADD_STAT(rxUdpChecksums, Stats::units::Count::get(), "Number of rx UDP Checksums done by device"), - ADD_STAT(descDmaReads, Stats::Units::Count::get(), + ADD_STAT(descDmaReads, Stats::units::Count::get(), "Number of descriptors the device read w/ DMA"), - ADD_STAT(descDmaWrites, Stats::Units::Count::get(), + ADD_STAT(descDmaWrites, Stats::units::Count::get(), "Number of descriptors the device wrote w/ DMA"), - ADD_STAT(descDmaRdBytes, Stats::Units::Count::get(), + ADD_STAT(descDmaRdBytes, Stats::units::Count::get(), "Number of descriptor bytes read w/ DMA"), - ADD_STAT(descDmaWrBytes, Stats::Units::Count::get(), + ADD_STAT(descDmaWrBytes, Stats::units::Count::get(), "Number of descriptor bytes write w/ DMA"), - ADD_STAT(totBandwidth, Stats::Units::Rate< - Stats::Units::Bit, Stats::Units::Second>::get(), + ADD_STAT(totBandwidth, Stats::units::Rate< + Stats::units::Bit, Stats::units::Second>::get(), "Total Bandwidth", txBandwidth + rxBandwidth), - ADD_STAT(totPackets, Stats::Units::Count::get(), "Total Packets", + ADD_STAT(totPackets, Stats::units::Count::get(), "Total Packets", txPackets + rxPackets), - ADD_STAT(totBytes, Stats::Units::Byte::get(), "Total Bytes", + ADD_STAT(totBytes, Stats::units::Byte::get(), "Total Bytes", txBytes + rxBytes), - ADD_STAT(totPacketRate, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Second>::get(), + ADD_STAT(totPacketRate, Stats::units::Rate< + Stats::units::Count, Stats::units::Second>::get(), "Total Packet Tranmission Rate", totPackets / simSeconds), - ADD_STAT(txPacketRate, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Second>::get(), + ADD_STAT(txPacketRate, Stats::units::Rate< + Stats::units::Count, Stats::units::Second>::get(), "Packet Tranmission Rate", txPackets / simSeconds), - ADD_STAT(rxPacketRate, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Second>::get(), + ADD_STAT(rxPacketRate, Stats::units::Rate< + Stats::units::Count, Stats::units::Second>::get(), "Packet Reception Rate", rxPackets / simSeconds), - ADD_STAT(postedSwi, Stats::Units::Count::get(), + ADD_STAT(postedSwi, Stats::units::Count::get(), "Number of software interrupts posted to CPU"), - ADD_STAT(totalSwi, Stats::Units::Count::get(), + ADD_STAT(totalSwi, Stats::units::Count::get(), "Total number of Swi written to ISR"), - ADD_STAT(coalescedSwi, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(coalescedSwi, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average number of Swi's coalesced into each post", totalSwi / postedInterrupts), - ADD_STAT(postedRxIdle, Stats::Units::Count::get(), + ADD_STAT(postedRxIdle, Stats::units::Count::get(), "Number of rxIdle interrupts posted to CPU"), - ADD_STAT(totalRxIdle, Stats::Units::Count::get(), + ADD_STAT(totalRxIdle, Stats::units::Count::get(), "Total number of RxIdle written to ISR"), - ADD_STAT(coalescedRxIdle, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(coalescedRxIdle, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average number of RxIdle's coalesced into each post", totalRxIdle / postedInterrupts), - ADD_STAT(postedRxOk, Stats::Units::Count::get(), + ADD_STAT(postedRxOk, Stats::units::Count::get(), "Number of RxOk interrupts posted to CPU"), - ADD_STAT(totalRxOk, Stats::Units::Count::get(), + ADD_STAT(totalRxOk, Stats::units::Count::get(), "Total number of RxOk written to ISR"), - ADD_STAT(coalescedRxOk, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(coalescedRxOk, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average number of RxOk's coalesced into each post", totalRxOk / postedInterrupts), - ADD_STAT(postedRxDesc, Stats::Units::Count::get(), + ADD_STAT(postedRxDesc, Stats::units::Count::get(), "Number of RxDesc interrupts posted to CPU"), - ADD_STAT(totalRxDesc, Stats::Units::Count::get(), + ADD_STAT(totalRxDesc, Stats::units::Count::get(), "Total number of RxDesc written to ISR"), - ADD_STAT(coalescedRxDesc, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(coalescedRxDesc, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average number of RxDesc's coalesced into each post", totalRxDesc / postedInterrupts), - ADD_STAT(postedTxOk, Stats::Units::Count::get(), + ADD_STAT(postedTxOk, Stats::units::Count::get(), "Number of TxOk interrupts posted to CPU"), - ADD_STAT(totalTxOk, Stats::Units::Count::get(), + ADD_STAT(totalTxOk, Stats::units::Count::get(), "Total number of TxOk written to ISR"), - ADD_STAT(coalescedTxOk, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(coalescedTxOk, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average number of TxOk's coalesced into each post", totalTxOk / postedInterrupts), - ADD_STAT(postedTxIdle, Stats::Units::Count::get(), + ADD_STAT(postedTxIdle, Stats::units::Count::get(), "Number of TxIdle interrupts posted to CPU"), - ADD_STAT(totalTxIdle, Stats::Units::Count::get(), + ADD_STAT(totalTxIdle, Stats::units::Count::get(), "Total number of TxIdle written to ISR"), - ADD_STAT(coalescedTxIdle, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(coalescedTxIdle, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average number of TxIdle's coalesced into each post", totalTxIdle / postedInterrupts), - ADD_STAT(postedTxDesc, Stats::Units::Count::get(), + ADD_STAT(postedTxDesc, Stats::units::Count::get(), "Number of TxDesc interrupts posted to CPU"), - ADD_STAT(totalTxDesc, Stats::Units::Count::get(), + ADD_STAT(totalTxDesc, Stats::units::Count::get(), "Total number of TxDesc written to ISR"), - ADD_STAT(coalescedTxDesc, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(coalescedTxDesc, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average number of TxDesc's coalesced into each post", totalTxDesc / postedInterrupts), - ADD_STAT(postedRxOrn, Stats::Units::Count::get(), + ADD_STAT(postedRxOrn, Stats::units::Count::get(), "Number of RxOrn posted to CPU"), - ADD_STAT(totalRxOrn, Stats::Units::Count::get(), + ADD_STAT(totalRxOrn, Stats::units::Count::get(), "Total number of RxOrn written to ISR"), - ADD_STAT(coalescedRxOrn, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(coalescedRxOrn, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average number of RxOrn's coalesced into each post", totalRxOrn / postedInterrupts), - ADD_STAT(coalescedTotal, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(coalescedTotal, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average number of interrupts coalesced into each post"), - ADD_STAT(droppedPackets, Stats::Units::Count::get(), + ADD_STAT(droppedPackets, Stats::units::Count::get(), "Number of packets dropped") { diff --git a/src/dev/net/sinic.cc b/src/dev/net/sinic.cc index 53f8b887a5..4f844f6ca5 100644 --- a/src/dev/net/sinic.cc +++ b/src/dev/net/sinic.cc @@ -100,14 +100,14 @@ Device::~Device() Device::DeviceStats::DeviceStats(Stats::Group *parent) : Stats::Group(parent, "SinicDevice"), - ADD_STAT(totalVnicDistance, Stats::Units::Count::get(), + ADD_STAT(totalVnicDistance, Stats::units::Count::get(), "Total vnic distance"), - ADD_STAT(numVnicDistance, Stats::Units::Count::get(), + ADD_STAT(numVnicDistance, Stats::units::Count::get(), "Number of vnic distance measurements"), - ADD_STAT(maxVnicDistance, Stats::Units::Count::get(), + ADD_STAT(maxVnicDistance, Stats::units::Count::get(), "Maximum vnic distance"), - ADD_STAT(avgVnicDistance, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(avgVnicDistance, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average vnic distance", totalVnicDistance / numVnicDistance), _maxVnicDistance(0) { diff --git a/src/dev/pci/copy_engine.cc b/src/dev/pci/copy_engine.cc index 74a4dab2c2..d5c3cbdd38 100644 --- a/src/dev/pci/copy_engine.cc +++ b/src/dev/pci/copy_engine.cc @@ -431,9 +431,9 @@ CopyEngine:: CopyEngineStats::CopyEngineStats(Stats::Group *parent, const uint8_t &channel_count) : Stats::Group(parent, "CopyEngine"), - ADD_STAT(bytesCopied, Stats::Units::Byte::get(), + ADD_STAT(bytesCopied, Stats::units::Byte::get(), "Number of bytes copied by each engine"), - ADD_STAT(copiesProcessed, Stats::Units::Count::get(), + ADD_STAT(copiesProcessed, Stats::units::Count::get(), "Number of copies processed by each engine") { bytesCopied diff --git a/src/dev/storage/ide_disk.cc b/src/dev/storage/ide_disk.cc index a6464ee40e..1b6476cd62 100644 --- a/src/dev/storage/ide_disk.cc +++ b/src/dev/storage/ide_disk.cc @@ -391,17 +391,17 @@ IdeDisk::doDmaDataRead() IdeDisk:: IdeDiskStats::IdeDiskStats(Stats::Group *parent) : Stats::Group(parent, "IdeDisk"), - ADD_STAT(dmaReadFullPages, Stats::Units::Count::get(), + ADD_STAT(dmaReadFullPages, Stats::units::Count::get(), "Number of full page size DMA reads (not PRD)."), - ADD_STAT(dmaReadBytes, Stats::Units::Byte::get(), + ADD_STAT(dmaReadBytes, Stats::units::Byte::get(), "Number of bytes transfered via DMA reads (not PRD)."), - ADD_STAT(dmaReadTxs, Stats::Units::Count::get(), + ADD_STAT(dmaReadTxs, Stats::units::Count::get(), "Number of DMA read transactions (not PRD)."), - ADD_STAT(dmaWriteFullPages, Stats::Units::Count::get(), + ADD_STAT(dmaWriteFullPages, Stats::units::Count::get(), "Number of full page size DMA writes."), - ADD_STAT(dmaWriteBytes, Stats::Units::Byte::get(), + ADD_STAT(dmaWriteBytes, Stats::units::Byte::get(), "Number of bytes transfered via DMA writes."), - ADD_STAT(dmaWriteTxs, Stats::Units::Count::get(), + ADD_STAT(dmaWriteTxs, Stats::units::Count::get(), "Number of DMA write transactions.") { } diff --git a/src/learning_gem5/part2/simple_cache.cc b/src/learning_gem5/part2/simple_cache.cc index fe41e9cd35..cdf9ab8403 100644 --- a/src/learning_gem5/part2/simple_cache.cc +++ b/src/learning_gem5/part2/simple_cache.cc @@ -424,11 +424,11 @@ SimpleCache::sendRangeChange() const SimpleCache::SimpleCacheStats::SimpleCacheStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(hits, Stats::Units::Count::get(), "Number of hits"), - ADD_STAT(misses, Stats::Units::Count::get(), "Number of misses"), - ADD_STAT(missLatency, Stats::Units::Tick::get(), + ADD_STAT(hits, Stats::units::Count::get(), "Number of hits"), + ADD_STAT(misses, Stats::units::Count::get(), "Number of misses"), + ADD_STAT(missLatency, Stats::units::Tick::get(), "Ticks for misses to the cache"), - ADD_STAT(hitRatio, Stats::Units::Ratio::get(), + ADD_STAT(hitRatio, Stats::units::Ratio::get(), "The ratio of hits to the total accesses to the cache", hits / (hits + misses)) { diff --git a/src/mem/abstract_mem.cc b/src/mem/abstract_mem.cc index b2f08dafc9..e5365920c8 100644 --- a/src/mem/abstract_mem.cc +++ b/src/mem/abstract_mem.cc @@ -111,30 +111,30 @@ AbstractMemory::setBackingStore(uint8_t* pmem_addr) AbstractMemory::MemStats::MemStats(AbstractMemory &_mem) : Stats::Group(&_mem), mem(_mem), - ADD_STAT(bytesRead, Stats::Units::Byte::get(), + ADD_STAT(bytesRead, Stats::units::Byte::get(), "Number of bytes read from this memory"), - ADD_STAT(bytesInstRead, Stats::Units::Byte::get(), + ADD_STAT(bytesInstRead, Stats::units::Byte::get(), "Number of instructions bytes read from this memory"), - ADD_STAT(bytesWritten, Stats::Units::Byte::get(), + ADD_STAT(bytesWritten, Stats::units::Byte::get(), "Number of bytes written to this memory"), - ADD_STAT(numReads, Stats::Units::Count::get(), + ADD_STAT(numReads, Stats::units::Count::get(), "Number of read requests responded to by this memory"), - ADD_STAT(numWrites, Stats::Units::Count::get(), + ADD_STAT(numWrites, Stats::units::Count::get(), "Number of write requests responded to by this memory"), - ADD_STAT(numOther, Stats::Units::Count::get(), + ADD_STAT(numOther, Stats::units::Count::get(), "Number of other requests responded to by this memory"), - ADD_STAT(bwRead, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(bwRead, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Total read bandwidth from this memory"), ADD_STAT(bwInstRead, - Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Instruction read bandwidth from this memory"), - ADD_STAT(bwWrite, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(bwWrite, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Write bandwidth from this memory"), - ADD_STAT(bwTotal, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(bwTotal, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Total bandwidth to/from this memory") { } diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc index 657fa18685..225de58695 100644 --- a/src/mem/cache/base.cc +++ b/src/mem/cache/base.cc @@ -1928,36 +1928,36 @@ BaseCache::unserialize(CheckpointIn &cp) BaseCache::CacheCmdStats::CacheCmdStats(BaseCache &c, const std::string &name) : Stats::Group(&c, name.c_str()), cache(c), - ADD_STAT(hits, Stats::Units::Count::get(), + ADD_STAT(hits, Stats::units::Count::get(), ("number of " + name + " hits").c_str()), - ADD_STAT(misses, Stats::Units::Count::get(), + ADD_STAT(misses, Stats::units::Count::get(), ("number of " + name + " misses").c_str()), - ADD_STAT(missLatency, Stats::Units::Tick::get(), + ADD_STAT(missLatency, Stats::units::Tick::get(), ("number of " + name + " miss ticks").c_str()), - ADD_STAT(accesses, Stats::Units::Count::get(), + ADD_STAT(accesses, Stats::units::Count::get(), ("number of " + name + " accesses(hits+misses)").c_str()), - ADD_STAT(missRate, Stats::Units::Ratio::get(), + ADD_STAT(missRate, Stats::units::Ratio::get(), ("miss rate for " + name + " accesses").c_str()), - ADD_STAT(avgMissLatency, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(avgMissLatency, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), ("average " + name + " miss latency").c_str()), - ADD_STAT(mshrHits, Stats::Units::Count::get(), + ADD_STAT(mshrHits, Stats::units::Count::get(), ("number of " + name + " MSHR hits").c_str()), - ADD_STAT(mshrMisses, Stats::Units::Count::get(), + ADD_STAT(mshrMisses, Stats::units::Count::get(), ("number of " + name + " MSHR misses").c_str()), - ADD_STAT(mshrUncacheable, Stats::Units::Count::get(), + ADD_STAT(mshrUncacheable, Stats::units::Count::get(), ("number of " + name + " MSHR uncacheable").c_str()), - ADD_STAT(mshrMissLatency, Stats::Units::Tick::get(), + ADD_STAT(mshrMissLatency, Stats::units::Tick::get(), ("number of " + name + " MSHR miss ticks").c_str()), - ADD_STAT(mshrUncacheableLatency, Stats::Units::Tick::get(), + ADD_STAT(mshrUncacheableLatency, Stats::units::Tick::get(), ("number of " + name + " MSHR uncacheable ticks").c_str()), - ADD_STAT(mshrMissRate, Stats::Units::Ratio::get(), + ADD_STAT(mshrMissRate, Stats::units::Ratio::get(), ("mshr miss rate for " + name + " accesses").c_str()), - ADD_STAT(avgMshrMissLatency, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(avgMshrMissLatency, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), ("average " + name + " mshr miss latency").c_str()), - ADD_STAT(avgMshrUncacheableLatency, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(avgMshrUncacheableLatency, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), ("average " + name + " mshr uncacheable latency").c_str()) { } @@ -2090,76 +2090,76 @@ BaseCache::CacheCmdStats::regStatsFromParent() BaseCache::CacheStats::CacheStats(BaseCache &c) : Stats::Group(&c), cache(c), - ADD_STAT(demandHits, Stats::Units::Count::get(), + ADD_STAT(demandHits, Stats::units::Count::get(), "number of demand (read+write) hits"), - ADD_STAT(overallHits, Stats::Units::Count::get(), + ADD_STAT(overallHits, Stats::units::Count::get(), "number of overall hits"), - ADD_STAT(demandMisses, Stats::Units::Count::get(), + ADD_STAT(demandMisses, Stats::units::Count::get(), "number of demand (read+write) misses"), - ADD_STAT(overallMisses, Stats::Units::Count::get(), + ADD_STAT(overallMisses, Stats::units::Count::get(), "number of overall misses"), - ADD_STAT(demandMissLatency, Stats::Units::Tick::get(), + ADD_STAT(demandMissLatency, Stats::units::Tick::get(), "number of demand (read+write) miss ticks"), - ADD_STAT(overallMissLatency, Stats::Units::Tick::get(), + ADD_STAT(overallMissLatency, Stats::units::Tick::get(), "number of overall miss ticks"), - ADD_STAT(demandAccesses, Stats::Units::Count::get(), + ADD_STAT(demandAccesses, Stats::units::Count::get(), "number of demand (read+write) accesses"), - ADD_STAT(overallAccesses, Stats::Units::Count::get(), + ADD_STAT(overallAccesses, Stats::units::Count::get(), "number of overall (read+write) accesses"), - ADD_STAT(demandMissRate, Stats::Units::Ratio::get(), + ADD_STAT(demandMissRate, Stats::units::Ratio::get(), "miss rate for demand accesses"), - ADD_STAT(overallMissRate, Stats::Units::Ratio::get(), + ADD_STAT(overallMissRate, Stats::units::Ratio::get(), "miss rate for overall accesses"), - ADD_STAT(demandAvgMissLatency, Stats::Units::Rate< - Stats::Units::Cycle, Stats::Units::Count>::get(), + ADD_STAT(demandAvgMissLatency, Stats::units::Rate< + Stats::units::Cycle, Stats::units::Count>::get(), "average overall miss latency"), - ADD_STAT(overallAvgMissLatency, Stats::Units::Rate< - Stats::Units::Cycle, Stats::Units::Count>::get(), + ADD_STAT(overallAvgMissLatency, Stats::units::Rate< + Stats::units::Cycle, Stats::units::Count>::get(), "average overall miss latency"), - ADD_STAT(blockedCycles, Stats::Units::Cycle::get(), + ADD_STAT(blockedCycles, Stats::units::Cycle::get(), "number of cycles access was blocked"), - ADD_STAT(blockedCauses, Stats::Units::Count::get(), + ADD_STAT(blockedCauses, Stats::units::Count::get(), "number of times access was blocked"), - ADD_STAT(avgBlocked, Stats::Units::Rate< - Stats::Units::Cycle, Stats::Units::Count>::get(), + ADD_STAT(avgBlocked, Stats::units::Rate< + Stats::units::Cycle, Stats::units::Count>::get(), "average number of cycles each access was blocked"), - ADD_STAT(unusedPrefetches, Stats::Units::Count::get(), + ADD_STAT(unusedPrefetches, Stats::units::Count::get(), "number of HardPF blocks evicted w/o reference"), - ADD_STAT(writebacks, Stats::Units::Count::get(), "number of writebacks"), - ADD_STAT(demandMshrHits, Stats::Units::Count::get(), + ADD_STAT(writebacks, Stats::units::Count::get(), "number of writebacks"), + ADD_STAT(demandMshrHits, Stats::units::Count::get(), "number of demand (read+write) MSHR hits"), - ADD_STAT(overallMshrHits, Stats::Units::Count::get(), + ADD_STAT(overallMshrHits, Stats::units::Count::get(), "number of overall MSHR hits"), - ADD_STAT(demandMshrMisses, Stats::Units::Count::get(), + ADD_STAT(demandMshrMisses, Stats::units::Count::get(), "number of demand (read+write) MSHR misses"), - ADD_STAT(overallMshrMisses, Stats::Units::Count::get(), + ADD_STAT(overallMshrMisses, Stats::units::Count::get(), "number of overall MSHR misses"), - ADD_STAT(overallMshrUncacheable, Stats::Units::Count::get(), + ADD_STAT(overallMshrUncacheable, Stats::units::Count::get(), "number of overall MSHR uncacheable misses"), - ADD_STAT(demandMshrMissLatency, Stats::Units::Tick::get(), + ADD_STAT(demandMshrMissLatency, Stats::units::Tick::get(), "number of demand (read+write) MSHR miss ticks"), - ADD_STAT(overallMshrMissLatency, Stats::Units::Tick::get(), + ADD_STAT(overallMshrMissLatency, Stats::units::Tick::get(), "number of overall MSHR miss ticks"), - ADD_STAT(overallMshrUncacheableLatency, Stats::Units::Tick::get(), + ADD_STAT(overallMshrUncacheableLatency, Stats::units::Tick::get(), "number of overall MSHR uncacheable ticks"), - ADD_STAT(demandMshrMissRate, Stats::Units::Ratio::get(), + ADD_STAT(demandMshrMissRate, Stats::units::Ratio::get(), "mshr miss ratio for demand accesses"), - ADD_STAT(overallMshrMissRate, Stats::Units::Ratio::get(), + ADD_STAT(overallMshrMissRate, Stats::units::Ratio::get(), "mshr miss ratio for overall accesses"), - ADD_STAT(demandAvgMshrMissLatency, Stats::Units::Rate< - Stats::Units::Cycle, Stats::Units::Count>::get(), + ADD_STAT(demandAvgMshrMissLatency, Stats::units::Rate< + Stats::units::Cycle, Stats::units::Count>::get(), "average overall mshr miss latency"), - ADD_STAT(overallAvgMshrMissLatency, Stats::Units::Rate< - Stats::Units::Cycle, Stats::Units::Count>::get(), + ADD_STAT(overallAvgMshrMissLatency, Stats::units::Rate< + Stats::units::Cycle, Stats::units::Count>::get(), "average overall mshr miss latency"), - ADD_STAT(overallAvgMshrUncacheableLatency, Stats::Units::Rate< - Stats::Units::Cycle, Stats::Units::Count>::get(), + ADD_STAT(overallAvgMshrUncacheableLatency, Stats::units::Rate< + Stats::units::Cycle, Stats::units::Count>::get(), "average overall mshr uncacheable latency"), - ADD_STAT(replacements, Stats::Units::Count::get(), + ADD_STAT(replacements, Stats::units::Count::get(), "number of replacements"), - ADD_STAT(dataExpansions, Stats::Units::Count::get(), + ADD_STAT(dataExpansions, Stats::units::Count::get(), "number of data expansions"), - ADD_STAT(dataContractions, Stats::Units::Count::get(), + ADD_STAT(dataContractions, Stats::units::Count::get(), "number of data contractions"), cmd(MemCmd::NUM_MEM_CMDS) { diff --git a/src/mem/cache/compressors/base.cc b/src/mem/cache/compressors/base.cc index f624e4cd46..179651519b 100644 --- a/src/mem/cache/compressors/base.cc +++ b/src/mem/cache/compressors/base.cc @@ -227,19 +227,19 @@ Base::setSizeBits(CacheBlk* blk, const std::size_t size_bits) Base::BaseStats::BaseStats(Base& _compressor) : Stats::Group(&_compressor), compressor(_compressor), - ADD_STAT(compressions, Stats::Units::Count::get(), + ADD_STAT(compressions, Stats::units::Count::get(), "Total number of compressions"), - ADD_STAT(failedCompressions, Stats::Units::Count::get(), + ADD_STAT(failedCompressions, Stats::units::Count::get(), "Total number of failed compressions"), - ADD_STAT(compressionSize, Stats::Units::Count::get(), + ADD_STAT(compressionSize, Stats::units::Count::get(), "Number of blocks that were compressed to this power of two " "size"), - ADD_STAT(compressionSizeBits, Stats::Units::Bit::get(), + ADD_STAT(compressionSizeBits, Stats::units::Bit::get(), "Total compressed data size"), - ADD_STAT(avgCompressionSizeBits, Stats::Units::Rate< - Stats::Units::Bit, Stats::Units::Count>::get(), + ADD_STAT(avgCompressionSizeBits, Stats::units::Rate< + Stats::units::Bit, Stats::units::Count>::get(), "Average compression size"), - ADD_STAT(decompressions, Stats::Units::Count::get(), + ADD_STAT(decompressions, Stats::units::Count::get(), "Total number of decompressions") { } diff --git a/src/mem/cache/compressors/base_dictionary_compressor.cc b/src/mem/cache/compressors/base_dictionary_compressor.cc index 49e630a44c..1f9d555e92 100644 --- a/src/mem/cache/compressors/base_dictionary_compressor.cc +++ b/src/mem/cache/compressors/base_dictionary_compressor.cc @@ -45,7 +45,7 @@ BaseDictionaryCompressor::BaseDictionaryCompressor(const Params &p) BaseDictionaryCompressor::DictionaryStats::DictionaryStats( BaseStats& base_group, BaseDictionaryCompressor& _compressor) : Stats::Group(&base_group), compressor(_compressor), - ADD_STAT(patterns, Stats::Units::Count::get(), + ADD_STAT(patterns, Stats::units::Count::get(), "Number of data entries that were compressed to this pattern") { } diff --git a/src/mem/cache/compressors/multi.cc b/src/mem/cache/compressors/multi.cc index c40c161a8e..1c0766cf61 100644 --- a/src/mem/cache/compressors/multi.cc +++ b/src/mem/cache/compressors/multi.cc @@ -188,7 +188,7 @@ Multi::decompress(const CompressionData* comp_data, Multi::MultiStats::MultiStats(BaseStats& base_group, Multi& _compressor) : Stats::Group(&base_group), compressor(_compressor), - ADD_STAT(ranks, Stats::Units::Count::get(), + ADD_STAT(ranks, Stats::units::Count::get(), "Number of times each compressor had the nth best compression") { } diff --git a/src/mem/cache/prefetch/base.cc b/src/mem/cache/prefetch/base.cc index 9018fe3e24..c38a3454d8 100644 --- a/src/mem/cache/prefetch/base.cc +++ b/src/mem/cache/prefetch/base.cc @@ -113,7 +113,7 @@ Base::setCache(BaseCache *_cache) } Base::StatGroup::StatGroup(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(pfIssued, Stats::Units::Count::get(), "number of hwpf issued") + ADD_STAT(pfIssued, Stats::units::Count::get(), "number of hwpf issued") { } diff --git a/src/mem/cache/prefetch/queued.cc b/src/mem/cache/prefetch/queued.cc index 6d3a476c75..65fa7d0b5b 100644 --- a/src/mem/cache/prefetch/queued.cc +++ b/src/mem/cache/prefetch/queued.cc @@ -226,15 +226,15 @@ Queued::getPacket() } Queued::QueuedStats::QueuedStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(pfIdentified, Stats::Units::Count::get(), + ADD_STAT(pfIdentified, Stats::units::Count::get(), "number of prefetch candidates identified"), - ADD_STAT(pfBufferHit, Stats::Units::Count::get(), + ADD_STAT(pfBufferHit, Stats::units::Count::get(), "number of redundant prefetches already in prefetch queue"), - ADD_STAT(pfInCache, Stats::Units::Count::get(), + ADD_STAT(pfInCache, Stats::units::Count::get(), "number of redundant prefetches already in cache/mshr dropped"), - ADD_STAT(pfRemovedFull, Stats::Units::Count::get(), + ADD_STAT(pfRemovedFull, Stats::units::Count::get(), "number of prefetches dropped due to prefetch queue size"), - ADD_STAT(pfSpanPage, Stats::Units::Count::get(), + ADD_STAT(pfSpanPage, Stats::units::Count::get(), "number of prefetches that crossed the page") { } diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc index 67f6666c93..13751bcff9 100644 --- a/src/mem/cache/tags/base.cc +++ b/src/mem/cache/tags/base.cc @@ -216,33 +216,33 @@ BaseTags::BaseTagStats::BaseTagStats(BaseTags &_tags) : Stats::Group(&_tags), tags(_tags), - ADD_STAT(tagsInUse, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(tagsInUse, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Average ticks per tags in use"), - ADD_STAT(totalRefs, Stats::Units::Count::get(), + ADD_STAT(totalRefs, Stats::units::Count::get(), "Total number of references to valid blocks."), - ADD_STAT(sampledRefs, Stats::Units::Count::get(), + ADD_STAT(sampledRefs, Stats::units::Count::get(), "Sample count of references to valid blocks."), - ADD_STAT(avgRefs, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Count>::get(), + ADD_STAT(avgRefs, Stats::units::Rate< + Stats::units::Count, Stats::units::Count>::get(), "Average number of references to valid blocks."), - ADD_STAT(warmupTick, Stats::Units::Tick::get(), + ADD_STAT(warmupTick, Stats::units::Tick::get(), "The tick when the warmup percentage was hit."), - ADD_STAT(occupancies, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Tick>::get(), + ADD_STAT(occupancies, Stats::units::Rate< + Stats::units::Count, Stats::units::Tick>::get(), "Average occupied blocks per tick, per requestor"), - ADD_STAT(avgOccs, Stats::Units::Rate< - Stats::Units::Ratio, Stats::Units::Tick>::get(), + ADD_STAT(avgOccs, Stats::units::Rate< + Stats::units::Ratio, Stats::units::Tick>::get(), "Average percentage of cache occupancy"), - ADD_STAT(occupanciesTaskId, Stats::Units::Count::get(), + ADD_STAT(occupanciesTaskId, Stats::units::Count::get(), "Occupied blocks per task id"), - ADD_STAT(ageTaskId, Stats::Units::Count::get(), + ADD_STAT(ageTaskId, Stats::units::Count::get(), "Occupied blocks per task id, per block age"), - ADD_STAT(ratioOccsTaskId, Stats::Units::Ratio::get(), + ADD_STAT(ratioOccsTaskId, Stats::units::Ratio::get(), "Ratio of occupied blocks and all blocks, per task id"), - ADD_STAT(tagAccesses, Stats::Units::Count::get(), + ADD_STAT(tagAccesses, Stats::units::Count::get(), "Number of tag accesses"), - ADD_STAT(dataAccesses, Stats::Units::Count::get(), + ADD_STAT(dataAccesses, Stats::units::Count::get(), "Number of data accesses") { } diff --git a/src/mem/cache/tags/fa_lru.cc b/src/mem/cache/tags/fa_lru.cc index 47ceb9fb8c..e256781512 100644 --- a/src/mem/cache/tags/fa_lru.cc +++ b/src/mem/cache/tags/fa_lru.cc @@ -300,11 +300,11 @@ FALRU::CacheTracking::CacheTracking(unsigned min_size, unsigned max_size, floorLog2(max_size) - floorLog2(min_size) : 0), inAllCachesMask(mask(numTrackedCaches)), boundaries(numTrackedCaches), - ADD_STAT(hits, Stats::Units::Count::get(), + ADD_STAT(hits, Stats::units::Count::get(), "The number of hits in each cache size."), - ADD_STAT(misses, Stats::Units::Count::get(), + ADD_STAT(misses, Stats::units::Count::get(), "The number of misses in each cache size."), - ADD_STAT(accesses, Stats::Units::Count::get(), + ADD_STAT(accesses, Stats::units::Count::get(), "The number of accesses to the FA LRU cache.") { fatal_if(numTrackedCaches > sizeof(CachesMask) * 8, diff --git a/src/mem/cache/tags/sector_tags.cc b/src/mem/cache/tags/sector_tags.cc index 373785472a..a4ec0bfa9f 100644 --- a/src/mem/cache/tags/sector_tags.cc +++ b/src/mem/cache/tags/sector_tags.cc @@ -338,7 +338,7 @@ SectorTags::regenerateBlkAddr(const CacheBlk* blk) const SectorTags::SectorTagsStats::SectorTagsStats(BaseTagStats &base_group, SectorTags& _tags) : Stats::Group(&base_group), tags(_tags), - ADD_STAT(evictionsReplacement, Stats::Units::Count::get(), + ADD_STAT(evictionsReplacement, Stats::units::Count::get(), "Number of blocks evicted due to a replacement") { } diff --git a/src/mem/coherent_xbar.cc b/src/mem/coherent_xbar.cc index 0a805361cd..d97bff8920 100644 --- a/src/mem/coherent_xbar.cc +++ b/src/mem/coherent_xbar.cc @@ -60,9 +60,9 @@ CoherentXBar::CoherentXBar(const CoherentXBarParams &p) pointOfCoherency(p.point_of_coherency), pointOfUnification(p.point_of_unification), - ADD_STAT(snoops, Stats::Units::Count::get(), "Total snoops"), - ADD_STAT(snoopTraffic, Stats::Units::Byte::get(), "Total snoop traffic"), - ADD_STAT(snoopFanout, Stats::Units::Count::get(), + ADD_STAT(snoops, Stats::units::Count::get(), "Total snoops"), + ADD_STAT(snoopTraffic, Stats::units::Byte::get(), "Total snoop traffic"), + ADD_STAT(snoopFanout, Stats::units::Count::get(), "Request fanout histogram") { // create the ports based on the size of the memory-side port and diff --git a/src/mem/comm_monitor.cc b/src/mem/comm_monitor.cc index c6ebe7b287..956ec1e5f7 100644 --- a/src/mem/comm_monitor.cc +++ b/src/mem/comm_monitor.cc @@ -101,72 +101,72 @@ CommMonitor::MonitorStats::MonitorStats(Stats::Group *parent, : Stats::Group(parent), disableBurstLengthHists(params.disable_burst_length_hists), - ADD_STAT(readBurstLengthHist, Stats::Units::Byte::get(), + ADD_STAT(readBurstLengthHist, Stats::units::Byte::get(), "Histogram of burst lengths of transmitted packets"), - ADD_STAT(writeBurstLengthHist, Stats::Units::Byte::get(), + ADD_STAT(writeBurstLengthHist, Stats::units::Byte::get(), "Histogram of burst lengths of transmitted packets"), disableBandwidthHists(params.disable_bandwidth_hists), readBytes(0), - ADD_STAT(readBandwidthHist, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(readBandwidthHist, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Histogram of read bandwidth per sample period"), - ADD_STAT(totalReadBytes, Stats::Units::Byte::get(), + ADD_STAT(totalReadBytes, Stats::units::Byte::get(), "Number of bytes read"), - ADD_STAT(averageReadBandwidth, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(averageReadBandwidth, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Average read bandwidth", totalReadBytes / simSeconds), writtenBytes(0), - ADD_STAT(writeBandwidthHist, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(writeBandwidthHist, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Histogram of write bandwidth"), - ADD_STAT(totalWrittenBytes, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(totalWrittenBytes, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Number of bytes written"), - ADD_STAT(averageWriteBandwidth, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(averageWriteBandwidth, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Average write bandwidth", totalWrittenBytes / simSeconds), disableLatencyHists(params.disable_latency_hists), - ADD_STAT(readLatencyHist, Stats::Units::Tick::get(), + ADD_STAT(readLatencyHist, Stats::units::Tick::get(), "Read request-response latency"), - ADD_STAT(writeLatencyHist, Stats::Units::Tick::get(), + ADD_STAT(writeLatencyHist, Stats::units::Tick::get(), "Write request-response latency"), disableITTDists(params.disable_itt_dists), - ADD_STAT(ittReadRead, Stats::Units::Tick::get(), + ADD_STAT(ittReadRead, Stats::units::Tick::get(), "Read-to-read inter transaction time"), - ADD_STAT(ittWriteWrite, Stats::Units::Tick::get(), + ADD_STAT(ittWriteWrite, Stats::units::Tick::get(), "Write-to-write inter transaction time"), - ADD_STAT(ittReqReq, Stats::Units::Tick::get(), + ADD_STAT(ittReqReq, Stats::units::Tick::get(), "Request-to-request inter transaction time"), timeOfLastRead(0), timeOfLastWrite(0), timeOfLastReq(0), disableOutstandingHists(params.disable_outstanding_hists), - ADD_STAT(outstandingReadsHist, Stats::Units::Count::get(), + ADD_STAT(outstandingReadsHist, Stats::units::Count::get(), "Outstanding read transactions"), outstandingReadReqs(0), - ADD_STAT(outstandingWritesHist, Stats::Units::Count::get(), + ADD_STAT(outstandingWritesHist, Stats::units::Count::get(), "Outstanding write transactions"), outstandingWriteReqs(0), disableTransactionHists(params.disable_transaction_hists), - ADD_STAT(readTransHist, Stats::Units::Count::get(), + ADD_STAT(readTransHist, Stats::units::Count::get(), "Histogram of read transactions per sample period"), readTrans(0), - ADD_STAT(writeTransHist, Stats::Units::Count::get(), + ADD_STAT(writeTransHist, Stats::units::Count::get(), "Histogram of write transactions per sample period"), writeTrans(0), disableAddrDists(params.disable_addr_dists), readAddrMask(params.read_addr_mask), writeAddrMask(params.write_addr_mask), - ADD_STAT(readAddrDist, Stats::Units::Count::get(), + ADD_STAT(readAddrDist, Stats::units::Count::get(), "Read address distribution"), - ADD_STAT(writeAddrDist, Stats::Units::Count::get(), + ADD_STAT(writeAddrDist, Stats::units::Count::get(), "Write address distribution") { using namespace Stats; diff --git a/src/mem/mem_ctrl.cc b/src/mem/mem_ctrl.cc index 173429def1..1816c637d6 100644 --- a/src/mem/mem_ctrl.cc +++ b/src/mem/mem_ctrl.cc @@ -1185,94 +1185,94 @@ MemCtrl::CtrlStats::CtrlStats(MemCtrl &_ctrl) : Stats::Group(&_ctrl), ctrl(_ctrl), - ADD_STAT(readReqs, Stats::Units::Count::get(), + ADD_STAT(readReqs, Stats::units::Count::get(), "Number of read requests accepted"), - ADD_STAT(writeReqs, Stats::Units::Count::get(), + ADD_STAT(writeReqs, Stats::units::Count::get(), "Number of write requests accepted"), - ADD_STAT(readBursts, Stats::Units::Count::get(), + ADD_STAT(readBursts, Stats::units::Count::get(), "Number of controller read bursts, including those serviced by " "the write queue"), - ADD_STAT(writeBursts, Stats::Units::Count::get(), + ADD_STAT(writeBursts, Stats::units::Count::get(), "Number of controller write bursts, including those merged in " "the write queue"), - ADD_STAT(servicedByWrQ, Stats::Units::Count::get(), + ADD_STAT(servicedByWrQ, Stats::units::Count::get(), "Number of controller read bursts serviced by the write queue"), - ADD_STAT(mergedWrBursts, Stats::Units::Count::get(), + ADD_STAT(mergedWrBursts, Stats::units::Count::get(), "Number of controller write bursts merged with an existing one"), - ADD_STAT(neitherReadNorWriteReqs, Stats::Units::Count::get(), + ADD_STAT(neitherReadNorWriteReqs, Stats::units::Count::get(), "Number of requests that are neither read nor write"), - ADD_STAT(avgRdQLen, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Tick>::get(), + ADD_STAT(avgRdQLen, Stats::units::Rate< + Stats::units::Count, Stats::units::Tick>::get(), "Average read queue length when enqueuing"), - ADD_STAT(avgWrQLen, Stats::Units::Rate< - Stats::Units::Count, Stats::Units::Tick>::get(), + ADD_STAT(avgWrQLen, Stats::units::Rate< + Stats::units::Count, Stats::units::Tick>::get(), "Average write queue length when enqueuing"), - ADD_STAT(numRdRetry, Stats::Units::Count::get(), + ADD_STAT(numRdRetry, Stats::units::Count::get(), "Number of times read queue was full causing retry"), - ADD_STAT(numWrRetry, Stats::Units::Count::get(), + ADD_STAT(numWrRetry, Stats::units::Count::get(), "Number of times write queue was full causing retry"), - ADD_STAT(readPktSize, Stats::Units::Count::get(), + ADD_STAT(readPktSize, Stats::units::Count::get(), "Read request sizes (log2)"), - ADD_STAT(writePktSize, Stats::Units::Count::get(), + ADD_STAT(writePktSize, Stats::units::Count::get(), "Write request sizes (log2)"), - ADD_STAT(rdQLenPdf, Stats::Units::Count::get(), + ADD_STAT(rdQLenPdf, Stats::units::Count::get(), "What read queue length does an incoming req see"), - ADD_STAT(wrQLenPdf, Stats::Units::Count::get(), + ADD_STAT(wrQLenPdf, Stats::units::Count::get(), "What write queue length does an incoming req see"), - ADD_STAT(rdPerTurnAround, Stats::Units::Count::get(), + ADD_STAT(rdPerTurnAround, Stats::units::Count::get(), "Reads before turning the bus around for writes"), - ADD_STAT(wrPerTurnAround, Stats::Units::Count::get(), + ADD_STAT(wrPerTurnAround, Stats::units::Count::get(), "Writes before turning the bus around for reads"), - ADD_STAT(bytesReadWrQ, Stats::Units::Byte::get(), + ADD_STAT(bytesReadWrQ, Stats::units::Byte::get(), "Total number of bytes read from write queue"), - ADD_STAT(bytesReadSys, Stats::Units::Byte::get(), + ADD_STAT(bytesReadSys, Stats::units::Byte::get(), "Total read bytes from the system interface side"), - ADD_STAT(bytesWrittenSys, Stats::Units::Byte::get(), + ADD_STAT(bytesWrittenSys, Stats::units::Byte::get(), "Total written bytes from the system interface side"), - ADD_STAT(avgRdBWSys, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(avgRdBWSys, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Average system read bandwidth in Byte/s"), - ADD_STAT(avgWrBWSys, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(avgWrBWSys, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Average system write bandwidth in Byte/s"), - ADD_STAT(totGap, Stats::Units::Tick::get(), "Total gap between requests"), - ADD_STAT(avgGap, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(totGap, Stats::units::Tick::get(), "Total gap between requests"), + ADD_STAT(avgGap, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Average gap between requests"), - ADD_STAT(requestorReadBytes, Stats::Units::Byte::get(), + ADD_STAT(requestorReadBytes, Stats::units::Byte::get(), "Per-requestor bytes read from memory"), - ADD_STAT(requestorWriteBytes, Stats::Units::Byte::get(), + ADD_STAT(requestorWriteBytes, Stats::units::Byte::get(), "Per-requestor bytes write to memory"), - ADD_STAT(requestorReadRate, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(requestorReadRate, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Per-requestor bytes read from memory rate"), - ADD_STAT(requestorWriteRate, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(requestorWriteRate, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Per-requestor bytes write to memory rate"), - ADD_STAT(requestorReadAccesses, Stats::Units::Count::get(), + ADD_STAT(requestorReadAccesses, Stats::units::Count::get(), "Per-requestor read serviced memory accesses"), - ADD_STAT(requestorWriteAccesses, Stats::Units::Count::get(), + ADD_STAT(requestorWriteAccesses, Stats::units::Count::get(), "Per-requestor write serviced memory accesses"), - ADD_STAT(requestorReadTotalLat, Stats::Units::Tick::get(), + ADD_STAT(requestorReadTotalLat, Stats::units::Tick::get(), "Per-requestor read total memory access latency"), - ADD_STAT(requestorWriteTotalLat, Stats::Units::Tick::get(), + ADD_STAT(requestorWriteTotalLat, Stats::units::Tick::get(), "Per-requestor write total memory access latency"), - ADD_STAT(requestorReadAvgLat, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(requestorReadAvgLat, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Per-requestor read average memory access latency"), - ADD_STAT(requestorWriteAvgLat, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(requestorWriteAvgLat, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Per-requestor write average memory access latency") { diff --git a/src/mem/mem_interface.cc b/src/mem/mem_interface.cc index 7ab40077be..8c4b631e69 100644 --- a/src/mem/mem_interface.cc +++ b/src/mem/mem_interface.cc @@ -1849,66 +1849,66 @@ DRAMInterface::DRAMStats::DRAMStats(DRAMInterface &_dram) : Stats::Group(&_dram), dram(_dram), - ADD_STAT(readBursts, Stats::Units::Count::get(), + ADD_STAT(readBursts, Stats::units::Count::get(), "Number of DRAM read bursts"), - ADD_STAT(writeBursts, Stats::Units::Count::get(), + ADD_STAT(writeBursts, Stats::units::Count::get(), "Number of DRAM write bursts"), - ADD_STAT(perBankRdBursts, Stats::Units::Count::get(), + ADD_STAT(perBankRdBursts, Stats::units::Count::get(), "Per bank write bursts"), - ADD_STAT(perBankWrBursts, Stats::Units::Count::get(), + ADD_STAT(perBankWrBursts, Stats::units::Count::get(), "Per bank write bursts"), - ADD_STAT(totQLat, Stats::Units::Tick::get(), "Total ticks spent queuing"), - ADD_STAT(totBusLat, Stats::Units::Tick::get(), + ADD_STAT(totQLat, Stats::units::Tick::get(), "Total ticks spent queuing"), + ADD_STAT(totBusLat, Stats::units::Tick::get(), "Total ticks spent in databus transfers"), - ADD_STAT(totMemAccLat, Stats::Units::Tick::get(), + ADD_STAT(totMemAccLat, Stats::units::Tick::get(), "Total ticks spent from burst creation until serviced " "by the DRAM"), - ADD_STAT(avgQLat, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(avgQLat, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Average queueing delay per DRAM burst"), - ADD_STAT(avgBusLat, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(avgBusLat, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Average bus latency per DRAM burst"), - ADD_STAT(avgMemAccLat, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(avgMemAccLat, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Average memory access latency per DRAM burst"), - ADD_STAT(readRowHits, Stats::Units::Count::get(), + ADD_STAT(readRowHits, Stats::units::Count::get(), "Number of row buffer hits during reads"), - ADD_STAT(writeRowHits, Stats::Units::Count::get(), + ADD_STAT(writeRowHits, Stats::units::Count::get(), "Number of row buffer hits during writes"), - ADD_STAT(readRowHitRate, Stats::Units::Ratio::get(), + ADD_STAT(readRowHitRate, Stats::units::Ratio::get(), "Row buffer hit rate for reads"), - ADD_STAT(writeRowHitRate, Stats::Units::Ratio::get(), + ADD_STAT(writeRowHitRate, Stats::units::Ratio::get(), "Row buffer hit rate for writes"), - ADD_STAT(bytesPerActivate, Stats::Units::Byte::get(), + ADD_STAT(bytesPerActivate, Stats::units::Byte::get(), "Bytes accessed per row activation"), - ADD_STAT(bytesRead, Stats::Units::Byte::get(), + ADD_STAT(bytesRead, Stats::units::Byte::get(), "Total number of bytes read from DRAM"), - ADD_STAT(bytesWritten, Stats::Units::Byte::get(), + ADD_STAT(bytesWritten, Stats::units::Byte::get(), "Total number of bytes written to DRAM"), - ADD_STAT(avgRdBW, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(avgRdBW, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Average DRAM read bandwidth in MiBytes/s"), - ADD_STAT(avgWrBW, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(avgWrBW, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Average DRAM write bandwidth in MiBytes/s"), - ADD_STAT(peakBW, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(peakBW, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Theoretical peak bandwidth in MiByte/s"), - ADD_STAT(busUtil, Stats::Units::Ratio::get(), + ADD_STAT(busUtil, Stats::units::Ratio::get(), "Data bus utilization in percentage"), - ADD_STAT(busUtilRead, Stats::Units::Ratio::get(), + ADD_STAT(busUtilRead, Stats::units::Ratio::get(), "Data bus utilization in percentage for reads"), - ADD_STAT(busUtilWrite, Stats::Units::Ratio::get(), + ADD_STAT(busUtilWrite, Stats::units::Ratio::get(), "Data bus utilization in percentage for writes"), - ADD_STAT(pageHitRate, Stats::Units::Ratio::get(), + ADD_STAT(pageHitRate, Stats::units::Ratio::get(), "Row buffer hit rate, read and write combined") { @@ -1966,35 +1966,35 @@ DRAMInterface::RankStats::RankStats(DRAMInterface &_dram, Rank &_rank) : Stats::Group(&_dram, csprintf("rank%d", _rank.rank).c_str()), rank(_rank), - ADD_STAT(actEnergy, Stats::Units::Joule::get(), + ADD_STAT(actEnergy, Stats::units::Joule::get(), "Energy for activate commands per rank (pJ)"), - ADD_STAT(preEnergy, Stats::Units::Joule::get(), + ADD_STAT(preEnergy, Stats::units::Joule::get(), "Energy for precharge commands per rank (pJ)"), - ADD_STAT(readEnergy, Stats::Units::Joule::get(), + ADD_STAT(readEnergy, Stats::units::Joule::get(), "Energy for read commands per rank (pJ)"), - ADD_STAT(writeEnergy, Stats::Units::Joule::get(), + ADD_STAT(writeEnergy, Stats::units::Joule::get(), "Energy for write commands per rank (pJ)"), - ADD_STAT(refreshEnergy, Stats::Units::Joule::get(), + ADD_STAT(refreshEnergy, Stats::units::Joule::get(), "Energy for refresh commands per rank (pJ)"), - ADD_STAT(actBackEnergy, Stats::Units::Joule::get(), + ADD_STAT(actBackEnergy, Stats::units::Joule::get(), "Energy for active background per rank (pJ)"), - ADD_STAT(preBackEnergy, Stats::Units::Joule::get(), + ADD_STAT(preBackEnergy, Stats::units::Joule::get(), "Energy for precharge background per rank (pJ)"), - ADD_STAT(actPowerDownEnergy, Stats::Units::Joule::get(), + ADD_STAT(actPowerDownEnergy, Stats::units::Joule::get(), "Energy for active power-down per rank (pJ)"), - ADD_STAT(prePowerDownEnergy, Stats::Units::Joule::get(), + ADD_STAT(prePowerDownEnergy, Stats::units::Joule::get(), "Energy for precharge power-down per rank (pJ)"), - ADD_STAT(selfRefreshEnergy, Stats::Units::Joule::get(), + ADD_STAT(selfRefreshEnergy, Stats::units::Joule::get(), "Energy for self refresh per rank (pJ)"), - ADD_STAT(totalEnergy, Stats::Units::Joule::get(), + ADD_STAT(totalEnergy, Stats::units::Joule::get(), "Total energy per rank (pJ)"), - ADD_STAT(averagePower, Stats::Units::Watt::get(), + ADD_STAT(averagePower, Stats::units::Watt::get(), "Core power per rank (mW)"), - ADD_STAT(totalIdleTime, Stats::Units::Tick::get(), + ADD_STAT(totalIdleTime, Stats::units::Tick::get(), "Total Idle time Per DRAM Rank"), - ADD_STAT(pwrStateTime, Stats::Units::Tick::get(), + ADD_STAT(pwrStateTime, Stats::units::Tick::get(), "Time in different power states") { } @@ -2516,57 +2516,57 @@ NVMInterface::NVMStats::NVMStats(NVMInterface &_nvm) : Stats::Group(&_nvm), nvm(_nvm), - ADD_STAT(readBursts, Stats::Units::Count::get(), + ADD_STAT(readBursts, Stats::units::Count::get(), "Number of NVM read bursts"), - ADD_STAT(writeBursts, Stats::Units::Count::get(), + ADD_STAT(writeBursts, Stats::units::Count::get(), "Number of NVM write bursts"), - ADD_STAT(perBankRdBursts, Stats::Units::Count::get(), + ADD_STAT(perBankRdBursts, Stats::units::Count::get(), "Per bank write bursts"), - ADD_STAT(perBankWrBursts, Stats::Units::Count::get(), + ADD_STAT(perBankWrBursts, Stats::units::Count::get(), "Per bank write bursts"), - ADD_STAT(totQLat, Stats::Units::Tick::get(), "Total ticks spent queuing"), - ADD_STAT(totBusLat, Stats::Units::Tick::get(), + ADD_STAT(totQLat, Stats::units::Tick::get(), "Total ticks spent queuing"), + ADD_STAT(totBusLat, Stats::units::Tick::get(), "Total ticks spent in databus transfers"), - ADD_STAT(totMemAccLat, Stats::Units::Tick::get(), + ADD_STAT(totMemAccLat, Stats::units::Tick::get(), "Total ticks spent from burst creation until serviced " "by the NVM"), - ADD_STAT(avgQLat, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(avgQLat, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Average queueing delay per NVM burst"), - ADD_STAT(avgBusLat, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(avgBusLat, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Average bus latency per NVM burst"), - ADD_STAT(avgMemAccLat, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Count>::get(), + ADD_STAT(avgMemAccLat, Stats::units::Rate< + Stats::units::Tick, Stats::units::Count>::get(), "Average memory access latency per NVM burst"), - ADD_STAT(bytesRead, Stats::Units::Byte::get(), + ADD_STAT(bytesRead, Stats::units::Byte::get(), "Total number of bytes read from DRAM"), - ADD_STAT(bytesWritten, Stats::Units::Byte::get(), + ADD_STAT(bytesWritten, Stats::units::Byte::get(), "Total number of bytes written to DRAM"), - ADD_STAT(avgRdBW, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(avgRdBW, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Average DRAM read bandwidth in MiBytes/s"), - ADD_STAT(avgWrBW, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(avgWrBW, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Average DRAM write bandwidth in MiBytes/s"), - ADD_STAT(peakBW, Stats::Units::Rate< - Stats::Units::Byte, Stats::Units::Second>::get(), + ADD_STAT(peakBW, Stats::units::Rate< + Stats::units::Byte, Stats::units::Second>::get(), "Theoretical peak bandwidth in MiByte/s"), - ADD_STAT(busUtil, Stats::Units::Ratio::get(), + ADD_STAT(busUtil, Stats::units::Ratio::get(), "NVM Data bus utilization in percentage"), - ADD_STAT(busUtilRead, Stats::Units::Ratio::get(), + ADD_STAT(busUtilRead, Stats::units::Ratio::get(), "NVM Data bus read utilization in percentage"), - ADD_STAT(busUtilWrite, Stats::Units::Ratio::get(), + ADD_STAT(busUtilWrite, Stats::units::Ratio::get(), "NVM Data bus write utilization in percentage"), - ADD_STAT(pendingReads, Stats::Units::Count::get(), + ADD_STAT(pendingReads, Stats::units::Count::get(), "Reads issued to NVM for which data has not been transferred"), - ADD_STAT(pendingWrites, Stats::Units::Count::get(), + ADD_STAT(pendingWrites, Stats::units::Count::get(), "Number of outstanding writes to NVM"), - ADD_STAT(bytesPerBank, Stats::Units::Byte::get(), + ADD_STAT(bytesPerBank, Stats::units::Byte::get(), "Bytes read within a bank before loading new bank") { diff --git a/src/mem/probes/mem_footprint.cc b/src/mem/probes/mem_footprint.cc index aa010b8e06..7474d3717f 100644 --- a/src/mem/probes/mem_footprint.cc +++ b/src/mem/probes/mem_footprint.cc @@ -63,14 +63,14 @@ MemFootprintProbe::MemFootprintProbe(const MemFootprintProbeParams &p) MemFootprintProbe:: MemFootprintProbeStats::MemFootprintProbeStats(MemFootprintProbe *parent) : Stats::Group(parent), - ADD_STAT(cacheLine, Stats::Units::Count::get(), + ADD_STAT(cacheLine, Stats::units::Count::get(), "Memory footprint at cache line granularity"), - ADD_STAT(cacheLineTotal, Stats::Units::Count::get(), + ADD_STAT(cacheLineTotal, Stats::units::Count::get(), "Total memory footprint at cache line granularity since " "simulation begin"), - ADD_STAT(page, Stats::Units::Count::get(), + ADD_STAT(page, Stats::units::Count::get(), "Memory footprint at page granularity"), - ADD_STAT(pageTotal, Stats::Units::Count::get(), + ADD_STAT(pageTotal, Stats::units::Count::get(), "Total memory footprint at page granularity since simulation " "begin") { diff --git a/src/mem/probes/stack_dist.cc b/src/mem/probes/stack_dist.cc index b24c580684..78fd30b4f6 100644 --- a/src/mem/probes/stack_dist.cc +++ b/src/mem/probes/stack_dist.cc @@ -56,15 +56,15 @@ StackDistProbe::StackDistProbe(const StackDistProbeParams &p) StackDistProbe:: StackDistProbeStats::StackDistProbeStats(StackDistProbe *parent) : Stats::Group(parent), - ADD_STAT(readLinearHist, Stats::Units::Count::get(), + ADD_STAT(readLinearHist, Stats::units::Count::get(), "Reads linear distribution"), - ADD_STAT(readLogHist, Stats::Units::Ratio::get(), + ADD_STAT(readLogHist, Stats::units::Ratio::get(), "Reads logarithmic distribution"), - ADD_STAT(writeLinearHist, Stats::Units::Count::get(), + ADD_STAT(writeLinearHist, Stats::units::Count::get(), "Writes linear distribution"), - ADD_STAT(writeLogHist, Stats::Units::Ratio::get(), + ADD_STAT(writeLogHist, Stats::units::Ratio::get(), "Writes logarithmic distribution"), - ADD_STAT(infiniteSD, Stats::Units::Count::get(), + ADD_STAT(infiniteSD, Stats::units::Count::get(), "Number of requests with infinite stack distance") { using namespace Stats; diff --git a/src/mem/qos/mem_ctrl.cc b/src/mem/qos/mem_ctrl.cc index 13e0d68f99..1dba59ede1 100644 --- a/src/mem/qos/mem_ctrl.cc +++ b/src/mem/qos/mem_ctrl.cc @@ -281,23 +281,23 @@ MemCtrl::MemCtrlStats::MemCtrlStats(MemCtrl &mc) : Stats::Group(&mc), memCtrl(mc), - ADD_STAT(avgPriority, Stats::Units::Count::get(), + ADD_STAT(avgPriority, Stats::units::Count::get(), "Average QoS priority value for accepted requests"), - ADD_STAT(avgPriorityDistance, Stats::Units::Count::get(), + ADD_STAT(avgPriorityDistance, Stats::units::Count::get(), "Average QoS priority distance between assigned and queued " "values"), - ADD_STAT(priorityMinLatency, Stats::Units::Second::get(), + ADD_STAT(priorityMinLatency, Stats::units::Second::get(), "per QoS priority minimum request to response latency"), - ADD_STAT(priorityMaxLatency, Stats::Units::Second::get(), + ADD_STAT(priorityMaxLatency, Stats::units::Second::get(), "per QoS priority maximum request to response latency"), - ADD_STAT(numReadWriteTurnArounds, Stats::Units::Count::get(), + ADD_STAT(numReadWriteTurnArounds, Stats::units::Count::get(), "Number of turnarounds from READ to WRITE"), - ADD_STAT(numWriteReadTurnArounds, Stats::Units::Count::get(), + ADD_STAT(numWriteReadTurnArounds, Stats::units::Count::get(), "Number of turnarounds from WRITE to READ"), - ADD_STAT(numStayReadState, Stats::Units::Count::get(), + ADD_STAT(numStayReadState, Stats::units::Count::get(), "Number of times bus staying in READ state"), - ADD_STAT(numStayWriteState, Stats::Units::Count::get(), + ADD_STAT(numStayWriteState, Stats::units::Count::get(), "Number of times bus staying in WRITE state") { } diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc index fa7b20136d..1534b4dba6 100644 --- a/src/mem/qos/mem_sink.cc +++ b/src/mem/qos/mem_sink.cc @@ -336,9 +336,9 @@ MemSinkCtrl::drain() MemSinkCtrl::MemSinkCtrlStats::MemSinkCtrlStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(numReadRetries, Stats::Units::Count::get(), + ADD_STAT(numReadRetries, Stats::units::Count::get(), "Number of read retries"), - ADD_STAT(numWriteRetries, Stats::Units::Count::get(), + ADD_STAT(numWriteRetries, Stats::units::Count::get(), "Number of write retries") { } diff --git a/src/mem/snoop_filter.cc b/src/mem/snoop_filter.cc index c9097f64d6..e9e3a9cd41 100644 --- a/src/mem/snoop_filter.cc +++ b/src/mem/snoop_filter.cc @@ -389,20 +389,20 @@ SnoopFilter::updateResponse(const Packet* cpkt, const ResponsePort& SnoopFilter::SnoopFilterStats::SnoopFilterStats(Stats::Group *parent) : Stats::Group(parent), - ADD_STAT(totRequests, Stats::Units::Count::get(), + ADD_STAT(totRequests, Stats::units::Count::get(), "Total number of requests made to the snoop filter."), - ADD_STAT(hitSingleRequests, Stats::Units::Count::get(), + ADD_STAT(hitSingleRequests, Stats::units::Count::get(), "Number of requests hitting in the snoop filter with a single " "holder of the requested data."), - ADD_STAT(hitMultiRequests, Stats::Units::Count::get(), + ADD_STAT(hitMultiRequests, Stats::units::Count::get(), "Number of requests hitting in the snoop filter with multiple " "(>1) holders of the requested data."), - ADD_STAT(totSnoops, Stats::Units::Count::get(), + ADD_STAT(totSnoops, Stats::units::Count::get(), "Total number of snoops made to the snoop filter."), - ADD_STAT(hitSingleSnoops, Stats::Units::Count::get(), + ADD_STAT(hitSingleSnoops, Stats::units::Count::get(), "Number of snoops hitting in the snoop filter with a single " "holder of the requested data."), - ADD_STAT(hitMultiSnoops, Stats::Units::Count::get(), + ADD_STAT(hitMultiSnoops, Stats::units::Count::get(), "Number of snoops hitting in the snoop filter with multiple " "(>1) holders of the requested data.") {} diff --git a/src/mem/xbar.cc b/src/mem/xbar.cc index ce0b80e0fd..dc12fcddc3 100644 --- a/src/mem/xbar.cc +++ b/src/mem/xbar.cc @@ -63,11 +63,11 @@ BaseXBar::BaseXBar(const BaseXBarParams &p) gotAllAddrRanges(false), defaultPortID(InvalidPortID), useDefaultRange(p.use_default_range), - ADD_STAT(transDist, Stats::Units::Count::get(), + ADD_STAT(transDist, Stats::units::Count::get(), "Transaction distribution"), - ADD_STAT(pktCount, Stats::Units::Count::get(), + ADD_STAT(pktCount, Stats::units::Count::get(), "Packet count per connected requestor and responder"), - ADD_STAT(pktSize, Stats::Units::Byte::get(), + ADD_STAT(pktSize, Stats::units::Byte::get(), "Cumulative packet size per connected requestor and responder") { } @@ -142,8 +142,8 @@ BaseXBar::Layer::Layer(DstType& _port, BaseXBar& _xbar, Stats::Group(&_xbar, _name.c_str()), port(_port), xbar(_xbar), _name(xbar.name() + "." + _name), state(IDLE), waitingForPeer(NULL), releaseEvent([this]{ releaseLayer(); }, name()), - ADD_STAT(occupancy, Stats::Units::Tick::get(), "Layer occupancy (ticks)"), - ADD_STAT(utilization, Stats::Units::Ratio::get(), "Layer utilization") + ADD_STAT(occupancy, Stats::units::Tick::get(), "Layer occupancy (ticks)"), + ADD_STAT(utilization, Stats::units::Ratio::get(), "Layer utilization") { occupancy .flags(Stats::nozero); diff --git a/src/sim/clock_domain.cc b/src/sim/clock_domain.cc index 3b825cdcc4..1f6470f079 100644 --- a/src/sim/clock_domain.cc +++ b/src/sim/clock_domain.cc @@ -53,7 +53,7 @@ ClockDomain::ClockDomainStats::ClockDomainStats(ClockDomain &cd) : Stats::Group(&cd), - ADD_STAT(clock, Stats::Units::Tick::get(), "Clock period in ticks") + ADD_STAT(clock, Stats::units::Tick::get(), "Clock period in ticks") { // Expose the current clock period as a stat for observability in // the dumps diff --git a/src/sim/power/power_model.cc b/src/sim/power/power_model.cc index d3f383c50a..5b8a29d552 100644 --- a/src/sim/power/power_model.cc +++ b/src/sim/power/power_model.cc @@ -45,9 +45,9 @@ PowerModelState::PowerModelState(const Params &p) : SimObject(p), _temp(0), clocked_object(NULL), - ADD_STAT(dynamicPower, Stats::Units::Watt::get(), + ADD_STAT(dynamicPower, Stats::units::Watt::get(), "Dynamic power for this object (Watts)"), - ADD_STAT(staticPower, Stats::Units::Watt::get(), + ADD_STAT(staticPower, Stats::units::Watt::get(), "Static power for this object (Watts)") { dynamicPower @@ -59,9 +59,9 @@ PowerModelState::PowerModelState(const Params &p) PowerModel::PowerModel(const Params &p) : SimObject(p), states_pm(p.pm), subsystem(p.subsystem), clocked_object(NULL), power_model_type(p.pm_type), - ADD_STAT(dynamicPower, Stats::Units::Watt::get(), + ADD_STAT(dynamicPower, Stats::units::Watt::get(), "Dynamic power for this power state"), - ADD_STAT(staticPower, Stats::Units::Watt::get(), + ADD_STAT(staticPower, Stats::units::Watt::get(), "Static power for this power state") { panic_if(subsystem == NULL, diff --git a/src/sim/power/thermal_domain.cc b/src/sim/power/thermal_domain.cc index e90778b7d4..056abf532f 100644 --- a/src/sim/power/thermal_domain.cc +++ b/src/sim/power/thermal_domain.cc @@ -51,7 +51,7 @@ ThermalDomain::ThermalDomain(const Params &p) : SimObject(p), _initTemperature(p.initial_temperature), node(NULL), subsystem(NULL), - ADD_STAT(currentTemp, Stats::Units::DegreeCelsius::get(), "Temperature") + ADD_STAT(currentTemp, Stats::units::DegreeCelsius::get(), "Temperature") { currentTemp .functor([this]() { return currentTemperature().toCelsius(); }); diff --git a/src/sim/power_domain.cc b/src/sim/power_domain.cc index 369beba519..159dc3530f 100644 --- a/src/sim/power_domain.cc +++ b/src/sim/power_domain.cc @@ -243,9 +243,9 @@ PowerDomain::pwrStateChangeCallback(Enums::PwrState new_pwr_state, PowerDomain::PowerDomainStats::PowerDomainStats(PowerDomain &pd) : Stats::Group(&pd), - ADD_STAT(numLeaderCalls, Stats::Units::Count::get(), + ADD_STAT(numLeaderCalls, Stats::units::Count::get(), "Number of calls by leaders to change power domain state"), - ADD_STAT(numLeaderCallsChangingState, Stats::Units::Count::get(), + ADD_STAT(numLeaderCallsChangingState, Stats::units::Count::get(), "Number of calls by leader to change power domain state actually " "resulting in a power state change") { diff --git a/src/sim/power_state.cc b/src/sim/power_state.cc index 630081131e..0e3792a2f3 100644 --- a/src/sim/power_state.cc +++ b/src/sim/power_state.cc @@ -220,13 +220,13 @@ PowerState::getWeights() const PowerState::PowerStateStats::PowerStateStats(PowerState &co) : Stats::Group(&co), powerState(co), - ADD_STAT(numTransitions, Stats::Units::Count::get(), + ADD_STAT(numTransitions, Stats::units::Count::get(), "Number of power state transitions"), - ADD_STAT(numPwrMatchStateTransitions, Stats::Units::Count::get(), + ADD_STAT(numPwrMatchStateTransitions, Stats::units::Count::get(), "Number of power state transitions due match request"), - ADD_STAT(ticksClkGated, Stats::Units::Tick::get(), + ADD_STAT(ticksClkGated, Stats::units::Tick::get(), "Distribution of time spent in the clock gated state"), - ADD_STAT(pwrStateResidencyTicks, Stats::Units::Tick::get(), + ADD_STAT(pwrStateResidencyTicks, Stats::units::Tick::get(), "Cumulative time (in ticks) in various power states") { } diff --git a/src/sim/process.cc b/src/sim/process.cc index 1e5810e58a..d6f1a71111 100644 --- a/src/sim/process.cc +++ b/src/sim/process.cc @@ -127,7 +127,7 @@ Process::Process(const ProcessParams ¶ms, EmulationPageTable *pTable, fds(std::make_shared( params.input, params.output, params.errout)), childClearTID(0), - ADD_STAT(numSyscalls, Stats::Units::Count::get(), + ADD_STAT(numSyscalls, Stats::units::Count::get(), "Number of system calls") { if (_pid >= System::maxPID) diff --git a/src/sim/root.cc b/src/sim/root.cc index 8f2e777436..91b86b1f24 100644 --- a/src/sim/root.cc +++ b/src/sim/root.cc @@ -54,22 +54,22 @@ Root::RootStats &rootStats = Root::RootStats::instance; Root::RootStats::RootStats() : Stats::Group(nullptr), - ADD_STAT(simSeconds, Stats::Units::Second::get(), + ADD_STAT(simSeconds, Stats::units::Second::get(), "Number of seconds simulated"), - ADD_STAT(simTicks, Stats::Units::Tick::get(), + ADD_STAT(simTicks, Stats::units::Tick::get(), "Number of ticks simulated"), - ADD_STAT(finalTick, Stats::Units::Tick::get(), + ADD_STAT(finalTick, Stats::units::Tick::get(), "Number of ticks from beginning of simulation " "(restored from checkpoints and never reset)"), - ADD_STAT(simFreq, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Second>::get(), + ADD_STAT(simFreq, Stats::units::Rate< + Stats::units::Tick, Stats::units::Second>::get(), "The number of ticks per simulated second"), - ADD_STAT(hostSeconds, Stats::Units::Second::get(), + ADD_STAT(hostSeconds, Stats::units::Second::get(), "Real time elapsed on the host"), - ADD_STAT(hostTickRate, Stats::Units::Rate< - Stats::Units::Tick, Stats::Units::Second>::get(), + ADD_STAT(hostTickRate, Stats::units::Rate< + Stats::units::Tick, Stats::units::Second>::get(), "The number of ticks simulated per host second (ticks/s)"), - ADD_STAT(hostMemory, Stats::Units::Byte::get(), + ADD_STAT(hostMemory, Stats::units::Byte::get(), "Number of bytes of host memory used"), statTime(true), diff --git a/src/sim/voltage_domain.cc b/src/sim/voltage_domain.cc index 6238c4ce7f..e710704e6b 100644 --- a/src/sim/voltage_domain.cc +++ b/src/sim/voltage_domain.cc @@ -139,7 +139,7 @@ VoltageDomain::unserialize(CheckpointIn &cp) VoltageDomain::VoltageDomainStats::VoltageDomainStats(VoltageDomain &vd) : Stats::Group(&vd), - ADD_STAT(voltage, Stats::Units::Volt::get(), "Voltage in Volts") + ADD_STAT(voltage, Stats::units::Volt::get(), "Voltage in Volts") { voltage.method(&vd, &VoltageDomain::voltage); } diff --git a/src/sim/workload.hh b/src/sim/workload.hh index ed3e112faf..ff29e2d5fd 100644 --- a/src/sim/workload.hh +++ b/src/sim/workload.hh @@ -53,9 +53,9 @@ class Workload : public SimObject Stats::Scalar quiesce; InstStats(Stats::Group *parent) : Stats::Group(parent, "inst"), - ADD_STAT(arm, Stats::Units::Count::get(), + ADD_STAT(arm, Stats::units::Count::get(), "number of arm instructions executed"), - ADD_STAT(quiesce, Stats::Units::Count::get(), + ADD_STAT(quiesce, Stats::units::Count::get(), "number of quiesce instructions executed") {}