summaryrefslogtreecommitdiff
path: root/configs/ruby/MESI_CMP_directory.py
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2012-07-10 22:51:53 -0700
committerBrad Beckmann <Brad.Beckmann@amd.com>2012-07-10 22:51:53 -0700
commit11b725c19da4d08ae471678f6da867c67e3c15b5 (patch)
tree58bd0ebd09b404f0e860531bda80195f234d0bf2 /configs/ruby/MESI_CMP_directory.py
parent745274cbd4851b3bf725b24138c1fd13746492ec (diff)
downloadgem5-11b725c19da4d08ae471678f6da867c67e3c15b5.tar.xz
ruby: changes how Topologies are created
Instead of just passing a list of controllers to the makeTopology function in src/mem/ruby/network/topologies/<Topo>.py we pass in a function pointer which knows how to make the topology, possibly with some extra state set in the configs/ruby/<protocol>.py file. Thus, we can move all of the files from network/topologies to configs/topologies. A new class BaseTopology is added which all topologies in configs/topologies must inheirit from and follow its API. --HG-- rename : src/mem/ruby/network/topologies/Crossbar.py => configs/topologies/Crossbar.py rename : src/mem/ruby/network/topologies/Mesh.py => configs/topologies/Mesh.py rename : src/mem/ruby/network/topologies/MeshDirCorners.py => configs/topologies/MeshDirCorners.py rename : src/mem/ruby/network/topologies/Pt2Pt.py => configs/topologies/Pt2Pt.py rename : src/mem/ruby/network/topologies/Torus.py => configs/topologies/Torus.py
Diffstat (limited to 'configs/ruby/MESI_CMP_directory.py')
-rw-r--r--configs/ruby/MESI_CMP_directory.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/configs/ruby/MESI_CMP_directory.py b/configs/ruby/MESI_CMP_directory.py
index cd503ddc9..d877543c0 100644
--- a/configs/ruby/MESI_CMP_directory.py
+++ b/configs/ruby/MESI_CMP_directory.py
@@ -31,6 +31,7 @@ import math
import m5
from m5.objects import *
from m5.defines import buildEnv
+from Ruby import create_topology
#
# Note: the L1 Cache latency is only used by the sequencer on fast path hits
@@ -185,4 +186,6 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
dir_cntrl_nodes + \
dma_cntrl_nodes
- return (cpu_sequencers, dir_cntrl_nodes, all_cntrls)
+ topology = create_topology(all_cntrls, options)
+
+ return (cpu_sequencers, dir_cntrl_nodes, topology)