garnet: removed flit_width from Routers

src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py

@@ -39,6 +39,5 @@ class GarnetRouter_d(BasicRouter):
                               "virtual channels per message class")
     virt_nets = Param.Int(Parent.number_of_virtual_networks,
                           "number of virtual networks")
-    flit_width = Param.Int(Parent.ni_flit_size, "flit width == flit size")
 
 

src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc

@@ -49,7 +49,6 @@ Router_d::Router_d(const Params *p)
     m_virtual_networks = p->virt_nets;
     m_vc_per_vnet = p->vcs_per_class;
     m_num_vcs = m_virtual_networks * m_vc_per_vnet;
-    m_flit_width = p->flit_width;
 
     m_routing_unit = new RoutingUnit_d(this);
     m_vc_alloc = new VCallocator_d(this);

src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh

@@ -96,7 +96,6 @@ class Router_d : public BasicRouter
   private:
     int m_virtual_networks, m_num_vcs, m_vc_per_vnet;
     GarnetNetwork_d *m_network_ptr;
-    int m_flit_width;
 
     std::vector<double> buf_read_count;
     std::vector<double> buf_write_count;

src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py

@@ -39,6 +39,5 @@ class GarnetRouter(BasicRouter):
                               "virtual channels per message class")
     virt_nets = Param.Int(Parent.number_of_virtual_networks,
                           "number of virtual networks")
-    flit_width = Param.Int(Parent.ni_flit_size, "flit width == flit size")
 
 

src/mem/ruby/network/orion/NetworkPower.cc

@@ -96,7 +96,8 @@ Router_d::calculate_power()
     uint32_t num_vc_per_vclass = m_vc_per_vnet;
     uint32_t in_buf_per_data_vc = m_network_ptr->getBuffersPerDataVC();
     uint32_t in_buf_per_ctrl_vc = m_network_ptr->getBuffersPerCtrlVC();
-    uint32_t flit_width = m_flit_width * 8; //flit width in bits
+    //flit width in bits
+    uint32_t flit_width = m_network_ptr->getNiFlitSize() * 8; 
 
     orion_rtr_ptr = new OrionRouter(
         num_in_port,