diff options
| author | Brad Beckmann <Brad.Beckmann@amd.com> | 2011-04-28 17:18:14 -0700 |
|---|---|---|
| committer | Brad Beckmann <Brad.Beckmann@amd.com> | 2011-04-28 17:18:14 -0700 |
| commit | 6c7429dbe34b2f4ad20e56d5054d5eb7b88acaca (patch) | |
| tree | bbd0777861c0e591e64e9d65a452d776e6e68f28 | |
| parent | 651cfbab0321fed267fb78ec6706057a0ca654e0 (diff) | |
| download | gem5-6c7429dbe34b2f4ad20e56d5054d5eb7b88acaca.tar.xz | |
garnet: removed flit_width from Routers
5 files changed, 2 insertions, 5 deletions
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 1a216abb9..c88568d2d 100644 --- 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 5eefd52de..d8f460e2e 100644 --- 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 ec44cc7b3..286d13a20 100644 --- 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 1aabd375f..a7ddfb7fb 100644 --- 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 2b77c2ef6..73d60697a 100644 --- 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, |