diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2012-04-05 11:09:19 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2012-04-05 11:09:19 -0500 |
| commit | 4f4a710457af4a9c8e72632995b55f106110ac9c (patch) | |
| tree | 816cc9af7167d0d016df34768fdf701ea5d3a140 /configs/example | |
| parent | f1a60906132fb816f80917d830b34df5e5d87ad4 (diff) | |
| download | gem5-4f4a710457af4a9c8e72632995b55f106110ac9c.tar.xz | |
Config: corrects the way Ruby attaches to the DMA ports
With recent changes to the memory system, a port cannot be assigned a peer
port twice. While making use of the Ruby memory system in FS mode, DMA
ports were assigned peer twice, once for the classic memory system
and once for the Ruby memory system. This patch removes this double
assignment of peer ports.
Diffstat (limited to 'configs/example')
| -rw-r--r-- | configs/example/ruby_fs.py | 2 | ||||
| -rw-r--r-- | configs/example/ruby_mem_test.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py index b5ce643b9..8f02b8cfd 100644 --- a/configs/example/ruby_fs.py +++ b/configs/example/ruby_fs.py @@ -96,7 +96,7 @@ if options.script is not None: system.readfile = options.script system.cpu = [CPUClass(cpu_id=i) for i in xrange(options.num_cpus)] -Ruby.create_system(options, system, system.piobus, system._dma_devices) +Ruby.create_system(options, system, system.piobus, system._dma_ports) for (i, cpu) in enumerate(system.cpu): # diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py index 3fec09c47..4b0948365 100644 --- a/configs/example/ruby_mem_test.py +++ b/configs/example/ruby_mem_test.py @@ -115,13 +115,17 @@ if options.num_dmas > 0: percent_functional = 0, percent_uncacheable = 0, progress_interval = options.progress, - warn_on_failure = options.warn_on_failure) \ + suppress_func_warnings = + not options.suppress_func_warnings) \ for i in xrange(options.num_dmas) ] system.dma_devices = dmas else: dmas = [] -Ruby.create_system(options, system, dma_devices = dmas) +dma_ports = [] +for (i, dma) in enumerate(dmas): + dma_ports.append(dma.test) +Ruby.create_system(options, system, dma_ports = dma_ports) # # The tester is most effective when randomization is turned on and |