From 11411cc9c70fb532798c5c8fb287ad658111ff15 Mon Sep 17 00:00:00 2001 From: Jason Power Date: Fri, 10 Aug 2012 13:50:42 -0500 Subject: Ruby: Clean up topology changes This patch moves instantiateTopology into Ruby.py and removes the mem/ruby/network/topologies directory. It also adds some extra inheritance to the topologies to clean up some issues in the existing topologies. --- src/mem/ruby/network/topologies/SConscript | 36 ---------------------- src/mem/ruby/network/topologies/TopologyCreator.py | 19 ------------ 2 files changed, 55 deletions(-) delete mode 100644 src/mem/ruby/network/topologies/SConscript delete mode 100644 src/mem/ruby/network/topologies/TopologyCreator.py (limited to 'src') diff --git a/src/mem/ruby/network/topologies/SConscript b/src/mem/ruby/network/topologies/SConscript deleted file mode 100644 index 3d61f6dd1..000000000 --- a/src/mem/ruby/network/topologies/SConscript +++ /dev/null @@ -1,36 +0,0 @@ -# -*- mode:python -*- - -# Copyright (c) 2010 Advanced Micro Devices, Inc. -# 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 - -Import('*') - -if env['PROTOCOL'] == 'None': - Return() - -PySource('', 'TopologyCreator.py') diff --git a/src/mem/ruby/network/topologies/TopologyCreator.py b/src/mem/ruby/network/topologies/TopologyCreator.py deleted file mode 100644 index d9b989e77..000000000 --- a/src/mem/ruby/network/topologies/TopologyCreator.py +++ /dev/null @@ -1,19 +0,0 @@ - - - - -from m5.params import * -from m5.objects import * - -def instantiateTopology(topology, options, IntLink, ExtLink, Router): - - topo = Topology() - topo.description = topology.description - - routers, int_links, ext_links = topology.makeTopology(options, IntLink, ExtLink, Router) - - topo.routers = routers - topo.int_links = int_links - topo.ext_links = ext_links - - return topo -- cgit v1.2.3