Hoa Nguyen has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/39296 )
Change subject: sim: Add units to src/sim
......................................................................
sim: Add units to src/sim
Change-Id: I5fa147aa1319d62be1790bbd74fd097ac566f808
Signed-off-by: Hoa Nguyen <[email protected]>
---
M src/sim/clock_domain.cc
M src/sim/power/power_model.cc
M src/sim/power/thermal_domain.cc
M src/sim/power_domain.cc
M src/sim/power_state.cc
M src/sim/process.cc
M src/sim/root.cc
M src/sim/voltage_domain.cc
M src/sim/workload.hh
9 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/src/sim/clock_domain.cc b/src/sim/clock_domain.cc
index 61d5654..adb29a5 100644
--- a/src/sim/clock_domain.cc
+++ b/src/sim/clock_domain.cc
@@ -51,7 +51,7 @@
ClockDomain::ClockDomainStats::ClockDomainStats(ClockDomain &cd)
: Stats::Group(&cd),
- ADD_STAT(clock, "Clock period in ticks")
+ ADD_STAT_WITH_UNIT(clock, UNIT_TICK, "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 fbc67d3..a355eb3 100644
--- a/src/sim/power/power_model.cc
+++ b/src/sim/power/power_model.cc
@@ -45,8 +45,10 @@
PowerModelState::PowerModelState(const Params &p)
: SimObject(p), _temp(0), clocked_object(NULL),
- ADD_STAT(dynamicPower, "Dynamic power for this object (Watts)"),
- ADD_STAT(staticPower, "Static power for this object (Watts)")
+ ADD_STAT_WITH_UNIT(dynamicPower, UNIT_WATT,
+ "Dynamic power for this object (Watts)"),
+ ADD_STAT_WITH_UNIT(staticPower, UNIT_WATT,
+ "Static power for this object (Watts)")
{
dynamicPower
.method(this, &PowerModelState::getDynamicPower);
@@ -57,8 +59,10 @@
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, "Dynamic power for this power state"),
- ADD_STAT(staticPower, "Static power for this power state")
+ ADD_STAT_WITH_UNIT(dynamicPower, UNIT_WATT,
+ "Dynamic power for this power state"),
+ ADD_STAT_WITH_UNIT(staticPower, UNIT_WATT,
+ "Static power for this power state")
{
panic_if(subsystem == NULL,
"Subsystem is NULL! This is not acceptable for a
PowerModel!\n");
diff --git a/src/sim/power/thermal_domain.cc
b/src/sim/power/thermal_domain.cc
index dabf2fe..7ca8e6a 100644
--- a/src/sim/power/thermal_domain.cc
+++ b/src/sim/power/thermal_domain.cc
@@ -51,7 +51,8 @@
ThermalDomain::ThermalDomain(const Params &p)
: SimObject(p), _initTemperature(p.initial_temperature),
node(NULL), subsystem(NULL),
- ADD_STAT(currentTemp, "Temperature in centigrade degrees")
+ ADD_STAT_WITH_UNIT(currentTemp, UNIT_CENTIGRADE,
+ "Temperature in centigrade degrees")
{
currentTemp
.method(this, &ThermalDomain::currentTemperature);
diff --git a/src/sim/power_domain.cc b/src/sim/power_domain.cc
index c6e0d35..0a5ca33 100644
--- a/src/sim/power_domain.cc
+++ b/src/sim/power_domain.cc
@@ -243,11 +243,12 @@
PowerDomain::PowerDomainStats::PowerDomainStats(PowerDomain &pd)
: Stats::Group(&pd),
- ADD_STAT(numLeaderCalls,
- "Number of calls by leaders to change power domain state"),
- ADD_STAT(numLeaderCallsChangingState,
- "Number of calls by leader to change power domain state "
- "actually resulting in a power state change")
+ ADD_STAT_WITH_UNIT(numLeaderCalls, UNIT_COUNT,
+ "Number of calls by leaders to change power domain "
+ "state"),
+ ADD_STAT_WITH_UNIT(numLeaderCallsChangingState, UNIT_COUNT,
+ "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 a11ed43..c571180 100644
--- a/src/sim/power_state.cc
+++ b/src/sim/power_state.cc
@@ -217,14 +217,14 @@
PowerState::PowerStateStats::PowerStateStats(PowerState &co)
: Stats::Group(&co),
powerState(co),
- ADD_STAT(numTransitions,
- "Number of power state transitions"),
- ADD_STAT(numPwrMatchStateTransitions,
- "Number of power state transitions due match request"),
- ADD_STAT(ticksClkGated,
- "Distribution of time spent in the clock gated state"),
- ADD_STAT(pwrStateResidencyTicks,
- "Cumulative time (in ticks) in various power states")
+ ADD_STAT_WITH_UNIT(numTransitions, UNIT_COUNT,
+ "Number of power state transitions"),
+ ADD_STAT_WITH_UNIT(numPwrMatchStateTransitions, UNIT_COUNT,
+ "Number of power state transitions due match
request"),
+ ADD_STAT_WITH_UNIT(ticksClkGated, UNIT_TICK,
+ "Distribution of time spent in the clock gated
state"),
+ ADD_STAT_WITH_UNIT(pwrStateResidencyTicks, UNIT_TICK,
+ "Cumulative time (in ticks) in various power
states")
{
}
diff --git a/src/sim/process.cc b/src/sim/process.cc
index 7819820..4b11390 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -129,7 +129,7 @@
_pgid(params.pgid), drivers(params.drivers),
fds(make_shared<FDArray>(params.input, params.output,
params.errout)),
childClearTID(0),
- ADD_STAT(numSyscalls, "Number of system calls")
+ ADD_STAT_WITH_UNIT(numSyscalls, UNIT_COUNT, "Number of system calls")
{
if (_pid >= System::maxPID)
fatal("_pid is too large: %d", _pid);
diff --git a/src/sim/root.cc b/src/sim/root.cc
index 4927940..e0a544b 100644
--- a/src/sim/root.cc
+++ b/src/sim/root.cc
@@ -54,14 +54,21 @@
Root::RootStats::RootStats()
: Stats::Group(nullptr),
- ADD_STAT(simSeconds, "Number of seconds simulated"),
- ADD_STAT(simTicks, "Number of ticks simulated"),
- ADD_STAT(finalTick, "Number of ticks from beginning of simulation "
- "(restored from checkpoints and never reset)"),
- ADD_STAT(simFreq, "Frequency of simulated ticks"),
- ADD_STAT(hostSeconds, "Real time elapsed on the host"),
- ADD_STAT(hostTickRate, "Simulator tick rate (ticks/s)"),
- ADD_STAT(hostMemory, "Number of bytes of host memory used"),
+ ADD_STAT_WITH_UNIT(simSeconds, UNIT_SECOND, "Number of seconds
simulated"),
+ ADD_STAT_WITH_UNIT(simTicks, UNIT_TICK, "Number of ticks simulated"),
+ ADD_STAT_WITH_UNIT(finalTick, UNIT_TICK,
+ "Number of ticks from beginning of simulation "
+ "(restored from checkpoints and never reset)"),
+ ADD_STAT_WITH_UNIT(simFreq,
+ UNIT_RATE(Stats::Units::Count, Stats::Units::Tick),
+ "Frequency of simulated ticks"),
+ ADD_STAT_WITH_UNIT(hostSeconds, UNIT_SECOND,
+ "Real time elapsed on the host"),
+ ADD_STAT_WITH_UNIT(hostTickRate,
+ UNIT_RATE(Stats::Units::Tick, Stats::Units::Second),
+ "Simulator tick rate (ticks/s)"),
+ ADD_STAT_WITH_UNIT(hostMemory, UNIT_BYTE,
+ "Number of bytes of host memory used"),
statTime(true),
startTick(0)
diff --git a/src/sim/voltage_domain.cc b/src/sim/voltage_domain.cc
index f6f8396..4208278 100644
--- a/src/sim/voltage_domain.cc
+++ b/src/sim/voltage_domain.cc
@@ -139,7 +139,7 @@
VoltageDomain::VoltageDomainStats::VoltageDomainStats(VoltageDomain &vd)
: Stats::Group(&vd),
- ADD_STAT(voltage, "Voltage in Volts")
+ ADD_STAT_WITH_UNIT(voltage, UNIT_VOLT, "Voltage in Volts")
{
voltage.method(&vd, &VoltageDomain::voltage);
}
diff --git a/src/sim/workload.hh b/src/sim/workload.hh
index f7d3b06..53706eb 100644
--- a/src/sim/workload.hh
+++ b/src/sim/workload.hh
@@ -50,8 +50,10 @@
Stats::Scalar quiesce;
InstStats(Stats::Group *parent) : Stats::Group(parent, "inst"),
- ADD_STAT(arm, "number of arm instructions executed"),
- ADD_STAT(quiesce, "number of quiesce instructions
executed")
+ ADD_STAT_WITH_UNIT(arm, UNIT_COUNT,
+ "number of arm instructions executed"),
+ ADD_STAT_WITH_UNIT(quiesce, UNIT_COUNT,
+ "number of quiesce instructions
executed")
{}
} instStats;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39296
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I5fa147aa1319d62be1790bbd74fd097ac566f808
Gerrit-Change-Number: 39296
Gerrit-PatchSet: 1
Gerrit-Owner: Hoa Nguyen <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
