diff options
Diffstat (limited to 'src/mem/ruby/network/garnet/flexible-pipeline')
20 files changed, 1232 insertions, 1097 deletions
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh b/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh index fd12b4ec8..2f38fc158 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/FlexibleConsumer.hh @@ -28,19 +28,21 @@ * Authors: Niket Agarwal */ -#ifndef FLEXIBLE_CONSUMER_H -#define FLEXIBLE_CONSUMER_H +#ifndef __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLEXIBLE_CONSUMER_HH__ +#define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLEXIBLE_CONSUMER_HH__ #include "mem/ruby/common/Consumer.hh" #include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/NetDest.hh" -class FlexibleConsumer : public Consumer { -public: - virtual bool isBufferNotFull(int vc, int inport) {return true;} - virtual void grant_vc(int out_port, int vc, Time grant_time) {} - virtual void release_vc(int out_port, int vc, Time release_time) {} - virtual void request_vc(int vc, int in_port, NetDest destination, Time request_time) {} +class FlexibleConsumer : public Consumer +{ + public: + virtual bool isBufferNotFull(int vc, int inport) { return true; } + virtual void grant_vc(int out_port, int vc, Time grant_time) {} + virtual void release_vc(int out_port, int vc, Time release_time) {} + virtual void request_vc(int vc, int in_port, NetDest destination, + Time request_time) {} }; -#endif +#endif // __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLEXIBLE_CONSUMER_HH__ diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc index 232898c52..a2b74d8dc 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc @@ -44,251 +44,263 @@ using namespace std; using m5::stl_helpers::deletePointers; GarnetNetwork::GarnetNetwork(const Params *p) - : BaseGarnetNetwork(p) + : BaseGarnetNetwork(p) { m_ruby_start = 0; - + // 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 number of virtual message buffers 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::init() +void +GarnetNetwork::init() { BaseGarnetNetwork::init(); // Setup the network switches assert (m_topology_ptr!=NULL); - + int number_of_routers = m_topology_ptr->numSwitches(); for (int i=0; i<number_of_routers; i++) { m_router_ptr_vector.push_back(new Router(i, this)); } - + for (int i=0; i < m_nodes; i++) { - NetworkInterface *ni = new NetworkInterface(i, m_virtual_networks, this); + NetworkInterface *ni = new NetworkInterface(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 + + // false because this isn't a reconfiguration : + m_topology_ptr->createLinks(this, false); } GarnetNetwork::~GarnetNetwork() { - 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); - 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); + delete m_topology_ptr; } -void GarnetNetwork::reset() +void +GarnetNetwork::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(); } + } } -void GarnetNetwork::makeInLink(NodeID src, SwitchID dest, const NetDest& routing_table_entry, int link_latency, int bw_multiplier, bool isReconfiguration) +void +GarnetNetwork::makeInLink(NodeID src, SwitchID dest, + const NetDest& routing_table_entry, int link_latency, int bw_multiplier, + bool isReconfiguration) { - assert(src < m_nodes); - - if(!isReconfiguration) - { - NetworkLink *net_link = new NetworkLink(m_link_ptr_vector.size(), link_latency, this); - m_link_ptr_vector.push_back(net_link); - m_router_ptr_vector[dest]->addInPort(net_link); - m_ni_ptr_vector[src]->addOutPort(net_link); - } - else - { - ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); - // do nothing - } + assert(src < m_nodes); + + if (!isReconfiguration) { + NetworkLink *net_link = new NetworkLink(m_link_ptr_vector.size(), + link_latency, this); + m_link_ptr_vector.push_back(net_link); + m_router_ptr_vector[dest]->addInPort(net_link); + m_ni_ptr_vector[src]->addOutPort(net_link); + } else { + ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + // do nothing + } } -void GarnetNetwork::makeOutLink(SwitchID src, NodeID dest, const NetDest& routing_table_entry, int link_latency, int link_weight, int bw_multiplier, bool isReconfiguration) +void +GarnetNetwork::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); - - if(!isReconfiguration) - { - NetworkLink *net_link = new NetworkLink(m_link_ptr_vector.size(), link_latency, this); - m_link_ptr_vector.push_back(net_link); - m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry, link_weight); - m_ni_ptr_vector[dest]->addInPort(net_link); - } - else - { - ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); - //do nothing - } + assert(dest < m_nodes); + assert(src < m_router_ptr_vector.size()); + assert(m_router_ptr_vector[src] != NULL); + + if (!isReconfiguration) { + NetworkLink *net_link = new NetworkLink(m_link_ptr_vector.size(), + link_latency, this); + m_link_ptr_vector.push_back(net_link); + m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry, + link_weight); + m_ni_ptr_vector[dest]->addInPort(net_link); + } else { + ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + //do nothing + } } -void GarnetNetwork::makeInternalLink(SwitchID src, SwitchID dest, const NetDest& routing_table_entry, int link_latency, int link_weight, int bw_multiplier, bool isReconfiguration) +void +GarnetNetwork::makeInternalLink(SwitchID src, SwitchID dest, + const NetDest& routing_table_entry, int link_latency, int link_weight, + int bw_multiplier, bool isReconfiguration) { - if(!isReconfiguration) - { - NetworkLink *net_link = new NetworkLink(m_link_ptr_vector.size(), link_latency, this); - m_link_ptr_vector.push_back(net_link); - m_router_ptr_vector[dest]->addInPort(net_link); - m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry, link_weight); - } - else - { - ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); - // do nothing - } + if (!isReconfiguration) { + NetworkLink *net_link = new NetworkLink(m_link_ptr_vector.size(), + link_latency, this); + m_link_ptr_vector.push_back(net_link); + m_router_ptr_vector[dest]->addInPort(net_link); + m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry, + link_weight); + } else { + ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + // do nothing + } } -void GarnetNetwork::checkNetworkAllocation(NodeID id, bool ordered, int network_num) +void +GarnetNetwork::checkNetworkAllocation(NodeID id, bool ordered, + int network_num) { - printf ("id = %i, m_nodes = %i \n", id, m_nodes); - ASSERT(id < m_nodes); - ASSERT(network_num < m_virtual_networks); + printf ("id = %i, m_nodes = %i \n", id, m_nodes); + ASSERT(id < m_nodes); + ASSERT(network_num < m_virtual_networks); - if (ordered) - { - m_ordered[network_num] = true; - } - m_in_use[network_num] = true; + if (ordered) { + m_ordered[network_num] = true; + } + m_in_use[network_num] = true; } -MessageBuffer* GarnetNetwork::getToNetQueue(NodeID id, bool ordered, int network_num) +MessageBuffer* +GarnetNetwork::getToNetQueue(NodeID id, bool ordered, int network_num) { - checkNetworkAllocation(id, ordered, network_num); - return m_toNetQueues[id][network_num]; + checkNetworkAllocation(id, ordered, network_num); + return m_toNetQueues[id][network_num]; } -MessageBuffer* GarnetNetwork::getFromNetQueue(NodeID id, bool ordered, int network_num) +MessageBuffer* +GarnetNetwork::getFromNetQueue(NodeID id, bool ordered, int network_num) { - checkNetworkAllocation(id, ordered, network_num); - return m_fromNetQueues[id][network_num]; + checkNetworkAllocation(id, ordered, network_num); + return m_fromNetQueues[id][network_num]; } -void GarnetNetwork::clearStats() +void +GarnetNetwork::clearStats() { - m_ruby_start = g_eventQueue_ptr->getTime(); + m_ruby_start = g_eventQueue_ptr->getTime(); } -Time GarnetNetwork::getRubyStartTime() +Time +GarnetNetwork::getRubyStartTime() { - return m_ruby_start; + return m_ruby_start; } -void GarnetNetwork::printStats(ostream& out) const -{ double average_link_utilization = 0; - std::vector<double> average_vc_load; - average_vc_load.resize(m_virtual_networks*m_vcs_per_class); +void +GarnetNetwork::printStats(ostream& out) const +{ + double average_link_utilization = 0; + vector<double> average_vc_load; + average_vc_load.resize(m_virtual_networks*m_vcs_per_class); - for(int i = 0; i < m_virtual_networks*m_vcs_per_class; i++) - { - average_vc_load[i] = 0; - } + for (int i = 0; i < m_virtual_networks*m_vcs_per_class; i++) { + average_vc_load[i] = 0; + } - out << endl; - out << "Network Stats" << endl; - out << "-------------" << endl; - out << endl; - for(int i = 0; i < m_link_ptr_vector.size(); i++) - { - average_link_utilization += m_link_ptr_vector[i]->getLinkUtilization(); - std::vector<int> vc_load = m_link_ptr_vector[i]->getVcLoad(); - for(int j = 0; j < vc_load.size(); j++) - { - assert(vc_load.size() == m_vcs_per_class*m_virtual_networks); - average_vc_load[j] += vc_load[j]; - } - } - average_link_utilization = average_link_utilization/m_link_ptr_vector.size(); - out << "Average Link Utilization :: " << average_link_utilization << " flits/cycle" <<endl; - out << "-------------" << endl; - - for(int i = 0; i < m_vcs_per_class*m_virtual_networks; i++) - { - average_vc_load[i] = (double(average_vc_load[i]) / (double(g_eventQueue_ptr->getTime()) - m_ruby_start)); - out << "Average VC Load [" << i << "] = " << average_vc_load[i] << " flits/cycle" << endl; + out << endl; + out << "Network Stats" << endl; + out << "-------------" << endl; + out << endl; + for (int i = 0; i < m_link_ptr_vector.size(); i++) { + average_link_utilization += + m_link_ptr_vector[i]->getLinkUtilization(); + vector<int> vc_load = m_link_ptr_vector[i]->getVcLoad(); + for (int j = 0; j < vc_load.size(); j++) { + assert(vc_load.size() == m_vcs_per_class*m_virtual_networks); + average_vc_load[j] += vc_load[j]; } - out << "-------------" << endl; + } + average_link_utilization = + average_link_utilization/m_link_ptr_vector.size(); + out << "Average Link Utilization :: " << average_link_utilization << + " flits/cycle" <<endl; + out << "-------------" << endl; + + for (int i = 0; i < m_vcs_per_class*m_virtual_networks; i++) { + average_vc_load[i] = (double(average_vc_load[i]) / + (double(g_eventQueue_ptr->getTime()) - m_ruby_start)); + out << "Average VC Load [" << i << "] = " << average_vc_load[i] << + " flits/cycle" << endl; + } + out << "-------------" << endl; } -void GarnetNetwork::printConfig(ostream& out) const +void +GarnetNetwork::printConfig(ostream& out) const { - out << endl; - out << "Network Configuration" << endl; - out << "---------------------" << endl; - out << "network: GARNET_NETWORK" << endl; - out << "topology: " << m_topology_ptr->getName() << endl; - out << endl; - - for (int i = 0; i < m_virtual_networks; i++) - { - out << "virtual_net_" << i << ": "; - if (m_in_use[i]) - { - out << "active, "; - if (m_ordered[i]) - { - out << "ordered" << endl; - } - else - { - out << "unordered" << endl; - } - } - else - { - out << "inactive" << endl; - } - } - out << endl; + out << endl; + out << "Network Configuration" << endl; + out << "---------------------" << endl; + out << "network: GARNET_NETWORK" << endl; + out << "topology: " << m_topology_ptr->getName() << endl; + out << endl; - for(int i = 0; i < m_ni_ptr_vector.size(); i++) - { - m_ni_ptr_vector[i]->printConfig(out); - } - for(int i = 0; i < m_router_ptr_vector.size(); i++) - { - m_router_ptr_vector[i]->printConfig(out); + for (int i = 0; i < m_virtual_networks; i++) { + out << "virtual_net_" << i << ": "; + if (m_in_use[i]) { + out << "active, "; + if (m_ordered[i]) { + out << "ordered" << endl; + } else { + out << "unordered" << endl; + } + } else { + out << "inactive" << endl; } - m_topology_ptr->printConfig(out); + } + out << endl; + + for (int i = 0; i < m_ni_ptr_vector.size(); i++) { + m_ni_ptr_vector[i]->printConfig(out); + } + for (int i = 0; i < m_router_ptr_vector.size(); i++) { + m_router_ptr_vector[i]->printConfig(out); + } + m_topology_ptr->printConfig(out); } -void GarnetNetwork::print(ostream& out) const +void +GarnetNetwork::print(ostream& out) const { - out << "[GarnetNetwork]"; + out << "[GarnetNetwork]"; } GarnetNetwork * diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh index 62857223e..96aa5fd10 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#ifndef GARNET_NETWORK_H -#define GARNET_NETWORK_H +#ifndef __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_GARNET_NETWORK_HH__ +#define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_GARNET_NETWORK_HH__ #include <iostream> #include <vector> @@ -46,61 +46,65 @@ class Topology; class NetDest; class NetworkLink; -class GarnetNetwork : public BaseGarnetNetwork { -public: +class GarnetNetwork : public BaseGarnetNetwork +{ + public: typedef GarnetNetworkParams Params; GarnetNetwork(const Params *p); ~GarnetNetwork(); - void init(); - - // returns the queue requested for the given component - MessageBuffer* getToNetQueue(NodeID id, bool ordered, int network_num); - MessageBuffer* getFromNetQueue(NodeID id, bool ordered, int network_num); + void init(); - void clearStats(); - void printStats(std::ostream& out) const; - void printConfig(std::ostream& out) const; - void print(std::ostream& out) const; + // returns the queue requested for the given component + MessageBuffer* getToNetQueue(NodeID id, bool ordered, int network_num); + MessageBuffer* getFromNetQueue(NodeID id, bool ordered, int network_num); - bool isVNetOrdered(int vnet) { return m_ordered[vnet]; } - bool validVirtualNetwork(int vnet) { return m_in_use[vnet]; } + void clearStats(); + void printStats(std::ostream& out) const; + void printConfig(std::ostream& out) const; + void print(std::ostream& out) const; - Time getRubyStartTime(); - int getNumNodes(){ return m_nodes; } + bool isVNetOrdered(int vnet) { return m_ordered[vnet]; } + bool validVirtualNetwork(int vnet) { return m_in_use[vnet]; } - void reset(); + Time getRubyStartTime(); + int getNumNodes(){ return m_nodes; } - // Methods used by Topology to setup the network - void makeOutLink(SwitchID src, NodeID dest, const NetDest& routing_table_entry, int link_latency, int link_weight, int bw_multiplier, bool isReconfiguration); - void makeInLink(SwitchID src, NodeID dest, const NetDest& routing_table_entry, int link_latency, int bw_multiplier, bool isReconfiguration); - void makeInternalLink(SwitchID src, NodeID dest, const NetDest& routing_table_entry, int link_latency, int link_weight, int bw_multiplier, bool isReconfiguration); + void reset(); -private: - void checkNetworkAllocation(NodeID id, bool ordered, int network_num); + // Methods used by Topology to setup the network + void makeOutLink(SwitchID src, NodeID dest, + const NetDest& routing_table_entry, int link_latency, + int link_weight, int bw_multiplier, bool isReconfiguration); + void makeInLink(SwitchID src, NodeID dest, + const NetDest& routing_table_entry, int link_latency, + int bw_multiplier, bool isReconfiguration); + void makeInternalLink(SwitchID src, NodeID dest, + const NetDest& routing_table_entry, int link_latency, + int link_weight, int bw_multiplier, bool isReconfiguration); -// Private copy constructor and assignment operator - GarnetNetwork(const GarnetNetwork& obj); - GarnetNetwork& operator=(const GarnetNetwork& obj); + private: + void checkNetworkAllocation(NodeID id, bool ordered, int network_num); + GarnetNetwork(const GarnetNetwork& obj); + GarnetNetwork& operator=(const GarnetNetwork& obj); -/***********Data Members*************/ -// int m_virtual_networks; -// int m_nodes; + // int m_virtual_networks; + // int m_nodes; - std::vector<bool> m_in_use; - std::vector<bool> m_ordered; + std::vector<bool> m_in_use; + std::vector<bool> m_ordered; - std::vector<std::vector<MessageBuffer*> > m_toNetQueues; - std::vector<std::vector<MessageBuffer*> > m_fromNetQueues; + std::vector<std::vector<MessageBuffer*> > m_toNetQueues; + std::vector<std::vector<MessageBuffer*> > m_fromNetQueues; - std::vector<Router *> m_router_ptr_vector; // All Routers in Network - std::vector<NetworkLink *> m_link_ptr_vector; // All links in the network - std::vector<NetworkInterface *> m_ni_ptr_vector; // All NI's in Network + std::vector<Router *> m_router_ptr_vector; // All Routers in Network + std::vector<NetworkLink *> m_link_ptr_vector; // All links in network + std::vector<NetworkInterface *> m_ni_ptr_vector; // All NI's in Network -// Topology* m_topology_ptr; - Time m_ruby_start; + // Topology* m_topology_ptr; + Time m_ruby_start; }; inline std::ostream& @@ -111,4 +115,5 @@ operator<<(std::ostream& out, const GarnetNetwork& obj) return out; } -#endif //NETWORK_H +#endif // __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_GARNET_NETWORK_HH__ + diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.cc b/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.cc index 84196e45e..d688dc1fd 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.cc @@ -32,39 +32,45 @@ InVcState::InVcState(int id) { - m_id = id; - m_vc_state = IDLE_; + m_id = id; + m_vc_state = IDLE_; } -bool InVcState::isInState(VC_state_type state, Time request_time) +bool +InVcState::isInState(VC_state_type state, Time request_time) { - return ((m_vc_state == state) && (request_time >= m_time) ); + return ((m_vc_state == state) && (request_time >= m_time) ); } -void InVcState::setRoute(int route) +void +InVcState::setRoute(int route) { - m_route = route; + m_route = route; } -void InVcState::setState(VC_state_type state, Time time) +void +InVcState::setState(VC_state_type state, Time time) { - m_vc_state = state; - m_time = time; + m_vc_state = state; + m_time = time; } -void InVcState::grant_vc(int out_vc, Time grant_time) +void +InVcState::grant_vc(int out_vc, Time grant_time) { - m_vc_state = ACTIVE_; - m_time = grant_time; - m_output_vc = out_vc; + m_vc_state = ACTIVE_; + m_time = grant_time; + m_output_vc = out_vc; } -int InVcState::get_outport() +int +InVcState::get_outport() { - return m_route; + return m_route; } -int InVcState::get_outvc() +int +InVcState::get_outvc() { - return m_output_vc; + return m_output_vc; } diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.hh b/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.hh index d84bbe81f..829509f64 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/InVcState.hh @@ -28,28 +28,29 @@ * Authors: Niket Agarwal */ -#ifndef IN_VC_STATE_H -#define IN_VC_STATE_H +#ifndef __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_IN_VC_STATE_HH__ +#define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_IN_VC_STATE_HH__ #include "mem/ruby/network/garnet/NetworkHeader.hh" -class InVcState { -public: - InVcState(int id); +class InVcState +{ + public: + InVcState(int id); - void setRoute(int route); - void setState(VC_state_type state, Time time); - int get_outport(); - int get_outvc(); - void grant_vc(int out_vc, Time grant_time); - bool isInState(VC_state_type state, Time time); + void setRoute(int route); + void setState(VC_state_type state, Time time); + int get_outport(); + int get_outvc(); + void grant_vc(int out_vc, Time grant_time); + bool isInState(VC_state_type state, Time time); -private: - int m_id; - int m_route; - int m_output_vc; - VC_state_type m_vc_state; - Time m_time; + private: + int m_id; + int m_route; + int m_output_vc; + VC_state_type m_vc_state; + Time m_time; }; -#endif +#endif // __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_IN_VC_STATE_HH__ diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc index b233ca0f5..86f9483c6 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc @@ -39,271 +39,307 @@ using namespace std; using m5::stl_helpers::deletePointers; -NetworkInterface::NetworkInterface(int id, int virtual_networks, GarnetNetwork *network_ptr) +NetworkInterface::NetworkInterface(int id, int virtual_networks, + GarnetNetwork *network_ptr) { - m_id = id; - m_net_ptr = network_ptr; - m_virtual_networks = virtual_networks; - m_vc_per_vnet = m_net_ptr->getVCsPerClass(); - m_num_vcs = m_vc_per_vnet*m_virtual_networks; - - m_vc_round_robin = 0; - m_ni_buffers.resize(m_num_vcs); - inNode_ptr.resize(m_virtual_networks); - outNode_ptr.resize(m_virtual_networks); - - for(int i =0; i < m_num_vcs; i++) - m_ni_buffers[i] = new flitBuffer(); // instantiating the NI flit buffers - - m_vc_allocator.resize(m_virtual_networks); - for(int i = 0; i < m_virtual_networks; i++) - { - m_vc_allocator[i] = 0; - } - - for(int i = 0; i < m_num_vcs; i++) - { - m_out_vc_state.push_back(new OutVcState(i)); - m_out_vc_state[i]->setState(IDLE_, g_eventQueue_ptr->getTime()); - } + m_id = id; + m_net_ptr = network_ptr; + m_virtual_networks = virtual_networks; + m_vc_per_vnet = m_net_ptr->getVCsPerClass(); + m_num_vcs = m_vc_per_vnet*m_virtual_networks; + + m_vc_round_robin = 0; + m_ni_buffers.resize(m_num_vcs); + inNode_ptr.resize(m_virtual_networks); + outNode_ptr.resize(m_virtual_networks); + + // instantiating the NI flit buffers + for (int i =0; i < m_num_vcs; i++) + m_ni_buffers[i] = new flitBuffer(); + + m_vc_allocator.resize(m_virtual_networks); + for (int i = 0; i < m_virtual_networks; i++) { + m_vc_allocator[i] = 0; + } + + for (int i = 0; i < m_num_vcs; i++) { + m_out_vc_state.push_back(new OutVcState(i)); + m_out_vc_state[i]->setState(IDLE_, g_eventQueue_ptr->getTime()); + } } NetworkInterface::~NetworkInterface() { - deletePointers(m_out_vc_state); - deletePointers(m_ni_buffers); - delete outSrcQueue; + deletePointers(m_out_vc_state); + deletePointers(m_ni_buffers); + delete outSrcQueue; } -void NetworkInterface::addInPort(NetworkLink *in_link) +void +NetworkInterface::addInPort(NetworkLink *in_link) { - inNetLink = in_link; - in_link->setLinkConsumer(this); + inNetLink = in_link; + in_link->setLinkConsumer(this); } -void NetworkInterface::addOutPort(NetworkLink *out_link) +void +NetworkInterface::addOutPort(NetworkLink *out_link) { - outNetLink = out_link; - outSrcQueue = new flitBuffer(); - out_link->setSourceQueue(outSrcQueue); - out_link->setSource(this); + outNetLink = out_link; + outSrcQueue = new flitBuffer(); + out_link->setSourceQueue(outSrcQueue); + out_link->setSource(this); } -void NetworkInterface::addNode(vector<MessageBuffer*>& in, vector<MessageBuffer*>& out) +void +NetworkInterface::addNode(vector<MessageBuffer*>& in, + vector<MessageBuffer*>& out) { - ASSERT(in.size() == m_virtual_networks); - inNode_ptr = in; - outNode_ptr = out; - for (int j = 0; j < m_virtual_networks; j++) - { - inNode_ptr[j]->setConsumer(this); // So that protocol injects messages into the NI - } + ASSERT(in.size() == m_virtual_networks); + inNode_ptr = in; + outNode_ptr = out; + + // protocol injects messages into the NI + for (int j = 0; j < m_virtual_networks; j++) { + inNode_ptr[j]->setConsumer(this); + } } -void NetworkInterface::request_vc(int in_vc, int in_port, NetDest destination, Time request_time) +void +NetworkInterface::request_vc(int in_vc, int in_port, NetDest destination, + Time request_time) { - inNetLink->grant_vc_link(in_vc, request_time); + inNetLink->grant_vc_link(in_vc, request_time); } -bool NetworkInterface::flitisizeMessage(MsgPtr msg_ptr, int vnet) +bool +NetworkInterface::flitisizeMessage(MsgPtr msg_ptr, int vnet) { - NetworkMessage *net_msg_ptr = - safe_cast<NetworkMessage*>(msg_ptr.get()); - NetDest net_msg_dest = net_msg_ptr->getInternalDestination(); - vector<NodeID> dest_nodes = net_msg_dest.getAllDest(); // gets all the destinations associated with this message. - int num_flits = (int) ceil((double) m_net_ptr->MessageSizeType_to_int(net_msg_ptr->getMessageSize())/m_net_ptr->getFlitSize() ); // Number of flits is dependent on the link bandwidth available. This is expressed in terms of bytes/cycle or the flit size + NetworkMessage *net_msg_ptr = safe_cast<NetworkMessage *>(msg_ptr.get()); + NetDest net_msg_dest = net_msg_ptr->getInternalDestination(); - for(int ctr = 0; ctr < dest_nodes.size(); ctr++) // loop because we will be converting all multicast messages into unicast messages - { - int vc = calculateVC(vnet); // this will return a free output virtual channel + // get all the destinations associated with this message. + vector<NodeID> dest_nodes = net_msg_dest.getAllDest(); - if(vc == -1) - { - // did not find a free output vc - return false ; - } - MsgPtr new_msg_ptr = msg_ptr->clone(); - NodeID destID = dest_nodes[ctr]; - - NetworkMessage *new_net_msg_ptr = - safe_cast<NetworkMessage*>(new_msg_ptr.get()); - if(dest_nodes.size() > 1) - { - NetDest personal_dest; - for(int m = 0; m < (int) MachineType_NUM; m++) - { - if((destID >= MachineType_base_number((MachineType) m)) && destID < MachineType_base_number((MachineType) (m+1))) - { - // calculating the NetDest associated with this destination ID - personal_dest.clear(); - personal_dest.add((MachineID) {(MachineType) m, (destID - MachineType_base_number((MachineType) m))}); - new_net_msg_ptr->getInternalDestination() = personal_dest; - break; - } - } - net_msg_dest.removeNetDest(personal_dest); - net_msg_ptr->getInternalDestination().removeNetDest(personal_dest); // removing the destination from the original message to reflect that a message with this particular destination has been flitisized and an output vc is acquired - } - for(int i = 0; i < num_flits; i++) - { - flit *fl = new flit(i, vc, vnet, num_flits, new_msg_ptr); - m_ni_buffers[vc]->insert(fl); + // Number of flits is dependent on the link bandwidth available. + // This is expressed in terms of bytes/cycle or the flit size + + int num_flits = (int) ceil((double) m_net_ptr->MessageSizeType_to_int( + net_msg_ptr->getMessageSize())/m_net_ptr->getFlitSize() ); + + // loop to convert all multicast messages into unicast messages + for (int ctr = 0; ctr < dest_nodes.size(); ctr++) { + int vc = calculateVC(vnet); // this will return a free output vc + + if (vc == -1) { + // did not find a free output vc + return false ; + } + MsgPtr new_msg_ptr = msg_ptr->clone(); + NodeID destID = dest_nodes[ctr]; + + NetworkMessage *new_net_msg_ptr = + safe_cast<NetworkMessage *>(new_msg_ptr.get()); + if (dest_nodes.size() > 1) { + NetDest personal_dest; + for (int m = 0; m < (int) MachineType_NUM; m++) { + if ((destID >= MachineType_base_number((MachineType) m)) && + destID < MachineType_base_number((MachineType) (m+1))) { + // calculating the NetDest associated with this destID + personal_dest.clear(); + personal_dest.add((MachineID) {(MachineType) m, (destID - + MachineType_base_number((MachineType) m))}); + new_net_msg_ptr->getInternalDestination() = personal_dest; + break; } + } + net_msg_dest.removeNetDest(personal_dest); - m_out_vc_state[vc]->setState(VC_AB_, g_eventQueue_ptr->getTime()); - outNetLink->request_vc_link(vc, new_net_msg_ptr->getInternalDestination(), g_eventQueue_ptr->getTime()); // setting an output vc request for the next hop. It is only when an output vc is acquired at the next hop that this flit will be ready to traverse the link and into the next hop + // removing the destination from the original message to reflect + // that a message with this particular destination has been + // flitisized and an output vc is acquired + net_msg_ptr->getInternalDestination().removeNetDest(personal_dest); } + for (int i = 0; i < num_flits; i++) { + flit *fl = new flit(i, vc, vnet, num_flits, new_msg_ptr); + m_ni_buffers[vc]->insert(fl); + } + + m_out_vc_state[vc]->setState(VC_AB_, g_eventQueue_ptr->getTime()); - return true ; + // setting an output vc request for the next hop. + // This flit will be ready to traverse the link and into the next hop + // only when an output vc is acquired at the next hop + outNetLink->request_vc_link(vc, + new_net_msg_ptr->getInternalDestination(), + g_eventQueue_ptr->getTime()); + } + + return true ; } -// An output vc has been granted at the next hop to one of the vc's. We have to update the state of the vc to reflect this -void NetworkInterface::grant_vc(int out_port, int vc, Time grant_time) +// An output vc has been granted at the next hop to one of the vc's. +// We have to update the state of the vc to reflect this +void +NetworkInterface::grant_vc(int out_port, int vc, Time grant_time) { - - assert(m_out_vc_state[vc]->isInState(VC_AB_, grant_time)); - m_out_vc_state[vc]->grant_vc(grant_time); - g_eventQueue_ptr->scheduleEvent(this, 1); + assert(m_out_vc_state[vc]->isInState(VC_AB_, grant_time)); + m_out_vc_state[vc]->grant_vc(grant_time); + g_eventQueue_ptr->scheduleEvent(this, 1); } -// The tail flit corresponding to this vc has been buffered at the next hop and thus this vc is now free -void NetworkInterface::release_vc(int out_port, int vc, Time release_time) +// The tail flit corresponding to this vc has been buffered at the next hop +// and thus this vc is now free +void +NetworkInterface::release_vc(int out_port, int vc, Time release_time) { - assert(m_out_vc_state[vc]->isInState(ACTIVE_, release_time)); - m_out_vc_state[vc]->setState(IDLE_, release_time); - g_eventQueue_ptr->scheduleEvent(this, 1); + assert(m_out_vc_state[vc]->isInState(ACTIVE_, release_time)); + m_out_vc_state[vc]->setState(IDLE_, release_time); + g_eventQueue_ptr->scheduleEvent(this, 1); } // Looking for a free output vc -int NetworkInterface::calculateVC(int vnet) +int +NetworkInterface::calculateVC(int vnet) { - int vc_per_vnet; - if(m_net_ptr->isVNetOrdered(vnet)) - vc_per_vnet = 1; - else - vc_per_vnet = m_vc_per_vnet; - - for(int i = 0; i < vc_per_vnet; i++) - { - int delta = m_vc_allocator[vnet]; - m_vc_allocator[vnet]++; - if(m_vc_allocator[vnet] == vc_per_vnet) - m_vc_allocator[vnet] = 0; - - if(m_out_vc_state[(vnet*m_vc_per_vnet) + delta]->isInState(IDLE_, g_eventQueue_ptr->getTime())) - { - return ((vnet*m_vc_per_vnet) + delta); - } + int vc_per_vnet; + if (m_net_ptr->isVNetOrdered(vnet)) + vc_per_vnet = 1; + else + vc_per_vnet = m_vc_per_vnet; + + for (int i = 0; i < vc_per_vnet; i++) { + int delta = m_vc_allocator[vnet]; + m_vc_allocator[vnet]++; + if (m_vc_allocator[vnet] == vc_per_vnet) + m_vc_allocator[vnet] = 0; + + if (m_out_vc_state[(vnet*m_vc_per_vnet) + delta]->isInState(IDLE_, + g_eventQueue_ptr->getTime())) { + return ((vnet*m_vc_per_vnet) + delta); } - return -1; + } + return -1; } /* - * The NI wakeup checks whether there are any ready messages in the protocol buffer. If yes, it picks that up, flitisizes it into a number of flits and puts it into an output - * buffer and schedules the output link. - * On a wakeup it also checks whether there are flits in the input link. If yes, it picks them up and if the flit is a tail, the NI inserts the corresponding message into - * the protocol buffer. + * The NI wakeup checks whether there are any ready messages in the protocol + * buffer. If yes, it picks that up, flitisizes it into a number of flits and + * puts it into an output buffer and schedules the output link. + * On a wakeup it also checks whether there are flits in the input link. + * If yes, it picks them up and if the flit is a tail, the NI inserts the + * corresponding message into the protocol buffer. */ -void NetworkInterface::wakeup() +void +NetworkInterface::wakeup() { - MsgPtr msg_ptr; + MsgPtr msg_ptr; - //Checking for messages coming from the protocol - for (int vnet = 0; vnet < m_virtual_networks; vnet++) // can pick up a message/cycle for each virtual net + //Checking for messages coming from the protocol + // can pick up a message/cycle for each virtual net + for (int vnet = 0; vnet < m_virtual_networks; vnet++) { + while (inNode_ptr[vnet]->isReady()) // Is there a message waiting { - while(inNode_ptr[vnet]->isReady()) // Is there a message waiting - { - msg_ptr = inNode_ptr[vnet]->peekMsgPtr(); - if(flitisizeMessage(msg_ptr, vnet)) - { - inNode_ptr[vnet]->pop(); - } - else - { - break; - } - } + msg_ptr = inNode_ptr[vnet]->peekMsgPtr(); + if (flitisizeMessage(msg_ptr, vnet)) { + inNode_ptr[vnet]->pop(); + } else { + break; + } } - - scheduleOutputLink(); - checkReschedule(); - -/*********** Picking messages destined for this NI **********/ - - if(inNetLink->isReady()) - { - flit *t_flit = inNetLink->consumeLink(); - if(t_flit->get_type() == TAIL_ || t_flit->get_type() == HEAD_TAIL_) - { - DEBUG_EXPR(NETWORK_COMP, HighPrio, m_id); - DEBUG_MSG(NETWORK_COMP, HighPrio, "Message got delivered"); - DEBUG_EXPR(NETWORK_COMP, HighPrio, g_eventQueue_ptr->getTime()); - if(!m_net_ptr->isNetworkTesting()) // When we are doing network only testing, the messages do not have to be buffered into the message buffers - { - outNode_ptr[t_flit->get_vnet()]->enqueue(t_flit->get_msg_ptr(), 1); // enqueueing for protocol buffer. This is not required when doing network only testing - } - inNetLink->release_vc_link(t_flit->get_vc(), g_eventQueue_ptr->getTime() + 1); // signal the upstream router that this vc can be freed now - } - delete t_flit; + } + + scheduleOutputLink(); + checkReschedule(); + + /*********** Picking messages destined for this NI **********/ + + if (inNetLink->isReady()) { + flit *t_flit = inNetLink->consumeLink(); + if (t_flit->get_type() == TAIL_ || t_flit->get_type() == HEAD_TAIL_) { + DEBUG_EXPR(NETWORK_COMP, HighPrio, m_id); + DEBUG_MSG(NETWORK_COMP, HighPrio, "Message got delivered"); + DEBUG_EXPR(NETWORK_COMP, HighPrio, g_eventQueue_ptr->getTime()); + + // When we are doing network only testing, the messages do not + // have to be buffered into the message buffers of the protocol + if (!m_net_ptr->isNetworkTesting()) { + outNode_ptr[t_flit->get_vnet()]->enqueue( + t_flit->get_msg_ptr(), 1); + } + + // signal the upstream router that this vc can be freed now + inNetLink->release_vc_link(t_flit->get_vc(), + g_eventQueue_ptr->getTime() + 1); } + delete t_flit; + } } -// This function look at the NI buffers and if some buffer has flits which are ready to traverse the link in the next cycle and also the downstream output vc associated with this flit has buffers left, the link is scheduled for the next cycle -void NetworkInterface::scheduleOutputLink() +/* This function looks at the NI buffers and if some buffer has flits which + * are ready to traverse the link in the next cycle and also the downstream + * output vc associated with this flit has buffers left, the link is scheduled + * for the next cycle + */ + +void +NetworkInterface::scheduleOutputLink() { - int vc = m_vc_round_robin; - m_vc_round_robin++; - if(m_vc_round_robin == m_num_vcs) - m_vc_round_robin = 0; + int vc = m_vc_round_robin; + m_vc_round_robin++; + if (m_vc_round_robin == m_num_vcs) + m_vc_round_robin = 0; - for(int i = 0; i < m_num_vcs; i++) - { - vc++; - if(vc == m_num_vcs) - vc = 0; - if(m_ni_buffers[vc]->isReady()) - { - if(m_out_vc_state[vc]->isInState(ACTIVE_, g_eventQueue_ptr->getTime()) && outNetLink->isBufferNotFull_link(vc)) // models buffer backpressure - { - flit *t_flit = m_ni_buffers[vc]->getTopFlit(); // Just removing the flit - t_flit->set_time(g_eventQueue_ptr->getTime() + 1); - outSrcQueue->insert(t_flit); - g_eventQueue_ptr->scheduleEvent(outNetLink, 1); // schedule the out link - return; - } - } + for (int i = 0; i < m_num_vcs; i++) { + vc++; + if (vc == m_num_vcs) + vc = 0; + if (m_ni_buffers[vc]->isReady()) { + if (m_out_vc_state[vc]->isInState(ACTIVE_, + g_eventQueue_ptr->getTime()) && + outNetLink->isBufferNotFull_link(vc)) { // buffer backpressure + + // Just removing the flit + flit *t_flit = m_ni_buffers[vc]->getTopFlit(); + t_flit->set_time(g_eventQueue_ptr->getTime() + 1); + outSrcQueue->insert(t_flit); + + // schedule the out link + g_eventQueue_ptr->scheduleEvent(outNetLink, 1); + return; + } } + } } -void NetworkInterface::checkReschedule() +void +NetworkInterface::checkReschedule() { - for(int vnet = 0; vnet < m_virtual_networks; vnet++) - { - if(inNode_ptr[vnet]->isReady()) // Is there a message waiting - { - g_eventQueue_ptr->scheduleEvent(this, 1); - return; - } + for (int vnet = 0; vnet < m_virtual_networks; vnet++) { + if (inNode_ptr[vnet]->isReady()) { // Is there a message waiting + g_eventQueue_ptr->scheduleEvent(this, 1); + return; } - for(int vc = 0; vc < m_num_vcs; vc++) - { - if(m_ni_buffers[vc]->isReadyForNext()) - { - g_eventQueue_ptr->scheduleEvent(this, 1); - return; - } + } + for (int vc = 0; vc < m_num_vcs; vc++) { + if (m_ni_buffers[vc]->isReadyForNext()) { + g_eventQueue_ptr->scheduleEvent(this, 1); + return; } + } } -void NetworkInterface::printConfig(std::ostream& out) const +void +NetworkInterface::printConfig(std::ostream& out) const { - out << "[Network Interface " << m_id << "] - "; - out << "[inLink " << inNetLink->get_id() << "] - "; - out << "[outLink " << outNetLink->get_id() << "]" << std::endl; + out << "[Network Interface " << m_id << "] - "; + out << "[inLink " << inNetLink->get_id() << "] - "; + out << "[outLink " << outNetLink->get_id() << "]" << std::endl; } -void NetworkInterface::print(std::ostream& out) const +void +NetworkInterface::print(std::ostream& out) const { - out << "[Network Interface]"; + out << "[Network Interface]"; } diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh index 01608498d..401a8bc23 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#ifndef NET_INTERFACE_H -#define NET_INTERFACE_H +#ifndef __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_NETWORK_INTERFACE_HH__ +#define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_NETWORK_INTERFACE_HH__ #include <iostream> #include <vector> @@ -45,52 +45,62 @@ class NetworkMessage; class MessageBuffer; class flitBuffer; -class NetworkInterface : public FlexibleConsumer { -public: - NetworkInterface(int id, int virtual_networks, GarnetNetwork* network_ptr); +class NetworkInterface : public FlexibleConsumer +{ + public: + NetworkInterface(int id, int virtual_networks, + GarnetNetwork* network_ptr); - ~NetworkInterface(); + ~NetworkInterface(); - void addInPort(NetworkLink *in_link); - void addOutPort(NetworkLink *out_link); + void addInPort(NetworkLink *in_link); + void addOutPort(NetworkLink *out_link); - void wakeup(); - void addNode(std::vector<MessageBuffer *> &inNode, std::vector<MessageBuffer *> &outNode); - void grant_vc(int out_port, int vc, Time grant_time); - void release_vc(int out_port, int vc, Time release_time); - bool isBufferNotFull(int vc, int inport) - { - return true; - } - void request_vc(int in_vc, int in_port, NetDest destination, Time request_time); + void wakeup(); + void addNode(std::vector<MessageBuffer *> &inNode, + std::vector<MessageBuffer *> &outNode); + void grant_vc(int out_port, int vc, Time grant_time); + void release_vc(int out_port, int vc, Time release_time); - void printConfig(std::ostream& out) const; - void print(std::ostream& out) const; + bool + isBufferNotFull(int vc, int inport) + { + return true; + } + void request_vc(int in_vc, int in_port, NetDest destination, + Time request_time); -private: -/**************Data Members*************/ - GarnetNetwork *m_net_ptr; - int m_virtual_networks, m_num_vcs, m_vc_per_vnet; - NodeID m_id; + void printConfig(std::ostream& out) const; + void print(std::ostream& out) const; - std::vector<OutVcState *> m_out_vc_state; - std::vector<int> m_vc_allocator; - int m_vc_round_robin; // For round robin scheduling - flitBuffer *outSrcQueue; // For modelling link contention + private: + GarnetNetwork *m_net_ptr; + int m_virtual_networks, m_num_vcs, m_vc_per_vnet; + NodeID m_id; - NetworkLink *inNetLink; - NetworkLink *outNetLink; + std::vector<OutVcState *> m_out_vc_state; + std::vector<int> m_vc_allocator; + int m_vc_round_robin; // For round robin scheduling + flitBuffer *outSrcQueue; // For modelling link contention - // Input Flit Buffers - std::vector<flitBuffer *> m_ni_buffers; // The flit buffers which will serve the Consumer + NetworkLink *inNetLink; + NetworkLink *outNetLink; - std::vector<MessageBuffer *> inNode_ptr; // The Message buffers that takes messages from the protocol - std::vector<MessageBuffer *> outNode_ptr; // The Message buffers that provides messages to the protocol + // Input Flit Buffers - bool flitisizeMessage(MsgPtr msg_ptr, int vnet); - int calculateVC(int vnet); - void scheduleOutputLink(); - void checkReschedule(); + // The flit buffers which will serve the Consumer + std::vector<flitBuffer *> m_ni_buffers; + + // The Message buffers that takes messages from the protocol + std::vector<MessageBuffer *> inNode_ptr; + + // The Message buffers that provides messages to the protocol + std::vector<MessageBuffer *> outNode_ptr; + + bool flitisizeMessage(MsgPtr msg_ptr, int vnet); + int calculateVC(int vnet); + void scheduleOutputLink(); + void checkReschedule(); }; -#endif +#endif // __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_NETWORK_INTERFACE_HH__ diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc index 2947ce8ec..24b93c975 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.cc @@ -33,109 +33,128 @@ NetworkLink::NetworkLink(int id, int latency, GarnetNetwork *net_ptr) { - m_id = id; - linkBuffer = new flitBuffer(); - m_in_port = 0; - m_out_port = 0; - m_link_utilized = 0; - m_net_ptr = net_ptr; - m_latency = latency; - int num_net = net_ptr->getNumberOfVirtualNetworks(); - int num_vc = m_net_ptr->getVCsPerClass(); - m_vc_load.resize(num_net * num_vc); + m_id = id; + linkBuffer = new flitBuffer(); + m_in_port = 0; + m_out_port = 0; + m_link_utilized = 0; + m_net_ptr = net_ptr; + m_latency = latency; + int num_net = net_ptr->getNumberOfVirtualNetworks(); + int num_vc = m_net_ptr->getVCsPerClass(); + m_vc_load.resize(num_net * num_vc); - for(int i = 0; i < num_net*num_vc; i++) - m_vc_load[i] = 0; + for (int i = 0; i < num_net * num_vc; i++) + m_vc_load[i] = 0; } NetworkLink::~NetworkLink() { - delete linkBuffer; + delete linkBuffer; } -int NetworkLink::get_id() +int +NetworkLink::get_id() { - return m_id; + return m_id; } -void NetworkLink::setLinkConsumer(FlexibleConsumer *consumer) +void +NetworkLink::setLinkConsumer(FlexibleConsumer *consumer) { - link_consumer = consumer; + link_consumer = consumer; } -void NetworkLink::setSourceQueue(flitBuffer *srcQueue) +void +NetworkLink::setSourceQueue(flitBuffer *srcQueue) { - link_srcQueue = srcQueue; + link_srcQueue = srcQueue; } -void NetworkLink::setSource(FlexibleConsumer *source) +void +NetworkLink::setSource(FlexibleConsumer *source) { - link_source = source; + link_source = source; } -void NetworkLink::request_vc_link(int vc, NetDest destination, Time request_time) + +void +NetworkLink::request_vc_link(int vc, NetDest destination, Time request_time) { - link_consumer->request_vc(vc, m_in_port, destination, request_time); + link_consumer->request_vc(vc, m_in_port, destination, request_time); } -bool NetworkLink::isBufferNotFull_link(int vc) + +bool +NetworkLink::isBufferNotFull_link(int vc) { - return link_consumer->isBufferNotFull(vc, m_in_port); + return link_consumer->isBufferNotFull(vc, m_in_port); } -void NetworkLink::grant_vc_link(int vc, Time grant_time) +void +NetworkLink::grant_vc_link(int vc, Time grant_time) { - link_source->grant_vc(m_out_port, vc, grant_time); + link_source->grant_vc(m_out_port, vc, grant_time); } -void NetworkLink::release_vc_link(int vc, Time release_time) +void +NetworkLink::release_vc_link(int vc, Time release_time) { - link_source->release_vc(m_out_port, vc, release_time); + link_source->release_vc(m_out_port, vc, release_time); } -std::vector<int> NetworkLink::getVcLoad() +std::vector<int> +NetworkLink::getVcLoad() { - return m_vc_load; + return m_vc_load; } -double NetworkLink::getLinkUtilization() +double +NetworkLink::getLinkUtilization() { - Time m_ruby_start = m_net_ptr->getRubyStartTime(); - return (double(m_link_utilized)) / (double(g_eventQueue_ptr->getTime()-m_ruby_start)); + Time m_ruby_start = m_net_ptr->getRubyStartTime(); + return (double(m_link_utilized)) / + (double(g_eventQueue_ptr->getTime()-m_ruby_start)); } -bool NetworkLink::isReady() +bool +NetworkLink::isReady() { - return linkBuffer->isReady(); + return linkBuffer->isReady(); } -void NetworkLink::setInPort(int port) +void +NetworkLink::setInPort(int port) { - m_in_port = port; + m_in_port = port; } -void NetworkLink::setOutPort(int port) +void +NetworkLink::setOutPort(int port) { - m_out_port = port; + m_out_port = port; } -void NetworkLink::wakeup() +void +NetworkLink::wakeup() { - if(link_srcQueue->isReady()) - { - flit *t_flit = link_srcQueue->getTopFlit(); - t_flit->set_time(g_eventQueue_ptr->getTime() + m_latency); - linkBuffer->insert(t_flit); - g_eventQueue_ptr->scheduleEvent(link_consumer, m_latency); - m_link_utilized++; - m_vc_load[t_flit->get_vc()]++; - } + if (!link_srcQueue->isReady()) + return; + + flit *t_flit = link_srcQueue->getTopFlit(); + t_flit->set_time(g_eventQueue_ptr->getTime() + m_latency); + linkBuffer->insert(t_flit); + g_eventQueue_ptr->scheduleEvent(link_consumer, m_latency); + m_link_utilized++; + m_vc_load[t_flit->get_vc()]++; } -flit* NetworkLink::peekLink() +flit* +NetworkLink::peekLink() { - return linkBuffer->peekTopFlit(); + return linkBuffer->peekTopFlit(); } -flit* NetworkLink::consumeLink() +flit* +NetworkLink::consumeLink() { - return linkBuffer->getTopFlit(); + return linkBuffer->getTopFlit(); } diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh index 9f1311dce..3915448c5 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#ifndef NETWORK_LINK_H -#define NETWORK_LINK_H +#ifndef __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_NETWORK_LINK_HH__ +#define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_NETWORK_LINK_HH__ #include <iostream> #include <vector> @@ -41,46 +41,46 @@ class GarnetNetwork; -class NetworkLink : public FlexibleConsumer { -public: - NetworkLink(); - NetworkLink(int id, int latency, GarnetNetwork *net_ptr); - ~NetworkLink(); +class NetworkLink : public FlexibleConsumer +{ + public: + NetworkLink(); + NetworkLink(int id, int latency, GarnetNetwork *net_ptr); + ~NetworkLink(); - void setLinkConsumer(FlexibleConsumer *consumer); - void setSourceQueue(flitBuffer *srcQueue); - flit* peekLink(); - flit* consumeLink(); + void setLinkConsumer(FlexibleConsumer *consumer); + void setSourceQueue(flitBuffer *srcQueue); + flit *peekLink(); + flit *consumeLink(); - void print(std::ostream& out) const {} + void print(std::ostream& out) const {} - bool is_vc_ready(flit *t_flit); + bool is_vc_ready(flit *t_flit); - int get_id(); - void setInPort(int port); - void setOutPort(int port); - void wakeup(); - bool isReady(); - void grant_vc_link(int vc, Time grant_time); - void release_vc_link(int vc, Time release_time); - void request_vc_link(int vc, NetDest destination, Time request_time); - bool isBufferNotFull_link(int vc); - void setSource(FlexibleConsumer *source); - double getLinkUtilization(); - std::vector<int> getVcLoad(); + int get_id(); + void setInPort(int port); + void setOutPort(int port); + void wakeup(); + bool isReady(); + void grant_vc_link(int vc, Time grant_time); + void release_vc_link(int vc, Time release_time); + void request_vc_link(int vc, NetDest destination, Time request_time); + bool isBufferNotFull_link(int vc); + void setSource(FlexibleConsumer *source); + double getLinkUtilization(); + std::vector<int> getVcLoad(); -protected: - int m_id, m_latency; - int m_in_port, m_out_port; - int m_link_utilized; - std::vector<int> m_vc_load; - GarnetNetwork *m_net_ptr; + protected: + int m_id, m_latency; + int m_in_port, m_out_port; + int m_link_utilized; + std::vector<int> m_vc_load; + GarnetNetwork *m_net_ptr; - flitBuffer *linkBuffer; - FlexibleConsumer *link_consumer; - FlexibleConsumer *link_source; - flitBuffer *link_srcQueue; + flitBuffer *linkBuffer; + FlexibleConsumer *link_consumer; + FlexibleConsumer *link_source; + flitBuffer *link_srcQueue; }; -#endif - +#endif // __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_NETWORK_LINK_HH__ diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.cc b/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.cc index e17db5dcf..c1696a551 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.cc @@ -32,24 +32,26 @@ OutVcState::OutVcState(int id) { - m_id = id; - m_vc_state = IDLE_; + m_id = id; + m_vc_state = IDLE_; } -bool OutVcState::isInState(VC_state_type state, Time request_time) +bool +OutVcState::isInState(VC_state_type state, Time request_time) { - return ((m_vc_state == state) && (request_time >= m_time) ); + return ((m_vc_state == state) && (request_time >= m_time)); } -void OutVcState::grant_vc(Time grant_time) +void +OutVcState::grant_vc(Time grant_time) { - m_time = grant_time; - m_vc_state = ACTIVE_; + m_time = grant_time; + m_vc_state = ACTIVE_; } -void OutVcState::setState(VC_state_type state, Time time) +void +OutVcState::setState(VC_state_type state, Time time) { - m_vc_state = state; - m_time = time; + m_vc_state = state; + m_time = time; } - diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh b/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh index a1c0fdfac..17fa9141e 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/OutVcState.hh @@ -28,23 +28,24 @@ * Authors: Niket Agarwal */ -#ifndef OUT_VC_STATE_H -#define OUT_VC_STATE_H +#ifndef __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_OUT_VC_STATE_HH__ +#define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_OUT_VC_STATE_HH__ #include "mem/ruby/network/garnet/NetworkHeader.hh" -class OutVcState { -public: - OutVcState(int id); +class OutVcState +{ + public: + OutVcState(int id); - bool isInState(VC_state_type state, Time request_time); - void setState(VC_state_type state, Time time); - void grant_vc(Time grant_time); + bool isInState(VC_state_type state, Time request_time); + void setState(VC_state_type state, Time time); + void grant_vc(Time grant_time); -private: - int m_id ; - Time m_time; - VC_state_type m_vc_state; + private: + int m_id ; + Time m_time; + VC_state_type m_vc_state; }; -#endif +#endif // __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_OUT_VC_STATE_HH__ diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc index 95b92d49d..ca75edb58 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc @@ -40,351 +40,370 @@ using m5::stl_helpers::deletePointers; Router::Router(int id, GarnetNetwork *network_ptr) { - m_id = id; - m_net_ptr = network_ptr; - m_virtual_networks = m_net_ptr->getNumberOfVirtualNetworks(); - m_vc_per_vnet = m_net_ptr->getVCsPerClass(); - m_round_robin_inport = 0; - m_round_robin_start = 0; - m_num_vcs = m_vc_per_vnet*m_virtual_networks; - m_vc_arbiter = new VCarbiter(this); + m_id = id; + m_net_ptr = network_ptr; + m_virtual_networks = m_net_ptr->getNumberOfVirtualNetworks(); + m_vc_per_vnet = m_net_ptr->getVCsPerClass(); + m_round_robin_inport = 0; + m_round_robin_start = 0; + m_num_vcs = m_vc_per_vnet*m_virtual_networks; + m_vc_arbiter = new VCarbiter(this); } Router::~Router() { - for (int i = 0; i < m_in_link.size(); i++) - { - deletePointers(m_in_vc_state[i]); - } - for (int i = 0; i < m_out_link.size(); i++) - { - deletePointers(m_out_vc_state[i]); - deletePointers(m_router_buffers[i]); - } - deletePointers(m_out_src_queue); - delete m_vc_arbiter; - + for (int i = 0; i < m_in_link.size(); i++) { + deletePointers(m_in_vc_state[i]); + } + for (int i = 0; i < m_out_link.size(); i++) { + deletePointers(m_out_vc_state[i]); + deletePointers(m_router_buffers[i]); + } + deletePointers(m_out_src_queue); + delete m_vc_arbiter; } -void Router::addInPort(NetworkLink *in_link) +void +Router::addInPort(NetworkLink *in_link) { - int port = m_in_link.size(); - vector<InVcState *> in_vc_vector; - for(int i = 0; i < m_num_vcs; i++) - { - in_vc_vector.push_back(new InVcState(i)); - in_vc_vector[i]->setState(IDLE_, g_eventQueue_ptr->getTime()); - } - m_in_vc_state.push_back(in_vc_vector); - m_in_link.push_back(in_link); - in_link->setLinkConsumer(this); - in_link->setInPort(port); - - int start = 0; - m_round_robin_invc.push_back(start); - + int port = m_in_link.size(); + vector<InVcState *> in_vc_vector; + for (int i = 0; i < m_num_vcs; i++) { + in_vc_vector.push_back(new InVcState(i)); + in_vc_vector[i]->setState(IDLE_, g_eventQueue_ptr->getTime()); + } + m_in_vc_state.push_back(in_vc_vector); + m_in_link.push_back(in_link); + in_link->setLinkConsumer(this); + in_link->setInPort(port); + + int start = 0; + m_round_robin_invc.push_back(start); } -void Router::addOutPort(NetworkLink *out_link, const NetDest& routing_table_entry, int link_weight) +void +Router::addOutPort(NetworkLink *out_link, const NetDest& routing_table_entry, + int link_weight) { - int port = m_out_link.size(); - out_link->setOutPort(port); - int start = 0; - m_vc_round_robin.push_back(start); - - m_out_src_queue.push_back(new flitBuffer()); - - m_out_link.push_back(out_link); - m_routing_table.push_back(routing_table_entry); - out_link->setSourceQueue(m_out_src_queue[port]); - out_link->setSource(this); - - vector<flitBuffer *> intermediateQueues; - for(int i = 0; i < m_num_vcs; i++) - { - intermediateQueues.push_back(new flitBuffer(m_net_ptr->getBufferSize())); - } - m_router_buffers.push_back(intermediateQueues); - - vector<OutVcState *> out_vc_vector; - for(int i = 0; i < m_num_vcs; i++) - { - out_vc_vector.push_back(new OutVcState(i)); - out_vc_vector[i]->setState(IDLE_, g_eventQueue_ptr->getTime()); - } - m_out_vc_state.push_back(out_vc_vector); - m_link_weights.push_back(link_weight); + int port = m_out_link.size(); + out_link->setOutPort(port); + int start = 0; + m_vc_round_robin.push_back(start); + + m_out_src_queue.push_back(new flitBuffer()); + + m_out_link.push_back(out_link); + m_routing_table.push_back(routing_table_entry); + out_link->setSourceQueue(m_out_src_queue[port]); + out_link->setSource(this); + + vector<flitBuffer *> intermediateQueues; + for (int i = 0; i < m_num_vcs; i++) { + intermediateQueues.push_back(new flitBuffer( + m_net_ptr->getBufferSize())); + } + m_router_buffers.push_back(intermediateQueues); + + vector<OutVcState *> out_vc_vector; + for (int i = 0; i < m_num_vcs; i++) { + out_vc_vector.push_back(new OutVcState(i)); + out_vc_vector[i]->setState(IDLE_, g_eventQueue_ptr->getTime()); + } + m_out_vc_state.push_back(out_vc_vector); + m_link_weights.push_back(link_weight); } -bool Router::isBufferNotFull(int vc, int inport) +bool +Router::isBufferNotFull(int vc, int inport) { - int outport = m_in_vc_state[inport][vc]->get_outport(); - int outvc = m_in_vc_state[inport][vc]->get_outvc(); + int outport = m_in_vc_state[inport][vc]->get_outport(); + int outvc = m_in_vc_state[inport][vc]->get_outvc(); - return (!m_router_buffers[outport][outvc]->isFull()); + return (!m_router_buffers[outport][outvc]->isFull()); } -// A request for an output vc has been placed by an upstream Router/NI. This has to be updated and arbitration performed -void Router::request_vc(int in_vc, int in_port, NetDest destination, Time request_time) +// A request for an output vc has been placed by an upstream Router/NI. +// This has to be updated and arbitration performed +void +Router::request_vc(int in_vc, int in_port, NetDest destination, + Time request_time) { - assert(m_in_vc_state[in_port][in_vc]->isInState(IDLE_, request_time)); - - int outport = getRoute(destination); - m_in_vc_state[in_port][in_vc]->setRoute(outport); - m_in_vc_state[in_port][in_vc]->setState(VC_AB_, request_time); - assert(request_time >= g_eventQueue_ptr->getTime()); - if(request_time > g_eventQueue_ptr->getTime()) - g_eventQueue_ptr->scheduleEventAbsolute(m_vc_arbiter, request_time); - else - vc_arbitrate(); + assert(m_in_vc_state[in_port][in_vc]->isInState(IDLE_, request_time)); + + int outport = getRoute(destination); + m_in_vc_state[in_port][in_vc]->setRoute(outport); + m_in_vc_state[in_port][in_vc]->setState(VC_AB_, request_time); + assert(request_time >= g_eventQueue_ptr->getTime()); + if (request_time > g_eventQueue_ptr->getTime()) + g_eventQueue_ptr->scheduleEventAbsolute(m_vc_arbiter, request_time); + else + vc_arbitrate(); } -void Router::vc_arbitrate() +void +Router::vc_arbitrate() { - int inport = m_round_robin_inport; - m_round_robin_inport++; - if(m_round_robin_inport == m_in_link.size()) - m_round_robin_inport = 0; - - for(int port_iter = 0; port_iter < m_in_link.size(); port_iter++) - { - inport++; - if(inport >= m_in_link.size()) - inport = 0; - int invc = m_round_robin_invc[inport]; - m_round_robin_invc[inport]++; - - if(m_round_robin_invc[inport] >= m_num_vcs) - m_round_robin_invc[inport] = 0; - for(int vc_iter = 0; vc_iter < m_num_vcs; vc_iter++) - { - invc++; - if(invc >= m_num_vcs) - invc = 0; - InVcState *in_vc_state = m_in_vc_state[inport][invc]; - - if(in_vc_state->isInState(VC_AB_, g_eventQueue_ptr->getTime())) - { - int outport = in_vc_state->get_outport(); - vector<int> valid_vcs = get_valid_vcs(invc); - for(int valid_vc_iter = 0; valid_vc_iter < valid_vcs.size(); valid_vc_iter++) - { - if(m_out_vc_state[outport][valid_vcs[valid_vc_iter]]->isInState(IDLE_, g_eventQueue_ptr->getTime())) - { - in_vc_state->grant_vc(valid_vcs[valid_vc_iter], g_eventQueue_ptr->getTime()); - m_in_link[inport]->grant_vc_link(invc, g_eventQueue_ptr->getTime()); - m_out_vc_state[outport][valid_vcs[valid_vc_iter]]->setState(VC_AB_, g_eventQueue_ptr->getTime()); - break; - } - } - } + int inport = m_round_robin_inport; + m_round_robin_inport++; + if (m_round_robin_inport == m_in_link.size()) + m_round_robin_inport = 0; + + for (int port_iter = 0; port_iter < m_in_link.size(); port_iter++) { + inport++; + if (inport >= m_in_link.size()) + inport = 0; + int invc = m_round_robin_invc[inport]; + m_round_robin_invc[inport]++; + + if (m_round_robin_invc[inport] >= m_num_vcs) + m_round_robin_invc[inport] = 0; + for (int vc_iter = 0; vc_iter < m_num_vcs; vc_iter++) { + invc++; + if (invc >= m_num_vcs) + invc = 0; + InVcState *in_vc_state = m_in_vc_state[inport][invc]; + + if (in_vc_state->isInState(VC_AB_, g_eventQueue_ptr->getTime())) { + int outport = in_vc_state->get_outport(); + vector<int> valid_vcs = get_valid_vcs(invc); + for (int valid_vc_iter = 0; valid_vc_iter < valid_vcs.size(); + valid_vc_iter++) { + if (m_out_vc_state[outport][valid_vcs[valid_vc_iter]] + ->isInState(IDLE_, g_eventQueue_ptr->getTime())) { + + in_vc_state->grant_vc(valid_vcs[valid_vc_iter], + g_eventQueue_ptr->getTime()); + + m_in_link[inport]->grant_vc_link(invc, + g_eventQueue_ptr->getTime()); + + m_out_vc_state[outport][valid_vcs[valid_vc_iter]] + ->setState(VC_AB_, g_eventQueue_ptr->getTime()); + break; + } } + } } + } } -vector<int> Router::get_valid_vcs(int invc) +vector<int> +Router::get_valid_vcs(int invc) { - vector<int> vc_list; - - for(int vnet = 0; vnet < m_virtual_networks; vnet++) - { - if(invc >= (vnet*m_vc_per_vnet) && invc < ((vnet+1)*m_vc_per_vnet)) - { - int base = vnet*m_vc_per_vnet; - int vc_per_vnet; - if(m_net_ptr->isVNetOrdered(vnet)) - vc_per_vnet = 1; - else - vc_per_vnet = m_vc_per_vnet; - - for(int offset = 0; offset < vc_per_vnet; offset++) - { - vc_list.push_back(base+offset); - } - break; - } + vector<int> vc_list; + + for (int vnet = 0; vnet < m_virtual_networks; vnet++) { + if (invc >= (vnet*m_vc_per_vnet) && invc < ((vnet+1)*m_vc_per_vnet)) { + int base = vnet*m_vc_per_vnet; + int vc_per_vnet; + if (m_net_ptr->isVNetOrdered(vnet)) + vc_per_vnet = 1; + else + vc_per_vnet = m_vc_per_vnet; + + for (int offset = 0; offset < vc_per_vnet; offset++) { + vc_list.push_back(base+offset); + } + break; } - return vc_list; + } + return vc_list; } -void Router::grant_vc(int out_port, int vc, Time grant_time) +void +Router::grant_vc(int out_port, int vc, Time grant_time) { - assert(m_out_vc_state[out_port][vc]->isInState(VC_AB_, grant_time)); - m_out_vc_state[out_port][vc]->grant_vc(grant_time); - g_eventQueue_ptr->scheduleEvent(this, 1); + assert(m_out_vc_state[out_port][vc]->isInState(VC_AB_, grant_time)); + m_out_vc_state[out_port][vc]->grant_vc(grant_time); + g_eventQueue_ptr->scheduleEvent(this, 1); } -void Router::release_vc(int out_port, int vc, Time release_time) +void +Router::release_vc(int out_port, int vc, Time release_time) { - assert(m_out_vc_state[out_port][vc]->isInState(ACTIVE_, release_time)); - m_out_vc_state[out_port][vc]->setState(IDLE_, release_time); - g_eventQueue_ptr->scheduleEvent(this, 1); + assert(m_out_vc_state[out_port][vc]->isInState(ACTIVE_, release_time)); + m_out_vc_state[out_port][vc]->setState(IDLE_, release_time); + g_eventQueue_ptr->scheduleEvent(this, 1); } // This function calculated the output port for a particular destination. -int Router::getRoute(NetDest destination) +int +Router::getRoute(NetDest destination) { - int output_link = -1; - int min_weight = INFINITE_; - for(int link = 0; link < m_routing_table.size(); link++) - { - if (destination.intersectionIsNotEmpty(m_routing_table[link])) - { - if((m_link_weights[link] >= min_weight)) - continue; - output_link = link; - min_weight = m_link_weights[link]; - } + int output_link = -1; + int min_weight = INFINITE_; + for (int link = 0; link < m_routing_table.size(); link++) { + if (destination.intersectionIsNotEmpty(m_routing_table[link])) { + if ((m_link_weights[link] >= min_weight)) + continue; + output_link = link; + min_weight = m_link_weights[link]; } - return output_link; + } + return output_link; } -void Router::routeCompute(flit *m_flit, int inport) +void +Router::routeCompute(flit *m_flit, int inport) { - int invc = m_flit->get_vc(); - int outport = m_in_vc_state[inport][invc]->get_outport(); - int outvc = m_in_vc_state[inport][invc]->get_outvc(); - - assert(m_net_ptr->getNumPipeStages() >= 1); - m_flit->set_time(g_eventQueue_ptr->getTime() + (m_net_ptr->getNumPipeStages() - 1)); // Becasuse 1 cycle will be consumed in scheduling the output link - m_flit->set_vc(outvc); - m_router_buffers[outport][outvc]->insert(m_flit); - - if(m_net_ptr->getNumPipeStages() > 1) - g_eventQueue_ptr->scheduleEvent(this, m_net_ptr->getNumPipeStages() -1 ); - if((m_flit->get_type() == HEAD_) || (m_flit->get_type() == HEAD_TAIL_)) - { - NetworkMessage *nm = - safe_cast<NetworkMessage*>(m_flit->get_msg_ptr().get()); - NetDest destination = nm->getInternalDestination(); - if(m_net_ptr->getNumPipeStages() > 1) - { - m_out_vc_state[outport][outvc]->setState(VC_AB_, g_eventQueue_ptr->getTime() + 1); - m_out_link[outport]->request_vc_link(outvc, destination, g_eventQueue_ptr->getTime() + 1); - } - else - { - m_out_vc_state[outport][outvc]->setState(VC_AB_, g_eventQueue_ptr->getTime()); - m_out_link[outport]->request_vc_link(outvc, destination, g_eventQueue_ptr->getTime()); - } - } - if((m_flit->get_type() == TAIL_) || (m_flit->get_type() == HEAD_TAIL_)) - { - m_in_vc_state[inport][invc]->setState(IDLE_, g_eventQueue_ptr->getTime() + 1); - m_in_link[inport]->release_vc_link(invc, g_eventQueue_ptr->getTime() + 1); + int invc = m_flit->get_vc(); + int outport = m_in_vc_state[inport][invc]->get_outport(); + int outvc = m_in_vc_state[inport][invc]->get_outvc(); + + assert(m_net_ptr->getNumPipeStages() >= 1); + + // Subtract 1 as 1 cycle will be consumed in scheduling the output link + m_flit->set_time(g_eventQueue_ptr->getTime() + + (m_net_ptr->getNumPipeStages() - 1)); + m_flit->set_vc(outvc); + m_router_buffers[outport][outvc]->insert(m_flit); + + if (m_net_ptr->getNumPipeStages() > 1) + g_eventQueue_ptr->scheduleEvent(this, + m_net_ptr->getNumPipeStages() - 1 ); + if ((m_flit->get_type() == HEAD_) || (m_flit->get_type() == HEAD_TAIL_)) { + NetworkMessage *nm = + safe_cast<NetworkMessage*>(m_flit->get_msg_ptr().get()); + NetDest destination = nm->getInternalDestination(); + + if (m_net_ptr->getNumPipeStages() > 1) { + m_out_vc_state[outport][outvc]->setState(VC_AB_, + g_eventQueue_ptr->getTime() + 1); + + m_out_link[outport]->request_vc_link(outvc, destination, + g_eventQueue_ptr->getTime() + 1); + } else { + m_out_vc_state[outport][outvc]->setState(VC_AB_, + g_eventQueue_ptr->getTime()); + + m_out_link[outport]->request_vc_link(outvc, destination, + g_eventQueue_ptr->getTime()); } + } + if ((m_flit->get_type() == TAIL_) || (m_flit->get_type() == HEAD_TAIL_)) { + m_in_vc_state[inport][invc]->setState(IDLE_, + g_eventQueue_ptr->getTime() + 1); + + m_in_link[inport]->release_vc_link(invc, + g_eventQueue_ptr->getTime() + 1); + } } -void Router::wakeup() +void +Router::wakeup() { - flit *t_flit; + flit *t_flit; - int incoming_port = m_round_robin_start; // This is for round-robin scheduling of incoming ports - m_round_robin_start++; - if (m_round_robin_start >= m_in_link.size()) { - m_round_robin_start = 0; - } - - for(int port = 0; port < m_in_link.size(); port++) - { - // Round robin scheduling - incoming_port++; - if(incoming_port >= m_in_link.size()) - incoming_port = 0; - if(m_in_link[incoming_port]->isReady()) // checking the incoming link - { - DEBUG_EXPR(NETWORK_COMP, HighPrio, m_id); - DEBUG_EXPR(NETWORK_COMP, HighPrio, g_eventQueue_ptr->getTime()); - t_flit = m_in_link[incoming_port]->peekLink(); - routeCompute(t_flit, incoming_port); - m_in_link[incoming_port]->consumeLink(); - } + // This is for round-robin scheduling of incoming ports + int incoming_port = m_round_robin_start; + m_round_robin_start++; + if (m_round_robin_start >= m_in_link.size()) { + m_round_robin_start = 0; + } + + for (int port = 0; port < m_in_link.size(); port++) { + // Round robin scheduling + incoming_port++; + if (incoming_port >= m_in_link.size()) + incoming_port = 0; + + // checking the incoming link + if (m_in_link[incoming_port]->isReady()) { + DEBUG_EXPR(NETWORK_COMP, HighPrio, m_id); + DEBUG_EXPR(NETWORK_COMP, HighPrio, g_eventQueue_ptr->getTime()); + t_flit = m_in_link[incoming_port]->peekLink(); + routeCompute(t_flit, incoming_port); + m_in_link[incoming_port]->consumeLink(); } - scheduleOutputLinks(); - checkReschedule(); // This is for flits lying in the router buffers - vc_arbitrate(); - check_arbiter_reschedule(); + } + scheduleOutputLinks(); + checkReschedule(); // This is for flits lying in the router buffers + vc_arbitrate(); + check_arbiter_reschedule(); } -void Router::scheduleOutputLinks() +void +Router::scheduleOutputLinks() { - for(int port = 0; port < m_out_link.size(); port++) - { - int vc_tolookat = m_vc_round_robin[port]; - m_vc_round_robin[port]++; - if(m_vc_round_robin[port] == m_num_vcs) - m_vc_round_robin[port] = 0; - - for(int i = 0; i < m_num_vcs; i++) - { - vc_tolookat++; - if(vc_tolookat == m_num_vcs) - vc_tolookat = 0; - - if(m_router_buffers[port][vc_tolookat]->isReady()) - { - if(m_out_vc_state[port][vc_tolookat]->isInState(ACTIVE_, g_eventQueue_ptr->getTime()) && m_out_link[port]->isBufferNotFull_link(vc_tolookat)) - // models buffer backpressure - { - flit *t_flit = m_router_buffers[port][vc_tolookat]->getTopFlit(); - t_flit->set_time(g_eventQueue_ptr->getTime() + 1 ); - m_out_src_queue[port]->insert(t_flit); - g_eventQueue_ptr->scheduleEvent(m_out_link[port], 1); - break; // done for this port - } - } + for (int port = 0; port < m_out_link.size(); port++) { + int vc_tolookat = m_vc_round_robin[port]; + m_vc_round_robin[port]++; + if (m_vc_round_robin[port] == m_num_vcs) + m_vc_round_robin[port] = 0; + + for (int i = 0; i < m_num_vcs; i++) { + vc_tolookat++; + if (vc_tolookat == m_num_vcs) + vc_tolookat = 0; + + if (m_router_buffers[port][vc_tolookat]->isReady()) { + + // models buffer backpressure + if (m_out_vc_state[port][vc_tolookat]->isInState(ACTIVE_, + g_eventQueue_ptr->getTime()) && + m_out_link[port]->isBufferNotFull_link(vc_tolookat)) { + + flit *t_flit = + m_router_buffers[port][vc_tolookat]->getTopFlit(); + t_flit->set_time(g_eventQueue_ptr->getTime() + 1 ); + m_out_src_queue[port]->insert(t_flit); + g_eventQueue_ptr->scheduleEvent(m_out_link[port], 1); + break; // done for this port } + } } + } } -void Router::checkReschedule() +void +Router::checkReschedule() { - for(int port = 0; port < m_out_link.size(); port++) - { - for(int vc = 0; vc < m_num_vcs; vc++) - { - if(m_router_buffers[port][vc]->isReadyForNext()) - { - g_eventQueue_ptr->scheduleEvent(this, 1); - return; - } - } + for (int port = 0; port < m_out_link.size(); port++) { + for (int vc = 0; vc < m_num_vcs; vc++) { + if (m_router_buffers[port][vc]->isReadyForNext()) { + g_eventQueue_ptr->scheduleEvent(this, 1); + return; + } } + } } -void Router::check_arbiter_reschedule() +void +Router::check_arbiter_reschedule() { - for(int port = 0; port < m_in_link.size(); port++) - { - for(int vc = 0; vc < m_num_vcs; vc++) - { - if(m_in_vc_state[port][vc]->isInState(VC_AB_, g_eventQueue_ptr->getTime() + 1)) - { - g_eventQueue_ptr->scheduleEvent(m_vc_arbiter, 1); - return; - } - } + for (int port = 0; port < m_in_link.size(); port++) { + for (int vc = 0; vc < m_num_vcs; vc++) { + if (m_in_vc_state[port][vc]->isInState(VC_AB_, + g_eventQueue_ptr->getTime() + 1)) { + + g_eventQueue_ptr->scheduleEvent(m_vc_arbiter, 1); + return; + } } + } } -void Router::printConfig(ostream& out) const +void +Router::printConfig(ostream& out) const { - out << "[Router " << m_id << "] :: " << endl; - out << "[inLink - "; - for(int i = 0;i < m_in_link.size(); i++) - out << m_in_link[i]->get_id() << " - "; - out << "]" << endl; - out << "[outLink - "; - for(int i = 0;i < m_out_link.size(); i++) - out << m_out_link[i]->get_id() << " - "; - out << "]" << endl; -/* out << "---------- routing table -------------" << endl; - for(int i =0; i < m_routing_table.size(); i++) - out << m_routing_table[i] << endl; -*/ + out << "[Router " << m_id << "] :: " << endl; + out << "[inLink - "; + for (int i = 0;i < m_in_link.size(); i++) + out << m_in_link[i]->get_id() << " - "; + out << "]" << endl; + out << "[outLink - "; + for (int i = 0;i < m_out_link.size(); i++) + out << m_out_link[i]->get_id() << " - "; + out << "]" << endl; +#if 0 + out << "---------- routing table -------------" << endl; + for (int i = 0; i < m_routing_table.size(); i++) + out << m_routing_table[i] << endl; +#endif } -void Router::print(ostream& out) const +void +Router::print(ostream& out) const { - out << "[Router]"; + out << "[Router]"; } diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh index 16b19204a..20a4abd54 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#ifndef ROUTER_H -#define ROUTER_H +#ifndef __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_ROUTER_HH__ +#define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_ROUTER_HH__ #include <iostream> #include <vector> @@ -45,51 +45,55 @@ class VCarbiter; -class Router : public FlexibleConsumer { -public: - Router(int id, GarnetNetwork *network_ptr); +class Router : public FlexibleConsumer +{ + public: + Router(int id, GarnetNetwork *network_ptr); - ~Router(); + ~Router(); - void addInPort(NetworkLink *in_link); - void addOutPort(NetworkLink *out_link, const NetDest& routing_table_entry, int link_weight); - void wakeup(); - void request_vc(int in_vc, int in_port, NetDest destination, Time request_time); - bool isBufferNotFull(int vc, int inport); - void grant_vc(int out_port, int vc, Time grant_time); - void release_vc(int out_port, int vc, Time release_time); - void vc_arbitrate(); + void addInPort(NetworkLink *in_link); + void addOutPort(NetworkLink *out_link, const NetDest& routing_table_entry, + int link_weight); + void wakeup(); + void request_vc(int in_vc, int in_port, NetDest destination, + Time request_time); + bool isBufferNotFull(int vc, int inport); + void grant_vc(int out_port, int vc, Time grant_time); + void release_vc(int out_port, int vc, Time release_time); + void vc_arbitrate(); - void printConfig(std::ostream& out) const; - void print(std::ostream& out) const; + void printConfig(std::ostream& out) const; + void print(std::ostream& out) const; -private: -/***************Data Members******************/ - int m_id; - int m_virtual_networks, m_num_vcs, m_vc_per_vnet; - GarnetNetwork *m_net_ptr; - std::vector<int> m_vc_round_robin; // For scheduling of out source queues - int m_round_robin_inport, m_round_robin_start; // for vc arbitration - std::vector<int> m_round_robin_invc; // For every outport. for vc arbitration + private: + int m_id; + int m_virtual_networks, m_num_vcs, m_vc_per_vnet; + GarnetNetwork *m_net_ptr; + std::vector<int> m_vc_round_robin; // For scheduling of out source queues + int m_round_robin_inport, m_round_robin_start; // for vc arbitration + std::vector<int> m_round_robin_invc; // For vc arbitration of each outport - std::vector<std::vector<flitBuffer *> > m_router_buffers; // These are essentially output buffers - std::vector<flitBuffer *> m_out_src_queue; // These are source queues for the output link - std::vector<NetworkLink *> m_in_link; - std::vector<NetworkLink *> m_out_link; - std::vector<std::vector<InVcState *> > m_in_vc_state; - std::vector<std::vector<OutVcState *> > m_out_vc_state; - std::vector<NetDest> m_routing_table; - std::vector<int> m_link_weights; - VCarbiter *m_vc_arbiter; + // These are essentially output buffers + std::vector<std::vector<flitBuffer *> > m_router_buffers; -/*********** Private methods *************/ - int getRoute(NetDest destination); - std::vector<int> get_valid_vcs(int invc); - void routeCompute(flit *m_flit, int inport); - void checkReschedule(); - void check_arbiter_reschedule(); - void scheduleOutputLinks(); -}; + // These are source queues for the output link + std::vector<flitBuffer *> m_out_src_queue; + + std::vector<NetworkLink *> m_in_link; + std::vector<NetworkLink *> m_out_link; + std::vector<std::vector<InVcState *> > m_in_vc_state; + std::vector<std::vector<OutVcState *> > m_out_vc_state; + std::vector<NetDest> m_routing_table; + std::vector<int> m_link_weights; + VCarbiter *m_vc_arbiter; -#endif + int getRoute(NetDest destination); + std::vector<int> get_valid_vcs(int invc); + void routeCompute(flit *m_flit, int inport); + void checkReschedule(); + void check_arbiter_reschedule(); + void scheduleOutputLinks(); +}; +#endif // __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_ROUTER_HH__ diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc index fdf9aadb0..f1960d62d 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.cc @@ -33,10 +33,12 @@ VCarbiter::VCarbiter(Router *router) { - m_router = router; + m_router = router; } -void VCarbiter::wakeup() +void +VCarbiter::wakeup() { - m_router->vc_arbitrate(); + m_router->vc_arbitrate(); } + diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh index 3f3223f29..7aa6f9fc1 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/VCarbiter.hh @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#ifndef VC_ARBITER_H -#define VC_ARBITER_H +#ifndef __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_VC_ARBITER_HH__ +#define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_VC_ARBITER_HH__ #include <iostream> @@ -38,16 +38,17 @@ class Router; -class VCarbiter : public Consumer{ -public: - VCarbiter(Router *router); - ~VCarbiter() {} +class VCarbiter : public Consumer +{ + public: + VCarbiter(Router *router); + ~VCarbiter() {} - void print(std::ostream& out) const {} - void wakeup(); + void print(std::ostream& out) const {} + void wakeup(); -private: - Router *m_router; + private: + Router *m_router; }; -#endif +#endif // __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_VC_ARBITER_HH__ diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/flit.cc b/src/mem/ruby/network/garnet/flexible-pipeline/flit.cc index dd0525754..1227b70f0 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/flit.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/flit.cc @@ -32,77 +32,94 @@ flit::flit(int id, int vc, int vnet, int size, MsgPtr msg_ptr) { - m_size = size; - m_msg_ptr = msg_ptr; - m_enqueue_time = g_eventQueue_ptr->getTime(); - m_time = g_eventQueue_ptr->getTime(); - m_id = id; - m_vnet = vnet; - m_vc = vc; + m_size = size; + m_msg_ptr = msg_ptr; + m_enqueue_time = g_eventQueue_ptr->getTime(); + m_time = g_eventQueue_ptr->getTime(); + m_id = id; + m_vnet = vnet; + m_vc = vc; - if(size == 1) - { - m_type = HEAD_TAIL_; - return; - } - if(id == 0) - m_type = HEAD_; - else if(id == (size - 1)) - m_type = TAIL_; - else - m_type = BODY_; + if (size == 1) { + m_type = HEAD_TAIL_; + return; + } + if (id == 0) + m_type = HEAD_; + else if (id == (size - 1)) + m_type = TAIL_; + else + m_type = BODY_; } -int flit::get_size() +int +flit::get_size() { - return m_size; + return m_size; } -int flit::get_id() + +int +flit::get_id() { - return m_id; + return m_id; } -Time flit::get_time() + +Time +flit::get_time() { - return m_time; + return m_time; } -Time flit::get_enqueue_time() +Time +flit::get_enqueue_time() { - return m_enqueue_time; + return m_enqueue_time; } -void flit::set_time(Time time) + +void +flit::set_time(Time time) { - m_time = time; + m_time = time; } -int flit::get_vnet() +int +flit::get_vnet() { - return m_vnet; + return m_vnet; } -int flit::get_vc() + +int +flit::get_vc() { - return m_vc; + return m_vc; } -void flit::set_vc(int vc) + +void +flit::set_vc(int vc) { - m_vc = vc; + m_vc = vc; } -MsgPtr& flit::get_msg_ptr() + +MsgPtr& +flit::get_msg_ptr() { - return m_msg_ptr; + return m_msg_ptr; } -flit_type flit::get_type() + +flit_type +flit::get_type() { - return m_type; + return m_type; } -void flit::print(std::ostream& out) const +void +flit::print(std::ostream& out) const { - out << "[flit:: "; - out << "Id=" << m_id << " "; - out << "Type=" << m_type << " "; - out << "Vnet=" << m_vnet << " "; - out << "VC=" << m_vc << " "; - out << "Enqueue Time=" << m_enqueue_time << " "; - out << "]"; + out << "[flit:: "; + out << "Id=" << m_id << " "; + out << "Type=" << m_type << " "; + out << "Vnet=" << m_vnet << " "; + out << "VC=" << m_vc << " "; + out << "Enqueue Time=" << m_enqueue_time << " "; + out << "]"; } diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh b/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh index 5aa01c5e7..e0825f3ab 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh @@ -33,44 +33,44 @@ #include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/slicc_interface/Message.hh" -#ifndef FLIT_H -#define FLIT_H +#ifndef __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLIT_HH__ +#define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLIT_HH__ -class flit { -public: - flit(int id, int vc, int vnet, int size, MsgPtr msg_ptr); +class flit +{ + public: + flit(int id, int vc, int vnet, int size, MsgPtr msg_ptr); - int get_size(); - int get_id(); - Time get_time(); - Time get_enqueue_time(); - void set_time(Time time); - int get_vnet(); - int get_vc(); - void set_vc(int vc); - MsgPtr& get_msg_ptr(); - flit_type get_type(); - void print(std::ostream& out) const; + int get_size(); + int get_id(); + Time get_time(); + Time get_enqueue_time(); + void set_time(Time time); + int get_vnet(); + int get_vc(); + void set_vc(int vc); + MsgPtr& get_msg_ptr(); + flit_type get_type(); + void print(std::ostream& out) const; - static bool - greater(flit* n1, flit* n2) - { - if (n1->get_time() == n2->get_time()) - //ASSERT(n1->flit_id != n2->flit_id); - return (n1->get_id() > n2->get_id()); - else - return (n1->get_time() > n2->get_time()); - } + static bool + greater(flit* n1, flit* n2) + { + if (n1->get_time() == n2->get_time()) + //ASSERT(n1->flit_id != n2->flit_id); + return (n1->get_id() > n2->get_id()); + else + return (n1->get_time() > n2->get_time()); + } -private: -/************Data Members*************/ - int m_id; - int m_vnet; - int m_vc; - int m_size; - Time m_enqueue_time, m_time; - flit_type m_type; - MsgPtr m_msg_ptr; + private: + int m_id; + int m_vnet; + int m_vc; + int m_size; + Time m_enqueue_time, m_time; + flit_type m_type; + MsgPtr m_msg_ptr; }; @@ -82,4 +82,4 @@ operator<<(std::ostream& out, const flit& obj) return out; } -#endif +#endif // __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLIT_HH__ diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.cc b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.cc index 82eb08902..2bb297e03 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.cc @@ -36,72 +36,79 @@ using namespace std; flitBuffer::flitBuffer() { - max_size = INFINITE_; + max_size = INFINITE_; } flitBuffer::flitBuffer(int maximum_size) { - max_size = maximum_size; + max_size = maximum_size; } -bool flitBuffer::isEmpty() +bool +flitBuffer::isEmpty() { - return (m_buffer.size() == 0); + return (m_buffer.size() == 0); } -bool flitBuffer::isReady() +bool +flitBuffer::isReady() { - if(m_buffer.size() != 0 ) - { - flit *t_flit = m_buffer.front(); - if(t_flit->get_time() <= g_eventQueue_ptr->getTime()) - return true; - } - return false; + if (m_buffer.size() != 0 ) { + flit *t_flit = m_buffer.front(); + if (t_flit->get_time() <= g_eventQueue_ptr->getTime()) + return true; + } + return false; } -bool flitBuffer::isReadyForNext() +bool +flitBuffer::isReadyForNext() { - if(m_buffer.size() != 0 ) - { - flit *t_flit = m_buffer.front(); - if(t_flit->get_time() <= (g_eventQueue_ptr->getTime() + 1)) - return true; - } - return false; + if (m_buffer.size() != 0 ) { + flit *t_flit = m_buffer.front(); + if (t_flit->get_time() <= (g_eventQueue_ptr->getTime() + 1)) + return true; + } + return false; } -bool flitBuffer::isFull() +bool +flitBuffer::isFull() { - return (m_buffer.size() >= max_size); + return (m_buffer.size() >= max_size); } -void flitBuffer::setMaxSize(int maximum) +void +flitBuffer::setMaxSize(int maximum) { - max_size = maximum; + max_size = maximum; } -flit* flitBuffer:: getTopFlit() +flit* +flitBuffer:: getTopFlit() { - flit *f = m_buffer.front(); - pop_heap(m_buffer.begin(), m_buffer.end(), flit::greater); - m_buffer.pop_back(); - return f; + flit *f = m_buffer.front(); + pop_heap(m_buffer.begin(), m_buffer.end(), flit::greater); + m_buffer.pop_back(); + return f; } -flit* flitBuffer::peekTopFlit() +flit* +flitBuffer::peekTopFlit() { - return m_buffer.front(); + return m_buffer.front(); } -void flitBuffer::insert(flit *flt) +void +flitBuffer::insert(flit *flt) { - m_buffer.push_back(flt); - push_heap(m_buffer.begin(), m_buffer.end(), flit::greater); + m_buffer.push_back(flt); + push_heap(m_buffer.begin(), m_buffer.end(), flit::greater); } -void flitBuffer::print(std::ostream& out) const +void +flitBuffer::print(std::ostream& out) const { - out << "[flitBuffer: "; - out << m_buffer.size() << "] " << std::endl; + out << "[flitBuffer: "; + out << m_buffer.size() << "] " << std::endl; } diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh index a5ec25590..619f3285f 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh @@ -28,8 +28,8 @@ * Authors: Niket Agarwal */ -#ifndef FLIT_BUFFER_H -#define FLIT_BUFFER_H +#ifndef __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLIT_BUFFER_HH__ +#define __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLIT_BUFFER_HH__ #include <iostream> #include <vector> @@ -37,25 +37,25 @@ #include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/garnet/flexible-pipeline/flit.hh" -class flitBuffer { -public: - flitBuffer(); - flitBuffer(int maximum_size); +class flitBuffer +{ + public: + flitBuffer(); + flitBuffer(int maximum_size); - bool isReady(); - bool isReadyForNext(); - bool isFull(); - bool isEmpty(); - void setMaxSize(int maximum); - flit *getTopFlit(); - flit *peekTopFlit(); - void insert(flit *flt); - void print(std::ostream& out) const; + bool isReady(); + bool isReadyForNext(); + bool isFull(); + bool isEmpty(); + void setMaxSize(int maximum); + flit *getTopFlit(); + flit *peekTopFlit(); + void insert(flit *flt); + void print(std::ostream& out) const; -/**********Data Members*********/ -private: - std::vector<flit *> m_buffer; - int size, max_size; + private: + std::vector<flit *> m_buffer; + int size, max_size; }; inline std::ostream& @@ -66,5 +66,4 @@ operator<<(std::ostream& out, const flitBuffer& obj) return out; } -#endif - +#endif // __MEM_RUBY_NETWORK_GARNET_FLEXIBLE_PIPELINE_FLIT_BUFFER_HH__ diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/netconfig.defaults b/src/mem/ruby/network/garnet/flexible-pipeline/netconfig.defaults deleted file mode 100644 index e60f1921d..000000000 --- a/src/mem/ruby/network/garnet/flexible-pipeline/netconfig.defaults +++ /dev/null @@ -1,8 +0,0 @@ -// Note: You should set Garnet's parameters in config/rubyconfig.defaults and not here -g_GARNET_NETWORK:true -g_DETAIL_NETWORK:true -g_NETWORK_TESTING:false -g_FLIT_SIZE:16 -g_NUM_PIPE_STAGES:4 -g_VCS_PER_CLASS:4 -g_BUFFER_SIZE:4 |