summaryrefslogtreecommitdiff
path: root/configs/example
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/example
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/example')
-rw-r--r--configs/example/ruby_direct_test.py1
-rw-r--r--configs/example/ruby_fs.py1
-rw-r--r--configs/example/ruby_mem_test.py1
-rw-r--r--configs/example/ruby_network_test.py1
-rw-r--r--configs/example/ruby_random_test.py1
-rw-r--r--configs/example/se.py1
6 files changed, 6 insertions, 0 deletions
diff --git a/configs/example/ruby_direct_test.py b/configs/example/ruby_direct_test.py
index f591d47ea..1fcad30a9 100644
--- a/configs/example/ruby_direct_test.py
+++ b/configs/example/ruby_direct_test.py
@@ -35,6 +35,7 @@ from m5.util import addToPath
import os, optparse, sys
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Options
import Ruby
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index 35e485c7a..97863a46b 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -40,6 +40,7 @@ from m5.util import addToPath, fatal
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Ruby
diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py
index 4d7932b77..e3dab955c 100644
--- a/configs/example/ruby_mem_test.py
+++ b/configs/example/ruby_mem_test.py
@@ -35,6 +35,7 @@ from m5.util import addToPath
import os, optparse, sys
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Options
import Ruby
diff --git a/configs/example/ruby_network_test.py b/configs/example/ruby_network_test.py
index 1d44813ac..58e8b2e40 100644
--- a/configs/example/ruby_network_test.py
+++ b/configs/example/ruby_network_test.py
@@ -35,6 +35,7 @@ from m5.util import addToPath
import os, optparse, sys
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Options
import Ruby
diff --git a/configs/example/ruby_random_test.py b/configs/example/ruby_random_test.py
index b4d32b72c..eae3873b7 100644
--- a/configs/example/ruby_random_test.py
+++ b/configs/example/ruby_random_test.py
@@ -35,6 +35,7 @@ from m5.util import addToPath
import os, optparse, sys
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Options
import Ruby
diff --git a/configs/example/se.py b/configs/example/se.py
index 83abbd2f3..fa20c37db 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -52,6 +52,7 @@ from m5.util import addToPath, fatal
addToPath('../common')
addToPath('../ruby')
+addToPath('../topologies')
import Options
import Ruby