8a652f9871
Re-enabling implicit parenting (see previous patch) causes current Ruby config scripts to create some strange hierarchies and generate several warnings. This patch makes three general changes to address these issues. 1. The order of object creation in the ruby config files makes the L1 caches children of the sequencer rather than the controller; these config ciles are rewritten to assign the L1 caches to the controller first. 2. The assignment of the sequencer list to system.ruby.cpu_ruby_ports causes the sequencers to be children of system.ruby, generating warnings because they are already parented to their respective controllers. Changing this attribute to _cpu_ruby_ports fixes this because the leading underscore means this is now treated as a plain Python attribute rather than a child assignment. As a result, the configuration hierarchy changes such that, e.g., system.ruby.cpu_ruby_ports0 becomes system.l1_cntrl0.sequencer. 3. In the topology classes, the routers become children of some random internal link node rather than direct children of the topology. The topology classes are rewritten to assign the routers to the topology object first.
58 lines
2.5 KiB
Python
58 lines
2.5 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 *
|
|
|
|
class Pt2Pt(Topology):
|
|
description='Pt2Pt'
|
|
|
|
def makeTopology(nodes, options, IntLink, ExtLink, Router):
|
|
# Create an individual router for each controller, and connect all to all.
|
|
pt2pt = Pt2Pt()
|
|
pt2pt.routers = [Router(router_id=i) for i in range(len(nodes))]
|
|
ext_links = [ExtLink(link_id=i, ext_node=n, int_node=pt2pt.routers[i])
|
|
for (i, n) in enumerate(nodes)]
|
|
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=pt2pt.routers[i],
|
|
node_b=pt2pt.routers[j]))
|
|
|
|
pt2pt.ext_links = ext_links
|
|
pt2pt.int_links = int_links
|
|
|
|
return pt2pt
|