Ruby: Fix instantiations of DMA controller and sequencer

The patch on Ruby functional accesses made changes to the process of
instantiating controllers and sequencers. The DMA controller and
sequencer was not updated, hence this patch.

diff --git a/configs/ruby/MESI_CMP_directory.py b/configs/ruby/MESI_CMP_directory.py
index fdb6ce0b0add1a4cbfc0212d38d92d23fcacf88c..6e70944b7cdbcd819919f0aa8385e86f427d52b8 100644 (file)
--- a/configs/ruby/MESI_CMP_directory.py
+++ b/configs/ruby/MESI_CMP_directory.py
@@ -166,11 +166,13 @@ def create_system(options, system, piobus, dma_devices, ruby_system):
         #
         dma_seq = DMASequencer(version = i,
                                physMemPort = system.physmem.port,
-                               physmem = system.physmem)
+                               physmem = system.physmem,
+                               ruby_system = ruby_system)
         
         dma_cntrl = DMA_Controller(version = i,
                                    cntrl_id = cntrl_count,
-                                   dma_sequencer = dma_seq)
+                                   dma_sequencer = dma_seq,
+                                   ruby_system = ruby_system)
 
         exec("system.dma_cntrl%d = dma_cntrl" % i)
         if dma_device.type == 'MemTest':

diff --git a/configs/ruby/MI_example.py b/configs/ruby/MI_example.py
index fcee35f00671eaac7f60a4631dae15de24ae6013..eeb81e8a30ca3c8c4d0822439c8b5734aa1dec13 100644 (file)
--- a/configs/ruby/MI_example.py
+++ b/configs/ruby/MI_example.py
@@ -141,11 +141,13 @@ def create_system(options, system, piobus, dma_devices, ruby_system):
         #
         dma_seq = DMASequencer(version = i,
                                physMemPort = system.physmem.port,
-                               physmem = system.physmem)
+                               physmem = system.physmem,
+                               ruby_system = ruby_system)
         
         dma_cntrl = DMA_Controller(version = i,
                                    cntrl_id = cntrl_count,
-                                   dma_sequencer = dma_seq)
+                                   dma_sequencer = dma_seq,
+                                   ruby_system = ruby_system)
 
         exec("system.dma_cntrl%d = dma_cntrl" % i)
         if dma_device.type == 'MemTest':

diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py
index 5da1cf310a2b089eb2c034c11c861f3b0fa22895..e3bc9ae85a450b5465d6a2ee5241077f67f4b877 100644 (file)
--- a/configs/ruby/MOESI_CMP_directory.py
+++ b/configs/ruby/MOESI_CMP_directory.py
@@ -165,11 +165,13 @@ def create_system(options, system, piobus, dma_devices, ruby_system):
         #
         dma_seq = DMASequencer(version = i,
                                physMemPort = system.physmem.port,
-                               physmem = system.physmem)
+                               physmem = system.physmem,
+                               ruby_system = ruby_system)
         
         dma_cntrl = DMA_Controller(version = i,
                                    cntrl_id = cntrl_count,
-                                   dma_sequencer = dma_seq)
+                                   dma_sequencer = dma_seq,
+                                   ruby_system = ruby_system)
 
         exec("system.dma_cntrl%d = dma_cntrl" % i)
         if dma_device.type == 'MemTest':

diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py
index c7f9dda11bc5eb91a19dbcd9c71142133b6e1c49..d11bb320c6d70af2908f34e949476cf36026e81d 100644 (file)
--- a/configs/ruby/MOESI_CMP_token.py
+++ b/configs/ruby/MOESI_CMP_token.py
@@ -189,11 +189,13 @@ def create_system(options, system, piobus, dma_devices, ruby_system):
         #
         dma_seq = DMASequencer(version = i,
                                physMemPort = system.physmem.port,
-                               physmem = system.physmem)
+                               physmem = system.physmem,
+                               ruby_system = ruby_system)
         
         dma_cntrl = DMA_Controller(version = i,
                                    cntrl_id = cntrl_count,
-                                   dma_sequencer = dma_seq)
+                                   dma_sequencer = dma_seq,
+                                   ruby_system = ruby_system)
 
         exec("system.dma_cntrl%d = dma_cntrl" % i)
         if dma_device.type == 'MemTest':

diff --git a/configs/ruby/MOESI_hammer.py b/configs/ruby/MOESI_hammer.py
index 6e46f3e0f0a1ec9215a1d7055392c697989ba078..fb755ba552ec8c6601af9524bd5c8a58ef351f03 100644 (file)
--- a/configs/ruby/MOESI_hammer.py
+++ b/configs/ruby/MOESI_hammer.py
@@ -200,11 +200,13 @@ def create_system(options, system, piobus, dma_devices, ruby_system):
         #
         dma_seq = DMASequencer(version = i,
                                physMemPort = system.physmem.port,
-                               physmem = system.physmem)
+                               physmem = system.physmem,
+                               ruby_system = ruby_system)
         
         dma_cntrl = DMA_Controller(version = i,
                                    cntrl_id = cntrl_count,
-                                   dma_sequencer = dma_seq)
+                                   dma_sequencer = dma_seq,
+                                   ruby_system = ruby_system)
 
         exec("system.dma_cntrl%d = dma_cntrl" % i)
         if dma_device.type == 'MemTest':