changeset 721718c62859 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=721718c62859
description:
config: move ruby objects under ruby_system in obj hierarchy
This patch moves the contollers to be children of the ruby_system
instead of
'system' under the python object hierarchy. This is so that these
objects
can inherit some of the ruby_system's parameter values without
resorting to
calling a global system pointer during run-time.
Committed by: Nilay Vaish <[email protected]>
diffstat:
configs/ruby/MESI_CMP_directory.py | 10 +++++-----
configs/ruby/MI_example.py | 8 ++++----
configs/ruby/MOESI_CMP_directory.py | 10 +++++-----
configs/ruby/MOESI_CMP_token.py | 10 +++++-----
configs/ruby/MOESI_hammer.py | 8 ++++----
configs/ruby/Network_test.py | 4 ++--
6 files changed, 25 insertions(+), 25 deletions(-)
diffs (208 lines):
diff -r 8da5ee073b92 -r 721718c62859 configs/ruby/MESI_CMP_directory.py
--- a/configs/ruby/MESI_CMP_directory.py Mon Jan 14 10:05:12 2013 -0600
+++ b/configs/ruby/MESI_CMP_directory.py Mon Jan 14 10:05:14 2013 -0600
@@ -110,7 +110,7 @@
if piobus != None:
cpu_seq.pio_port = piobus.slave
- exec("system.l1_cntrl%d = l1_cntrl" % i)
+ exec("ruby_system.l1_cntrl%d = l1_cntrl" % i)
#
# Add controllers and sequencers to the appropriate lists
@@ -135,7 +135,7 @@
L2cacheMemory = l2_cache,
ruby_system = ruby_system)
- exec("system.l2_cntrl%d = l2_cntrl" % i)
+ exec("ruby_system.l2_cntrl%d = l2_cntrl" % i)
l2_cntrl_nodes.append(l2_cntrl)
cntrl_count += 1
@@ -165,7 +165,7 @@
memBuffer = mem_cntrl,
ruby_system = ruby_system)
- exec("system.dir_cntrl%d = dir_cntrl" % i)
+ exec("ruby_system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl)
cntrl_count += 1
@@ -182,8 +182,8 @@
dma_sequencer = dma_seq,
ruby_system = ruby_system)
- exec("system.dma_cntrl%d = dma_cntrl" % i)
- exec("system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
+ exec("ruby_system.dma_cntrl%d = dma_cntrl" % i)
+ exec("ruby_system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
dma_cntrl_nodes.append(dma_cntrl)
cntrl_count += 1
diff -r 8da5ee073b92 -r 721718c62859 configs/ruby/MI_example.py
--- a/configs/ruby/MI_example.py Mon Jan 14 10:05:12 2013 -0600
+++ b/configs/ruby/MI_example.py Mon Jan 14 10:05:14 2013 -0600
@@ -96,7 +96,7 @@
if piobus != None:
cpu_seq.pio_port = piobus.slave
- exec("system.l1_cntrl%d = l1_cntrl" % i)
+ exec("ruby_system.l1_cntrl%d = l1_cntrl" % i)
#
# Add controllers and sequencers to the appropriate lists
#
@@ -132,7 +132,7 @@
memBuffer = mem_cntrl,
ruby_system = ruby_system)
- exec("system.dir_cntrl%d = dir_cntrl" % i)
+ exec("ruby_system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl)
cntrl_count += 1
@@ -149,8 +149,8 @@
dma_sequencer = dma_seq,
ruby_system = ruby_system)
- exec("system.dma_cntrl%d = dma_cntrl" % i)
- exec("system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
+ exec("ruby_system.dma_cntrl%d = dma_cntrl" % i)
+ exec("ruby_system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
dma_cntrl_nodes.append(dma_cntrl)
cntrl_count += 1
diff -r 8da5ee073b92 -r 721718c62859 configs/ruby/MOESI_CMP_directory.py
--- a/configs/ruby/MOESI_CMP_directory.py Mon Jan 14 10:05:12 2013 -0600
+++ b/configs/ruby/MOESI_CMP_directory.py Mon Jan 14 10:05:14 2013 -0600
@@ -106,7 +106,7 @@
if piobus != None:
cpu_seq.pio_port = piobus.slave
- exec("system.l1_cntrl%d = l1_cntrl" % i)
+ exec("ruby_system.l1_cntrl%d = l1_cntrl" % i)
#
# Add controllers and sequencers to the appropriate lists
#
@@ -130,7 +130,7 @@
L2cacheMemory = l2_cache,
ruby_system = ruby_system)
- exec("system.l2_cntrl%d = l2_cntrl" % i)
+ exec("ruby_system.l2_cntrl%d = l2_cntrl" % i)
l2_cntrl_nodes.append(l2_cntrl)
cntrl_count += 1
@@ -158,7 +158,7 @@
memBuffer = mem_cntrl,
ruby_system = ruby_system)
- exec("system.dir_cntrl%d = dir_cntrl" % i)
+ exec("ruby_system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl)
cntrl_count += 1
@@ -175,8 +175,8 @@
dma_sequencer = dma_seq,
ruby_system = ruby_system)
- exec("system.dma_cntrl%d = dma_cntrl" % i)
- exec("system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
+ exec("ruby_system.dma_cntrl%d = dma_cntrl" % i)
+ exec("ruby_system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
dma_cntrl_nodes.append(dma_cntrl)
cntrl_count += 1
diff -r 8da5ee073b92 -r 721718c62859 configs/ruby/MOESI_CMP_token.py
--- a/configs/ruby/MOESI_CMP_token.py Mon Jan 14 10:05:12 2013 -0600
+++ b/configs/ruby/MOESI_CMP_token.py Mon Jan 14 10:05:14 2013 -0600
@@ -126,7 +126,7 @@
if piobus != None:
cpu_seq.pio_port = piobus.slave
- exec("system.l1_cntrl%d = l1_cntrl" % i)
+ exec("ruby_system.l1_cntrl%d = l1_cntrl" % i)
#
# Add controllers and sequencers to the appropriate lists
#
@@ -151,7 +151,7 @@
N_tokens = n_tokens,
ruby_system = ruby_system)
- exec("system.l2_cntrl%d = l2_cntrl" % i)
+ exec("ruby_system.l2_cntrl%d = l2_cntrl" % i)
l2_cntrl_nodes.append(l2_cntrl)
cntrl_count += 1
@@ -180,7 +180,7 @@
l2_select_num_bits = l2_bits,
ruby_system = ruby_system)
- exec("system.dir_cntrl%d = dir_cntrl" % i)
+ exec("ruby_system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl)
cntrl_count += 1
@@ -197,8 +197,8 @@
dma_sequencer = dma_seq,
ruby_system = ruby_system)
- exec("system.dma_cntrl%d = dma_cntrl" % i)
- exec("system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
+ exec("ruby_system.dma_cntrl%d = dma_cntrl" % i)
+ exec("ruby_system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
dma_cntrl_nodes.append(dma_cntrl)
cntrl_count += 1
diff -r 8da5ee073b92 -r 721718c62859 configs/ruby/MOESI_hammer.py
--- a/configs/ruby/MOESI_hammer.py Mon Jan 14 10:05:12 2013 -0600
+++ b/configs/ruby/MOESI_hammer.py Mon Jan 14 10:05:14 2013 -0600
@@ -122,7 +122,7 @@
if options.recycle_latency:
l1_cntrl.recycle_latency = options.recycle_latency
- exec("system.l1_cntrl%d = l1_cntrl" % i)
+ exec("ruby_system.l1_cntrl%d = l1_cntrl" % i)
#
# Add controllers and sequencers to the appropriate lists
#
@@ -192,7 +192,7 @@
if options.recycle_latency:
dir_cntrl.recycle_latency = options.recycle_latency
- exec("system.dir_cntrl%d = dir_cntrl" % i)
+ exec("ruby_system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl)
cntrl_count += 1
@@ -209,8 +209,8 @@
dma_sequencer = dma_seq,
ruby_system = ruby_system)
- exec("system.dma_cntrl%d = dma_cntrl" % i)
- exec("system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
+ exec("ruby_system.dma_cntrl%d = dma_cntrl" % i)
+ exec("ruby_system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i)
dma_cntrl_nodes.append(dma_cntrl)
if options.recycle_latency:
diff -r 8da5ee073b92 -r 721718c62859 configs/ruby/Network_test.py
--- a/configs/ruby/Network_test.py Mon Jan 14 10:05:12 2013 -0600
+++ b/configs/ruby/Network_test.py Mon Jan 14 10:05:14 2013 -0600
@@ -97,7 +97,7 @@
if piobus != None:
cpu_seq.pio_port = piobus.slave
- exec("system.l1_cntrl%d = l1_cntrl" % i)
+ exec("ruby_system.l1_cntrl%d = l1_cntrl" % i)
#
# Add controllers and sequencers to the appropriate lists
#
@@ -129,7 +129,7 @@
memBuffer = mem_cntrl,
ruby_system = ruby_system)
- exec("system.dir_cntrl%d = dir_cntrl" % i)
+ exec("ruby_system.dir_cntrl%d = dir_cntrl" % i)
dir_cntrl_nodes.append(dir_cntrl)
cntrl_count += 1
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
