diff options
| author | Jason Power <power.jg@gmail.com> | 2012-08-16 23:39:36 -0500 |
|---|---|---|
| committer | Jason Power <power.jg@gmail.com> | 2012-08-16 23:39:36 -0500 |
| commit | 44b4c9625331670d11f5bddb94c50a55c5864d7c (patch) | |
| tree | 8e64f2d864c5928b5d9e7e3c1573a306952575ff | |
| parent | 649e37793776757d4076ce194fbe537b8d49e1db (diff) | |
| download | gem5-44b4c9625331670d11f5bddb94c50a55c5864d7c.tar.xz | |
Ruby: Add RubySystem parameter to MemoryControl
This guarantees that RubySystem object is created before the MemoryController
object is created.
| -rw-r--r-- | configs/ruby/MESI_CMP_directory.py | 3 | ||||
| -rw-r--r-- | configs/ruby/MI_example.py | 3 | ||||
| -rw-r--r-- | configs/ruby/MOESI_CMP_directory.py | 3 | ||||
| -rw-r--r-- | configs/ruby/MOESI_CMP_token.py | 3 | ||||
| -rw-r--r-- | configs/ruby/MOESI_hammer.py | 3 | ||||
| -rw-r--r-- | configs/ruby/Network_test.py | 3 | ||||
| -rw-r--r-- | src/mem/ruby/system/MemoryControl.py | 1 |
7 files changed, 13 insertions, 6 deletions
diff --git a/configs/ruby/MESI_CMP_directory.py b/configs/ruby/MESI_CMP_directory.py index d877543c0..017fe3a4a 100644 --- a/configs/ruby/MESI_CMP_directory.py +++ b/configs/ruby/MESI_CMP_directory.py @@ -144,7 +144,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system): # 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 --git a/configs/ruby/MI_example.py b/configs/ruby/MI_example.py index 4fb55b89f..85544837d 100644 --- a/configs/ruby/MI_example.py +++ b/configs/ruby/MI_example.py @@ -115,7 +115,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system): # 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 --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py index bce7be5d6..b238b7675 100644 --- a/configs/ruby/MOESI_CMP_directory.py +++ b/configs/ruby/MOESI_CMP_directory.py @@ -143,7 +143,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system): # 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 --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py index 51cc5fb92..466f9bb8c 100644 --- a/configs/ruby/MOESI_CMP_token.py +++ b/configs/ruby/MOESI_CMP_token.py @@ -166,7 +166,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system): # 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 --git a/configs/ruby/MOESI_hammer.py b/configs/ruby/MOESI_hammer.py index 48129c0a4..56fe05298 100644 --- a/configs/ruby/MOESI_hammer.py +++ b/configs/ruby/MOESI_hammer.py @@ -164,7 +164,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system): # 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 --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py index 6eae52e86..c4dd97e8d 100644 --- a/configs/ruby/Network_test.py +++ b/configs/ruby/Network_test.py @@ -116,7 +116,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system): # 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 --git a/src/mem/ruby/system/MemoryControl.py b/src/mem/ruby/system/MemoryControl.py index dafd0a789..c4c852932 100644 --- a/src/mem/ruby/system/MemoryControl.py +++ b/src/mem/ruby/system/MemoryControl.py @@ -35,5 +35,6 @@ class MemoryControl(SimObject): type = 'MemoryControl' cxx_class = 'MemoryControl' version = Param.Int(""); + ruby_system = Param.RubySystem("") mem_bus_cycle_multiplier = Param.Int(10, ""); |