garnet: removed flit_width from Routers

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py
index 1a216abb92ca35dfdb2107afea946fda00459fea..c88568d2d15a54ed6185c3a9344a64572cc4d56c 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetRouter_d.py
+++ b/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")
 
 

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 5eefd52debd0b2a43cfffef9af2c7971a43e2bbd..d8f460e2eb4d3b73de15796e8d639b191d3a1a83 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.cc
+++ b/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);

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
index ec44cc7b310242927d249f1fabc1a824942457d3..286d13a2090ef8517eaf705e9b209e89ec212302 100644 (file)
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
+++ b/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;

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py
index 1aabd375fc17e09390de630a3229368ab989cb22..a7ddfb7fb5fa8f1ca7a853d85d4a88d33a0bee54 100644 (file)
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py
+++ b/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")
 
 

diff --git a/src/mem/ruby/network/orion/NetworkPower.cc b/src/mem/ruby/network/orion/NetworkPower.cc
index 2b77c2ef680346034c2270822694bbb8ac446942..73d60697a541931fcbbb5f33123f7cd89a8ccbf3 100644 (file)
--- a/src/mem/ruby/network/orion/NetworkPower.cc
+++ b/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,