diff options
author | Tushar Krishna <Tushar.Krishna@amd.com> | 2010-06-22 15:36:07 -0700 |
---|---|---|
committer | Tushar Krishna <Tushar.Krishna@amd.com> | 2010-06-22 15:36:07 -0700 |
commit | 66f0d26059ffaa09b829c0a84419936f88fd68c2 (patch) | |
tree | 6878f789faa552fa8c4af6e1c2c096370f7ecfa2 /src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | |
parent | 84489c58741d637fd3af2379952df5b96b4f63a5 (diff) | |
download | gem5-66f0d26059ffaa09b829c0a84419936f88fd68c2.tar.xz |
style: updated garnet to match M5 coding style
Diffstat (limited to 'src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc')
-rw-r--r-- | src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 436 |
1 files changed, 225 insertions, 211 deletions
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc index 124a38e93..2a392c206 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc @@ -43,49 +43,50 @@ using namespace std; 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 @@ void GarnetNetwork_d::init() } 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); - - 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 - } + 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); + + 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 @@ void GarnetNetwork_d::makeInLink(NodeID src, SwitchID dest, const NetDest& routi * 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); - - 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[src]->addOutPort(net_link, routing_table_entry, link_weight, credit_link); - m_ni_ptr_vector[dest]->addInPort(net_link, credit_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_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[src]->addOutPort(net_link, routing_table_entry, + link_weight, credit_link); + m_ni_ptr_vector[dest]->addInPort(net_link, credit_link); + } else { + ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + // do nothing + } } /* - * This function creates a internal network links + * This function creates an internal network link */ -void GarnetNetwork_d::makeInternalLink(SwitchID src, SwitchID dest, const NetDest& routing_table_entry, int link_latency, int link_weight, int bw_multiplier, bool isReconfiguration) +void +GarnetNetwork_d::makeInternalLink(SwitchID src, SwitchID dest, + const NetDest& routing_table_entry, int link_latency, int link_weight, + int bw_multiplier, bool isReconfiguration) { - 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_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry, link_weight, credit_link); - } - else - { - ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); - // do nothing - } + 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_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry, + link_weight, credit_link); + } else { + ERROR_MSG("Fatal Error:: Reconfiguration not allowed here"); + // do nothing + } } -void GarnetNetwork_d::checkNetworkAllocation(NodeID id, bool ordered, int network_num) +void +GarnetNetwork_d::checkNetworkAllocation(NodeID id, bool ordered, + int network_num) { - ASSERT(id < m_nodes); - ASSERT(network_num < m_virtual_networks); + 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_d::getToNetQueue(NodeID id, bool ordered, int network_num) +MessageBuffer* +GarnetNetwork_d::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_d::getFromNetQueue(NodeID id, bool ordered, int network_num) +MessageBuffer* +GarnetNetwork_d::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_d::clearStats() +void +GarnetNetwork_d::clearStats() { - m_ruby_start = g_eventQueue_ptr->getTime(); + m_ruby_start = g_eventQueue_ptr->getTime(); } -Time GarnetNetwork_d::getRubyStartTime() +Time +GarnetNetwork_d::getRubyStartTime() { - return m_ruby_start; + return m_ruby_start; } -void GarnetNetwork_d::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; - } - - out << endl; - out << "Network Stats" << endl; - out << "-------------" << endl; - out << endl; - for(int i = 0; i < m_link_ptr_vector.size(); i++) - { - average_link_utilization += (double(m_link_ptr_vector[i]->getLinkUtilization())) / (double(g_eventQueue_ptr->getTime()-m_ruby_start)); - - 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 << "Total flits injected = " << m_flits_injected << endl; - // out << "Total flits recieved = " << m_flits_recieved << endl; - out << "Average network latency = " << ((double) m_network_latency/ (double) m_flits_recieved)<< endl; - // out << "Average queueing latency = " << ((double) m_queueing_latency/ (double) m_flits_recieved)<< endl; - // out << "Average latency = " << ((double) (m_queueing_latency + m_network_latency) / (double) m_flits_recieved)<< endl; - out << "-------------" << endl; +void +GarnetNetwork_d::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); - double m_total_link_power = 0.0; - double m_total_router_power = 0.0; + for (int i = 0; i < m_virtual_networks*m_vcs_per_class; i++) + { + average_vc_load[i] = 0; + } - for(int i = 0; i < m_link_ptr_vector.size(); i++) - { - m_total_link_power += m_link_ptr_vector[i]->calculate_power(); + out << endl; + out << "Network Stats" << endl; + out << "-------------" << endl; + out << endl; + for (int i = 0; i < m_link_ptr_vector.size(); i++) { + average_link_utilization += + (double(m_link_ptr_vector[i]->getLinkUtilization())) / + (double(g_eventQueue_ptr->getTime()-m_ruby_start)); + + 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 << "Total flits injected = " << m_flits_injected << endl; + // out << "Total flits received = " << m_flits_received << endl; + out << "Average network latency = " + << ((double) m_network_latency/ (double) m_flits_received)<< endl; + // out << "Average queueing latency = " + // << ((double) m_queueing_latency/ (double) m_flits_received)<< endl; + // out << "Average latency = " + // << ((double) (m_queueing_latency + m_network_latency) / + // (double) m_flits_received)<< endl; + out << "-------------" << endl; + + double m_total_link_power = 0.0; + double m_total_router_power = 0.0; + + for (int i = 0; i < m_link_ptr_vector.size(); i++) { + m_total_link_power += m_link_ptr_vector[i]->calculate_power(); + } - for(int i = 0; i < m_router_ptr_vector.size(); i++) - { - m_total_router_power += m_router_ptr_vector[i]->calculate_power(); - } - out << "Total Link Power = " << m_total_link_power << " W " << endl; - out << "Total Router Power = " << m_total_router_power << " W " <<endl; - out << "-------------" << endl; + for (int i = 0; i < m_router_ptr_vector.size(); i++) { + m_total_router_power += m_router_ptr_vector[i]->calculate_power(); + } + out << "Total Link Power = " << m_total_link_power << " W " << endl; + out << "Total Router Power = " << m_total_router_power << " W " <<endl; + out << "-------------" << endl; } -void GarnetNetwork_d::printConfig(ostream& out) const +void +GarnetNetwork_d::printConfig(ostream& out) const { - out << endl; - out << "Network Configuration" << endl; - out << "---------------------" << endl; - out << "network: GarnetNetwork_d" << 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 << "Network Configuration" << endl; + out << "---------------------" << endl; + out << "network: GarnetNetwork_d" << 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; - 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); + 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_d::print(ostream& out) const +void +GarnetNetwork_d::print(ostream& out) const { - out << "[GarnetNetwork_d]"; + out << "[GarnetNetwork_d]"; } GarnetNetwork_d * |