summaryrefslogtreecommitdiff
path: root/configs/example/ruby_mem_test.py
diff options
context:
space:
mode:
Diffstat (limited to 'configs/example/ruby_mem_test.py')
-rw-r--r--configs/example/ruby_mem_test.py23
1 files changed, 3 insertions, 20 deletions
diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py
index ab658f787..68ad1ca66 100644
--- a/configs/example/ruby_mem_test.py
+++ b/configs/example/ruby_mem_test.py
@@ -96,9 +96,7 @@ if options.num_cpus > block_size:
#
# Currently ruby does not support atomic or uncacheable accesses
#
-cpus = [ MemTest(atomic = False,
- max_loads = options.maxloads,
- issue_dmas = False,
+cpus = [ MemTest(max_loads = options.maxloads,
percent_functional = options.functional,
percent_uncacheable = 0,
progress_interval = options.progress,
@@ -106,15 +104,11 @@ cpus = [ MemTest(atomic = False,
for i in xrange(options.num_cpus) ]
system = System(cpu = cpus,
- funcmem = SimpleMemory(in_addr_map = False),
- funcbus = IOXBar(),
clk_domain = SrcClockDomain(clock = options.sys_clock),
mem_ranges = [AddrRange(options.mem_size)])
if options.num_dmas > 0:
- dmas = [ MemTest(atomic = False,
- max_loads = options.maxloads,
- issue_dmas = True,
+ dmas = [ MemTest(max_loads = options.maxloads,
percent_functional = 0,
percent_uncacheable = 0,
progress_interval = options.progress,
@@ -150,8 +144,7 @@ for (i, cpu) in enumerate(cpus):
#
# Tie the cpu memtester ports to the correct system ports
#
- cpu.test = system.ruby._cpu_ports[i].slave
- cpu.functional = system.funcbus.slave
+ cpu.port = system.ruby._cpu_ports[i].slave
#
# Since the memtester is incredibly bursty, increase the deadlock
@@ -159,16 +152,6 @@ for (i, cpu) in enumerate(cpus):
#
system.ruby._cpu_ports[i].deadlock_threshold = 5000000
-for (i, dma) in enumerate(dmas):
- #
- # Tie the dma memtester ports to the correct functional port
- # Note that the test port has already been connected to the dma_sequencer
- #
- dma.functional = system.funcbus.slave
-
-# connect reference memory to funcbus
-system.funcbus.master = system.funcmem.port
-
# -----------------------
# run simulation
# -----------------------