[gem5-dev] Change in gem5/gem5[develop]: base,arch-arm: Replace Stats namespace with statistics.
Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/51528 )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: base,arch-arm: Replace Stats namespace with statistics.
..
base,arch-arm: Replace Stats namespace with statistics.
The Stats namespace is deprecated.
Change-Id: I17b1aa7fbced5db7b325e5339395281f3b3eda0b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51528
Reviewed-by: Giacomo Travaglini
Reviewed-by: Daniel Carvalho
Maintainer: Giacomo Travaglini
Tested-by: kokoro
---
M src/arch/arm/table_walker.cc
M src/base/stats/group.test.cc
2 files changed, 92 insertions(+), 76 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
Daniel Carvalho: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index ba1b4a4..73bcc5c 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -2519,8 +2519,8 @@
parent.mmu->translateTiming(req, tc, this, mode, tranType, true);
}
-TableWalker::TableWalkerStats::TableWalkerStats(Stats::Group *parent)
-: Stats::Group(parent),
+TableWalker::TableWalkerStats::TableWalkerStats(statistics::Group *parent)
+: statistics::Group(parent),
ADD_STAT(walks, statistics::units::Count::get(),
"Table walker walks requested"),
ADD_STAT(walksShortDescriptor, statistics::units::Count::get(),
diff --git a/src/base/stats/group.test.cc b/src/base/stats/group.test.cc
index 92f125a..e2e0598 100644
--- a/src/base/stats/group.test.cc
+++ b/src/base/stats/group.test.cc
@@ -38,15 +38,15 @@
/** Test that the constructor without a parent doesn't do anything. */
TEST(StatsGroupTest, ConstructNoParent)
{
-Stats::Group root(nullptr);
+statistics::Group root(nullptr);
ASSERT_EQ(root.getStatGroups().size(), 0);
}
/** Test adding a single stat group to a root node. */
TEST(StatsGroupTest, AddGetSingleStatGroup)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
root.addStatGroup("Node1", );
const auto root_map = root.getStatGroups();
@@ -59,9 +59,9 @@
/** Test that group names are unique within a node's stat group. */
TEST(StatsGroupDeathTest, AddUniqueNameStatGroup)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
-Stats::Group node2(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
+statistics::Group node2(nullptr);
root.addStatGroup("Node1", );
ASSERT_ANY_THROW(root.addStatGroup("Node1", ));
}
@@ -69,10 +69,10 @@
/** Test that group names are not unique among two nodes' stat groups. */
TEST(StatsGroupTest, AddNotUniqueNameAmongGroups)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
-Stats::Group node2(nullptr);
-Stats::Group node1_1(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
+statistics::Group node2(nullptr);
+statistics::Group node1_1(nullptr);
root.addStatGroup("Node1", );
node1.addStatGroup("Node1_1", _1);
ASSERT_NO_THROW(node1.addStatGroup("Node1", ));
@@ -81,23 +81,23 @@
/** Test that a group cannot add a non-existent group. */
TEST(StatsGroupDeathTest, AddNull)
{
-Stats::Group root(nullptr);
+statistics::Group root(nullptr);
ASSERT_ANY_THROW(root.addStatGroup("Node1", nullptr));
}
/** Test that a group cannot add itself. */
TEST(StatsGroupDeathTest, AddItself)
{
-Stats::Group root(nullptr);
+statistics::Group root(nullptr);
ASSERT_ANY_THROW(root.addStatGroup("Node1", ));
}
/** @todo Test that a group cannot be added in a cycle. */
TEST(StatsGroupDeathTest, DISABLED_AddCycle)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
-Stats::Group node1_1(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
+statistics::Group node1_1(nullptr);
root.addStatGroup("Node1", );
node1.addStatGroup("Node1_1", _1);
ASSERT_ANY_THROW(node1_1.addStatGroup("Root", ));
@@ -106,9 +106,9 @@
/** Test adding multiple stat groups to a root node. */
TEST(StatsGroupTest, AddGetMultipleStatGroup)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
-Stats::Group node2(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
+statistics::Group node2(nullptr);
root.addStatGroup("Node1", );
root.addStatGroup("Node2", );
@@ -124,10 +124,10 @@
/** Make sure that the groups are correctly assigned in the map. */
TEST(StatsGroupTest, ConstructCorrectlyAssigned)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
-Stats::Group
[gem5-dev] Change in gem5/gem5[develop]: base,arch-arm: Replace Stats namespace with statistics.
Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/51528 )
Change subject: base,arch-arm: Replace Stats namespace with statistics.
..
base,arch-arm: Replace Stats namespace with statistics.
The Stats namespace is deprecated.
Change-Id: I17b1aa7fbced5db7b325e5339395281f3b3eda0b
---
M src/arch/arm/table_walker.cc
M src/base/stats/group.test.cc
2 files changed, 87 insertions(+), 76 deletions(-)
diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index ba1b4a4..73bcc5c 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -2519,8 +2519,8 @@
parent.mmu->translateTiming(req, tc, this, mode, tranType, true);
}
-TableWalker::TableWalkerStats::TableWalkerStats(Stats::Group *parent)
-: Stats::Group(parent),
+TableWalker::TableWalkerStats::TableWalkerStats(statistics::Group *parent)
+: statistics::Group(parent),
ADD_STAT(walks, statistics::units::Count::get(),
"Table walker walks requested"),
ADD_STAT(walksShortDescriptor, statistics::units::Count::get(),
diff --git a/src/base/stats/group.test.cc b/src/base/stats/group.test.cc
index 92f125a..e2e0598 100644
--- a/src/base/stats/group.test.cc
+++ b/src/base/stats/group.test.cc
@@ -38,15 +38,15 @@
/** Test that the constructor without a parent doesn't do anything. */
TEST(StatsGroupTest, ConstructNoParent)
{
-Stats::Group root(nullptr);
+statistics::Group root(nullptr);
ASSERT_EQ(root.getStatGroups().size(), 0);
}
/** Test adding a single stat group to a root node. */
TEST(StatsGroupTest, AddGetSingleStatGroup)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
root.addStatGroup("Node1", );
const auto root_map = root.getStatGroups();
@@ -59,9 +59,9 @@
/** Test that group names are unique within a node's stat group. */
TEST(StatsGroupDeathTest, AddUniqueNameStatGroup)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
-Stats::Group node2(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
+statistics::Group node2(nullptr);
root.addStatGroup("Node1", );
ASSERT_ANY_THROW(root.addStatGroup("Node1", ));
}
@@ -69,10 +69,10 @@
/** Test that group names are not unique among two nodes' stat groups. */
TEST(StatsGroupTest, AddNotUniqueNameAmongGroups)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
-Stats::Group node2(nullptr);
-Stats::Group node1_1(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
+statistics::Group node2(nullptr);
+statistics::Group node1_1(nullptr);
root.addStatGroup("Node1", );
node1.addStatGroup("Node1_1", _1);
ASSERT_NO_THROW(node1.addStatGroup("Node1", ));
@@ -81,23 +81,23 @@
/** Test that a group cannot add a non-existent group. */
TEST(StatsGroupDeathTest, AddNull)
{
-Stats::Group root(nullptr);
+statistics::Group root(nullptr);
ASSERT_ANY_THROW(root.addStatGroup("Node1", nullptr));
}
/** Test that a group cannot add itself. */
TEST(StatsGroupDeathTest, AddItself)
{
-Stats::Group root(nullptr);
+statistics::Group root(nullptr);
ASSERT_ANY_THROW(root.addStatGroup("Node1", ));
}
/** @todo Test that a group cannot be added in a cycle. */
TEST(StatsGroupDeathTest, DISABLED_AddCycle)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
-Stats::Group node1_1(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
+statistics::Group node1_1(nullptr);
root.addStatGroup("Node1", );
node1.addStatGroup("Node1_1", _1);
ASSERT_ANY_THROW(node1_1.addStatGroup("Root", ));
@@ -106,9 +106,9 @@
/** Test adding multiple stat groups to a root node. */
TEST(StatsGroupTest, AddGetMultipleStatGroup)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
-Stats::Group node2(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
+statistics::Group node2(nullptr);
root.addStatGroup("Node1", );
root.addStatGroup("Node2", );
@@ -124,10 +124,10 @@
/** Make sure that the groups are correctly assigned in the map. */
TEST(StatsGroupTest, ConstructCorrectlyAssigned)
{
-Stats::Group root(nullptr);
-Stats::Group node1(nullptr);
-Stats::Group node1_1(nullptr);
-Stats::Group node1_1_1(nullptr);
+statistics::Group root(nullptr);
+statistics::Group node1(nullptr);
+statistics::Group node1_1(nullptr);
+statistics::Group node1_1_1(nullptr);
root.addStatGroup("Node1", );
node1.addStatGroup("Node1_1", _1);
node1_1.addStatGroup("Node1_1_1", _1_1);
@@ -146,8 +146,8 @@
*/
TEST(StatsGroupTest, ConstructOneLevelLinear)
{
-Stats::Group root(nullptr);
-Stats::Group
