diff options
Diffstat (limited to 'configs/topologies/Mesh_westfirst.py')
| -rw-r--r-- | configs/topologies/Mesh_westfirst.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/configs/topologies/Mesh_westfirst.py b/configs/topologies/Mesh_westfirst.py index 3af894f93..6139f6742 100644 --- a/configs/topologies/Mesh_westfirst.py +++ b/configs/topologies/Mesh_westfirst.py @@ -58,15 +58,21 @@ class Mesh_westfirst(SimpleTopology): num_routers = options.num_cpus num_rows = options.mesh_rows + # default values for link latency and router latency. + # Can be over-ridden on a per link/router basis + link_latency = options.link_latency # used by simple and garnet + router_latency = options.router_latency # only used by garnet + # 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) + assert(num_rows > 0 and 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)] + routers = [Router(router_id=i, latency=router_latency) \ + for i in range(num_routers)] network.routers = routers # link counter to set unique link ids @@ -88,7 +94,8 @@ class Mesh_westfirst(SimpleTopology): 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])) + int_node=routers[router_id], + latency = link_latency)) link_count += 1 # Connect the remainding nodes to router 0. These should only be @@ -97,7 +104,8 @@ class Mesh_westfirst(SimpleTopology): assert(node.type == 'DMA_Controller') assert(i < remainder) ext_links.append(ExtLink(link_id=link_count, ext_node=node, - int_node=routers[0])) + int_node=routers[0], + latency = link_latency)) link_count += 1 network.ext_links = ext_links @@ -114,6 +122,7 @@ class Mesh_westfirst(SimpleTopology): int_links.append(IntLink(link_id=link_count, src_node=routers[east_out], dst_node=routers[west_in], + latency = link_latency, weight=2)) link_count += 1 @@ -126,6 +135,7 @@ class Mesh_westfirst(SimpleTopology): int_links.append(IntLink(link_id=link_count, src_node=routers[west_out], dst_node=routers[east_in], + latency = link_latency, weight=1)) link_count += 1 @@ -139,6 +149,7 @@ class Mesh_westfirst(SimpleTopology): int_links.append(IntLink(link_id=link_count, src_node=routers[north_out], dst_node=routers[south_in], + latency = link_latency, weight=2)) link_count += 1 @@ -151,6 +162,7 @@ class Mesh_westfirst(SimpleTopology): int_links.append(IntLink(link_id=link_count, src_node=routers[south_out], dst_node=routers[north_in], + latency = link_latency, weight=2)) link_count += 1 |