[gem5-dev] Change in gem5/gem5[develop]: mem-garnet: Add a garnet namespace

Daniel Carvalho (Gerrit) via gem5-dev Sun, 27 Jun 2021 19:56:20 -0700

Daniel Carvalho has uploaded this change for review. (https://gem5-review.googlesource.com/c/public/gem5/+/47306 )


Change subject: mem-garnet: Add a garnet namespace
......................................................................

mem-garnet: Add a garnet namespace

Add a namespace encapsulating all garnet files.

GarnetSyntheticTraffic, from
cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh
has not been added to this namespace.

Change-Id: I5304ad3130100ba325e35e20883ee9286f51a75a
Issued-on: https://gem5.atlassian.net/browse/GEM5-987
Signed-off-by: Daniel R. Carvalho <[email protected]>
---
M src/mem/ruby/network/garnet/CommonTypes.hh
M src/mem/ruby/network/garnet/Credit.cc
M src/mem/ruby/network/garnet/Credit.hh
M src/mem/ruby/network/garnet/CreditLink.hh
M src/mem/ruby/network/garnet/CrossbarSwitch.cc
M src/mem/ruby/network/garnet/CrossbarSwitch.hh
M src/mem/ruby/network/garnet/GarnetLink.cc
M src/mem/ruby/network/garnet/GarnetLink.hh
M src/mem/ruby/network/garnet/GarnetLink.py
M src/mem/ruby/network/garnet/GarnetNetwork.cc
M src/mem/ruby/network/garnet/GarnetNetwork.hh
M src/mem/ruby/network/garnet/GarnetNetwork.py
M src/mem/ruby/network/garnet/InputUnit.cc
M src/mem/ruby/network/garnet/InputUnit.hh
M src/mem/ruby/network/garnet/NetworkBridge.cc
M src/mem/ruby/network/garnet/NetworkBridge.hh
M src/mem/ruby/network/garnet/NetworkInterface.cc
M src/mem/ruby/network/garnet/NetworkInterface.hh
M src/mem/ruby/network/garnet/NetworkLink.cc
M src/mem/ruby/network/garnet/NetworkLink.hh
M src/mem/ruby/network/garnet/OutVcState.cc
M src/mem/ruby/network/garnet/OutVcState.hh
M src/mem/ruby/network/garnet/OutputUnit.cc
M src/mem/ruby/network/garnet/OutputUnit.hh
M src/mem/ruby/network/garnet/Router.cc
M src/mem/ruby/network/garnet/Router.hh
M src/mem/ruby/network/garnet/RoutingUnit.cc
M src/mem/ruby/network/garnet/RoutingUnit.hh
M src/mem/ruby/network/garnet/SwitchAllocator.cc
M src/mem/ruby/network/garnet/SwitchAllocator.hh
M src/mem/ruby/network/garnet/VirtualChannel.cc
M src/mem/ruby/network/garnet/VirtualChannel.hh
M src/mem/ruby/network/garnet/flit.cc
M src/mem/ruby/network/garnet/flit.hh
M src/mem/ruby/network/garnet/flitBuffer.cc
M src/mem/ruby/network/garnet/flitBuffer.hh
36 files changed, 149 insertions(+), 10 deletions(-)

diff --git a/src/mem/ruby/network/garnet/CommonTypes.hhb/src/mem/ruby/network/garnet/CommonTypes.hh

index c0d8af2..c2b8b65 100644
--- a/src/mem/ruby/network/garnet/CommonTypes.hh
+++ b/src/mem/ruby/network/garnet/CommonTypes.hh
@@ -36,6 +36,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 // All common enums and typedefs go here

 enum flit_type {HEAD_, BODY_, TAIL_, HEAD_TAIL_,
@@ -68,6 +71,7 @@

 #define INFINITE_ 10000

+} // namespace garnet
 } // namespace gem5

 #endif //__MEM_RUBY_NETWORK_GARNET_0_COMMONTYPES_HH__

diff --git a/src/mem/ruby/network/garnet/Credit.ccb/src/mem/ruby/network/garnet/Credit.cc

index 5624005..e88faa0 100644
--- a/src/mem/ruby/network/garnet/Credit.cc
+++ b/src/mem/ruby/network/garnet/Credit.cc
@@ -35,6 +35,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 // Credit Signal for buffers inside VC
 // Carries m_vc (inherits from flit.hh)
 // and m_is_free_signal (whether VC is free or not)
@@ -83,4 +86,5 @@
     out << "]";
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/Credit.hhb/src/mem/ruby/network/garnet/Credit.hh

index 2db47d0..98469e1 100644
--- a/src/mem/ruby/network/garnet/Credit.hh
+++ b/src/mem/ruby/network/garnet/Credit.hh
@@ -41,6 +41,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 // Credit Signal for buffers inside VC
 // Carries m_vc (inherits from flit.hh)
 // and m_is_free_signal (whether VC is free or not)
@@ -64,6 +67,7 @@
     bool m_is_free_signal;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_CREDIT_HH__

diff --git a/src/mem/ruby/network/garnet/CreditLink.hhb/src/mem/ruby/network/garnet/CreditLink.hh

index 96842dc..c85dc4e 100644
--- a/src/mem/ruby/network/garnet/CreditLink.hh
+++ b/src/mem/ruby/network/garnet/CreditLink.hh
@@ -37,6 +37,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class CreditLink : public NetworkLink
 {
   public:
@@ -44,6 +47,7 @@
     CreditLink(const Params &p) : NetworkLink(p) {}
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_CREDITLINK_HH__

diff --git a/src/mem/ruby/network/garnet/CrossbarSwitch.ccb/src/mem/ruby/network/garnet/CrossbarSwitch.cc

index 2e6c29d..d94f728 100644
--- a/src/mem/ruby/network/garnet/CrossbarSwitch.cc
+++ b/src/mem/ruby/network/garnet/CrossbarSwitch.cc
@@ -38,6 +38,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 CrossbarSwitch::CrossbarSwitch(Router *router)
   : Consumer(router), m_router(router), m_num_vcs(m_router->get_num_vcs()),
     m_crossbar_activity(0), switchBuffers(0)
@@ -103,4 +106,5 @@
     m_crossbar_activity = 0;
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/CrossbarSwitch.hhb/src/mem/ruby/network/garnet/CrossbarSwitch.hh

index 6eefe40..186cf24 100644
--- a/src/mem/ruby/network/garnet/CrossbarSwitch.hh
+++ b/src/mem/ruby/network/garnet/CrossbarSwitch.hh
@@ -42,6 +42,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class Router;

 class CrossbarSwitch : public Consumer
@@ -71,6 +74,7 @@
     std::vector<flitBuffer> switchBuffers;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_CROSSBARSWITCH_HH__

diff --git a/src/mem/ruby/network/garnet/GarnetLink.ccb/src/mem/ruby/network/garnet/GarnetLink.cc

index 1606814..1088e86 100644
--- a/src/mem/ruby/network/garnet/GarnetLink.cc
+++ b/src/mem/ruby/network/garnet/GarnetLink.cc
@@ -38,6 +38,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 GarnetIntLink::GarnetIntLink(const Params &p)
     : BasicIntLink(p)
 {
@@ -157,4 +160,5 @@
     out << name();
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/GarnetLink.hhb/src/mem/ruby/network/garnet/GarnetLink.hh

index 300479a..84db8e6 100644
--- a/src/mem/ruby/network/garnet/GarnetLink.hh
+++ b/src/mem/ruby/network/garnet/GarnetLink.hh
@@ -45,6 +45,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class GarnetIntLink : public BasicIntLink
 {
   public:
@@ -126,6 +129,7 @@
     return out;
 }

+} // namespace garnet
 } // namespace gem5

 #endif //__MEM_RUBY_NETWORK_GARNET_0_GARNETLINK_HH__

diff --git a/src/mem/ruby/network/garnet/GarnetLink.pyb/src/mem/ruby/network/garnet/GarnetLink.py

index af3320e..5acb403 100644
--- a/src/mem/ruby/network/garnet/GarnetLink.py
+++ b/src/mem/ruby/network/garnet/GarnetLink.py
@@ -38,7 +38,7 @@
 class NetworkLink(ClockedObject):
     type = 'NetworkLink'
     cxx_header = "mem/ruby/network/garnet/NetworkLink.hh"
-    cxx_class = 'gem5::NetworkLink'
+    cxx_class = 'gem5::garnet::NetworkLink'

     link_id = Param.Int(Parent.link_id, "link id")
     link_latency = Param.Cycles(Parent.latency, "link latency")
@@ -53,12 +53,12 @@
 class CreditLink(NetworkLink):
     type = 'CreditLink'
     cxx_header = "mem/ruby/network/garnet/CreditLink.hh"
-    cxx_class = 'gem5::CreditLink'
+    cxx_class = 'gem5::garnet::CreditLink'

 class NetworkBridge(CreditLink):
     type = 'NetworkBridge'
     cxx_header = "mem/ruby/network/garnet/NetworkBridge.hh"
-    cxx_class = 'gem5::NetworkBridge'
+    cxx_class = 'gem5::garnet::NetworkBridge'

     link = Param.NetworkLink("Associated Network Link")
     vtype = Param.CDCType('LINK_OBJECT',
@@ -70,7 +70,7 @@
 class GarnetIntLink(BasicIntLink):
     type = 'GarnetIntLink'
     cxx_header = "mem/ruby/network/garnet/GarnetLink.hh"
-    cxx_class = 'gem5::GarnetIntLink'
+    cxx_class = 'gem5::garnet::GarnetIntLink'

     # The internal link includes one forward link (for flit)
     # and one backward flow-control link (for credit)
@@ -109,7 +109,7 @@
 class GarnetExtLink(BasicExtLink):
     type = 'GarnetExtLink'
     cxx_header = "mem/ruby/network/garnet/GarnetLink.hh"
-    cxx_class = 'gem5::GarnetExtLink'
+    cxx_class = 'gem5::garnet::GarnetExtLink'

     # The external link is bi-directional.
     # It includes two forward links (for flits)

diff --git a/src/mem/ruby/network/garnet/GarnetNetwork.ccb/src/mem/ruby/network/garnet/GarnetNetwork.cc

index 13d841d..688673b 100644
--- a/src/mem/ruby/network/garnet/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet/GarnetNetwork.cc
@@ -49,6 +49,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 /*
  * GarnetNetwork sets up the routers and links and collects stats.

* Default parameters (GarnetNetwork.py) can be overwritten from commandline

@@ -617,4 +620,5 @@
     return num_functional_writes;
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/GarnetNetwork.hhb/src/mem/ruby/network/garnet/GarnetNetwork.hh

index 65a7eb6..e7dc311 100644
--- a/src/mem/ruby/network/garnet/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet/GarnetNetwork.hh
@@ -44,9 +44,13 @@
 {

 class FaultModel;
+class NetDest;
+
+namespace garnet
+{
+
 class NetworkInterface;
 class Router;
-class NetDest;
 class NetworkLink;
 class CreditLink;

@@ -212,6 +216,7 @@
     return out;
 }

+} // namespace garnet
 } // namespace gem5

 #endif //__MEM_RUBY_NETWORK_GARNET_0_GARNETNETWORK_HH__

diff --git a/src/mem/ruby/network/garnet/GarnetNetwork.pyb/src/mem/ruby/network/garnet/GarnetNetwork.py

index 749fdb9..37f047e 100644
--- a/src/mem/ruby/network/garnet/GarnetNetwork.py
+++ b/src/mem/ruby/network/garnet/GarnetNetwork.py
@@ -37,7 +37,7 @@
 class GarnetNetwork(RubyNetwork):
     type = 'GarnetNetwork'
     cxx_header = "mem/ruby/network/garnet/GarnetNetwork.hh"
-    cxx_class = 'gem5::GarnetNetwork'
+    cxx_class = 'gem5::garnet::GarnetNetwork'

num_rows = Param.Int(0, "number of rows if 2D (mesh/torus/..)topology");

     ni_flit_size = Param.UInt32(16, "network interface flit size in bytes")
@@ -53,7 +53,7 @@

 class GarnetNetworkInterface(ClockedObject):
     type = 'GarnetNetworkInterface'
-    cxx_class = 'gem5::NetworkInterface'
+    cxx_class = 'gem5::garnet::NetworkInterface'
     cxx_header = "mem/ruby/network/garnet/NetworkInterface.hh"

     id = Param.UInt32("ID in relation to other network interfaces")
@@ -66,7 +66,7 @@

 class GarnetRouter(BasicRouter):
     type = 'GarnetRouter'
-    cxx_class = 'gem5::Router'
+    cxx_class = 'gem5::garnet::Router'
     cxx_header = "mem/ruby/network/garnet/Router.hh"
     vcs_per_vnet = Param.UInt32(Parent.vcs_per_vnet,
                               "virtual channels per virtual network")

diff --git a/src/mem/ruby/network/garnet/InputUnit.ccb/src/mem/ruby/network/garnet/InputUnit.cc

index aa3128c..787ca37 100644
--- a/src/mem/ruby/network/garnet/InputUnit.cc
+++ b/src/mem/ruby/network/garnet/InputUnit.cc
@@ -38,6 +38,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 InputUnit::InputUnit(int id, PortDirection direction, Router *router)
   : Consumer(router), m_router(router), m_id(id), m_direction(direction),
     m_vc_per_vnet(m_router->get_vc_per_vnet())
@@ -166,4 +169,5 @@
     }
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/InputUnit.hhb/src/mem/ruby/network/garnet/InputUnit.hh

index e418840..dd25fc0 100644
--- a/src/mem/ruby/network/garnet/InputUnit.hh
+++ b/src/mem/ruby/network/garnet/InputUnit.hh
@@ -46,6 +46,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class InputUnit : public Consumer
 {
   public:
@@ -166,6 +169,7 @@
     std::vector<double> m_num_buffer_reads;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_INPUTUNIT_HH__

diff --git a/src/mem/ruby/network/garnet/NetworkBridge.ccb/src/mem/ruby/network/garnet/NetworkBridge.cc

index 73261d2..a252e59 100644
--- a/src/mem/ruby/network/garnet/NetworkBridge.cc
+++ b/src/mem/ruby/network/garnet/NetworkBridge.cc
@@ -42,6 +42,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 NetworkBridge::NetworkBridge(const Params &p)
     :CreditLink(p)
 {
@@ -268,4 +271,5 @@
     }
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/NetworkBridge.hhb/src/mem/ruby/network/garnet/NetworkBridge.hh

index 42435cb..9db7861 100644
--- a/src/mem/ruby/network/garnet/NetworkBridge.hh
+++ b/src/mem/ruby/network/garnet/NetworkBridge.hh
@@ -49,6 +49,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class GarnetNetwork;

 class NetworkBridge: public CreditLink
@@ -98,6 +101,7 @@

 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_NETWORK_BRIDGE_HH__

diff --git a/src/mem/ruby/network/garnet/NetworkInterface.ccb/src/mem/ruby/network/garnet/NetworkInterface.cc

index 5190c9d..e5f323a 100644
--- a/src/mem/ruby/network/garnet/NetworkInterface.cc
+++ b/src/mem/ruby/network/garnet/NetworkInterface.cc
@@ -45,6 +45,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 NetworkInterface::NetworkInterface(const Params &p)
   : ClockedObject(p), Consumer(this), m_id(p.id),
     m_virtual_networks(p.virt_nets), m_vc_per_vnet(0),
@@ -674,4 +677,5 @@
     return num_functional_writes;
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/NetworkInterface.hhb/src/mem/ruby/network/garnet/NetworkInterface.hh

index 15becbd..dc6165e 100644
--- a/src/mem/ruby/network/garnet/NetworkInterface.hh
+++ b/src/mem/ruby/network/garnet/NetworkInterface.hh
@@ -50,6 +50,10 @@
 {

 class MessageBuffer;
+
+namespace garnet
+{
+
 class flitBuffer;

 class NetworkInterface : public ClockedObject, public Consumer
@@ -300,6 +304,7 @@
     OutputPort *getOutportForVnet(int vnet);
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_NETWORKINTERFACE_HH__

diff --git a/src/mem/ruby/network/garnet/NetworkLink.ccb/src/mem/ruby/network/garnet/NetworkLink.cc

index 4145ea4..5cf16d3 100644
--- a/src/mem/ruby/network/garnet/NetworkLink.cc
+++ b/src/mem/ruby/network/garnet/NetworkLink.cc
@@ -39,6 +39,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 NetworkLink::NetworkLink(const Params &p)
     : ClockedObject(p), Consumer(this), m_id(p.link_id),
       m_type(NUM_LINK_TYPES_),
@@ -119,4 +122,5 @@
     return linkBuffer.functionalWrite(pkt);
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/NetworkLink.hhb/src/mem/ruby/network/garnet/NetworkLink.hh

index 5fc8a58..746c4d6 100644
--- a/src/mem/ruby/network/garnet/NetworkLink.hh
+++ b/src/mem/ruby/network/garnet/NetworkLink.hh
@@ -45,6 +45,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class GarnetNetwork;

 class NetworkLink : public ClockedObject, public Consumer
@@ -100,6 +103,7 @@

 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_NETWORKLINK_HH__

diff --git a/src/mem/ruby/network/garnet/OutVcState.ccb/src/mem/ruby/network/garnet/OutVcState.cc

index 88ae9ef..799af28 100644
--- a/src/mem/ruby/network/garnet/OutVcState.cc
+++ b/src/mem/ruby/network/garnet/OutVcState.cc
@@ -35,6 +35,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 OutVcState::OutVcState(int id, GarnetNetwork *network_ptr,
     uint32_t consumerVcs)
     : m_time(0)
@@ -71,4 +74,5 @@
     assert(m_credit_count >= 0);
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/OutVcState.hhb/src/mem/ruby/network/garnet/OutVcState.hh

index f8c36da..9a780b3 100644
--- a/src/mem/ruby/network/garnet/OutVcState.hh
+++ b/src/mem/ruby/network/garnet/OutVcState.hh
@@ -37,6 +37,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class OutVcState
 {
   public:
@@ -67,6 +70,7 @@
     int m_max_credit_count;
 };

+} // namespace garnet
 } // namespace gem5

 #endif //__MEM_RUBY_NETWORK_GARNET_0_OUTVCSTATE_HH__

diff --git a/src/mem/ruby/network/garnet/OutputUnit.ccb/src/mem/ruby/network/garnet/OutputUnit.cc

index f903f5b..22cb77c 100644
--- a/src/mem/ruby/network/garnet/OutputUnit.cc
+++ b/src/mem/ruby/network/garnet/OutputUnit.cc
@@ -40,6 +40,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 OutputUnit::OutputUnit(int id, PortDirection direction, Router *router,
   uint32_t consumerVcs)
   : Consumer(router), m_router(router), m_id(id), m_direction(direction),
@@ -172,4 +175,5 @@
     return outBuffer.functionalWrite(pkt);
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/OutputUnit.hhb/src/mem/ruby/network/garnet/OutputUnit.hh

index 16c686b..db1a3a1 100644
--- a/src/mem/ruby/network/garnet/OutputUnit.hh
+++ b/src/mem/ruby/network/garnet/OutputUnit.hh
@@ -44,6 +44,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class CreditLink;
 class Router;

@@ -114,6 +117,7 @@
     std::vector<OutVcState> outVcState;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_OUTPUTUNIT_HH__

diff --git a/src/mem/ruby/network/garnet/Router.ccb/src/mem/ruby/network/garnet/Router.cc

index 8fa20aa..b8b7cdf 100644
--- a/src/mem/ruby/network/garnet/Router.cc
+++ b/src/mem/ruby/network/garnet/Router.cc
@@ -42,6 +42,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 Router::Router(const Params &p)
   : BasicRouter(p), Consumer(this), m_latency(p.latency),
     m_virtual_networks(p.virt_nets), m_vc_per_vnet(p.vcs_per_vnet),
@@ -285,4 +288,5 @@
     return num_functional_writes;
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/Router.hhb/src/mem/ruby/network/garnet/Router.hh

index fb63611..f9b7955 100644
--- a/src/mem/ruby/network/garnet/Router.hh
+++ b/src/mem/ruby/network/garnet/Router.hh
@@ -50,11 +50,15 @@
 namespace gem5
 {

+class FaultModel;
+
+namespace garnet
+{
+
 class NetworkLink;
 class CreditLink;
 class InputUnit;
 class OutputUnit;
-class FaultModel;

 class Router : public BasicRouter, public Consumer
 {
@@ -157,6 +161,7 @@
     statistics::Scalar m_crossbar_activity;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_ROUTER_HH__

diff --git a/src/mem/ruby/network/garnet/RoutingUnit.ccb/src/mem/ruby/network/garnet/RoutingUnit.cc

index a850c2d..7230b6f 100644
--- a/src/mem/ruby/network/garnet/RoutingUnit.cc
+++ b/src/mem/ruby/network/garnet/RoutingUnit.cc
@@ -40,6 +40,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 RoutingUnit::RoutingUnit(Router *router)
 {
     m_router = router;
@@ -264,4 +267,5 @@
     panic("%s placeholder executed", __FUNCTION__);
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/RoutingUnit.hhb/src/mem/ruby/network/garnet/RoutingUnit.hh

index 25a801a..b903031 100644
--- a/src/mem/ruby/network/garnet/RoutingUnit.hh
+++ b/src/mem/ruby/network/garnet/RoutingUnit.hh
@@ -40,6 +40,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class InputUnit;
 class Router;

@@ -91,6 +94,7 @@
     std::map<PortDirection, int> m_outports_dirn2idx;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_ROUTINGUNIT_HH__

diff --git a/src/mem/ruby/network/garnet/SwitchAllocator.ccb/src/mem/ruby/network/garnet/SwitchAllocator.cc

index e413406..5502b2b 100644
--- a/src/mem/ruby/network/garnet/SwitchAllocator.cc
+++ b/src/mem/ruby/network/garnet/SwitchAllocator.cc
@@ -40,6 +40,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 SwitchAllocator::SwitchAllocator(Router *router)
     : Consumer(router)
 {
@@ -390,4 +393,5 @@
     m_output_arbiter_activity = 0;
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/SwitchAllocator.hhb/src/mem/ruby/network/garnet/SwitchAllocator.hh

index 90089f3..0f2d480 100644
--- a/src/mem/ruby/network/garnet/SwitchAllocator.hh
+++ b/src/mem/ruby/network/garnet/SwitchAllocator.hh
@@ -41,6 +41,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class Router;
 class InputUnit;
 class OutputUnit;
@@ -86,6 +89,7 @@
     std::vector<int> m_vc_winners;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_SWITCHALLOCATOR_HH__

diff --git a/src/mem/ruby/network/garnet/VirtualChannel.ccb/src/mem/ruby/network/garnet/VirtualChannel.cc

index b4fc288..bf4502d 100644
--- a/src/mem/ruby/network/garnet/VirtualChannel.cc
+++ b/src/mem/ruby/network/garnet/VirtualChannel.cc
@@ -34,6 +34,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 VirtualChannel::VirtualChannel()
   : inputBuffer(), m_vc_state(IDLE_, Tick(0)), m_output_port(-1),
     m_enqueue_time(INFINITE_), m_output_vc(-1)
@@ -75,4 +78,5 @@
     return inputBuffer.functionalWrite(pkt);
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/VirtualChannel.hhb/src/mem/ruby/network/garnet/VirtualChannel.hh

index 2bee8ec..fb0ef4a 100644
--- a/src/mem/ruby/network/garnet/VirtualChannel.hh
+++ b/src/mem/ruby/network/garnet/VirtualChannel.hh
@@ -40,6 +40,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class VirtualChannel
 {
   public:
@@ -99,6 +102,7 @@
     int m_output_vc;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_VIRTUALCHANNEL_HH__

diff --git a/src/mem/ruby/network/garnet/flit.ccb/src/mem/ruby/network/garnet/flit.cc

index f188ad9..7daff73 100644
--- a/src/mem/ruby/network/garnet/flit.cc
+++ b/src/mem/ruby/network/garnet/flit.cc
@@ -36,6 +36,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 // Constructor for the flit
 flit::flit(int id, int  vc, int vnet, RouteInfo route, int size,
     MsgPtr msg_ptr, int MsgSize, uint32_t bWidth, Tick curTime)
@@ -124,4 +127,5 @@
     return msg->functionalWrite(pkt);
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/flit.hhb/src/mem/ruby/network/garnet/flit.hh

index ffad7eb..8bb1a4d 100644
--- a/src/mem/ruby/network/garnet/flit.hh
+++ b/src/mem/ruby/network/garnet/flit.hh
@@ -41,6 +41,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class flit
 {
   public:
@@ -130,6 +133,7 @@
     return out;
 }

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_FLIT_HH__

diff --git a/src/mem/ruby/network/garnet/flitBuffer.ccb/src/mem/ruby/network/garnet/flitBuffer.cc

index 96e14f5..468aeb3 100644
--- a/src/mem/ruby/network/garnet/flitBuffer.cc
+++ b/src/mem/ruby/network/garnet/flitBuffer.cc
@@ -34,6 +34,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 flitBuffer::flitBuffer()
 {
     max_size = INFINITE_;
@@ -93,4 +96,5 @@
     return num_functional_writes;
 }

+} // namespace garnet
 } // namespace gem5

diff --git a/src/mem/ruby/network/garnet/flitBuffer.hhb/src/mem/ruby/network/garnet/flitBuffer.hh

index dbe92c0..e994c45 100644
--- a/src/mem/ruby/network/garnet/flitBuffer.hh
+++ b/src/mem/ruby/network/garnet/flitBuffer.hh
@@ -41,6 +41,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class flitBuffer
 {
   public:
@@ -89,6 +92,7 @@
     return out;
 }

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_FLITBUFFER_HH__

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47306

To unsubscribe, or for help writing mail filters, visithttps://gem5-review.googlesource.com/settings


Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I5304ad3130100ba325e35e20883ee9286f51a75a
Gerrit-Change-Number: 47306
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <[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

[gem5-dev] Change in gem5/gem5[develop]: mem-garnet: Add a garnet namespace

Reply via email to