From 4488379244cdf3c211e76dbf3b4278347f639039 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Tue, 2 Oct 2012 14:35:45 -0500 Subject: ruby: changes to simple network This patch makes the Switch structure inherit from BasicRouter, as is done in two other networks. --- src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py | 2 -- src/mem/ruby/network/garnet/flexible-pipeline/Router.cc | 1 - src/mem/ruby/network/garnet/flexible-pipeline/Router.hh | 1 - 3 files changed, 4 deletions(-) (limited to 'src/mem/ruby/network/garnet/flexible-pipeline') diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py index b626471a6..a39348c46 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py +++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetRouter.py @@ -39,5 +39,3 @@ class GarnetRouter(BasicRouter): "virtual channels per virtual network") virt_nets = Param.Int(Parent.number_of_virtual_networks, "number of virtual networks") - - diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc index 88361d35a..44dd6a501 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc +++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.cc @@ -43,7 +43,6 @@ using m5::stl_helpers::deletePointers; Router::Router(const Params *p) : BasicRouter(p), FlexibleConsumer(this) { - m_id = p->router_id; m_virtual_networks = p->virt_nets; m_vc_per_vnet = p->vcs_per_vnet; m_round_robin_inport = 0; diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh index 504284404..93578b597 100644 --- a/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh +++ b/src/mem/ruby/network/garnet/flexible-pipeline/Router.hh @@ -75,7 +75,6 @@ class Router : public BasicRouter, public FlexibleConsumer } private: - int m_id; int m_virtual_networks, m_num_vcs, m_vc_per_vnet; GarnetNetwork *m_net_ptr; std::vector m_vc_round_robin; // For scheduling of out source queues -- cgit v1.2.3