From 8c8a2f12f2f8b419723e7af8e3851033c41b7b51 Mon Sep 17 00:00:00 2001 From: Nikos Nikoleris Date: Thu, 4 Oct 2018 16:15:52 +0100 Subject: [PATCH] configs: Revamp ruby mem test to align with MemTest The test script was broken as it was based on an older version of MemTest, this changes revamps the creation of MemTest and removes parameters that are not any longer valid. Change-Id: Ib87369c1e4717c2da23e8108c72eec871e56f6ed Signed-off-by: Nikos Nikoleris Reviewed-on: https://gem5-review.googlesource.com/c/13596 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- configs/example/ruby_mem_test.py | 23 +++-------------------- 1 file 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 # ----------------------- -- 2.30.2