1 files changed, 42 insertions, 11 deletions

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
index 2ff985fc2..9db3e21d1 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
@@ -8,8 +8,9 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 physmem ruby sys_port_proxy
+children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcbus funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 physmem ruby sys_port_proxy
 boot_osflags=a
+clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
@@ -30,6 +31,7 @@ system_port=system.sys_port_proxy.slave[0]
 [system.cpu0]
 type=MemTest
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -42,12 +44,13 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[0]
+functional=system.funcbus.slave[0]
 test=system.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -60,12 +63,13 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[1]
+functional=system.funcbus.slave[1]
 test=system.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -78,12 +82,13 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[2]
+functional=system.funcbus.slave[2]
 test=system.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -96,12 +101,13 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[3]
+functional=system.funcbus.slave[3]
 test=system.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -114,12 +120,13 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[4]
+functional=system.funcbus.slave[4]
 test=system.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -132,12 +139,13 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[5]
+functional=system.funcbus.slave[5]
 test=system.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -150,12 +158,13 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[6]
+functional=system.funcbus.slave[6]
 test=system.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -168,7 +177,7 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[7]
+functional=system.funcbus.slave[7]
 test=system.l1_cntrl7.sequencer.slave[0]
 
 [system.dir_cntrl0]
@@ -200,9 +209,9 @@ bank_busy_time=11
 bank_queue_size=12
 banks_per_rank=8
 basic_bus_busy_time=2
+clock=3
 dimm_bit_0=12
 dimms_per_channel=2
-mem_bus_cycle_multiplier=10
 mem_ctl_latency=12
 mem_fixed_delay=0
 mem_random_arbitrate=0
@@ -211,11 +220,23 @@ rank_rank_delay=1
 ranks_per_dimm=2
 read_write_delay=2
 refresh_period=1560
+ruby_system=system.ruby
 tFaw=0
 version=0
 
+[system.funcbus]
+type=NoncoherentBus
+block_size=64
+clock=1
+header_cycles=1
+use_default_range=false
+width=8
+master=system.funcmem.port
+slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
+
 [system.funcmem]
 type=SimpleMemory
+clock=1
 conf_table_reported=false
 file=
 in_addr_map=false
@@ -224,7 +245,7 @@ latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
+port=system.funcbus.master[0]
 
 [system.l1_cntrl0]
 type=L1Cache_Controller
@@ -259,6 +280,7 @@ tagArrayBanks=1
 [system.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=false
+clock=1
 dcache=system.l1_cntrl0.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl0.cacheMemory
@@ -305,6 +327,7 @@ tagArrayBanks=1
 [system.l1_cntrl1.sequencer]
 type=RubySequencer
 access_phys_mem=false
+clock=1
 dcache=system.l1_cntrl1.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl1.cacheMemory
@@ -351,6 +374,7 @@ tagArrayBanks=1
 [system.l1_cntrl2.sequencer]
 type=RubySequencer
 access_phys_mem=false
+clock=1
 dcache=system.l1_cntrl2.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl2.cacheMemory
@@ -397,6 +421,7 @@ tagArrayBanks=1
 [system.l1_cntrl3.sequencer]
 type=RubySequencer
 access_phys_mem=false
+clock=1
 dcache=system.l1_cntrl3.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl3.cacheMemory
@@ -443,6 +468,7 @@ tagArrayBanks=1
 [system.l1_cntrl4.sequencer]
 type=RubySequencer
 access_phys_mem=false
+clock=1
 dcache=system.l1_cntrl4.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl4.cacheMemory
@@ -489,6 +515,7 @@ tagArrayBanks=1
 [system.l1_cntrl5.sequencer]
 type=RubySequencer
 access_phys_mem=false
+clock=1
 dcache=system.l1_cntrl5.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl5.cacheMemory
@@ -535,6 +562,7 @@ tagArrayBanks=1
 [system.l1_cntrl6.sequencer]
 type=RubySequencer
 access_phys_mem=false
+clock=1
 dcache=system.l1_cntrl6.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl6.cacheMemory
@@ -581,6 +609,7 @@ tagArrayBanks=1
 [system.l1_cntrl7.sequencer]
 type=RubySequencer
 access_phys_mem=false
+clock=1
 dcache=system.l1_cntrl7.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl7.cacheMemory
@@ -596,6 +625,7 @@ slave=system.cpu7.test
 
 [system.physmem]
 type=SimpleMemory
+clock=1
 conf_table_reported=false
 file=
 in_addr_map=true
@@ -858,6 +888,7 @@ ruby_system=system.ruby
 [system.sys_port_proxy]
 type=RubyPortProxy
 access_phys_mem=true
+clock=1
 ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true