diff options
Diffstat (limited to 'configs/topologies/Crossbar.py')
| -rw-r--r-- | configs/topologies/Crossbar.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/configs/topologies/Crossbar.py b/configs/topologies/Crossbar.py index 35d20de34..447b1c597 100644 --- a/configs/topologies/Crossbar.py +++ b/configs/topologies/Crossbar.py @@ -35,6 +35,12 @@ class Crossbar(SimpleTopology): description='Crossbar' def makeTopology(self, options, network, IntLink, ExtLink, Router): + + # 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 + # 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 @@ -45,7 +51,8 @@ class Crossbar(SimpleTopology): xbar = routers[len(self.nodes)] # the crossbar router is the last router created network.routers = routers - ext_links = [ExtLink(link_id=i, ext_node=n, int_node=routers[i]) + ext_links = [ExtLink(link_id=i, ext_node=n, int_node=routers[i], + latency = link_latency) for (i, n) in enumerate(self.nodes)] network.ext_links = ext_links @@ -55,13 +62,15 @@ class Crossbar(SimpleTopology): for i in range(len(self.nodes)): int_links.append(IntLink(link_id=(link_count+i), src_node=routers[i], - dst_node=xbar)) + dst_node=xbar, + latency = link_latency)) link_count += len(self.nodes) for i in range(len(self.nodes)): int_links.append(IntLink(link_id=(link_count+i), src_node=xbar, - dst_node=routers[i])) + dst_node=routers[i], + latency = link_latency)) network.int_links = int_links |