changeset 3006bde825fd in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=3006bde825fd
description:
style: updated garnet to match M5 coding style
diffstat:
src/mem/ruby/network/garnet/BaseGarnetNetwork.cc | 3 +-
src/mem/ruby/network/garnet/BaseGarnetNetwork.hh | 11 +-
src/mem/ruby/network/garnet/NetworkHeader.hh | 7 +-
src/mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh | 15 +-
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 418 +++---
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh | 123 +-
src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc | 89 +-
src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh | 229 ++-
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc | 486
++++----
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh | 80 +-
src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.cc | 77 +-
src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh | 67 +-
src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc | 10 +-
src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh | 79 +-
src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.cc | 92 +-
src/mem/ruby/network/garnet/fixed-pipeline/OutputUnit_d.hh | 93 +-
src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc | 188 +-
src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh | 83 +-
src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc | 69 +-
src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.hh | 29 +-
src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc | 285 ++--
src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh | 72 +-
src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.cc | 75 +-
src/mem/ruby/network/garnet/fixed-pipeline/Switch_d.hh | 56 +-
src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc | 346 +++---
src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.hh | 85 +-
src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.cc | 67 +-
src/mem/ruby/network/garnet/fixed-pipeline/VirtualChannel_d.hh | 124 +-
src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.cc | 58 +-
src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh | 73 +-
src/mem/ruby/network/garnet/fixed-pipeline/flit_d.cc | 120 +-
src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh | 187 +-
src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh | 20 +-
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 346 +++---
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh | 85 +-
src/mem/ruby/network/garnet/flexible-pipeline/InVcState.cc | 40 +-
src/mem/ruby/network/garnet/flexible-pipeline/InVcState.hh | 37 +-
src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc | 426
++++---
src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh | 88 +-
src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc | 135 +-
src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh | 74 +-
src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.cc | 24 +-
src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh | 27 +-
src/mem/ruby/network/garnet/flexible-pipeline/Router.cc | 553
+++++----
src/mem/ruby/network/garnet/flexible-pipeline/Router.hh | 88 +-
src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc | 8 +-
src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh | 23 +-
src/mem/ruby/network/garnet/flexible-pipeline/flit.cc | 137 +-
src/mem/ruby/network/garnet/flexible-pipeline/flit.hh | 70 +-
src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.cc | 81 +-
src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh | 41 +-
src/mem/ruby/network/garnet/flexible-pipeline/netconfig.defaults | 8 -
52 files changed, 3125 insertions(+), 2982 deletions(-)
diffs (truncated from 7693 to 300 lines):
diff -r b285acfcd797 -r 3006bde825fd
src/mem/ruby/network/garnet/BaseGarnetNetwork.cc
--- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc Mon Jun 28 07:33:33
2010 -0400
+++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.cc Tue Jun 22 15:36:07
2010 -0700
@@ -40,7 +40,8 @@
m_using_network_testing = p->using_network_testing;
}
-void BaseGarnetNetwork::init()
+void
+BaseGarnetNetwork::init()
{
Network::init();
}
diff -r b285acfcd797 -r 3006bde825fd
src/mem/ruby/network/garnet/BaseGarnetNetwork.hh
--- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh Mon Jun 28 07:33:33
2010 -0400
+++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh Tue Jun 22 15:36:07
2010 -0700
@@ -33,14 +33,15 @@
* required by the interconnection network.
*/
-#ifndef BASEGARNETNETWORK_H
-#define BASEGARNETNETWORK_H
+#ifndef __MEM_RUBY_NETWORK_GARNET_BASEGARNETNETWORK_HH__
+#define __MEM_RUBY_NETWORK_GARNET_BASEGARNETNETWORK_HH__
#include "mem/ruby/network/garnet/NetworkHeader.hh"
#include "mem/ruby/network/Network.hh"
#include "params/BaseGarnetNetwork.hh"
-class BaseGarnetNetwork : public Network {
+class BaseGarnetNetwork : public Network
+{
public:
typedef BaseGarnetNetworkParams Params;
BaseGarnetNetwork(const Params *p);
@@ -58,8 +59,6 @@
int m_vcs_per_class;
int m_buffer_size;
bool m_using_network_testing;
-
};
-
-#endif
+#endif // __MEM_RUBY_NETWORK_GARNET_BASEGARNETNETWORK_HH__
diff -r b285acfcd797 -r 3006bde825fd
src/mem/ruby/network/garnet/NetworkHeader.hh
--- a/src/mem/ruby/network/garnet/NetworkHeader.hh Mon Jun 28 07:33:33
2010 -0400
+++ b/src/mem/ruby/network/garnet/NetworkHeader.hh Tue Jun 22 15:36:07
2010 -0700
@@ -28,8 +28,8 @@
* Authors: Niket Agarwal
*/
-#ifndef NETWORK_HEADER_H
-#define NETWORK_HEADER_H
+#ifndef __MEM_RUBY_NETWORK_GARNET_NETWORKHEADER_HH__
+#define __MEM_RUBY_NETWORK_GARNET_NETWORKHEADER_HH__
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/system/NodeID.hh"
@@ -40,5 +40,4 @@
#define INFINITE_ 10000
-#endif
-
+#endif // __MEM_RUBY_NETWORK_GARNET_NETWORKHEADER_HH__
diff -r b285acfcd797 -r 3006bde825fd
src/mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh Mon Jun
28 07:33:33 2010 -0400
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/CreditLink_d.hh Tue Jun
22 15:36:07 2010 -0700
@@ -28,14 +28,17 @@
* Authors: Niket Agarwal
*/
-#ifndef CREDIT_LINK_D_H
-#define CREDIT_LINK_D_H
+#ifndef __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_CREDIT_LINK_D_HH__
+#define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_CREDIT_LINK_D_HH__
#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
-class CreditLink_d : public NetworkLink_d {
-public:
- CreditLink_d(int id, int link_latency, GarnetNetwork_d
*net_ptr):NetworkLink_d(id, link_latency, net_ptr) {}
+class CreditLink_d : public NetworkLink_d
+{
+ public:
+ CreditLink_d(int id, int link_latency, GarnetNetwork_d *net_ptr)
+ : NetworkLink_d(id, link_latency, net_ptr)
+ {}
};
-#endif
+#endif // __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_CREDIT_LINK_D_HH__
diff -r b285acfcd797 -r 3006bde825fd
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Mon Jun
28 07:33:33 2010 -0400
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Tue Jun
22 15:36:07 2010 -0700
@@ -43,49 +43,50 @@
using m5::stl_helpers::deletePointers;
GarnetNetwork_d::GarnetNetwork_d(const Params *p)
- : BaseGarnetNetwork(p)
+ : BaseGarnetNetwork(p)
{
m_ruby_start = 0;
- m_flits_recieved = 0;
+ m_flits_received = 0;
m_flits_injected = 0;
m_network_latency = 0.0;
m_queueing_latency = 0.0;
-
+
m_router_ptr_vector.clear();
-
- // Allocate to and from queues
- m_toNetQueues.resize(m_nodes); // Queues that are getting messages
from protocol
- m_fromNetQueues.resize(m_nodes); // Queues that are feeding the
protocol
+
+ // Queues that are getting messages from protocol
+ m_toNetQueues.resize(m_nodes);
+
+ // Queues that are feeding the protocol
+ m_fromNetQueues.resize(m_nodes);
m_in_use.resize(m_virtual_networks);
m_ordered.resize(m_virtual_networks);
- for (int i = 0; i < m_virtual_networks; i++)
- {
+ for (int i = 0; i < m_virtual_networks; i++) {
m_in_use[i] = false;
m_ordered[i] = false;
}
-
- for (int node = 0; node < m_nodes; node++)
- {
- //Setting how many vitual message buffers will there be per Network
Queue
+
+ for (int node = 0; node < m_nodes; node++) {
+ // Setting how many vitual message buffers
+ // will there be per Network Queue
m_toNetQueues[node].resize(m_virtual_networks);
m_fromNetQueues[node].resize(m_virtual_networks);
-
- for (int j = 0; j < m_virtual_networks; j++)
- {
- m_toNetQueues[node][j] = new MessageBuffer(); // Instantiating
the Message Buffers that interact with the coherence protocol
+
+ // Instantiating the Message Buffers
+ // that interact with the coherence protocol
+ for (int j = 0; j < m_virtual_networks; j++) {
+ m_toNetQueues[node][j] = new MessageBuffer();
m_fromNetQueues[node][j] = new MessageBuffer();
}
}
}
-void GarnetNetwork_d::init()
+void
+GarnetNetwork_d::init()
{
BaseGarnetNetwork::init();
- //
- // The topology pointer should have already been initialized in the parent
- // network constructor.
- //
+ // The topology pointer should have already been initialized in the
+ // parent network constructor
assert(m_topology_ptr != NULL);
int number_of_routers = m_topology_ptr->numSwitches();
@@ -94,68 +95,70 @@
}
for (int i=0; i < m_nodes; i++) {
- NetworkInterface_d *ni = new NetworkInterface_d(i, m_virtual_networks,
this);
+ NetworkInterface_d *ni = new NetworkInterface_d(i, m_virtual_networks,
+ this);
ni->addNode(m_toNetQueues[i], m_fromNetQueues[i]);
m_ni_ptr_vector.push_back(ni);
}
- m_topology_ptr->createLinks(this, false); // false because this isn't a
reconfiguration
- for(int i = 0; i < m_router_ptr_vector.size(); i++)
- {
+ // false because this isn't a reconfiguration
+ m_topology_ptr->createLinks(this, false);
+ for (int i = 0; i < m_router_ptr_vector.size(); i++) {
m_router_ptr_vector[i]->init();
}
}
GarnetNetwork_d::~GarnetNetwork_d()
{
- for (int i = 0; i < m_nodes; i++)
- {
- deletePointers(m_toNetQueues[i]);
- deletePointers(m_fromNetQueues[i]);
- }
- deletePointers(m_router_ptr_vector);
- deletePointers(m_ni_ptr_vector);
- deletePointers(m_link_ptr_vector);
- deletePointers(m_creditlink_ptr_vector);
- delete m_topology_ptr;
+ for (int i = 0; i < m_nodes; i++) {
+ deletePointers(m_toNetQueues[i]);
+ deletePointers(m_fromNetQueues[i]);
+ }
+ deletePointers(m_router_ptr_vector);
+ deletePointers(m_ni_ptr_vector);
+ deletePointers(m_link_ptr_vector);
+ deletePointers(m_creditlink_ptr_vector);
+ delete m_topology_ptr;
}
-void GarnetNetwork_d::reset()
+void
+GarnetNetwork_d::reset()
{
- for (int node = 0; node < m_nodes; node++)
- {
- for (int j = 0; j < m_virtual_networks; j++)
- {
- m_toNetQueues[node][j]->clear();
- m_fromNetQueues[node][j]->clear();
- }
+ for (int node = 0; node < m_nodes; node++) {
+ for (int j = 0; j < m_virtual_networks; j++) {
+ m_toNetQueues[node][j]->clear();
+ m_fromNetQueues[node][j]->clear();
}
+ }
}
/*
- * This function creates a link from the Network Interface (NI) into the
Network.
+ * This function creates a link from the Network Interface (NI)
+ * into the Network.
* It creates a Network Link from the NI to a Router and a Credit Link from
* the Router to the NI
*/
-void GarnetNetwork_d::makeInLink(NodeID src, SwitchID dest, const NetDest&
routing_table_entry, int link_latency, int bw_multiplier, bool
isReconfiguration)
+void
+GarnetNetwork_d::makeInLink(NodeID src, SwitchID dest,
+ const NetDest& routing_table_entry, int link_latency, int bw_multiplier,
+ bool isReconfiguration)
{
- assert(src < m_nodes);
+ assert(src < m_nodes);
- if(!isReconfiguration)
- {
- NetworkLink_d *net_link = new
NetworkLink_d(m_link_ptr_vector.size(), link_latency, this);
- CreditLink_d *credit_link = new
CreditLink_d(m_creditlink_ptr_vector.size(), link_latency, this);
- m_link_ptr_vector.push_back(net_link);
- m_creditlink_ptr_vector.push_back(credit_link);
+ if (!isReconfiguration) {
+ NetworkLink_d *net_link = new NetworkLink_d
+ (m_link_ptr_vector.size(), link_latency, this);
+ CreditLink_d *credit_link = new CreditLink_d
+ (m_creditlink_ptr_vector.size(), link_latency, this);
+ m_link_ptr_vector.push_back(net_link);
+ m_creditlink_ptr_vector.push_back(credit_link);
- m_router_ptr_vector[dest]->addInPort(net_link, credit_link);
- m_ni_ptr_vector[src]->addOutPort(net_link, credit_link);
- }
- else
- {
- ERROR_MSG("Fatal Error:: Reconfiguration not allowed here");
- // do nothing
- }
+ m_router_ptr_vector[dest]->addInPort(net_link, credit_link);
+ m_ni_ptr_vector[src]->addOutPort(net_link, credit_link);
+ } else {
+ ERROR_MSG("Fatal Error:: Reconfiguration not allowed here");
+ // do nothing
+ }
}
/*
@@ -164,191 +167,202 @@
* a Credit Link from NI to the Router
*/
-void GarnetNetwork_d::makeOutLink(SwitchID src, NodeID dest, const NetDest&
routing_table_entry, int link_latency, int link_weight, int bw_multiplier, bool
isReconfiguration)
+void
+GarnetNetwork_d::makeOutLink(SwitchID src, NodeID dest,
+ const NetDest& routing_table_entry, int link_latency, int link_weight,
+ int bw_multiplier, bool isReconfiguration)
{
- assert(dest < m_nodes);
- assert(src < m_router_ptr_vector.size());
- assert(m_router_ptr_vector[src] != NULL);
+ assert(dest < m_nodes);
+ assert(src < m_router_ptr_vector.size());
+ assert(m_router_ptr_vector[src] != NULL);
- if(!isReconfiguration)
- {
- NetworkLink_d *net_link = new
NetworkLink_d(m_link_ptr_vector.size(), link_latency, this);
- CreditLink_d *credit_link = new
CreditLink_d(m_creditlink_ptr_vector.size(), link_latency, this);
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
