summaryrefslogtreecommitdiff
path: root/configs/ruby
diff options
context:
space:
mode:
authorJason Power <powerjg@cs.wisc.edu>2012-08-10 13:50:42 -0500
committerJason Power <powerjg@cs.wisc.edu>2012-08-10 13:50:42 -0500
commit11411cc9c70fb532798c5c8fb287ad658111ff15 (patch)
tree5ac6030e71ed22cfb57ce927ad50cf76e44ba2ea /configs/ruby
parent706e84f2b8553baba020560f4a83550f05b80630 (diff)
downloadgem5-11411cc9c70fb532798c5c8fb287ad658111ff15.tar.xz
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.
Diffstat (limited to 'configs/ruby')
-rw-r--r--configs/ruby/Ruby.py29
1 files changed, 16 insertions, 13 deletions
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py
index 82b8d0111..ba6f3e7fa 100644
--- a/configs/ruby/Ruby.py
+++ b/configs/ruby/Ruby.py
@@ -136,20 +136,23 @@ def create_system(options, system, piobus = None, dma_ports = []):
class IntLinkClass(SimpleIntLink): pass
class ExtLinkClass(SimpleExtLink): pass
class RouterClass(BasicRouter): pass
-
+
#
# Important: the topology must be instantiated before the network and after
# the controllers. Hence the separation between topology definition and
- # instantiation. TopologyCreator is in src/mem/ruby/network/topologies/.
+ # instantiation.
#
- from TopologyCreator import instantiateTopology
- try:
- net_topology = instantiateTopology(topology, options, \
- IntLinkClass, ExtLinkClass, \
- RouterClass)
- except:
- print "Error: could not make topology %s" % options.topology
- raise
+ # 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.routers = routers
+ net_topology.int_links = int_links
+ net_topology.ext_links = ext_links
+
if options.network_fault_model:
assert(options.garnet_network == "fixed")
@@ -162,7 +165,7 @@ def create_system(options, system, piobus = None, dma_ports = []):
#
# Loop through the directory controlers.
# Determine the total memory size of the ruby system and verify it is equal
- # to physmem. However, if Ruby memory is using sparse memory in SE
+ # to physmem. However, if Ruby memory is using sparse memory in SE
# mode, then the system should not back-up the memory state with
# the Memory Vector and thus the memory size bytes should stay at 0.
# Also set the numa bits to the appropriate values.
@@ -180,11 +183,11 @@ def create_system(options, system, piobus = None, dma_ports = []):
numa_bit = dir_bits + 5
else:
numa_bit = 6
-
+
for dir_cntrl in dir_cntrls:
total_mem_size.value += dir_cntrl.directory.size.value
dir_cntrl.directory.numa_high_bit = numa_bit
-
+
phys_mem_size = 0
for mem in system.memories.unproxy(system):
phys_mem_size += long(mem.range.second) - long(mem.range.first) + 1