changeset 198352d722e4 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=198352d722e4
description:
Ruby: Add RubySystem parameter to MemoryControl
This guarantees that RubySystem object is created before the
MemoryController
object is created.
diffstat:
configs/ruby/MESI_CMP_directory.py | 3 ++-
configs/ruby/MI_example.py | 3 ++-
configs/ruby/MOESI_CMP_directory.py | 3 ++-
configs/ruby/MOESI_CMP_token.py | 3 ++-
configs/ruby/MOESI_hammer.py | 3 ++-
configs/ruby/Network_test.py | 3 ++-
src/mem/ruby/system/MemoryControl.py | 1 +
7 files changed, 13 insertions(+), 6 deletions(-)
diffs (88 lines):
diff -r dc656c4af516 -r 198352d722e4 configs/ruby/MESI_CMP_directory.py
--- a/configs/ruby/MESI_CMP_directory.py Thu Aug 16 23:45:21 2012 -0500
+++ b/configs/ruby/MESI_CMP_directory.py Thu Aug 16 23:39:36 2012 -0500
@@ -144,7 +144,8 @@
# Create the Ruby objects associated with the directory controller
#
- mem_cntrl = RubyMemoryControl(version = i)
+ mem_cntrl = RubyMemoryControl(version = i,
+ ruby_system = ruby_system)
dir_size = MemorySize('0B')
dir_size.value = mem_module_size
diff -r dc656c4af516 -r 198352d722e4 configs/ruby/MI_example.py
--- a/configs/ruby/MI_example.py Thu Aug 16 23:45:21 2012 -0500
+++ b/configs/ruby/MI_example.py Thu Aug 16 23:39:36 2012 -0500
@@ -115,7 +115,8 @@
# Create the Ruby objects associated with the directory controller
#
- mem_cntrl = RubyMemoryControl(version = i)
+ mem_cntrl = RubyMemoryControl(version = i,
+ ruby_system = ruby_system)
dir_size = MemorySize('0B')
dir_size.value = mem_module_size
diff -r dc656c4af516 -r 198352d722e4 configs/ruby/MOESI_CMP_directory.py
--- a/configs/ruby/MOESI_CMP_directory.py Thu Aug 16 23:45:21 2012 -0500
+++ b/configs/ruby/MOESI_CMP_directory.py Thu Aug 16 23:39:36 2012 -0500
@@ -143,7 +143,8 @@
# Create the Ruby objects associated with the directory controller
#
- mem_cntrl = RubyMemoryControl(version = i)
+ mem_cntrl = RubyMemoryControl(version = i,
+ ruby_system = ruby_system)
dir_size = MemorySize('0B')
dir_size.value = mem_module_size
diff -r dc656c4af516 -r 198352d722e4 configs/ruby/MOESI_CMP_token.py
--- a/configs/ruby/MOESI_CMP_token.py Thu Aug 16 23:45:21 2012 -0500
+++ b/configs/ruby/MOESI_CMP_token.py Thu Aug 16 23:39:36 2012 -0500
@@ -166,7 +166,8 @@
# Create the Ruby objects associated with the directory controller
#
- mem_cntrl = RubyMemoryControl(version = i)
+ mem_cntrl = RubyMemoryControl(version = i,
+ ruby_system = ruby_system)
dir_size = MemorySize('0B')
dir_size.value = mem_module_size
diff -r dc656c4af516 -r 198352d722e4 configs/ruby/MOESI_hammer.py
--- a/configs/ruby/MOESI_hammer.py Thu Aug 16 23:45:21 2012 -0500
+++ b/configs/ruby/MOESI_hammer.py Thu Aug 16 23:39:36 2012 -0500
@@ -164,7 +164,8 @@
# Create the Ruby objects associated with the directory controller
#
- mem_cntrl = RubyMemoryControl(version = i)
+ mem_cntrl = RubyMemoryControl(version = i,
+ ruby_system = ruby_system)
dir_size = MemorySize('0B')
dir_size.value = mem_module_size
diff -r dc656c4af516 -r 198352d722e4 configs/ruby/Network_test.py
--- a/configs/ruby/Network_test.py Thu Aug 16 23:45:21 2012 -0500
+++ b/configs/ruby/Network_test.py Thu Aug 16 23:39:36 2012 -0500
@@ -116,7 +116,8 @@
# Create the Ruby objects associated with the directory controller
#
- mem_cntrl = RubyMemoryControl(version = i)
+ mem_cntrl = RubyMemoryControl(version = i,
+ ruby_system = ruby_system)
dir_size = MemorySize('0B')
dir_size.value = mem_module_size
diff -r dc656c4af516 -r 198352d722e4 src/mem/ruby/system/MemoryControl.py
--- a/src/mem/ruby/system/MemoryControl.py Thu Aug 16 23:45:21 2012 -0500
+++ b/src/mem/ruby/system/MemoryControl.py Thu Aug 16 23:39:36 2012 -0500
@@ -35,5 +35,6 @@
type = 'MemoryControl'
cxx_class = 'MemoryControl'
version = Param.Int("");
+ ruby_system = Param.RubySystem("")
mem_bus_cycle_multiplier = Param.Int(10, "");
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
