Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45437 )
Change subject: base,dev,mem-ruby: Rename m5 namespace as gem5
......................................................................
base,dev,mem-ruby: Rename m5 namespace as gem5
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
::m5 became ::gem5.
Change-Id: I250b4354113fcd6005dc4144ae378552cb8f6717
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45437
Maintainer: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
Reviewed-by: Hoa Nguyen <[email protected]>
---
M src/base/coroutine.hh
M src/base/coroutine.test.cc
M src/base/stl_helpers.hh
M src/dev/arm/gic_v3_its.hh
M src/dev/arm/smmu_v3_proc.hh
M src/mem/ruby/common/SubBlock.cc
M src/mem/ruby/network/MessageBuffer.cc
M src/mem/ruby/network/simple/Switch.cc
M src/mem/ruby/profiler/AddressProfiler.cc
M src/mem/ruby/profiler/Profiler.cc
10 files changed, 18 insertions(+), 12 deletions(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/coroutine.hh b/src/base/coroutine.hh
index 594c1e8..dbdddc2 100644
--- a/src/base/coroutine.hh
+++ b/src/base/coroutine.hh
@@ -41,9 +41,11 @@
#include <functional>
#include <stack>
+#include "base/compiler.hh"
#include "base/fiber.hh"
-namespace m5
+GEM5_DEPRECATED_NAMESPACE(m5, gem5);
+namespace gem5
{
/**
@@ -292,6 +294,6 @@
CallerType caller;
};
-} //namespace m5
+} //namespace gem5
#endif // __BASE_COROUTINE_HH__
diff --git a/src/base/coroutine.test.cc b/src/base/coroutine.test.cc
index 771097a..47ffcf2 100644
--- a/src/base/coroutine.test.cc
+++ b/src/base/coroutine.test.cc
@@ -39,7 +39,7 @@
#include "base/coroutine.hh"
-using namespace m5;
+using namespace gem5;
/**
* This test is checking if the Coroutine, once it's created
diff --git a/src/base/stl_helpers.hh b/src/base/stl_helpers.hh
index ba812b9..793bf77 100644
--- a/src/base/stl_helpers.hh
+++ b/src/base/stl_helpers.hh
@@ -34,7 +34,11 @@
#include <type_traits>
#include <vector>
-namespace m5 {
+#include "base/compiler.hh"
+
+GEM5_DEPRECATED_NAMESPACE(m5, gem5);
+namespace gem5
+{
namespace stl_helpers {
template <typename T, typename Enabled=void>
@@ -69,6 +73,6 @@
}
} // namespace stl_helpers
-} // namespace m5
+} // namespace gem5
#endif // __BASE_STL_HELPERS_HH__
diff --git a/src/dev/arm/gic_v3_its.hh b/src/dev/arm/gic_v3_its.hh
index e1688cd..7221e26 100644
--- a/src/dev/arm/gic_v3_its.hh
+++ b/src/dev/arm/gic_v3_its.hh
@@ -354,7 +354,7 @@
using DTE = Gicv3Its::DTE;
using ITTE = Gicv3Its::ITTE;
using CTE = Gicv3Its::CTE;
- using Coroutine = m5::Coroutine<PacketPtr, ItsAction>;
+ using Coroutine = gem5::Coroutine<PacketPtr, ItsAction>;
using Yield = Coroutine::CallerType;
ItsProcess(Gicv3Its &_its);
diff --git a/src/dev/arm/smmu_v3_proc.hh b/src/dev/arm/smmu_v3_proc.hh
index b55ec19..eaf5659 100644
--- a/src/dev/arm/smmu_v3_proc.hh
+++ b/src/dev/arm/smmu_v3_proc.hh
@@ -94,7 +94,7 @@
class SMMUProcess : public Packet::SenderState
{
private:
- typedef m5::Coroutine<PacketPtr, SMMUAction> Coroutine;
+ typedef gem5::Coroutine<PacketPtr, SMMUAction> Coroutine;
Coroutine *coroutine;
std::string myName;
diff --git a/src/mem/ruby/common/SubBlock.cc
b/src/mem/ruby/common/SubBlock.cc
index 98fec99..e889a55 100644
--- a/src/mem/ruby/common/SubBlock.cc
+++ b/src/mem/ruby/common/SubBlock.cc
@@ -30,7 +30,7 @@
#include "base/stl_helpers.hh"
-using m5::stl_helpers::operator<<;
+using gem5::stl_helpers::operator<<;
SubBlock::SubBlock(Addr addr, int size)
{
diff --git a/src/mem/ruby/network/MessageBuffer.cc
b/src/mem/ruby/network/MessageBuffer.cc
index d67b678..206f50d 100644
--- a/src/mem/ruby/network/MessageBuffer.cc
+++ b/src/mem/ruby/network/MessageBuffer.cc
@@ -49,7 +49,7 @@
#include "debug/RubyQueue.hh"
#include "mem/ruby/system/RubySystem.hh"
-using m5::stl_helpers::operator<<;
+using gem5::stl_helpers::operator<<;
MessageBuffer::MessageBuffer(const Params &p)
: SimObject(p), m_stall_map_size(0),
diff --git a/src/mem/ruby/network/simple/Switch.cc
b/src/mem/ruby/network/simple/Switch.cc
index 2eeddb6..06e1736 100644
--- a/src/mem/ruby/network/simple/Switch.cc
+++ b/src/mem/ruby/network/simple/Switch.cc
@@ -48,7 +48,7 @@
#include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/network/simple/SimpleNetwork.hh"
-using m5::stl_helpers::operator<<;
+using gem5::stl_helpers::operator<<;
Switch::Switch(const Params &p)
: BasicRouter(p),
diff --git a/src/mem/ruby/profiler/AddressProfiler.cc
b/src/mem/ruby/profiler/AddressProfiler.cc
index c54dae3..5e68c6d 100644
--- a/src/mem/ruby/profiler/AddressProfiler.cc
+++ b/src/mem/ruby/profiler/AddressProfiler.cc
@@ -37,7 +37,7 @@
typedef AddressProfiler::AddressMap AddressMap;
-using m5::stl_helpers::operator<<;
+using gem5::stl_helpers::operator<<;
// Helper functions
AccessTraceForAddress&
diff --git a/src/mem/ruby/profiler/Profiler.cc
b/src/mem/ruby/profiler/Profiler.cc
index 7e66311..14b8319 100644
--- a/src/mem/ruby/profiler/Profiler.cc
+++ b/src/mem/ruby/profiler/Profiler.cc
@@ -78,7 +78,7 @@
#include "mem/ruby/system/Sequencer.hh"
-using m5::stl_helpers::operator<<;
+using gem5::stl_helpers::operator<<;
Profiler::Profiler(const RubySystemParams &p, RubySystem *rs)
: m_ruby_system(rs), m_hot_lines(p.hot_lines),
6 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45437
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: I250b4354113fcd6005dc4144ae378552cb8f6717
Gerrit-Change-Number: 45437
Gerrit-PatchSet: 10
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
