From 808701a10c7d2b79feb3746c2b47c5faa3fca042 Mon Sep 17 00:00:00 2001 From: Brad Beckmann Date: Fri, 20 Aug 2010 11:46:12 -0700 Subject: memtest: Memtester support for DMA This patch adds DMA testing to the Memtester and is inherits many changes from Polina's old tester_dma_extension patch. Since Ruby does not work in atomic mode, the atomic mode options are removed. --- configs/ruby/MESI_CMP_directory.py | 4 ++++ configs/ruby/MI_example.py | 4 ++++ configs/ruby/MOESI_CMP_directory.py | 4 ++++ configs/ruby/MOESI_CMP_token.py | 4 ++++ configs/ruby/MOESI_hammer.py | 4 ++++ 5 files changed, 20 insertions(+) (limited to 'configs/ruby') diff --git a/configs/ruby/MESI_CMP_directory.py b/configs/ruby/MESI_CMP_directory.py index d336ca7e4..f6dafa44a 100644 --- a/configs/ruby/MESI_CMP_directory.py +++ b/configs/ruby/MESI_CMP_directory.py @@ -153,6 +153,10 @@ def create_system(options, system, piobus, dma_devices): dma_cntrl.dma_sequencer.port = dma_device.dma exec("system.dma_cntrl%d = dma_cntrl" % i) + if dma_device.type == 'MemTest': + system.dma_cntrl.dma_sequencer.port = dma_device.test + else: + system.dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl_nodes.append(dma_cntrl) all_cntrls = l1_cntrl_nodes + \ diff --git a/configs/ruby/MI_example.py b/configs/ruby/MI_example.py index c51e19e09..0e101d18f 100644 --- a/configs/ruby/MI_example.py +++ b/configs/ruby/MI_example.py @@ -132,6 +132,10 @@ def create_system(options, system, piobus, dma_devices): dma_sequencer = dma_seq) exec("system.dma_cntrl%d = dma_cntrl" % i) + if dma_device.type == 'MemTest': + system.dma_cntrl.dma_sequencer.port = dma_device.test + else: + system.dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl_nodes.append(dma_cntrl) diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py index ebc628fc0..4498617a9 100644 --- a/configs/ruby/MOESI_CMP_directory.py +++ b/configs/ruby/MOESI_CMP_directory.py @@ -151,6 +151,10 @@ def create_system(options, system, piobus, dma_devices): dma_sequencer = dma_seq) exec("system.dma_cntrl%d = dma_cntrl" % i) + if dma_device.type == 'MemTest': + system.dma_cntrl.dma_sequencer.port = dma_device.test + else: + system.dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl_nodes.append(dma_cntrl) diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py index db704cfd8..f2669ef78 100644 --- a/configs/ruby/MOESI_CMP_token.py +++ b/configs/ruby/MOESI_CMP_token.py @@ -173,6 +173,10 @@ def create_system(options, system, piobus, dma_devices): dma_sequencer = dma_seq) exec("system.dma_cntrl%d = dma_cntrl" % i) + if dma_device.type == 'MemTest': + system.dma_cntrl.dma_sequencer.port = dma_device.test + else: + system.dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl_nodes.append(dma_cntrl) diff --git a/configs/ruby/MOESI_hammer.py b/configs/ruby/MOESI_hammer.py index 45b08a288..5cf27206b 100644 --- a/configs/ruby/MOESI_hammer.py +++ b/configs/ruby/MOESI_hammer.py @@ -139,6 +139,10 @@ def create_system(options, system, piobus, dma_devices): dma_sequencer = dma_seq) exec("system.dma_cntrl%d = dma_cntrl" % i) + if dma_device.type == 'MemTest': + system.dma_cntrl.dma_sequencer.port = dma_device.test + else: + system.dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl.dma_sequencer.port = dma_device.dma dma_cntrl_nodes.append(dma_cntrl) -- cgit v1.2.3