diff options
Diffstat (limited to 'src/mem/ruby/network/garnet/fixed-pipeline')
-rw-r--r-- | src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 32 | ||||
-rw-r--r-- | src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh | 13 |
2 files changed, 0 insertions, 45 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 5aa9ceca8..c8b9fbea7 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc @@ -49,12 +49,6 @@ using m5::stl_helpers::deletePointers; GarnetNetwork_d::GarnetNetwork_d(const Params *p) : BaseGarnetNetwork(p) { - m_ruby_start = 0; - m_flits_received = 0; - m_flits_injected = 0; - m_network_latency = 0.0; - m_queueing_latency = 0.0; - // record the routers for (vector<BasicRouter*>::const_iterator i = m_topology_ptr->params()->routers.begin(); @@ -62,32 +56,6 @@ GarnetNetwork_d::GarnetNetwork_d(const Params *p) Router_d* router = safe_cast<Router_d*>(*i); m_router_ptr_vector.push_back(router); } - - // Queues that are getting messages from protocol - m_toNetQueues.resize(m_nodes); - - // Queues that are feeding the protocol - m_fromNetQueues.resize(m_nodes); - m_in_use.resize(m_virtual_networks); - m_ordered.resize(m_virtual_networks); - for (int i = 0; i < m_virtual_networks; i++) { - m_in_use[i] = false; - m_ordered[i] = false; - } - - for (int node = 0; node < m_nodes; node++) { - // Setting how many vitual message buffers - // will there be per Network Queue - m_toNetQueues[node].resize(m_virtual_networks); - m_fromNetQueues[node].resize(m_virtual_networks); - - // Instantiating the Message Buffers - // that interact with the coherence protocol - for (int j = 0; j < m_virtual_networks; j++) { - m_toNetQueues[node][j] = new MessageBuffer(); - m_fromNetQueues[node][j] = new MessageBuffer(); - } - } } void 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 7c6e5f8e1..b4e264be1 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh @@ -125,24 +125,11 @@ class GarnetNetwork_d : public BaseGarnetNetwork GarnetNetwork_d& operator=(const GarnetNetwork_d& obj); std::vector<VNET_type > m_vnet_type; - // int m_virtual_networks; - // int m_nodes; - int m_flits_received, m_flits_injected; - double m_network_latency, m_queueing_latency; - - std::vector<bool> m_in_use; - std::vector<bool> m_ordered; - - std::vector<std::vector<MessageBuffer*> > m_toNetQueues; - std::vector<std::vector<MessageBuffer*> > m_fromNetQueues; 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 - - // Topology* m_topology_ptr; - Time m_ruby_start; }; inline std::ostream& |