From 2a0555470cfc66ab70544e97578c048822ec9282 Mon Sep 17 00:00:00 2001 From: Brad Beckmann Date: Fri, 29 Jan 2010 20:29:19 -0800 Subject: ruby: Converted MOESI_hammer dma cntrl to new config system --- configs/example/memtest-ruby.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'configs/example') diff --git a/configs/example/memtest-ruby.py b/configs/example/memtest-ruby.py index c0569944e..abc22a93b 100644 --- a/configs/example/memtest-ruby.py +++ b/configs/example/memtest-ruby.py @@ -104,6 +104,7 @@ class L2Cache(RubyCache): # l1_cntrl_nodes = [] dir_cntrl_nodes = [] +dma_cntrl_nodes = [] # # Must create the individual controllers before the network to ensure the @@ -138,12 +139,15 @@ for (i, cpu) in enumerate(cpus): directory = RubyDirectoryMemory(), memBuffer = RubyMemoryControl()) + dma_cntrl = DMA_Controller(version = i, + dma_sequencer = DMASequencer()) # # As noted above: Two independent list are track to maintain the order of # nodes/controllers assumed by the ruby network # l1_cntrl_nodes.append(l1_cntrl) dir_cntrl_nodes.append(dir_cntrl) + dma_cntrl_nodes.append(dma_cntrl) # # Finally tie the memtester ports to the correct system ports @@ -157,7 +161,8 @@ for (i, cpu) in enumerate(cpus): # constructor. # network = SimpleNetwork(topology = makeCrossbar(l1_cntrl_nodes + \ - dir_cntrl_nodes)) + dir_cntrl_nodes + \ + dma_cntrl_nodes)) mem_size_mb = sum([int(dir_cntrl.directory.size_mb) \ for dir_cntrl in dir_cntrl_nodes]) @@ -166,7 +171,9 @@ system.ruby = RubySystem(clock = '1GHz', network = network, profiler = RubyProfiler(), tracer = RubyTracer(), - debug = RubyDebug(), + debug = RubyDebug(filter_string = 'qQin', + verbosity_string = 'high', + protocol_trace = True), mem_size_mb = mem_size_mb) -- cgit v1.2.3