ruby: changes how Topologies are created

Instead of just passing a list of controllers to the makeTopology function
in src/mem/ruby/network/topologies/<Topo>.py we pass in a function pointer
which knows how to make the topology, possibly with some extra state set
in the configs/ruby/<protocol>.py file. Thus, we can move all of the files
from network/topologies to configs/topologies. A new class BaseTopology
is added which all topologies in configs/topologies must inheirit from and
follow its API.

--HG--
rename : src/mem/ruby/network/topologies/Crossbar.py => configs/topologies/Crossbar.py
rename : src/mem/ruby/network/topologies/Mesh.py => configs/topologies/Mesh.py
rename : src/mem/ruby/network/topologies/MeshDirCorners.py => configs/topologies/MeshDirCorners.py
rename : src/mem/ruby/network/topologies/Pt2Pt.py => configs/topologies/Pt2Pt.py
rename : src/mem/ruby/network/topologies/Torus.py => configs/topologies/Torus.py

1 files changed, 0 insertions, 114 deletions

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