diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2013-09-06 16:21:29 -0500 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2013-09-06 16:21:29 -0500 |
commit | e7bd70e0790cb3a2665a7f13c0762b0ec71b519f (patch) | |
tree | 7d653d014ec05d175f4033353f832f4ee0a651ea /src/mem/ruby/network/garnet/fixed-pipeline | |
parent | 47d113696dd545933b818772f5e2cd7534947484 (diff) | |
download | gem5-e7bd70e0790cb3a2665a7f13c0762b0ec71b519f.tar.xz |
ruby: network: shorten variable names
Diffstat (limited to 'src/mem/ruby/network/garnet/fixed-pipeline')
-rw-r--r-- | src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 90 | ||||
-rw-r--r-- | src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh | 8 |
2 files changed, 49 insertions, 49 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 491a413b4..0254e1a86 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc @@ -62,7 +62,7 @@ GarnetNetwork_d::GarnetNetwork_d(const Params *p) for (vector<BasicRouter*>::const_iterator i = p->routers.begin(); i != p->routers.end(); ++i) { Router_d* router = safe_cast<Router_d*>(*i); - m_router_ptr_vector.push_back(router); + m_routers.push_back(router); } } @@ -72,8 +72,8 @@ GarnetNetwork_d::init() BaseGarnetNetwork::init(); // initialize the router's network pointers - for (vector<Router_d*>::const_iterator i = m_router_ptr_vector.begin(); - i != m_router_ptr_vector.end(); ++i) { + for (vector<Router_d*>::const_iterator i = m_routers.begin(); + i != m_routers.end(); ++i) { Router_d* router = safe_cast<Router_d*>(*i); router->init_net_ptr(this); } @@ -86,21 +86,21 @@ GarnetNetwork_d::init() 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_nis.push_back(ni); } m_topology_ptr->createLinks(this); // initialize the link's network pointers - for (vector<NetworkLink_d*>::const_iterator i = m_link_ptr_vector.begin(); - i != m_link_ptr_vector.end(); ++i) { + for (vector<NetworkLink_d*>::const_iterator i = m_links.begin(); + i != m_links.end(); ++i) { NetworkLink_d* net_link = safe_cast<NetworkLink_d*>(*i); net_link->init_net_ptr(this); } // FaultModel: declare each router to the fault model if(isFaultModelEnabled()){ - for (vector<Router_d*>::const_iterator i= m_router_ptr_vector.begin(); - i != m_router_ptr_vector.end(); ++i) { + for (vector<Router_d*>::const_iterator i= m_routers.begin(); + i != m_routers.end(); ++i) { Router_d* router = safe_cast<Router_d*>(*i); int router_id M5_VAR_USED = fault_model->declare_router(router->get_num_inports(), @@ -121,10 +121,10 @@ GarnetNetwork_d::~GarnetNetwork_d() 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); + deletePointers(m_routers); + deletePointers(m_nis); + deletePointers(m_links); + deletePointers(m_creditlinks); delete m_topology_ptr; } @@ -157,11 +157,11 @@ GarnetNetwork_d::makeInLink(NodeID src, SwitchID dest, BasicLink* link, NetworkLink_d* net_link = garnet_link->m_network_links[direction]; CreditLink_d* credit_link = garnet_link->m_credit_links[direction]; - m_link_ptr_vector.push_back(net_link); - m_creditlink_ptr_vector.push_back(credit_link); + m_links.push_back(net_link); + m_creditlinks.push_back(credit_link); - m_router_ptr_vector[dest]->addInPort(net_link, credit_link); - m_ni_ptr_vector[src]->addOutPort(net_link, credit_link); + m_routers[dest]->addInPort(net_link, credit_link); + m_nis[src]->addOutPort(net_link, credit_link); } /* @@ -176,19 +176,19 @@ GarnetNetwork_d::makeOutLink(SwitchID src, NodeID dest, BasicLink* link, const NetDest& routing_table_entry) { assert(dest < m_nodes); - assert(src < m_router_ptr_vector.size()); - assert(m_router_ptr_vector[src] != NULL); + assert(src < m_routers.size()); + assert(m_routers[src] != NULL); GarnetExtLink_d* garnet_link = safe_cast<GarnetExtLink_d*>(link); NetworkLink_d* net_link = garnet_link->m_network_links[direction]; CreditLink_d* credit_link = garnet_link->m_credit_links[direction]; - m_link_ptr_vector.push_back(net_link); - m_creditlink_ptr_vector.push_back(credit_link); + m_links.push_back(net_link); + m_creditlinks.push_back(credit_link); - m_router_ptr_vector[src]->addOutPort(net_link, routing_table_entry, + m_routers[src]->addOutPort(net_link, routing_table_entry, link->m_weight, credit_link); - m_ni_ptr_vector[dest]->addInPort(net_link, credit_link); + m_nis[dest]->addInPort(net_link, credit_link); } /* @@ -204,11 +204,11 @@ GarnetNetwork_d::makeInternalLink(SwitchID src, SwitchID dest, BasicLink* link, NetworkLink_d* net_link = garnet_link->m_network_links[direction]; CreditLink_d* credit_link = garnet_link->m_credit_links[direction]; - m_link_ptr_vector.push_back(net_link); - m_creditlink_ptr_vector.push_back(credit_link); + m_links.push_back(net_link); + m_creditlinks.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, + m_routers[dest]->addInPort(net_link, credit_link); + m_routers[src]->addOutPort(net_link, routing_table_entry, link->m_weight, credit_link); } @@ -243,19 +243,19 @@ GarnetNetwork_d::printLinkStats(ostream& out) const } out << endl; - for (int i = 0; i < m_link_ptr_vector.size(); i++) { + for (int i = 0; i < m_links.size(); i++) { average_link_utilization += - (double(m_link_ptr_vector[i]->getLinkUtilization())) / + (double(m_links[i]->getLinkUtilization())) / (double(curCycle() - g_ruby_start)); - vector<int> vc_load = m_link_ptr_vector[i]->getVcLoad(); + vector<int> vc_load = m_links[i]->getVcLoad(); for (int j = 0; j < vc_load.size(); j++) { assert(vc_load.size() == m_vcs_per_vnet*m_virtual_networks); average_vc_load[j] += vc_load[j]; } } average_link_utilization = - average_link_utilization/m_link_ptr_vector.size(); + average_link_utilization/m_links.size(); out << "Average Link Utilization :: " << average_link_utilization << " flits/cycle" << endl; out << "-------------" << endl; @@ -286,17 +286,17 @@ GarnetNetwork_d::printPowerStats(ostream& out) const double m_static_router_power = 0.0; double m_clk_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(); - m_dynamic_link_power += m_link_ptr_vector[i]->get_dynamic_power(); - m_static_link_power += m_link_ptr_vector[i]->get_static_power(); + for (int i = 0; i < m_links.size(); i++) { + m_total_link_power += m_links[i]->calculate_power(); + m_dynamic_link_power += m_links[i]->get_dynamic_power(); + m_static_link_power += m_links[i]->get_static_power(); } - for (int i = 0; i < m_router_ptr_vector.size(); i++) { - m_total_router_power += m_router_ptr_vector[i]->calculate_power(); - m_dynamic_router_power += m_router_ptr_vector[i]->get_dynamic_power(); - m_static_router_power += m_router_ptr_vector[i]->get_static_power(); - m_clk_power += m_router_ptr_vector[i]->get_clk_power(); + for (int i = 0; i < m_routers.size(); i++) { + m_total_router_power += m_routers[i]->calculate_power(); + m_dynamic_router_power += m_routers[i]->get_dynamic_power(); + m_static_router_power += m_routers[i]->get_static_power(); + m_clk_power += m_routers[i]->get_clk_power(); } out << "Link Dynamic Power = " << m_dynamic_link_power << " W" << endl; out << "Link Static Power = " << m_static_link_power << " W" << endl; @@ -326,16 +326,16 @@ GarnetNetwork_d::functionalWrite(Packet *pkt) { uint32_t num_functional_writes = 0; - for (unsigned int i = 0; i < m_router_ptr_vector.size(); i++) { - num_functional_writes += m_router_ptr_vector[i]->functionalWrite(pkt); + for (unsigned int i = 0; i < m_routers.size(); i++) { + num_functional_writes += m_routers[i]->functionalWrite(pkt); } - for (unsigned int i = 0; i < m_ni_ptr_vector.size(); ++i) { - num_functional_writes += m_ni_ptr_vector[i]->functionalWrite(pkt); + for (unsigned int i = 0; i < m_nis.size(); ++i) { + num_functional_writes += m_nis[i]->functionalWrite(pkt); } - for (unsigned int i = 0; i < m_link_ptr_vector.size(); ++i) { - num_functional_writes += m_link_ptr_vector[i]->functionalWrite(pkt); + for (unsigned int i = 0; i < m_links.size(); ++i) { + num_functional_writes += m_links[i]->functionalWrite(pkt); } return num_functional_writes; diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh index 9c2cc63bf..ee3277896 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh @@ -100,10 +100,10 @@ class GarnetNetwork_d : public BaseGarnetNetwork std::vector<VNET_type > m_vnet_type; - std::vector<Router_d *> m_router_ptr_vector; // All Routers in Network - std::vector<NetworkLink_d *> m_link_ptr_vector; // All links in the network - std::vector<CreditLink_d *> m_creditlink_ptr_vector; // All links in net - std::vector<NetworkInterface_d *> m_ni_ptr_vector; // All NI's in Network + std::vector<Router_d *> m_routers; // All Routers in Network + std::vector<NetworkLink_d *> m_links; // All links in the network + std::vector<CreditLink_d *> m_creditlinks; // All links in net + std::vector<NetworkInterface_d *> m_nis; // All NI's in Network int m_buffers_per_data_vc; int m_buffers_per_ctrl_vc; |