From 5aa43e130acec02bc616008a8758cf5096025c19 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Fri, 22 Mar 2013 15:53:23 -0500 Subject: ruby: convert Topology to regular class The Topology class in Ruby does not need to inherit from SimObject class. This patch turns it into a regular class. The topology object is now created in the constructor of the Network class. All the parameters for the topology class have been moved to the network class. --- configs/ruby/Ruby.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'configs/ruby/Ruby.py') diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index 6859b044e..a11ff53c3 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -142,19 +142,12 @@ def create_system(options, system, piobus = None, dma_ports = []): # the controllers. Hence the separation between topology definition and # instantiation. # - # gem5 SimObject defined in src/mem/ruby/network/Network.py - net_topology = Topology() - net_topology.description = topology.description routers, int_links, ext_links = topology.makeTopology(options, IntLinkClass, ExtLinkClass, RouterClass) - - net_topology.num_routers = len(routers) - net_topology.int_links = int_links - net_topology.ext_links = ext_links - - network = NetworkClass(ruby_system = ruby, topology = net_topology, - routers = routers) + network = NetworkClass(ruby_system = ruby, routers = routers, + int_links = int_links, ext_links = ext_links, + topology = topology.description) if options.network_fault_model: assert(options.garnet_network == "fixed") -- cgit v1.2.3