ruby: Added a mesh topology

3 files changed, 61 insertions, 1 deletions

diff --git a/configs/common/Options.py b/configs/common/Options.py
index ade403fe3..1bed93178 100644
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -37,6 +37,10 @@ parser.add_option("--fastmem", action="store_true")
 parser.add_option("--clock", action="store", type="string", default='1GHz')
 parser.add_option("--num-dirs", type="int", default=1)
 parser.add_option("--num-l2caches", type="int", default=1)
+parser.add_option("--topology", type="string", default="crossbar",
+                  help="'crossbar'|'mesh'")
+parser.add_option("--mesh-rows", type="int", default=1,
+                  help="the number of rows in the mesh topology")
       
 # Run duration options
 parser.add_option("-m", "--maxtick", type="int", default=m5.MaxTick,
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py
index e7f72b8eb..d34ffd7a2 100644
--- a/configs/ruby/Ruby.py
+++ b/configs/ruby/Ruby.py
@@ -80,7 +80,17 @@ def create_system(options, physmem, piobus = None, dma_devices = []):
     # Important: the topology constructor must be called before the network
     # constructor.
     #
-    network = SimpleNetwork(topology = makeCrossbar(all_cntrls))
+    if options.topology == "crossbar":
+        net_topology = makeCrossbar(all_cntrls)
+    elif options.topology == "mesh":
+        #
+        # The uniform mesh topology assumes one router per cpu
+        #
+        net_topology = makeMesh(all_cntrls,
+                                len(cpu_sequencers),
+                                options.mesh_rows)
+
+    network = SimpleNetwork(topology = net_topology)
 
     #
     # determine the total memory size of the ruby system and verify it is equal
diff --git a/src/mem/ruby/network/Network.py b/src/mem/ruby/network/Network.py
index 8079032c6..01ebfff70 100644
--- a/src/mem/ruby/network/Network.py
+++ b/src/mem/ruby/network/Network.py
@@ -64,6 +64,52 @@ def makeCrossbar(nodes):
     return Topology(ext_links=ext_links, int_links=int_links,
                     num_int_nodes=len(nodes)+1)
 
+def makeMesh(nodes, num_routers, num_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(remainder == 0)
+    assert(num_rows <= num_routers)
+    num_columns = int(num_routers / num_rows)
+    assert(num_columns * num_rows == num_routers)
+
+    #
+    # Connect each node to the appropriate router
+    #
+    ext_links = []
+    for (i, n) in enumerate(nodes):
+        cntrl_level, router_id = divmod(i, num_routers)
+        assert(cntrl_level < cntrls_per_router)
+        ext_links.append(ExtLink(ext_node=n, int_node=router_id))
+
+    #
+    # 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(node_a=east_id,
+                                         node_b=west_id,
+                                         weight=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(node_a=north_id,
+                                         node_b=south_id,
+                                         weight=2))
+
+    return Topology(ext_links=ext_links,
+                    int_links=int_links,
+                    num_int_nodes=num_routers)
+
 class RubyNetwork(SimObject):
     type = 'RubyNetwork'
     cxx_class = 'Network'