summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2010-01-29 20:29:32 -0800
committerBrad Beckmann <Brad.Beckmann@amd.com>2010-01-29 20:29:32 -0800
commit8dd45674aef2822d4c6cb57f1a4aedc7d9ee311c (patch)
tree47d5d83cfdd2a6ff7025c3417fd843b7cd16841f /configs
parentb5444625056a93cd676c512a891b0c13c44cf58b (diff)
downloadgem5-8dd45674aef2822d4c6cb57f1a4aedc7d9ee311c.tar.xz
ruby: Converted Garnet to M5 configuration
Diffstat (limited to 'configs')
-rw-r--r--configs/common/Options.py2
-rw-r--r--configs/ruby/Ruby.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/configs/common/Options.py b/configs/common/Options.py
index 1bed93178..7d1b0e745 100644
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -41,6 +41,8 @@ parser.add_option("--topology", type="string", default="crossbar",
help="'crossbar'|'mesh'")
parser.add_option("--mesh-rows", type="int", default=1,
help="the number of rows in the mesh topology")
+parser.add_option("--garnet-network", type="string", default=none,
+ help="'fixed'|'flexible'")
# Run duration options
parser.add_option("-m", "--maxtick", type="int", default=m5.MaxTick,
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py
index d34ffd7a2..65adc152e 100644
--- a/configs/ruby/Ruby.py
+++ b/configs/ruby/Ruby.py
@@ -90,7 +90,12 @@ def create_system(options, physmem, piobus = None, dma_devices = []):
len(cpu_sequencers),
options.mesh_rows)
- network = SimpleNetwork(topology = net_topology)
+ if options.garnet_network == "fixed":
+ network = GarnetNetwork_d(topology = net_topology)
+ elif options.garnet_network == "flexible":
+ network = GarnetNetwork(topology = net_topology)
+ else:
+ network = SimpleNetwork(topology = net_topology)
#
# determine the total memory size of the ruby system and verify it is equal