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 <odanrc@yahoo.com.br> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45415 Maintainer: Jason Lowe-Power <power.jg@gmail.com> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Hoa Nguyen <hoanguyen@ucdavis.edu>
This commit is contained in:
committed by
Daniel Carvalho
parent
7592230550
commit
3016478068
@@ -133,12 +133,12 @@ InfoAccess::info() const
|
||||
|
||||
Formula::Formula(Group *parent, const char *name, const char *desc)
|
||||
: DataWrapVec<Formula, FormulaInfoProxy>(
|
||||
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<Formula, FormulaInfoProxy>(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<Formula, FormulaInfoProxy>(
|
||||
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<Formula, FormulaInfoProxy>(parent, name, unit, desc)
|
||||
{
|
||||
|
||||
@@ -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<Derived, InfoProxyType>
|
||||
typedef InfoProxyType<Derived> 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<Derived, InfoProxyType>(parent, name, unit, desc)
|
||||
{}
|
||||
@@ -456,7 +456,7 @@ class DataWrapVec2d : public DataWrapVec<Derived, InfoProxyType>
|
||||
typedef InfoProxyType<Derived> Info;
|
||||
|
||||
DataWrapVec2d(Group *parent, const char *name,
|
||||
const Units::Base *unit, const char *desc)
|
||||
const units::Base *unit, const char *desc)
|
||||
: DataWrapVec<Derived, InfoProxyType>(parent, name, unit, desc)
|
||||
{
|
||||
}
|
||||
@@ -551,7 +551,7 @@ class ScalarBase : public DataWrap<Derived, ScalarInfoProxy>
|
||||
|
||||
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<Derived, ScalarInfoProxy>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -709,7 +709,7 @@ class ValueBase : public DataWrap<Derived, ScalarInfoProxy>
|
||||
|
||||
public:
|
||||
ValueBase(Group *parent, const char *name,
|
||||
const Units::Base *unit,
|
||||
const units::Base *unit,
|
||||
const char *desc)
|
||||
: DataWrap<Derived, ScalarInfoProxy>(parent, name, unit, desc),
|
||||
proxy(NULL)
|
||||
@@ -1013,7 +1013,7 @@ class VectorBase : public DataWrapVec<Derived, VectorInfoProxy>
|
||||
|
||||
public:
|
||||
VectorBase(Group *parent, const char *name,
|
||||
const Units::Base *unit,
|
||||
const units::Base *unit,
|
||||
const char *desc)
|
||||
: DataWrapVec<Derived, VectorInfoProxy>(parent, name, unit, desc),
|
||||
storage(nullptr), _size(0)
|
||||
@@ -1156,7 +1156,7 @@ class Vector2dBase : public DataWrapVec2d<Derived, Vector2dInfoProxy>
|
||||
|
||||
public:
|
||||
Vector2dBase(Group *parent, const char *name,
|
||||
const Units::Base *unit,
|
||||
const units::Base *unit,
|
||||
const char *desc)
|
||||
: DataWrapVec2d<Derived, Vector2dInfoProxy>(parent, name, unit, desc),
|
||||
x(0), y(0), _size(0), storage(nullptr)
|
||||
@@ -1317,7 +1317,7 @@ class DistBase : public DataWrap<Derived, DistInfoProxy>
|
||||
|
||||
public:
|
||||
DistBase(Group *parent, const char *name,
|
||||
const Units::Base *unit,
|
||||
const units::Base *unit,
|
||||
const char *desc)
|
||||
: DataWrap<Derived, DistInfoProxy>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -1415,7 +1415,7 @@ class VectorDistBase : public DataWrapVec<Derived, VectorDistInfoProxy>
|
||||
|
||||
public:
|
||||
VectorDistBase(Group *parent, const char *name,
|
||||
const Units::Base *unit,
|
||||
const units::Base *unit,
|
||||
const char *desc)
|
||||
: DataWrapVec<Derived, VectorDistInfoProxy>(parent, name, unit, desc),
|
||||
storage(NULL)
|
||||
@@ -1947,17 +1947,17 @@ class Scalar : public ScalarBase<Scalar, StatStor>
|
||||
|
||||
Scalar(Group *parent = nullptr)
|
||||
: ScalarBase<Scalar, StatStor>(
|
||||
parent, nullptr, Units::Unspecified::get(), nullptr)
|
||||
parent, nullptr, units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
Scalar(Group *parent, const char *name, const char *desc = nullptr)
|
||||
: ScalarBase<Scalar, StatStor>(
|
||||
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<Scalar, StatStor>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -1975,17 +1975,17 @@ class Average : public ScalarBase<Average, AvgStor>
|
||||
|
||||
Average(Group *parent = nullptr)
|
||||
: ScalarBase<Average, AvgStor>(
|
||||
parent, nullptr, Units::Unspecified::get(), nullptr)
|
||||
parent, nullptr, units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
Average(Group *parent, const char *name, const char *desc = nullptr)
|
||||
: ScalarBase<Average, AvgStor>(
|
||||
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<Average, AvgStor>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -1996,16 +1996,16 @@ class Value : public ValueBase<Value>
|
||||
{
|
||||
public:
|
||||
Value(Group *parent = nullptr)
|
||||
: ValueBase<Value>(parent, nullptr, Units::Unspecified::get(), nullptr)
|
||||
: ValueBase<Value>(parent, nullptr, units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
Value(Group *parent, const char *name, const char *desc = nullptr)
|
||||
: ValueBase<Value>(parent, name, Units::Unspecified::get(), desc)
|
||||
: ValueBase<Value>(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<Value>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -2021,17 +2021,17 @@ class Vector : public VectorBase<Vector, StatStor>
|
||||
public:
|
||||
Vector(Group *parent = nullptr)
|
||||
: VectorBase<Vector, StatStor>(
|
||||
parent, nullptr, Units::Unspecified::get(), nullptr)
|
||||
parent, nullptr, units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
Vector(Group *parent, const char *name, const char *desc = nullptr)
|
||||
: VectorBase<Vector, StatStor>(
|
||||
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<Vector, StatStor>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -2047,17 +2047,17 @@ class AverageVector : public VectorBase<AverageVector, AvgStor>
|
||||
public:
|
||||
AverageVector(Group *parent = nullptr)
|
||||
: VectorBase<AverageVector, AvgStor>(
|
||||
parent, nullptr, Units::Unspecified::get(), nullptr)
|
||||
parent, nullptr, units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
AverageVector(Group *parent, const char *name, const char *desc = nullptr)
|
||||
: VectorBase<AverageVector, AvgStor>(
|
||||
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<AverageVector, AvgStor>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -2073,17 +2073,17 @@ class Vector2d : public Vector2dBase<Vector2d, StatStor>
|
||||
public:
|
||||
Vector2d(Group *parent = nullptr)
|
||||
: Vector2dBase<Vector2d, StatStor>(
|
||||
parent, nullptr, Units::Unspecified::get(), nullptr)
|
||||
parent, nullptr, units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
Vector2d(Group *parent, const char *name, const char *desc = nullptr)
|
||||
: Vector2dBase<Vector2d, StatStor>(
|
||||
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<Vector2d, StatStor>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -2099,17 +2099,17 @@ class Distribution : public DistBase<Distribution, DistStor>
|
||||
public:
|
||||
Distribution(Group *parent = nullptr)
|
||||
: DistBase<Distribution, DistStor>(
|
||||
parent, nullptr, Units::Unspecified::get(), nullptr)
|
||||
parent, nullptr, units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
Distribution(Group *parent, const char *name, const char *desc = nullptr)
|
||||
: DistBase<Distribution, DistStor>(
|
||||
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<Distribution, DistStor>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -2141,18 +2141,18 @@ class Histogram : public DistBase<Histogram, HistStor>
|
||||
public:
|
||||
Histogram(Group *parent = nullptr)
|
||||
: DistBase<Histogram, HistStor>(
|
||||
parent, nullptr, Units::Unspecified::get(), nullptr)
|
||||
parent, nullptr, units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
Histogram(Group *parent, const char *name,
|
||||
const char *desc = nullptr)
|
||||
: DistBase<Histogram, HistStor>(
|
||||
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<Histogram, HistStor>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -2185,7 +2185,7 @@ class StandardDeviation : public DistBase<StandardDeviation, SampleStor>
|
||||
*/
|
||||
StandardDeviation(Group *parent = nullptr)
|
||||
: DistBase<StandardDeviation, SampleStor>(
|
||||
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, SampleStor>
|
||||
StandardDeviation(Group *parent, const char *name,
|
||||
const char *desc = nullptr)
|
||||
: DistBase<StandardDeviation, SampleStor>(
|
||||
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<StandardDeviation, SampleStor>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -2224,7 +2224,7 @@ class AverageDeviation : public DistBase<AverageDeviation, AvgSampleStor>
|
||||
*/
|
||||
AverageDeviation(Group *parent = nullptr)
|
||||
: DistBase<AverageDeviation, AvgSampleStor>(
|
||||
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, AvgSampleStor>
|
||||
AverageDeviation(Group *parent, const char *name,
|
||||
const char *desc = nullptr)
|
||||
: DistBase<AverageDeviation, AvgSampleStor>(
|
||||
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<AverageDeviation, AvgSampleStor>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -2260,19 +2260,19 @@ class VectorDistribution : public VectorDistBase<VectorDistribution, DistStor>
|
||||
public:
|
||||
VectorDistribution(Group *parent = nullptr)
|
||||
: VectorDistBase<VectorDistribution, DistStor>(parent, nullptr,
|
||||
Units::Unspecified::get(), nullptr)
|
||||
units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
VectorDistribution(Group *parent, const char *name,
|
||||
const char *desc = nullptr)
|
||||
: VectorDistBase<VectorDistribution, DistStor>(
|
||||
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<VectorDistribution, DistStor>(parent, name, unit,
|
||||
desc)
|
||||
@@ -2307,19 +2307,19 @@ class VectorStandardDeviation
|
||||
public:
|
||||
VectorStandardDeviation(Group *parent = nullptr)
|
||||
: VectorDistBase<VectorStandardDeviation, SampleStor>(parent, nullptr,
|
||||
Units::Unspecified::get(), nullptr)
|
||||
units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
VectorStandardDeviation(Group *parent, const char *name,
|
||||
const char *desc = nullptr)
|
||||
: VectorDistBase<VectorStandardDeviation, SampleStor>(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<VectorStandardDeviation, SampleStor>(parent, name,
|
||||
unit, desc)
|
||||
@@ -2351,19 +2351,19 @@ class VectorAverageDeviation
|
||||
public:
|
||||
VectorAverageDeviation(Group *parent = nullptr)
|
||||
: VectorDistBase<VectorAverageDeviation, AvgSampleStor>(parent,
|
||||
nullptr, Units::Unspecified::get(), nullptr)
|
||||
nullptr, units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
VectorAverageDeviation(Group *parent, const char *name,
|
||||
const char *desc = nullptr)
|
||||
: VectorDistBase<VectorAverageDeviation, AvgSampleStor>(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<VectorAverageDeviation, AvgSampleStor>(parent, name,
|
||||
unit, desc)
|
||||
@@ -2462,7 +2462,7 @@ class SparseHistBase : public DataWrap<Derived, SparseHistInfoProxy>
|
||||
|
||||
public:
|
||||
SparseHistBase(Group *parent, const char *name,
|
||||
const Units::Base *unit,
|
||||
const units::Base *unit,
|
||||
const char *desc)
|
||||
: DataWrap<Derived, SparseHistInfoProxy>(parent, name, unit, desc)
|
||||
{
|
||||
@@ -2510,18 +2510,18 @@ class SparseHistogram : public SparseHistBase<SparseHistogram, SparseHistStor>
|
||||
public:
|
||||
SparseHistogram(Group *parent = nullptr)
|
||||
: SparseHistBase<SparseHistogram, SparseHistStor>(parent, nullptr,
|
||||
Units::Unspecified::get(), nullptr)
|
||||
units::Unspecified::get(), nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
SparseHistogram(Group *parent, const char *name,
|
||||
const char *desc = nullptr)
|
||||
: SparseHistBase<SparseHistogram, SparseHistStor>(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<SparseHistogram, SparseHistStor>(parent, name, unit,
|
||||
desc)
|
||||
@@ -2563,13 +2563,13 @@ class Formula : public DataWrapVec<Formula, FormulaInfoProxy>
|
||||
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);
|
||||
|
||||
/**
|
||||
|
||||
@@ -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")
|
||||
* {
|
||||
* }
|
||||
|
||||
@@ -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. */
|
||||
|
||||
@@ -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<T1, T2>::get()), \
|
||||
"Use Stats::Units::Rate<T1, T2>::get()")
|
||||
UNIT_RATE, (Stats::units::Rate<T1, T2>::get()), \
|
||||
"Use Stats::units::Rate<T1, T2>::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 <typename T1, typename T2>
|
||||
class Rate : public Base
|
||||
{
|
||||
static_assert(std::is_base_of<Base, T1>::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<Base, T2>::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<T1, T2>::value ||
|
||||
std::is_same<T1, Count>::value || std::is_same<T1, Unspecified>::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
|
||||
|
||||
|
||||
@@ -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<Stats::Units::Count, Stats::Units::Count> *unit =
|
||||
Stats::Units::Rate<Stats::Units::Count, Stats::Units::Count>::get();
|
||||
Stats::units::Rate<Stats::units::Count, Stats::units::Count> *unit =
|
||||
Stats::units::Rate<Stats::units::Count, Stats::units::Count>::get();
|
||||
ASSERT_EQ(unit->getUnitString(), "(Count/Count)");
|
||||
ASSERT_EQ(unit->getUnitString(), (Stats::Units::Rate<Stats::Units::Count,
|
||||
Stats::Units::Count>::toString()));
|
||||
ASSERT_EQ(unit->getUnitString(), (Stats::units::Rate<Stats::units::Count,
|
||||
Stats::units::Count>::toString()));
|
||||
}
|
||||
|
||||
TEST(StatsUnitsTest, Rate2)
|
||||
{
|
||||
Stats::Units::Rate<Stats::Units::Tick, Stats::Units::Second> *unit =
|
||||
Stats::Units::Rate<Stats::Units::Tick, Stats::Units::Second>::get();
|
||||
Stats::units::Rate<Stats::units::Tick, Stats::units::Second> *unit =
|
||||
Stats::units::Rate<Stats::units::Tick, Stats::units::Second>::get();
|
||||
ASSERT_EQ(unit->getUnitString(), "(Tick/Second)");
|
||||
ASSERT_EQ(unit->getUnitString(), (Stats::Units::Rate<Stats::Units::Tick,
|
||||
Stats::Units::Second>::toString()));
|
||||
ASSERT_EQ(unit->getUnitString(), (Stats::units::Rate<Stats::units::Tick,
|
||||
Stats::units::Second>::toString()));
|
||||
}
|
||||
|
||||
TEST(StatsUnitsTest, RateOfRates)
|
||||
{
|
||||
typedef Stats::Units::Rate<Stats::Units::Bit, Stats::Units::Second>
|
||||
typedef Stats::units::Rate<Stats::units::Bit, Stats::units::Second>
|
||||
BitPerSecond;
|
||||
typedef Stats::Units::Rate<Stats::Units::Count, Stats::Units::Cycle>
|
||||
typedef Stats::units::Rate<Stats::units::Count, Stats::units::Cycle>
|
||||
CountPerCycle;
|
||||
Stats::Units::Rate<BitPerSecond, CountPerCycle> *unit =
|
||||
Stats::Units::Rate<BitPerSecond, CountPerCycle>::get();
|
||||
Stats::units::Rate<BitPerSecond, CountPerCycle> *unit =
|
||||
Stats::units::Rate<BitPerSecond, CountPerCycle>::get();
|
||||
ASSERT_EQ(unit->getUnitString(), "((Bit/Second)/(Count/Cycle))");
|
||||
ASSERT_EQ(unit->getUnitString(),
|
||||
(Stats::Units::Rate<BitPerSecond, CountPerCycle>::toString()));
|
||||
(Stats::units::Rate<BitPerSecond, CountPerCycle>::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());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user