diff options
author | Jason Power <powerjg@cs.wisc.edu> | 2012-08-10 13:50:42 -0500 |
---|---|---|
committer | Jason Power <powerjg@cs.wisc.edu> | 2012-08-10 13:50:42 -0500 |
commit | 11411cc9c70fb532798c5c8fb287ad658111ff15 (patch) | |
tree | 5ac6030e71ed22cfb57ce927ad50cf76e44ba2ea /configs/topologies/Crossbar.py | |
parent | 706e84f2b8553baba020560f4a83550f05b80630 (diff) | |
download | gem5-11411cc9c70fb532798c5c8fb287ad658111ff15.tar.xz |
Ruby: Clean up topology changes
This patch moves instantiateTopology into Ruby.py and removes the
mem/ruby/network/topologies directory. It also adds some extra inheritance to
the topologies to clean up some issues in the existing topologies.
Diffstat (limited to 'configs/topologies/Crossbar.py')
-rw-r--r-- | configs/topologies/Crossbar.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/configs/topologies/Crossbar.py b/configs/topologies/Crossbar.py index e66492922..c85b8e8eb 100644 --- a/configs/topologies/Crossbar.py +++ b/configs/topologies/Crossbar.py @@ -29,14 +29,11 @@ from m5.params import * from m5.objects import * -from BaseTopology import BaseTopology +from BaseTopology import SimpleTopology -class Crossbar(BaseTopology): +class Crossbar(SimpleTopology): description='Crossbar' - def __init__(self, controllers): - self.nodes = controllers - def makeTopology(self, options, IntLink, ExtLink, Router): # Create an individual router for each controller plus one more for the # centralized crossbar. The large numbers of routers are needed because @@ -53,4 +50,3 @@ class Crossbar(BaseTopology): for i in range(len(self.nodes))] return routers, int_links, ext_links - |