summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/example/ruby_direct_test.py1
-rw-r--r--configs/example/ruby_fs.py1
-rw-r--r--configs/example/ruby_mem_test.py1
-rw-r--r--configs/example/ruby_network_test.py1
-rw-r--r--configs/example/ruby_random_test.py1
-rw-r--r--configs/example/se.py1
-rw-r--r--configs/ruby/MESI_CMP_directory.py5
-rw-r--r--configs/ruby/MI_example.py5
-rw-r--r--configs/ruby/MOESI_CMP_directory.py5
-rw-r--r--configs/ruby/MOESI_CMP_token.py5
-rw-r--r--configs/ruby/MOESI_hammer.py5
-rw-r--r--configs/ruby/Network_test.py5
-rw-r--r--configs/ruby/Ruby.py28
-rw-r--r--configs/topologies/BaseTopology.py51
-rw-r--r--configs/topologies/Cluster.py117
-rw-r--r--configs/topologies/Crossbar.py (renamed from src/mem/ruby/network/topologies/Crossbar.py)37
-rw-r--r--configs/topologies/Mesh.py114
-rw-r--r--configs/topologies/MeshDirCorners.py134
-rw-r--r--configs/topologies/Pt2Pt.py (renamed from src/mem/ruby/network/topologies/Pt2Pt.py)47
-rw-r--r--configs/topologies/Torus.py126
-rw-r--r--src/mem/ruby/network/topologies/Mesh.py114
-rw-r--r--src/mem/ruby/network/topologies/MeshDirCorners.py132
-rw-r--r--src/mem/ruby/network/topologies/SConscript6
-rw-r--r--src/mem/ruby/network/topologies/TopologyCreator.py19
-rw-r--r--src/mem/ruby/network/topologies/Torus.py126
-rw-r--r--src/python/m5/SimObject.py13
26 files changed, 666 insertions, 434 deletions
diff --git a/configs/example/ruby_direct_test.py b/configs/example/ruby_direct_test.py
index f591d47ea..1fcad30a9 100644
--- a/configs/example/ruby_direct_test.py
+++ b/configs/example/ruby_direct_test.py
@@ -35,6 +35,7 @@ from m5.util import addToPath
import os, optparse, sys
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Options
import Ruby
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index 35e485c7a..97863a46b 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -40,6 +40,7 @@ from m5.util import addToPath, fatal
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Ruby
diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py
index 4d7932b77..e3dab955c 100644
--- a/configs/example/ruby_mem_test.py
+++ b/configs/example/ruby_mem_test.py
@@ -35,6 +35,7 @@ from m5.util import addToPath
import os, optparse, sys
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Options
import Ruby
diff --git a/configs/example/ruby_network_test.py b/configs/example/ruby_network_test.py
index 1d44813ac..58e8b2e40 100644
--- a/configs/example/ruby_network_test.py
+++ b/configs/example/ruby_network_test.py
@@ -35,6 +35,7 @@ from m5.util import addToPath
import os, optparse, sys
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Options
import Ruby
diff --git a/configs/example/ruby_random_test.py b/configs/example/ruby_random_test.py
index b4d32b72c..eae3873b7 100644
--- a/configs/example/ruby_random_test.py
+++ b/configs/example/ruby_random_test.py
@@ -35,6 +35,7 @@ from m5.util import addToPath
import os, optparse, sys
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Options
import Ruby
diff --git a/configs/example/se.py b/configs/example/se.py
index 83abbd2f3..fa20c37db 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -52,6 +52,7 @@ from m5.util import addToPath, fatal
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Options
import Ruby
diff --git a/configs/ruby/MESI_CMP_directory.py b/configs/ruby/MESI_CMP_directory.py
index cd503ddc9..d877543c0 100644
--- a/configs/ruby/MESI_CMP_directory.py
+++ b/configs/ruby/MESI_CMP_directory.py
@@ -31,6 +31,7 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
+from Ruby import create_topology
#
# Note: the L1 Cache latency is only used by the sequencer on fast path hits
@@ -185,4 +186,6 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
dir_cntrl_nodes + \
dma_cntrl_nodes
- return (cpu_sequencers, dir_cntrl_nodes, all_cntrls)
+ topology = create_topology(all_cntrls, options)
+
+ return (cpu_sequencers, dir_cntrl_nodes, topology)
diff --git a/configs/ruby/MI_example.py b/configs/ruby/MI_example.py
index de82c38f6..4fb55b89f 100644
--- a/configs/ruby/MI_example.py
+++ b/configs/ruby/MI_example.py
@@ -31,6 +31,7 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
+from Ruby import create_topology
#
# Note: the cache latency is only used by the sequencer on fast path hits
@@ -155,4 +156,6 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
all_cntrls = l1_cntrl_nodes + dir_cntrl_nodes + dma_cntrl_nodes
- return (cpu_sequencers, dir_cntrl_nodes, all_cntrls)
+ topology = create_topology(all_cntrls, options)
+
+ return (cpu_sequencers, dir_cntrl_nodes, topology)
diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py
index 10eeaf21a..bce7be5d6 100644
--- a/configs/ruby/MOESI_CMP_directory.py
+++ b/configs/ruby/MOESI_CMP_directory.py
@@ -31,6 +31,7 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
+from Ruby import create_topology
#
# Note: the L1 Cache latency is only used by the sequencer on fast path hits
@@ -182,4 +183,6 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
dir_cntrl_nodes + \
dma_cntrl_nodes
- return (cpu_sequencers, dir_cntrl_nodes, all_cntrls)
+ topology = create_topology(all_cntrls, options)
+
+ return (cpu_sequencers, dir_cntrl_nodes, topology)
diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py
index 4da7d7adf..51cc5fb92 100644
--- a/configs/ruby/MOESI_CMP_token.py
+++ b/configs/ruby/MOESI_CMP_token.py
@@ -31,6 +31,7 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
+from Ruby import create_topology
#
# Note: the L1 Cache latency is only used by the sequencer on fast path hits
@@ -206,4 +207,6 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
dir_cntrl_nodes + \
dma_cntrl_nodes
- return (cpu_sequencers, dir_cntrl_nodes, all_cntrls)
+ topology = create_topology(all_cntrls, options)
+
+ return (cpu_sequencers, dir_cntrl_nodes, topology)
diff --git a/configs/ruby/MOESI_hammer.py b/configs/ruby/MOESI_hammer.py
index 622296289..48129c0a4 100644
--- a/configs/ruby/MOESI_hammer.py
+++ b/configs/ruby/MOESI_hammer.py
@@ -31,6 +31,7 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
+from Ruby import create_topology
#
# Note: the L1 Cache latency is only used by the sequencer on fast path hits
@@ -219,4 +220,6 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
all_cntrls = l1_cntrl_nodes + dir_cntrl_nodes + dma_cntrl_nodes
- return (cpu_sequencers, dir_cntrl_nodes, all_cntrls)
+ topology = create_topology(all_cntrls, options)
+
+ return (cpu_sequencers, dir_cntrl_nodes, topology)
diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py
index b84fabde6..6eae52e86 100644
--- a/configs/ruby/Network_test.py
+++ b/configs/ruby/Network_test.py
@@ -31,6 +31,7 @@ import m5
from m5.objects import *
from m5.defines import buildEnv
from m5.util import addToPath
+from Ruby import create_topology
#
# Note: the cache latency is only used by the sequencer on fast path hits
@@ -135,4 +136,6 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
all_cntrls = l1_cntrl_nodes + dir_cntrl_nodes
- return (cpu_sequencers, dir_cntrl_nodes, all_cntrls)
+ topology = create_topology(all_cntrls, options)
+
+ return (cpu_sequencers, dir_cntrl_nodes, topology)
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py
index 87939fac8..82b8d0111 100644
--- a/configs/ruby/Ruby.py
+++ b/configs/ruby/Ruby.py
@@ -79,6 +79,16 @@ def define_options(parser):
exec "import %s" % protocol
eval("%s.define_options(parser)" % protocol)
+def create_topology(controllers, options):
+ """ Called from create_system in configs/ruby/<protocol>.py
+ Must return an object which is a subclass of BaseTopology
+ found in configs/topologies/BaseTopology.py
+ This is a wrapper for the legacy topologies.
+ """
+ exec "import %s as Topo" % options.topology
+ topology = eval("Topo.%s(controllers)" % options.topology)
+ return topology
+
def create_system(options, system, piobus = None, dma_ports = []):
system.ruby = RubySystem(clock = options.clock,
@@ -89,7 +99,7 @@ def create_system(options, system, piobus = None, dma_ports = []):
protocol = buildEnv['PROTOCOL']
exec "import %s" % protocol
try:
- (cpu_sequencers, dir_cntrls, all_cntrls) = \
+ (cpu_sequencers, dir_cntrls, topology) = \
eval("%s.create_system(options, system, piobus, dma_ports, ruby)"
% protocol)
except:
@@ -128,17 +138,17 @@ def create_system(options, system, piobus = None, dma_ports = []):
class RouterClass(BasicRouter): pass
#
- # Important: the topology must be created before the network and after the
- # controllers.
+ # Important: the topology must be instantiated before the network and after
+ # the controllers. Hence the separation between topology definition and
+ # instantiation. TopologyCreator is in src/mem/ruby/network/topologies/.
#
- exec "import %s" % options.topology
+ from TopologyCreator import instantiateTopology
try:
- net_topology = eval("%s.makeTopology(all_cntrls, options, \
- IntLinkClass, ExtLinkClass, \
- RouterClass)" \
- % options.topology)
+ net_topology = instantiateTopology(topology, options, \
+ IntLinkClass, ExtLinkClass, \
+ RouterClass)
except:
- print "Error: could not create topology %s" % options.topology
+ print "Error: could not make topology %s" % options.topology
raise
if options.network_fault_model:
diff --git a/configs/topologies/BaseTopology.py b/configs/topologies/BaseTopology.py
new file mode 100644
index 000000000..114a29f19
--- /dev/null
+++ b/configs/topologies/BaseTopology.py
@@ -0,0 +1,51 @@
+# Copyright (c) 2012 Advanced Micro Devices, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Jason Power
+
+
+class BaseTopology(object):
+ description = "BaseTopology"
+
+ def __init__(self):
+ """ When overriding place any objects created in
+ configs/ruby/<protocol>.py that are needed in
+ makeTopology (below) here. The minimum is usually
+ all of the controllers created in the above file.
+ """
+
+ def makeTopology(self, options, IntLink, ExtLink, Router):
+ """ Called from src/mem/ruby/network/topologies/TopologyCreatory.py
+ The return value is ( list(Router), list(IntLink), list(ExtLink))
+ The API of this function cannot change when subclassing!!
+ Any additional information needed to create this topology should
+ be passed into the constructor when it's instantiated in
+ configs/ruby/<protocol>.py
+ """
+ print "BaseTopology should have been overridden in a sub class!!"
+ import sys
+ sys.exit(1)
+
diff --git a/configs/topologies/Cluster.py b/configs/topologies/Cluster.py
new file mode 100644
index 000000000..e5c6dac0e
--- /dev/null
+++ b/configs/topologies/Cluster.py
@@ -0,0 +1,117 @@
+# Copyright (c) 2012 Advanced Micro Devices, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Jason Power
+
+
+from BaseTopology import BaseTopology
+
+class Cluster(BaseTopology):
+ """ A cluster is a group of nodes which are all one hop from eachother
+ Clusters can also contain other clusters
+ When creating this kind of topology, return a single cluster (usually
+ the root cluster) from create_system in configs/ruby/<protocol>.py
+ """
+
+ _num_int_links = 0
+ _num_ext_links = 0
+ _num_routers = 0
+
+ # Below methods for auto counting
+ @classmethod
+ def num_int_links(cls):
+ cls._num_int_links += 1
+ return cls._num_int_links - 1
+ @classmethod
+ def num_ext_links(cls):
+ cls._num_ext_links += 1
+ return cls._num_ext_links - 1
+ @classmethod
+ def num_routers(cls):
+ cls._num_routers += 1
+ return cls._num_routers - 1
+
+ def __init__(self, intBW=0, extBW=0, intLatency=0, extLatency=0):
+ """ internalBandwidth is bandwidth of all links within the cluster
+ externalBandwidth is bandwidth from this cluster to any cluster
+ connecting to it.
+ internal/externalLatency are similar
+ **** When creating a cluster with sub-clusters, the sub-cluster
+ external bandwidth overrides the internal bandwidth of the
+ super cluster
+ """
+ self.nodes = []
+ self.router = None # created in makeTopology
+ self.intBW = intBW
+ self.extBW = extBW
+ self.intLatency = intLatency
+ self.extLatency = extLatency
+
+ def add(self, node):
+ self.nodes.append(node)
+
+ def makeTopology(self, options, IntLink, ExtLink, Router):
+ """ Recursively make all of the links and routers
+ """
+ routers = []
+ int_links = []
+ ext_links = []
+
+ # make a router to connect all of the nodes
+ self.router = Router(router_id=self.num_routers())
+ routers.append(self.router)
+ for node in self.nodes:
+ if type(node) == Cluster:
+ subRouters, subIntLinks, subExtLinks = node.makeTopology(options, IntLink, ExtLink, Router)
+ routers += subRouters
+ int_links += subIntLinks
+ ext_links += subExtLinks
+
+ # connect this cluster to the router
+ link = IntLink(link_id=self.num_int_links(), node_a=self.router, node_b=node.router)
+ if node.extBW:
+ link.bandwidth_factor = node.extBW
+ elif self.intBW: # if there is an interanl b/w for this node and no ext b/w to override
+ link.bandwidth_factor = self.intBW
+
+ if node.extLatency:
+ link.latency = node.extLatency
+ elif self.intLatency:
+ link.latency = self.intLatency
+
+ int_links.append(link)
+ else:
+ # node is just a controller connect it to the router via a ext_link
+ link = ExtLink(link_id=self.num_ext_links(), ext_node=node, int_node=self.router)
+ if self.intBW:
+ link.bandwidth_factor = self.intBW
+ if self.intLatency:
+ link.latency = self.intLatency
+
+ ext_links.append(link)
+
+ return routers, int_links, ext_links
+
diff --git a/src/mem/ruby/network/topologies/Crossbar.py b/configs/topologies/Crossbar.py
index 04e01ee1c..e66492922 100644
--- a/src/mem/ruby/network/topologies/Crossbar.py
+++ b/configs/topologies/Crossbar.py
@@ -29,23 +29,28 @@
from m5.params import *
from m5.objects import *
-class Crossbar(Topology):
+from BaseTopology import BaseTopology
+
+class Crossbar(BaseTopology):
description='Crossbar'
-def makeTopology(nodes, 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
- # external links do not model outgoing bandwidth in the simple network, but
- # internal links do.
- cb = Crossbar()
- cb.routers = [Router(router_id=i) for i in range(len(nodes)+1)]
- cb.ext_links = [ExtLink(link_id=i, ext_node=n, int_node=cb.routers[i])
- for (i, n) in enumerate(nodes)]
- link_count = len(nodes)
- xbar = cb.routers[len(nodes)] # the crossbar router is the last router created
- cb.int_links = [IntLink(link_id=(link_count+i),
- node_a=cb.routers[i], node_b=xbar)
- for i in range(len(nodes))]
- return cb
+ 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
+ # external links do not model outgoing bandwidth in the simple network, but
+ # internal links do.
+
+ routers = [Router(router_id=i) for i in range(len(self.nodes)+1)]
+ ext_links = [ExtLink(link_id=i, ext_node=n, int_node=routers[i])
+ for (i, n) in enumerate(self.nodes)]
+ link_count = len(self.nodes)
+ xbar = routers[len(self.nodes)] # the crossbar router is the last router created
+ int_links = [IntLink(link_id=(link_count+i),
+ node_a=routers[i], node_b=xbar)
+ for i in range(len(self.nodes))]
+ return routers, int_links, ext_links
diff --git a/configs/topologies/Mesh.py b/configs/topologies/Mesh.py
new file mode 100644
index 000000000..b1f2e6751
--- /dev/null
+++ b/configs/topologies/Mesh.py
@@ -0,0 +1,114 @@
+# Copyright (c) 2010 Advanced Micro Devices, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Brad Beckmann
+
+from m5.params import *
+from m5.objects import *
+
+from BaseTopology import BaseTopology
+
+class Mesh(BaseTopology):
+ description='Mesh'
+
+ def __init__(self, controllers):
+ self.nodes = controllers
+
+ # Makes a generic mesh assuming an equal number of cache and directory cntrls
+
+ def makeTopology(self, options, IntLink, ExtLink, Router):
+ nodes = self.nodes
+
+ num_routers = options.num_cpus
+ num_rows = options.mesh_rows
+
+ # There must be an evenly divisible number of cntrls to routers
+ # Also, obviously the number or rows must be <= the number of routers
+ cntrls_per_router, remainder = divmod(len(nodes), num_routers)
+ assert(num_rows <= num_routers)
+ num_columns = int(num_routers / num_rows)
+ assert(num_columns * num_rows == num_routers)
+
+ # Create the routers in the mesh
+ routers = [Router(router_id=i) for i in range(num_routers)]
+
+ # link counter to set unique link ids
+ link_count = 0
+
+ # Add all but the remainder nodes to the list of nodes to be uniformly
+ # distributed across the network.
+ network_nodes = []
+ remainder_nodes = []
+ for node_index in xrange(len(nodes)):
+ if node_index < (len(nodes) - remainder):
+ network_nodes.append(nodes[node_index])
+ else:
+ remainder_nodes.append(nodes[node_index])
+
+ # Connect each node to the appropriate router
+ ext_links = []
+ for (i, n) in enumerate(network_nodes):
+ cntrl_level, router_id = divmod(i, num_routers)
+ assert(cntrl_level < cntrls_per_router)
+ ext_links.append(ExtLink(link_id=link_count, ext_node=n,
+ int_node=routers[router_id]))
+ link_count += 1
+
+ # Connect the remainding nodes to router 0. These should only be
+ # DMA nodes.
+ for (i, node) in enumerate(remainder_nodes):
+ assert(node.type == 'DMA_Controller')
+ assert(i < remainder)
+ ext_links.append(ExtLink(link_id=link_count, ext_node=node,
+ int_node=routers[0]))
+ link_count += 1
+
+ # Create the mesh links. First row (east-west) links then column
+ # (north-south) links
+ int_links = []
+ for row in xrange(num_rows):
+ for col in xrange(num_columns):
+ if (col + 1 < num_columns):
+ east_id = col + (row * num_columns)
+ west_id = (col + 1) + (row * num_columns)
+ int_links.append(IntLink(link_id=link_count,
+ node_a=routers[east_id],
+ node_b=routers[west_id],
+ weight=1))
+ link_count += 1
+
+ for col in xrange(num_columns):
+ for row in xrange(num_rows):
+ if (row + 1 < num_rows):
+ north_id = col + (row * num_columns)
+ south_id = col + ((row + 1) * num_columns)
+ int_links.append(IntLink(link_id=link_count,
+ node_a=routers[north_id],
+ node_b=routers[south_id],
+ weight=2))
+ link_count += 1
+
+ return routers, int_links, ext_links
diff --git a/configs/topologies/MeshDirCorners.py b/configs/topologies/MeshDirCorners.py
new file mode 100644
index 000000000..23bcde5a6
--- /dev/null
+++ b/configs/topologies/MeshDirCorners.py
@@ -0,0 +1,134 @@
+# Copyright (c) 2010 Advanced Micro Devices, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Brad Beckmann
+
+from m5.params import *
+from m5.objects import *
+
+from BaseTopology import BaseTopology
+
+class MeshDirCorners(BaseTopology):
+ description='MeshDirCorners'
+
+ def __init__(self, controllers):
+ self.nodes = controllers
+
+ # This file contains a special network creation function. This
+ # networks is not general and will only work with specific system
+ # configurations. The network specified is similar to GEMS old file
+ # specified network.
+
+ def makeTopology(self, options, IntLink, ExtLink, Router):
+ nodes = self.nodes
+
+ num_routers = options.num_cpus
+ num_rows = options.mesh_rows
+
+ # First determine which nodes are cache cntrls vs. dirs vs. dma
+ cache_nodes = []
+ dir_nodes = []
+ dma_nodes = []
+ for node in nodes:
+ if node.type == 'L1Cache_Controller' or \
+ node.type == 'L2Cache_Controller':
+ cache_nodes.append(node)
+ elif node.type == 'Directory_Controller':
+ dir_nodes.append(node)
+ elif node.type == 'DMA_Controller':
+ dma_nodes.append(node)
+
+ # Obviously the number or rows must be <= the number of routers
+ # and evenly divisible. Also the number of caches must be a
+ # multiple of the number of routers and the number of directories
+ # must be four.
+ assert(num_rows <= num_routers)
+ num_columns = int(num_routers / num_rows)
+ assert(num_columns * num_rows == num_routers)
+ caches_per_router, remainder = divmod(len(cache_nodes), num_routers)
+ assert(remainder == 0)
+ assert(len(dir_nodes) == 4)
+
+ # Create the routers in the mesh
+ routers = [Router(router_id=i) for i in range(num_routers)]
+
+ # link counter to set unique link ids
+ link_count = 0
+
+ # Connect each cache controller to the appropriate router
+ ext_links = []
+ for (i, n) in enumerate(cache_nodes):
+ cntrl_level, router_id = divmod(i, num_routers)
+ assert(cntrl_level < caches_per_router)
+ ext_links.append(ExtLink(link_id=link_count, ext_node=n,
+ int_node=routers[router_id]))
+ link_count += 1
+
+ # Connect the dir nodes to the corners.
+ ext_links.append(ExtLink(link_id=link_count, ext_node=dir_nodes[0],
+ int_node=routers[0]))
+ link_count += 1
+ ext_links.append(ExtLink(link_id=link_count, ext_node=dir_nodes[1],
+ int_node=routers[num_columns - 1]))
+ link_count += 1
+ ext_links.append(ExtLink(link_id=link_count, ext_node=dir_nodes[2],
+ int_node=routers[num_routers - num_columns]))
+ link_count += 1
+ ext_links.append(ExtLink(link_id=link_count, ext_node=dir_nodes[3],
+ int_node=routers[num_routers - 1]))
+ link_count += 1
+
+ # Connect the dma nodes to router 0. These should only be DMA nodes.
+ for (i, node) in enumerate(dma_nodes):
+ assert(node.type == 'DMA_Controller')
+ ext_links.append(ExtLink(link_id=link_count, ext_node=node, int_node=routers[0]))
+
+ # Create the mesh links. First row (east-west) links then column
+ # (north-south) links
+ int_links = []
+ for row in xrange(num_rows):
+ for col in xrange(num_columns):
+ if (col + 1 < num_columns):
+ east_id = col + (row * num_columns)
+ west_id = (col + 1) + (row * num_columns)
+ int_links.append(IntLink(link_id=link_count,
+ node_a=routers[east_id],
+ node_b=routers[west_id],
+ weight=1))
+ link_count += 1
+
+ for col in xrange(num_columns):
+ for row in xrange(num_rows):
+ if (row + 1 < num_rows):
+ north_id = col + (row * num_columns)
+ south_id = col + ((row + 1) * num_columns)
+ int_links.append(IntLink(link_id=link_count,
+ node_a=routers[north_id],
+ node_b=routers[south_id],
+ weight=2))
+ link_count += 1
+
+ return routers, int_links, ext_links
diff --git a/src/mem/ruby/network/topologies/Pt2Pt.py b/configs/topologies/Pt2Pt.py
index f6ca13626..360811272 100644
--- a/src/mem/ruby/network/topologies/Pt2Pt.py
+++ b/configs/topologies/Pt2Pt.py
@@ -31,27 +31,30 @@
from m5.params import *
from m5.objects import *
-class Pt2Pt(Topology):
+from BaseTopology import BaseTopology
+
+class Pt2Pt(BaseTopology):
description='Pt2Pt'
-def makeTopology(nodes, options, IntLink, ExtLink, Router):
- # Create an individual router for each controller, and connect all to all.
- pt2pt = Pt2Pt()
- pt2pt.routers = [Router(router_id=i) for i in range(len(nodes))]
- ext_links = [ExtLink(link_id=i, ext_node=n, int_node=pt2pt.routers[i])
- for (i, n) in enumerate(nodes)]
- link_count = len(nodes)
-
- int_links = []
- for i in xrange(len(nodes)):
- for j in xrange(len(nodes)):
- if (i != j):
- link_count += 1
- int_links.append(IntLink(link_id=link_count,
- node_a=pt2pt.routers[i],
- node_b=pt2pt.routers[j]))
-
- pt2pt.ext_links = ext_links
- pt2pt.int_links = int_links
-
- return pt2pt
+ def __init__(self, controllers):
+ self.nodes = controllers
+
+ def makeTopology(self, options, IntLink, ExtLink, Router):
+ nodes = self.nodes
+ # Create an individual router for each controller, and connect all to all.
+
+ routers = [Router(router_id=i) for i in range(len(nodes))]
+ ext_links = [ExtLink(link_id=i, ext_node=n, int_node=routers[i])
+ for (i, n) in enumerate(nodes)]
+ link_count = len(nodes)
+
+ int_links = []
+ for i in xrange(len(nodes)):
+ for j in xrange(len(nodes)):
+ if (i != j):
+ link_count += 1
+ int_links.append(IntLink(link_id=link_count,
+ node_a=routers[i],
+ node_b=routers[j]))
+
+ return routers, int_links, ext_links
diff --git a/configs/topologies/Torus.py b/configs/topologies/Torus.py
new file mode 100644
index 000000000..7fbcbf55b
--- /dev/null
+++ b/configs/topologies/Torus.py
@@ -0,0 +1,126 @@
+# Copyright (c) 2011 Advanced Micro Devices, Inc.
+# 2011 Massachusetts Institute of Technology
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Brad Beckmann
+# Tushar Krishna
+
+from m5.params import *
+from m5.objects import *
+
+from BaseTopology import BaseTopology
+
+class Torus(BaseTopology):
+ description='Torus'
+
+ def __init__(self, controllers):
+ self.nodes = controllers
+
+ # Makes a generic torus assuming an equal number of cache and directory cntrls
+ # Assuming a folded-torus on-chip layout (as shown on gem5 wiki).
+ # All links (including the wrap-around ones) are of equal length, double that
+ # of a mesh. Thus, each link is assigned a latency of 2 cycles.
+
+ def makeTopology(self, options, IntLink, ExtLink, Router):
+ nodes = self.nodes
+
+ num_routers = options.num_cpus
+ num_rows = options.mesh_rows
+
+ # There must be an evenly divisible number of cntrls to routers
+ # Also, obviously the number or rows must be <= the number of routers
+ cntrls_per_router, remainder = divmod(len(nodes), num_routers)
+ assert(num_rows <= num_routers)
+ num_columns = int(num_routers / num_rows)
+ assert(num_columns * num_rows == num_routers)
+
+ # Create the routers in the torus
+ routers = [Router(router_id=i) for i in range(num_routers)]
+
+ # link counter to set unique link ids
+ link_count = 0
+
+ # Add all but the remainder nodes to the list of nodes to be uniformly
+ # distributed across the network.
+ network_nodes = []
+ remainder_nodes = []
+ for node_index in xrange(len(nodes)):
+ if node_index < (len(nodes) - remainder):
+ network_nodes.append(nodes[node_index])
+ else:
+ remainder_nodes.append(nodes[node_index])
+
+ # Connect each node to the appropriate router
+ ext_links = []
+ for (i, n) in enumerate(network_nodes):
+ cntrl_level, router_id = divmod(i, num_routers)
+ assert(cntrl_level < cntrls_per_router)
+ ext_links.append(ExtLink(link_id=link_count, ext_node=n,
+ int_node=routers[router_id]))
+ link_count += 1
+
+ # Connect the remainding nodes to router 0. These should only be
+ # DMA nodes.
+ for (i, node) in enumerate(remainder_nodes):
+ assert(node.type == 'DMA_Controller')
+ assert(i < remainder)
+ ext_links.append(ExtLink(link_id=link_count, ext_node=node,
+ int_node=routers[0]))
+ link_count += 1
+
+ # Create the torus links. First row (east-west) links then column
+ # (north-south) links
+ # column links are given higher weights to implement XY routing
+ int_links = []
+ for row in xrange(num_rows):
+ for col in xrange(num_columns):
+ west_id = col + (row * num_columns)
+ if (col + 1 < num_columns):
+ east_id = (col + 1) + (row * num_columns)
+ else:
+ east_id = (row * num_columns)
+ int_links.append(IntLink(link_id=link_count,
+ node_a=routers[east_id],
+ node_b=routers[west_id],
+ latency=2,
+ weight=1))
+ link_count += 1
+
+ for col in xrange(num_columns):
+ for row in xrange(num_rows):
+ north_id = col + (row * num_columns)
+ if (row + 1 < num_rows):
+ south_id = col + ((row + 1) * num_columns)
+ else:
+ south_id = col
+ int_links.append(IntLink(link_id=link_count,
+ node_a=routers[north_id],
+ node_b=routers[south_id],
+ latency=2,
+ weight=2))
+ link_count += 1
+
+ return routers, int_links, ext_links
diff --git a/src/mem/ruby/network/topologies/Mesh.py b/src/mem/ruby/network/topologies/Mesh.py
deleted file mode 100644
index fa6e63354..000000000
--- a/src/mem/ruby/network/topologies/Mesh.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright (c) 2010 Advanced Micro Devices, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Brad Beckmann
-
-from m5.params import *
-from m5.objects import *
-
-class Mesh(Topology):
- description='Mesh'
-
-# Makes a generic mesh assuming an equal number of cache and directory cntrls
-
-def makeTopology(nodes, options, IntLink, ExtLink, Router):
-
- num_routers = options.num_cpus
- num_rows = options.mesh_rows
-
- # There must be an evenly divisible number of cntrls to routers
- # Also, obviously the number or rows must be <= the number of routers
- cntrls_per_router, remainder = divmod(len(nodes), num_routers)
- assert(num_rows <= num_routers)
- num_columns = int(num_routers / num_rows)
- assert(num_columns * num_rows == num_routers)
-
- # Create the mesh object
- mesh = Mesh()
-
- # Create the routers in the mesh
- mesh.routers = [Router(router_id=i) for i in range(num_routers)]
-
- # link counter to set unique link ids
- link_count = 0
-
- # Add all but the remainder nodes to the list of nodes to be uniformly
- # distributed across the network.
- network_nodes = []
- remainder_nodes = []
- for node_index in xrange(len(nodes)):
- if node_index < (len(nodes) - remainder):
- network_nodes.append(nodes[node_index])
- else:
- remainder_nodes.append(nodes[node_index])
-
- # Connect each node to the appropriate router
- ext_links = []
- for (i, n) in enumerate(network_nodes):
- cntrl_level, router_id = divmod(i, num_routers)
- assert(cntrl_level < cntrls_per_router)
- ext_links.append(ExtLink(link_id=link_count, ext_node=n,
- int_node=mesh.routers[router_id]))
- link_count += 1
-
- # Connect the remainding nodes to router 0. These should only be
- # DMA nodes.
- for (i, node) in enumerate(remainder_nodes):
- assert(node.type == 'DMA_Controller')
- assert(i < remainder)
- ext_links.append(ExtLink(link_id=link_count, ext_node=node,
- int_node=mesh.routers[0]))
- link_count += 1
-
- # Create the mesh links. First row (east-west) links then column
- # (north-south) links
- int_links = []
- for row in xrange(num_rows):
- for col in xrange(num_columns):
- if (col + 1 < num_columns):
- east_id = col + (row * num_columns)
- west_id = (col + 1) + (row * num_columns)
- int_links.append(IntLink(link_id=link_count,
- node_a=mesh.routers[east_id],
- node_b=mesh.routers[west_id],
- weight=1))
- link_count += 1
-
- for col in xrange(num_columns):
- for row in xrange(num_rows):
- if (row + 1 < num_rows):
- north_id = col + (row * num_columns)
- south_id = col + ((row + 1) * num_columns)
- int_links.append(IntLink(link_id=link_count,
- node_a=mesh.routers[north_id],
- node_b=mesh.routers[south_id],
- weight=2))
- link_count += 1
-
- mesh.int_links = int_links
- mesh.ext_links = ext_links
-
- return mesh
diff --git a/src/mem/ruby/network/topologies/MeshDirCorners.py b/src/mem/ruby/network/topologies/MeshDirCorners.py
deleted file mode 100644
index 7be8b9101..000000000
--- a/src/mem/ruby/network/topologies/MeshDirCorners.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright (c) 2010 Advanced Micro Devices, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Brad Beckmann
-
-from m5.params import *
-from m5.objects import *
-
-class MeshDirCorners(Topology):
- description='MeshDirCorners'
-
-# This file contains a special network creation function. This
-# networks is not general and will only work with specific system
-# configurations. The network specified is similar to GEMS old file
-# specified network.
-
-def makeTopology(nodes, options, IntLink, ExtLink, Router):
- num_routers = options.num_cpus
- num_rows = options.mesh_rows
-
- # First determine which nodes are cache cntrls vs. dirs vs. dma
- cache_nodes = []
- dir_nodes = []
- dma_nodes = []
- for node in nodes:
- if node.type == 'L1Cache_Controller' or \
- node.type == 'L2Cache_Controller':
- cache_nodes.append(node)
- elif node.type == 'Directory_Controller':
- dir_nodes.append(node)
- elif node.type == 'DMA_Controller':
- dma_nodes.append(node)
-
- # Obviously the number or rows must be <= the number of routers
- # and evenly divisible. Also the number of caches must be a
- # multiple of the number of routers and the number of directories
- # must be four.
- assert(num_rows <= num_routers)
- num_columns = int(num_routers / num_rows)
- assert(num_columns * num_rows == num_routers)
- caches_per_router, remainder = divmod(len(cache_nodes), num_routers)
- assert(remainder == 0)
- assert(len(dir_nodes) == 4)
-
- mesh = MeshDirCorners()
-
- # Create the routers in the mesh
- mesh.routers = [Router(router_id=i) for i in range(num_routers)]
-
- # link counter to set unique link ids
- link_count = 0
-
- # Connect each cache controller to the appropriate router
- ext_links = []
- for (i, n) in enumerate(cache_nodes):
- cntrl_level, router_id = divmod(i, num_routers)
- assert(cntrl_level < caches_per_router)
- ext_links.append(ExtLink(link_id=link_count, ext_node=n,
- int_node=mesh.routers[router_id]))
- link_count += 1
-
- # Connect the dir nodes to the corners.
- ext_links.append(ExtLink(link_id=link_count, ext_node=dir_nodes[0],
- int_node=mesh.routers[0]))
- link_count += 1
- ext_links.append(ExtLink(link_id=link_count, ext_node=dir_nodes[1],
- int_node=mesh.routers[num_columns - 1]))
- link_count += 1
- ext_links.append(ExtLink(link_id=link_count, ext_node=dir_nodes[2],
- int_node=mesh.routers[num_routers - num_columns]))
- link_count += 1
- ext_links.append(ExtLink(link_id=link_count, ext_node=dir_nodes[3],
- int_node=mesh.routers[num_routers - 1]))
- link_count += 1
-
- # Connect the dma nodes to router 0. These should only be DMA nodes.
- for (i, node) in enumerate(dma_nodes):
- assert(node.type == 'DMA_Controller')
- ext_links.append(ExtLink(link_id=link_count, ext_node=node, int_node=mesh.routers[0]))
-
- # Create the mesh links. First row (east-west) links then column
- # (north-south) links
- int_links = []
- for row in xrange(num_rows):
- for col in xrange(num_columns):
- if (col + 1 < num_columns):
- east_id = col + (row * num_columns)
- west_id = (col + 1) + (row * num_columns)
- int_links.append(IntLink(link_id=link_count,
- node_a=mesh.routers[east_id],
- node_b=mesh.routers[west_id],
- weight=1))
- link_count += 1
-
- for col in xrange(num_columns):
- for row in xrange(num_rows):
- if (row + 1 < num_rows):
- north_id = col + (row * num_columns)
- south_id = col + ((row + 1) * num_columns)
- int_links.append(IntLink(link_id=link_count,
- node_a=mesh.routers[north_id],
- node_b=mesh.routers[south_id],
- weight=2))
- link_count += 1
-
- mesh.ext_links = ext_links
- mesh.int_links = int_links
-
- return mesh
diff --git a/src/mem/ruby/network/topologies/SConscript b/src/mem/ruby/network/topologies/SConscript
index a3c41a6d3..3d61f6dd1 100644
--- a/src/mem/ruby/network/topologies/SConscript
+++ b/src/mem/ruby/network/topologies/SConscript
@@ -33,8 +33,4 @@ Import('*')
if env['PROTOCOL'] == 'None':
Return()
-PySource('', 'Crossbar.py')
-PySource('', 'Mesh.py')
-PySource('', 'MeshDirCorners.py')
-PySource('', 'Pt2Pt.py')
-PySource('', 'Torus.py')
+PySource('', 'TopologyCreator.py')
diff --git a/src/mem/ruby/network/topologies/TopologyCreator.py b/src/mem/ruby/network/topologies/TopologyCreator.py
new file mode 100644
index 000000000..d9b989e77
--- /dev/null
+++ b/src/mem/ruby/network/topologies/TopologyCreator.py
@@ -0,0 +1,19 @@
+
+
+
+
+from m5.params import *
+from m5.objects import *
+
+def instantiateTopology(topology, options, IntLink, ExtLink, Router):
+
+ topo = Topology()
+ topo.description = topology.description
+
+ routers, int_links, ext_links = topology.makeTopology(options, IntLink, ExtLink, Router)
+
+ topo.routers = routers
+ topo.int_links = int_links
+ topo.ext_links = ext_links
+
+ return topo
diff --git a/src/mem/ruby/network/topologies/Torus.py b/src/mem/ruby/network/topologies/Torus.py
deleted file mode 100644
index f3583bfc1..000000000
--- a/src/mem/ruby/network/topologies/Torus.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright (c) 2011 Advanced Micro Devices, Inc.
-# 2011 Massachusetts Institute of Technology
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Authors: Brad Beckmann
-# Tushar Krishna
-
-from m5.params import *
-from m5.objects import *
-
-class Torus(Topology):
- description='Torus'
-
-# Makes a generic torus assuming an equal number of cache and directory cntrls
-# Assuming a folded-torus on-chip layout (as shown on gem5 wiki).
-# All links (including the wrap-around ones) are of equal length, double that
-# of a mesh. Thus, each link is assigned a latency of 2 cycles.
-
-def makeTopology(nodes, options, IntLink, ExtLink, Router):
-
- num_routers = options.num_cpus
- num_rows = options.mesh_rows
-
- # There must be an evenly divisible number of cntrls to routers
- # Also, obviously the number or rows must be <= the number of routers
- cntrls_per_router, remainder = divmod(len(nodes), num_routers)
- assert(num_rows <= num_routers)
- num_columns = int(num_routers / num_rows)
- assert(num_columns * num_rows == num_routers)
-
- # Create the torus object
- torus = Torus()
-
- # Create the routers in the torus
- torus.routers = [Router(router_id=i) for i in range(num_routers)]
-
- # link counter to set unique link ids
- link_count = 0
-
- # Add all but the remainder nodes to the list of nodes to be uniformly
- # distributed across the network.
- network_nodes = []
- remainder_nodes = []
- for node_index in xrange(len(nodes)):
- if node_index < (len(nodes) - remainder):
- network_nodes.append(nodes[node_index])
- else:
- remainder_nodes.append(nodes[node_index])
-
- # Connect each node to the appropriate router
- ext_links = []
- for (i, n) in enumerate(network_nodes):
- cntrl_level, router_id = divmod(i, num_routers)
- assert(cntrl_level < cntrls_per_router)
- ext_links.append(ExtLink(link_id=link_count, ext_node=n,
- int_node=torus.routers[router_id]))
- link_count += 1
-
- # Connect the remainding nodes to router 0. These should only be
- # DMA nodes.
- for (i, node) in enumerate(remainder_nodes):
- assert(node.type == 'DMA_Controller')
- assert(i < remainder)
- ext_links.append(ExtLink(link_id=link_count, ext_node=node,
- int_node=torus.routers[0]))
- link_count += 1
-
- # Create the torus links. First row (east-west) links then column
- # (north-south) links
- # column links are given higher weights to implement XY routing
- int_links = []
- for row in xrange(num_rows):
- for col in xrange(num_columns):
- west_id = col + (row * num_columns)
- if (col + 1 < num_columns):
- east_id = (col + 1) + (row * num_columns)
- else:
- east_id = (row * num_columns)
- int_links.append(IntLink(link_id=link_count,
- node_a=torus.routers[east_id],
- node_b=torus.routers[west_id],
- latency=2,
- weight=1))
- link_count += 1
-
- for col in xrange(num_columns):
- for row in xrange(num_rows):
- north_id = col + (row * num_columns)
- if (row + 1 < num_rows):
- south_id = col + ((row + 1) * num_columns)
- else:
- south_id = col
- int_links.append(IntLink(link_id=link_count,
- node_a=torus.routers[north_id],
- node_b=torus.routers[south_id],
- latency=2,
- weight=2))
- link_count += 1
-
- torus.ext_links = ext_links
- torus.int_links = int_links
-
- return torus
diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index fe0f1f606..0f742a3a2 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -168,10 +168,15 @@ class MetaSimObject(type):
cls._port_refs = multidict() # port ref objects
cls._instantiated = False # really instantiated, cloned, or subclassed
- # We don't support multiple inheritance. If you want to, you
- # must fix multidict to deal with it properly.
- if len(bases) > 1:
- raise TypeError, "SimObjects do not support multiple inheritance"
+ # We don't support multiple inheritance of sim objects. If you want
+ # to, you must fix multidict to deal with it properly. Non sim-objects
+ # are ok, though
+ bTotal = 0
+ for c in bases:
+ if isinstance(c, MetaSimObject):
+ bTotal += 1
+ if bTotal > 1:
+ raise TypeError, "SimObjects do not support multiple inheritance"
base = bases[0]