diff options
author | Brad Beckmann <Brad.Beckmann@amd.com> | 2010-03-21 21:22:22 -0700 |
---|---|---|
committer | Brad Beckmann <Brad.Beckmann@amd.com> | 2010-03-21 21:22:22 -0700 |
commit | 898f1fc4a45454f5d70ef64de3c4b4caf686677a (patch) | |
tree | 6e3da37823d4f7b671263a715fc90190c6cb306e /src/mem/ruby/network/Network.py | |
parent | 61e6b9e701c25537319e91b74362b962616ffee6 (diff) | |
download | gem5-898f1fc4a45454f5d70ef64de3c4b4caf686677a.tar.xz |
ruby: Reorganized Ruby topology and protocol files
--HG--
rename : configs/ruby/MESI_CMP_directory.py => configs/ruby/protocols/MESI_CMP_directory.py
rename : configs/ruby/MI_example.py => configs/ruby/protocols/MI_example.py
rename : configs/ruby/MOESI_CMP_directory.py => configs/ruby/protocols/MOESI_CMP_directory.py
rename : configs/ruby/MOESI_CMP_token.py => configs/ruby/protocols/MOESI_CMP_token.py
rename : configs/ruby/MOESI_hammer.py => configs/ruby/protocols/MOESI_hammer.py
rename : configs/ruby/networks/MeshDirCorners.py => src/mem/ruby/network/topologies/MeshDirCorners.py
Diffstat (limited to 'src/mem/ruby/network/Network.py')
-rw-r--r-- | src/mem/ruby/network/Network.py | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/src/mem/ruby/network/Network.py b/src/mem/ruby/network/Network.py index aabf023a3..1fdf15634 100644 --- a/src/mem/ruby/network/Network.py +++ b/src/mem/ruby/network/Network.py @@ -56,79 +56,6 @@ class Topology(SimObject): print_config = Param.Bool(False, "display topology config in the stats file") -def makeCrossbar(nodes): - ext_links = [ExtLink(ext_node=n, int_node=i) - for (i, n) in enumerate(nodes)] - xbar = len(nodes) # node ID for crossbar switch - int_links = [IntLink(node_a=i, node_b=xbar) for i in range(len(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(num_rows <= num_routers) - num_columns = int(num_routers / num_rows) - assert(num_columns * num_rows == num_routers) - - # - # 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(ext_node=n, int_node=router_id)) - - # - # 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(ext_node=node, int_node=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(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' |