1 files changed, 97 insertions, 83 deletions

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
index e7b766dd7..44c3a5d64 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
@@ -45,122 +45,136 @@ using m5::stl_helpers::deletePointers;
 
 Router_d::Router_d(int id, GarnetNetwork_d *network_ptr)
 {
-        m_id = id;
-        m_network_ptr = network_ptr;
-        m_virtual_networks = network_ptr->getNumberOfVirtualNetworks();
-        m_vc_per_vnet = m_network_ptr->getVCsPerClass();
-        m_num_vcs = m_virtual_networks*m_vc_per_vnet;
-        m_flit_width = m_network_ptr->getFlitSize();
-
-        m_routing_unit = new RoutingUnit_d(this);
-        m_vc_alloc = new VCallocator_d(this);
-        m_sw_alloc = new SWallocator_d(this);
-        m_switch = new Switch_d(this);
-
-        m_input_unit.clear();
-        m_output_unit.clear();
-
-        buf_read_count = 0;
-        buf_write_count = 0;
-        crossbar_count = 0;
-        vc_local_arbit_count = 0;
-        vc_global_arbit_count = 0;
-        sw_local_arbit_count = 0;
-        sw_global_arbit_count = 0;
+    m_id = id;
+    m_network_ptr = network_ptr;
+    m_virtual_networks = network_ptr->getNumberOfVirtualNetworks();
+    m_vc_per_vnet = m_network_ptr->getVCsPerClass();
+    m_num_vcs = m_virtual_networks*m_vc_per_vnet;
+    m_flit_width = m_network_ptr->getFlitSize();
+
+    m_routing_unit = new RoutingUnit_d(this);
+    m_vc_alloc = new VCallocator_d(this);
+    m_sw_alloc = new SWallocator_d(this);
+    m_switch = new Switch_d(this);
+
+    m_input_unit.clear();
+    m_output_unit.clear();
+
+    buf_read_count = 0;
+    buf_write_count = 0;
+    crossbar_count = 0;
+    vc_local_arbit_count = 0;
+    vc_global_arbit_count = 0;
+    sw_local_arbit_count = 0;
+    sw_global_arbit_count = 0;
 }
 
 Router_d::~Router_d()
 {
-        deletePointers(m_input_unit);
-        deletePointers(m_output_unit);
-        delete m_routing_unit;
-        delete m_vc_alloc;
-        delete m_sw_alloc;
-        delete m_switch;
+    deletePointers(m_input_unit);
+    deletePointers(m_output_unit);
+    delete m_routing_unit;
+    delete m_vc_alloc;
+    delete m_sw_alloc;
+    delete m_switch;
 }
 
-void Router_d::init()
+void
+Router_d::init()
 {
-        m_vc_alloc->init();
-        m_sw_alloc->init();
-        m_switch->init();
+    m_vc_alloc->init();
+    m_sw_alloc->init();
+    m_switch->init();
 }
 
-void Router_d::addInPort(NetworkLink_d *in_link, CreditLink_d *credit_link)
+void
+Router_d::addInPort(NetworkLink_d *in_link, CreditLink_d *credit_link)
 {
-        int port_num = m_input_unit.size();
-        InputUnit_d *input_unit = new InputUnit_d(port_num, this);
+    int port_num = m_input_unit.size();
+    InputUnit_d *input_unit = new InputUnit_d(port_num, this);
 
-        input_unit->set_in_link(in_link);
-        input_unit->set_credit_link(credit_link);
-        in_link->setLinkConsumer(input_unit);
-        credit_link->setSourceQueue(input_unit->getCreditQueue());
+    input_unit->set_in_link(in_link);
+    input_unit->set_credit_link(credit_link);
+    in_link->setLinkConsumer(input_unit);
+    credit_link->setSourceQueue(input_unit->getCreditQueue());
 
-        m_input_unit.push_back(input_unit);
+    m_input_unit.push_back(input_unit);
 }
 
-void Router_d::addOutPort(NetworkLink_d *out_link, const NetDest& routing_table_entry, int link_weight, CreditLink_d *credit_link)
+void
+Router_d::addOutPort(NetworkLink_d *out_link,
+    const NetDest& routing_table_entry, int link_weight,
+    CreditLink_d *credit_link)
 {
-        int port_num = m_output_unit.size();
-        OutputUnit_d *output_unit = new OutputUnit_d(port_num, this);
+    int port_num = m_output_unit.size();
+    OutputUnit_d *output_unit = new OutputUnit_d(port_num, this);
 
-        output_unit->set_out_link(out_link);
-        output_unit->set_credit_link(credit_link);
-        credit_link->setLinkConsumer(output_unit);
-        out_link->setSourceQueue(output_unit->getOutQueue());
+    output_unit->set_out_link(out_link);
+    output_unit->set_credit_link(credit_link);
+    credit_link->setLinkConsumer(output_unit);
+    out_link->setSourceQueue(output_unit->getOutQueue());
 
-        m_output_unit.push_back(output_unit);
+    m_output_unit.push_back(output_unit);
 
-        m_routing_unit->addRoute(routing_table_entry);
-        m_routing_unit->addWeight(link_weight);
+    m_routing_unit->addRoute(routing_table_entry);
+    m_routing_unit->addWeight(link_weight);
 }
 
-void Router_d::route_req(flit_d *t_flit, InputUnit_d *in_unit, int invc)
+void
+Router_d::route_req(flit_d *t_flit, InputUnit_d *in_unit, int invc)
 {
-        m_routing_unit->RC_stage(t_flit, in_unit, invc);
+    m_routing_unit->RC_stage(t_flit, in_unit, invc);
 }
-void Router_d::vcarb_req()
+
+void
+Router_d::vcarb_req()
 {
-        g_eventQueue_ptr->scheduleEvent(m_vc_alloc, 1);
+    g_eventQueue_ptr->scheduleEvent(m_vc_alloc, 1);
 }
-void Router_d::swarb_req()
+
+void
+Router_d::swarb_req()
 {
-        g_eventQueue_ptr->scheduleEvent(m_sw_alloc, 1);
+    g_eventQueue_ptr->scheduleEvent(m_sw_alloc, 1);
 }
-void Router_d::update_incredit(int in_port, int in_vc, int credit)
+
+void
+Router_d::update_incredit(int in_port, int in_vc, int credit)
 {
-        m_input_unit[in_port]->update_credit(in_vc, credit);
+    m_input_unit[in_port]->update_credit(in_vc, credit);
 }
-void Router_d::update_sw_winner(int inport, flit_d *t_flit)
+
+void
+Router_d::update_sw_winner(int inport, flit_d *t_flit)
 {
-        m_switch->update_sw_winner(inport, t_flit);
-        g_eventQueue_ptr->scheduleEvent(m_switch, 1);
+    m_switch->update_sw_winner(inport, t_flit);
+    g_eventQueue_ptr->scheduleEvent(m_switch, 1);
 }
 
-void Router_d::calculate_performance_numbers()
+void
+Router_d::calculate_performance_numbers()
 {
-        for(int i = 0; i < m_input_unit.size(); i++)
-        {
-                buf_read_count += m_input_unit[i]->get_buf_read_count();
-                buf_write_count += m_input_unit[i]->get_buf_write_count();
-        }
-        crossbar_count = m_switch->get_crossbar_count();
-        vc_local_arbit_count = m_vc_alloc->get_local_arbit_count();
-        vc_global_arbit_count = m_vc_alloc->get_global_arbit_count();
-        sw_local_arbit_count = m_sw_alloc->get_local_arbit_count();
-        sw_global_arbit_count = m_sw_alloc->get_global_arbit_count();
+    for (int i = 0; i < m_input_unit.size(); i++) {
+        buf_read_count += m_input_unit[i]->get_buf_read_count();
+        buf_write_count += m_input_unit[i]->get_buf_write_count();
+    }
+    crossbar_count = m_switch->get_crossbar_count();
+    vc_local_arbit_count = m_vc_alloc->get_local_arbit_count();
+    vc_global_arbit_count = m_vc_alloc->get_global_arbit_count();
+    sw_local_arbit_count = m_sw_alloc->get_local_arbit_count();
+    sw_global_arbit_count = m_sw_alloc->get_global_arbit_count();
 }
 
-void Router_d::printConfig(ostream& out)
+void
+Router_d::printConfig(ostream& out)
 {
-        out << "[Router " << m_id << "] :: " << endl;
-        out << "[inLink - ";
-        for(int i = 0;i < m_input_unit.size(); i++)
-                out << m_input_unit[i]->get_inlink_id() << " - ";
-        out << "]" << endl;
-        out << "[outLink - ";
-        for(int i = 0;i < m_output_unit.size(); i++)
-                out << m_output_unit[i]->get_outlink_id() << " - ";
-        out << "]" << endl;
+    out << "[Router " << m_id << "] :: " << endl;
+    out << "[inLink - ";
+    for (int i = 0;i < m_input_unit.size(); i++)
+        out << m_input_unit[i]->get_inlink_id() << " - ";
+    out << "]" << endl;
+    out << "[outLink - ";
+    for (int i = 0;i < m_output_unit.size(); i++)
+        out << m_output_unit[i]->get_outlink_id() << " - ";
+    out << "]" << endl;
 }
-