From 11b725c19da4d08ae471678f6da867c67e3c15b5 Mon Sep 17 00:00:00 2001 From: Brad Beckmann Date: Tue, 10 Jul 2012 22:51:53 -0700 Subject: ruby: changes how Topologies are created Instead of just passing a list of controllers to the makeTopology function in src/mem/ruby/network/topologies/.py we pass in a function pointer which knows how to make the topology, possibly with some extra state set in the configs/ruby/.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 --- configs/ruby/MOESI_CMP_directory.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'configs/ruby/MOESI_CMP_directory.py') diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py index 10eeaf21a..bce7be5d6 100644 --- a/configs/ruby/MOESI_CMP_directory.py +++ b/configs/ruby/MOESI_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 @@ -182,4 +183,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) -- cgit v1.2.3