e9ae8b7d29
The routers are created before the network class. This results in the routers becoming children of the first link they are connected to and they get generic names like int_node and node_b. This patch creates the network object first and passes it to the topology creation function. Now the routers are children of the network object and names are much more sensible.
63 lines
2.7 KiB
Python
63 lines
2.7 KiB
Python
# Copyright (c) 2011 Advanced Micro Devices, Inc.
|
|
# 2011 Massachusetts Institute of Technology
|
|
# 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
|
|
# Tushar Krishna
|
|
|
|
from m5.params import *
|
|
from m5.objects import *
|
|
|
|
from BaseTopology import SimpleTopology
|
|
|
|
class Pt2Pt(SimpleTopology):
|
|
description='Pt2Pt'
|
|
|
|
def __init__(self, controllers):
|
|
self.nodes = controllers
|
|
|
|
def makeTopology(self, options, network, IntLink, ExtLink, Router):
|
|
nodes = self.nodes
|
|
|
|
# Create an individual router for each controller, and connect all to all.
|
|
routers = [Router(router_id=i) for i in range(len(nodes))]
|
|
network.routers = routers
|
|
|
|
ext_links = [ExtLink(link_id=i, ext_node=n, int_node=routers[i])
|
|
for (i, n) in enumerate(nodes)]
|
|
network.ext_links = ext_links
|
|
|
|
link_count = len(nodes)
|
|
int_links = []
|
|
for i in xrange(len(nodes)):
|
|
for j in xrange(len(nodes)):
|
|
if (i != j):
|
|
link_count += 1
|
|
int_links.append(IntLink(link_id=link_count,
|
|
node_a=routers[i],
|
|
node_b=routers[j]))
|
|
|
|
network.int_links = int_links
|