changeset 86c3bf056a0d in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=86c3bf056a0d
description:
config: Added the topology description to m5 config.ini
diffstat:
src/mem/ruby/network/Network.py | 2 ++
src/mem/ruby/network/topologies/Crossbar.py | 5 ++++-
src/mem/ruby/network/topologies/Mesh.py | 9 ++++++---
src/mem/ruby/network/topologies/MeshDirCorners.py | 9 ++++++---
4 files changed, 18 insertions(+), 7 deletions(-)
diffs (79 lines):
diff -r 9ca6602c5345 -r 86c3bf056a0d src/mem/ruby/network/Network.py
--- a/src/mem/ruby/network/Network.py Fri Aug 20 11:46:11 2010 -0700
+++ b/src/mem/ruby/network/Network.py Fri Aug 20 11:46:11 2010 -0700
@@ -50,6 +50,8 @@
class Topology(SimObject):
type = 'Topology'
+ description = Param.String("Not Specified",
+ "the name of the imported topology module")
ext_links = VectorParam.ExtLink("Links to external nodes")
int_links = VectorParam.IntLink("Links between internal nodes")
num_int_nodes = Param.Int("Nunber of internal nodes")
diff -r 9ca6602c5345 -r 86c3bf056a0d src/mem/ruby/network/topologies/Crossbar.py
--- a/src/mem/ruby/network/topologies/Crossbar.py Fri Aug 20 11:46:11
2010 -0700
+++ b/src/mem/ruby/network/topologies/Crossbar.py Fri Aug 20 11:46:11
2010 -0700
@@ -29,12 +29,15 @@
from m5.params import *
from m5.objects import *
+class Crossbar(Topology):
+ description='Crossbar'
+
def makeTopology(nodes, options):
ext_links = [ExtLink(ext_node=n, int_node=i)
for (i, n) in enumerate(nodes)]
xbar = len(nodes) # node ID for crossbar switch
int_links = [IntLink(node_a=i, node_b=xbar) for i in range(len(nodes))]
- return Topology(ext_links=ext_links, int_links=int_links,
+ return Crossbar(ext_links=ext_links, int_links=int_links,
num_int_nodes=len(nodes)+1)
diff -r 9ca6602c5345 -r 86c3bf056a0d src/mem/ruby/network/topologies/Mesh.py
--- a/src/mem/ruby/network/topologies/Mesh.py Fri Aug 20 11:46:11 2010 -0700
+++ b/src/mem/ruby/network/topologies/Mesh.py Fri Aug 20 11:46:11 2010 -0700
@@ -29,6 +29,9 @@
from m5.params import *
from m5.objects import *
+class Mesh(Topology):
+ description='Mesh'
+
# Makes a generic mesh assuming an equal number of cache and directory cntrls
def makeTopology(nodes, options):
@@ -87,6 +90,6 @@
node_b=south_id,
weight=2))
- return Topology(ext_links=ext_links,
- int_links=int_links,
- num_int_nodes=num_routers)
+ return Mesh(ext_links=ext_links,
+ int_links=int_links,
+ num_int_nodes=num_routers)
diff -r 9ca6602c5345 -r 86c3bf056a0d
src/mem/ruby/network/topologies/MeshDirCorners.py
--- a/src/mem/ruby/network/topologies/MeshDirCorners.py Fri Aug 20 11:46:11
2010 -0700
+++ b/src/mem/ruby/network/topologies/MeshDirCorners.py Fri Aug 20 11:46:11
2010 -0700
@@ -29,6 +29,9 @@
from m5.params import *
from m5.objects import *
+class MeshDirCorners(Topology):
+ description='MeshDirCorners'
+
# This file contains a special network creation function. This
# networks is not general and will only work with specific system
# configurations. The network specified is similar to GEMS old file
@@ -105,7 +108,7 @@
node_b=south_id,
weight=2))
- return Topology(ext_links=ext_links,
- int_links=int_links,
- num_int_nodes=num_routers)
+ return MeshDirCorners(ext_links=ext_links,
+ int_links=int_links,
+ num_int_nodes=num_routers)
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
