stats: changes to due to recent set of patches

7 files changed, 405 insertions, 793 deletions

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini
index 2056212e7..5b3edc5fa 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem mem_ctrls ruby sys_port_proxy voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler mem_ctrls ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
-memories=system.funcmem system.mem_ctrls
+memories=system.mem_ctrls
+mmap_using_noreserve=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -45,163 +46,131 @@ voltage_domain=system.voltage_domain
 
 [system.cpu0]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.ruby.l1_cntrl0.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.ruby.l1_cntrl1.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.ruby.l1_cntrl2.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.ruby.l1_cntrl3.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.ruby.l1_cntrl4.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.ruby.l1_cntrl5.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.ruby.l1_cntrl6.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.ruby.l1_cntrl7.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl7.sequencer.slave[0]
 
 [system.cpu_clk_domain]
 type=SrcClockDomain
@@ -219,29 +188,6 @@ eventq_index=0
 sys_clk_domain=system.clk_domain
 transition_latency=100000
 
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-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
-bandwidth=0.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
 [system.mem_ctrls]
 type=DRAMCtrl
 IDD0=0.075000
@@ -269,7 +215,7 @@ IDD62=0.000000
 VDD=1.500000
 VDD2=0.000000
 activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
 bank_groups_per_rank=0
 banks_per_rank=8
 burst_length=8
@@ -322,6 +268,7 @@ port=system.ruby.dir_cntrl0.memory
 [system.ruby]
 type=RubySystem
 children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
 all_instructions=false
 block_size_bytes=64
 clk_domain=system.ruby.clk_domain
@@ -442,7 +389,6 @@ unit_filter=8
 
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=1000000
@@ -456,7 +402,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-slave=system.cpu0.test
+slave=system.cpu0.port
 
 [system.ruby.l1_cntrl1]
 type=L1Cache_Controller
@@ -531,7 +477,6 @@ unit_filter=8
 
 [system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl1.L1Dcache
 deadlock_threshold=1000000
@@ -545,7 +490,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=1
-slave=system.cpu1.test
+slave=system.cpu1.port
 
 [system.ruby.l1_cntrl2]
 type=L1Cache_Controller
@@ -620,7 +565,6 @@ unit_filter=8
 
 [system.ruby.l1_cntrl2.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl2.L1Dcache
 deadlock_threshold=1000000
@@ -634,7 +578,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=2
-slave=system.cpu2.test
+slave=system.cpu2.port
 
 [system.ruby.l1_cntrl3]
 type=L1Cache_Controller
@@ -709,7 +653,6 @@ unit_filter=8
 
 [system.ruby.l1_cntrl3.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl3.L1Dcache
 deadlock_threshold=1000000
@@ -723,7 +666,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=3
-slave=system.cpu3.test
+slave=system.cpu3.port
 
 [system.ruby.l1_cntrl4]
 type=L1Cache_Controller
@@ -798,7 +741,6 @@ unit_filter=8
 
 [system.ruby.l1_cntrl4.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl4.L1Dcache
 deadlock_threshold=1000000
@@ -812,7 +754,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=4
-slave=system.cpu4.test
+slave=system.cpu4.port
 
 [system.ruby.l1_cntrl5]
 type=L1Cache_Controller
@@ -887,7 +829,6 @@ unit_filter=8
 
 [system.ruby.l1_cntrl5.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl5.L1Dcache
 deadlock_threshold=1000000
@@ -901,7 +842,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=5
-slave=system.cpu5.test
+slave=system.cpu5.port
 
 [system.ruby.l1_cntrl6]
 type=L1Cache_Controller
@@ -976,7 +917,6 @@ unit_filter=8
 
 [system.ruby.l1_cntrl6.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl6.L1Dcache
 deadlock_threshold=1000000
@@ -990,7 +930,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=6
-slave=system.cpu6.test
+slave=system.cpu6.port
 
 [system.ruby.l1_cntrl7]
 type=L1Cache_Controller
@@ -1065,7 +1005,6 @@ unit_filter=8
 
 [system.ruby.l1_cntrl7.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl7.L1Dcache
 deadlock_threshold=1000000
@@ -1079,7 +1018,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=7
-slave=system.cpu7.test
+slave=system.cpu7.port
 
 [system.ruby.l2_cntrl0]
 type=L2Cache_Controller
@@ -1424,7 +1363,6 @@ virt_nets=10
 
 [system.sys_port_proxy]
 type=RubyPortProxy
-access_backing_store=false
 clk_domain=system.clk_domain
 eventq_index=0
 ruby_system=system.ruby
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
index 0c7adcd05..f3306cd28 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem mem_ctrls ruby sys_port_proxy voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler mem_ctrls ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
-memories=system.funcmem system.mem_ctrls
+memories=system.mem_ctrls
+mmap_using_noreserve=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -45,163 +46,131 @@ voltage_domain=system.voltage_domain
 
 [system.cpu0]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.ruby.l1_cntrl0.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.ruby.l1_cntrl1.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.ruby.l1_cntrl2.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.ruby.l1_cntrl3.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.ruby.l1_cntrl4.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.ruby.l1_cntrl5.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.ruby.l1_cntrl6.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.ruby.l1_cntrl7.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl7.sequencer.slave[0]
 
 [system.cpu_clk_domain]
 type=SrcClockDomain
@@ -219,29 +188,6 @@ eventq_index=0
 sys_clk_domain=system.clk_domain
 transition_latency=100000
 
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-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
-bandwidth=0.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
 [system.mem_ctrls]
 type=DRAMCtrl
 IDD0=0.075000
@@ -269,7 +215,7 @@ IDD62=0.000000
 VDD=1.500000
 VDD2=0.000000
 activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
 bank_groups_per_rank=0
 banks_per_rank=8
 burst_length=8
@@ -322,6 +268,7 @@ port=system.ruby.dir_cntrl0.memory
 [system.ruby]
 type=RubySystem
 children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
 all_instructions=false
 block_size_bytes=64
 clk_domain=system.ruby.clk_domain
@@ -427,7 +374,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=1000000
@@ -441,7 +387,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-slave=system.cpu0.test
+slave=system.cpu0.port
 
 [system.ruby.l1_cntrl1]
 type=L1Cache_Controller
@@ -500,7 +446,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl1.L1Dcache
 deadlock_threshold=1000000
@@ -514,7 +459,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=1
-slave=system.cpu1.test
+slave=system.cpu1.port
 
 [system.ruby.l1_cntrl2]
 type=L1Cache_Controller
@@ -573,7 +518,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl2.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl2.L1Dcache
 deadlock_threshold=1000000
@@ -587,7 +531,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=2
-slave=system.cpu2.test
+slave=system.cpu2.port
 
 [system.ruby.l1_cntrl3]
 type=L1Cache_Controller
@@ -646,7 +590,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl3.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl3.L1Dcache
 deadlock_threshold=1000000
@@ -660,7 +603,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=3
-slave=system.cpu3.test
+slave=system.cpu3.port
 
 [system.ruby.l1_cntrl4]
 type=L1Cache_Controller
@@ -719,7 +662,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl4.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl4.L1Dcache
 deadlock_threshold=1000000
@@ -733,7 +675,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=4
-slave=system.cpu4.test
+slave=system.cpu4.port
 
 [system.ruby.l1_cntrl5]
 type=L1Cache_Controller
@@ -792,7 +734,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl5.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl5.L1Dcache
 deadlock_threshold=1000000
@@ -806,7 +747,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=5
-slave=system.cpu5.test
+slave=system.cpu5.port
 
 [system.ruby.l1_cntrl6]
 type=L1Cache_Controller
@@ -865,7 +806,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl6.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl6.L1Dcache
 deadlock_threshold=1000000
@@ -879,7 +819,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=6
-slave=system.cpu6.test
+slave=system.cpu6.port
 
 [system.ruby.l1_cntrl7]
 type=L1Cache_Controller
@@ -938,7 +878,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl7.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl7.L1Dcache
 deadlock_threshold=1000000
@@ -952,7 +891,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=7
-slave=system.cpu7.test
+slave=system.cpu7.port
 
 [system.ruby.l2_cntrl0]
 type=L2Cache_Controller
@@ -1296,7 +1235,6 @@ virt_nets=10
 
 [system.sys_port_proxy]
 type=RubyPortProxy
-access_backing_store=false
 clk_domain=system.clk_domain
 eventq_index=0
 ruby_system=system.ruby
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
index f99cf2ff6..149e26f4e 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem mem_ctrls ruby sys_port_proxy voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler mem_ctrls ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
-memories=system.funcmem system.mem_ctrls
+memories=system.mem_ctrls
+mmap_using_noreserve=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -45,163 +46,131 @@ voltage_domain=system.voltage_domain
 
 [system.cpu0]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.ruby.l1_cntrl0.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.ruby.l1_cntrl1.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.ruby.l1_cntrl2.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.ruby.l1_cntrl3.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.ruby.l1_cntrl4.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.ruby.l1_cntrl5.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.ruby.l1_cntrl6.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.ruby.l1_cntrl7.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl7.sequencer.slave[0]
 
 [system.cpu_clk_domain]
 type=SrcClockDomain
@@ -219,29 +188,6 @@ eventq_index=0
 sys_clk_domain=system.clk_domain
 transition_latency=100000
 
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-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
-bandwidth=0.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
 [system.mem_ctrls]
 type=DRAMCtrl
 IDD0=0.075000
@@ -269,7 +215,7 @@ IDD62=0.000000
 VDD=1.500000
 VDD2=0.000000
 activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
 bank_groups_per_rank=0
 banks_per_rank=8
 burst_length=8
@@ -322,6 +268,7 @@ port=system.ruby.dir_cntrl0.memory
 [system.ruby]
 type=RubySystem
 children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 memctrl_clk_domain network
+access_backing_store=false
 all_instructions=false
 block_size_bytes=64
 clk_domain=system.ruby.clk_domain
@@ -444,7 +391,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=1000000
@@ -458,7 +404,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-slave=system.cpu0.test
+slave=system.cpu0.port
 
 [system.ruby.l1_cntrl1]
 type=L1Cache_Controller
@@ -526,7 +472,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl1.L1Dcache
 deadlock_threshold=1000000
@@ -540,7 +485,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=1
-slave=system.cpu1.test
+slave=system.cpu1.port
 
 [system.ruby.l1_cntrl2]
 type=L1Cache_Controller
@@ -608,7 +553,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl2.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl2.L1Dcache
 deadlock_threshold=1000000
@@ -622,7 +566,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=2
-slave=system.cpu2.test
+slave=system.cpu2.port
 
 [system.ruby.l1_cntrl3]
 type=L1Cache_Controller
@@ -690,7 +634,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl3.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl3.L1Dcache
 deadlock_threshold=1000000
@@ -704,7 +647,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=3
-slave=system.cpu3.test
+slave=system.cpu3.port
 
 [system.ruby.l1_cntrl4]
 type=L1Cache_Controller
@@ -772,7 +715,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl4.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl4.L1Dcache
 deadlock_threshold=1000000
@@ -786,7 +728,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=4
-slave=system.cpu4.test
+slave=system.cpu4.port
 
 [system.ruby.l1_cntrl5]
 type=L1Cache_Controller
@@ -854,7 +796,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl5.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl5.L1Dcache
 deadlock_threshold=1000000
@@ -868,7 +809,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=5
-slave=system.cpu5.test
+slave=system.cpu5.port
 
 [system.ruby.l1_cntrl6]
 type=L1Cache_Controller
@@ -936,7 +877,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl6.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl6.L1Dcache
 deadlock_threshold=1000000
@@ -950,7 +890,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=6
-slave=system.cpu6.test
+slave=system.cpu6.port
 
 [system.ruby.l1_cntrl7]
 type=L1Cache_Controller
@@ -1018,7 +958,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl7.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl7.L1Dcache
 deadlock_threshold=1000000
@@ -1032,7 +971,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=7
-slave=system.cpu7.test
+slave=system.cpu7.port
 
 [system.ruby.l2_cntrl0]
 type=L2Cache_Controller
@@ -1379,7 +1318,6 @@ virt_nets=10
 
 [system.sys_port_proxy]
 type=RubyPortProxy
-access_backing_store=false
 clk_domain=system.clk_domain
 eventq_index=0
 ruby_system=system.ruby
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
index 1c9a952a1..38c85fff5 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem mem_ctrls ruby sys_port_proxy voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler mem_ctrls ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
-memories=system.mem_ctrls system.funcmem
+memories=system.mem_ctrls
+mmap_using_noreserve=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -45,163 +46,131 @@ voltage_domain=system.voltage_domain
 
 [system.cpu0]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.ruby.l1_cntrl0.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.ruby.l1_cntrl1.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.ruby.l1_cntrl2.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.ruby.l1_cntrl3.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.ruby.l1_cntrl4.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.ruby.l1_cntrl5.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.ruby.l1_cntrl6.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.ruby.l1_cntrl7.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl7.sequencer.slave[0]
 
 [system.cpu_clk_domain]
 type=SrcClockDomain
@@ -219,29 +188,6 @@ eventq_index=0
 sys_clk_domain=system.clk_domain
 transition_latency=100000
 
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-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
-bandwidth=0.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
 [system.mem_ctrls]
 type=DRAMCtrl
 IDD0=0.075000
@@ -269,7 +215,7 @@ IDD62=0.000000
 VDD=1.500000
 VDD2=0.000000
 activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
 bank_groups_per_rank=0
 banks_per_rank=8
 burst_length=8
@@ -322,6 +268,7 @@ port=system.ruby.dir_cntrl0.memory
 [system.ruby]
 type=RubySystem
 children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 memctrl_clk_domain network
+access_backing_store=false
 all_instructions=false
 block_size_bytes=64
 clk_domain=system.ruby.clk_domain
@@ -466,7 +413,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=1000000
@@ -480,7 +426,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-slave=system.cpu0.test
+slave=system.cpu0.port
 
 [system.ruby.l1_cntrl1]
 type=L1Cache_Controller
@@ -557,7 +503,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl1.L1Dcache
 deadlock_threshold=1000000
@@ -571,7 +516,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=1
-slave=system.cpu1.test
+slave=system.cpu1.port
 
 [system.ruby.l1_cntrl2]
 type=L1Cache_Controller
@@ -648,7 +593,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl2.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl2.L1Dcache
 deadlock_threshold=1000000
@@ -662,7 +606,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=2
-slave=system.cpu2.test
+slave=system.cpu2.port
 
 [system.ruby.l1_cntrl3]
 type=L1Cache_Controller
@@ -739,7 +683,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl3.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl3.L1Dcache
 deadlock_threshold=1000000
@@ -753,7 +696,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=3
-slave=system.cpu3.test
+slave=system.cpu3.port
 
 [system.ruby.l1_cntrl4]
 type=L1Cache_Controller
@@ -830,7 +773,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl4.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl4.L1Dcache
 deadlock_threshold=1000000
@@ -844,7 +786,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=4
-slave=system.cpu4.test
+slave=system.cpu4.port
 
 [system.ruby.l1_cntrl5]
 type=L1Cache_Controller
@@ -921,7 +863,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl5.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl5.L1Dcache
 deadlock_threshold=1000000
@@ -935,7 +876,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=5
-slave=system.cpu5.test
+slave=system.cpu5.port
 
 [system.ruby.l1_cntrl6]
 type=L1Cache_Controller
@@ -1012,7 +953,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl6.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl6.L1Dcache
 deadlock_threshold=1000000
@@ -1026,7 +966,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=6
-slave=system.cpu6.test
+slave=system.cpu6.port
 
 [system.ruby.l1_cntrl7]
 type=L1Cache_Controller
@@ -1103,7 +1043,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl7.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl7.L1Dcache
 deadlock_threshold=1000000
@@ -1117,7 +1056,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=7
-slave=system.cpu7.test
+slave=system.cpu7.port
 
 [system.ruby.memctrl_clk_domain]
 type=DerivedClockDomain
@@ -1396,7 +1335,6 @@ virt_nets=10
 
 [system.sys_port_proxy]
 type=RubyPortProxy
-access_backing_store=false
 clk_domain=system.clk_domain
 eventq_index=0
 ruby_system=system.ruby
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 15c73e8ec..75224c394 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
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem mem_ctrls ruby sys_port_proxy voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler mem_ctrls ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
 mem_ranges=0:268435455
-memories=system.mem_ctrls system.funcmem
+memories=system.mem_ctrls
+mmap_using_noreserve=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -45,163 +46,131 @@ voltage_domain=system.voltage_domain
 
 [system.cpu0]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.ruby.l1_cntrl0.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.ruby.l1_cntrl1.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.ruby.l1_cntrl2.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.ruby.l1_cntrl3.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.ruby.l1_cntrl4.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.ruby.l1_cntrl5.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.ruby.l1_cntrl6.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=0
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=true
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.ruby.l1_cntrl7.sequencer.slave[0]
+system=system
+port=system.ruby.l1_cntrl7.sequencer.slave[0]
 
 [system.cpu_clk_domain]
 type=SrcClockDomain
@@ -219,29 +188,6 @@ eventq_index=0
 sys_clk_domain=system.clk_domain
 transition_latency=100000
 
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-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
-bandwidth=0.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
 [system.mem_ctrls]
 type=DRAMCtrl
 IDD0=0.075000
@@ -269,7 +215,7 @@ IDD62=0.000000
 VDD=1.500000
 VDD2=0.000000
 activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
 bank_groups_per_rank=0
 banks_per_rank=8
 burst_length=8
@@ -322,6 +268,7 @@ port=system.ruby.dir_cntrl0.memory
 [system.ruby]
 type=RubySystem
 children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 memctrl_clk_domain network
+access_backing_store=false
 all_instructions=false
 block_size_bytes=64
 clk_domain=system.ruby.clk_domain
@@ -411,7 +358,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl0.cacheMemory
 deadlock_threshold=1000000
@@ -425,7 +371,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-slave=system.cpu0.test
+slave=system.cpu0.port
 
 [system.ruby.l1_cntrl1]
 type=L1Cache_Controller
@@ -467,7 +413,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl1.cacheMemory
 deadlock_threshold=1000000
@@ -481,7 +426,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=1
-slave=system.cpu1.test
+slave=system.cpu1.port
 
 [system.ruby.l1_cntrl2]
 type=L1Cache_Controller
@@ -523,7 +468,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl2.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl2.cacheMemory
 deadlock_threshold=1000000
@@ -537,7 +481,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=2
-slave=system.cpu2.test
+slave=system.cpu2.port
 
 [system.ruby.l1_cntrl3]
 type=L1Cache_Controller
@@ -579,7 +523,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl3.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl3.cacheMemory
 deadlock_threshold=1000000
@@ -593,7 +536,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=3
-slave=system.cpu3.test
+slave=system.cpu3.port
 
 [system.ruby.l1_cntrl4]
 type=L1Cache_Controller
@@ -635,7 +578,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl4.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl4.cacheMemory
 deadlock_threshold=1000000
@@ -649,7 +591,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=4
-slave=system.cpu4.test
+slave=system.cpu4.port
 
 [system.ruby.l1_cntrl5]
 type=L1Cache_Controller
@@ -691,7 +633,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl5.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl5.cacheMemory
 deadlock_threshold=1000000
@@ -705,7 +646,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=5
-slave=system.cpu5.test
+slave=system.cpu5.port
 
 [system.ruby.l1_cntrl6]
 type=L1Cache_Controller
@@ -747,7 +688,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl6.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl6.cacheMemory
 deadlock_threshold=1000000
@@ -761,7 +701,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=6
-slave=system.cpu6.test
+slave=system.cpu6.port
 
 [system.ruby.l1_cntrl7]
 type=L1Cache_Controller
@@ -803,7 +743,6 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl7.sequencer]
 type=RubySequencer
-access_backing_store=false
 clk_domain=system.cpu_clk_domain
 dcache=system.ruby.l1_cntrl7.cacheMemory
 deadlock_threshold=1000000
@@ -817,7 +756,7 @@ system=system
 using_network_tester=false
 using_ruby_tester=false
 version=7
-slave=system.cpu7.test
+slave=system.cpu7.port
 
 [system.ruby.memctrl_clk_domain]
 type=DerivedClockDomain
@@ -1096,7 +1035,6 @@ virt_nets=10
 
 [system.sys_port_proxy]
 type=RubyPortProxy
-access_backing_store=false
 clk_domain=system.clk_domain
 eventq_index=0
 ruby_system=system.ruby
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
index 6605d530a..27d9847c3 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem l2c membus physmem toL2Bus voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler l2c membus physmem toL2Bus voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
 mem_ranges=
-memories=system.physmem system.funcmem
+memories=system.physmem
+mmap_using_noreserve=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -46,23 +47,19 @@ voltage_domain=system.voltage_domain
 [system.cpu0]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.cpu0.l1c.cpu_side
+system=system
+port=system.cpu0.l1c.cpu_side
 
 [system.cpu0.l1c]
 type=BaseCache
@@ -70,6 +67,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -86,7 +84,7 @@ tags=system.cpu0.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu0.test
+cpu_side=system.cpu0.port
 mem_side=system.toL2Bus.slave[0]
 
 [system.cpu0.l1c.tags]
@@ -102,23 +100,19 @@ size=32768
 [system.cpu1]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.cpu1.l1c.cpu_side
+system=system
+port=system.cpu1.l1c.cpu_side
 
 [system.cpu1.l1c]
 type=BaseCache
@@ -126,6 +120,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -142,7 +137,7 @@ tags=system.cpu1.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu1.test
+cpu_side=system.cpu1.port
 mem_side=system.toL2Bus.slave[1]
 
 [system.cpu1.l1c.tags]
@@ -158,23 +153,19 @@ size=32768
 [system.cpu2]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.cpu2.l1c.cpu_side
+system=system
+port=system.cpu2.l1c.cpu_side
 
 [system.cpu2.l1c]
 type=BaseCache
@@ -182,6 +173,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -198,7 +190,7 @@ tags=system.cpu2.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu2.test
+cpu_side=system.cpu2.port
 mem_side=system.toL2Bus.slave[2]
 
 [system.cpu2.l1c.tags]
@@ -214,23 +206,19 @@ size=32768
 [system.cpu3]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.cpu3.l1c.cpu_side
+system=system
+port=system.cpu3.l1c.cpu_side
 
 [system.cpu3.l1c]
 type=BaseCache
@@ -238,6 +226,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -254,7 +243,7 @@ tags=system.cpu3.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu3.test
+cpu_side=system.cpu3.port
 mem_side=system.toL2Bus.slave[3]
 
 [system.cpu3.l1c.tags]
@@ -270,23 +259,19 @@ size=32768
 [system.cpu4]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.cpu4.l1c.cpu_side
+system=system
+port=system.cpu4.l1c.cpu_side
 
 [system.cpu4.l1c]
 type=BaseCache
@@ -294,6 +279,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -310,7 +296,7 @@ tags=system.cpu4.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu4.test
+cpu_side=system.cpu4.port
 mem_side=system.toL2Bus.slave[4]
 
 [system.cpu4.l1c.tags]
@@ -326,23 +312,19 @@ size=32768
 [system.cpu5]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.cpu5.l1c.cpu_side
+system=system
+port=system.cpu5.l1c.cpu_side
 
 [system.cpu5.l1c]
 type=BaseCache
@@ -350,6 +332,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -366,7 +349,7 @@ tags=system.cpu5.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu5.test
+cpu_side=system.cpu5.port
 mem_side=system.toL2Bus.slave[5]
 
 [system.cpu5.l1c.tags]
@@ -382,23 +365,19 @@ size=32768
 [system.cpu6]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.cpu6.l1c.cpu_side
+system=system
+port=system.cpu6.l1c.cpu_side
 
 [system.cpu6.l1c]
 type=BaseCache
@@ -406,6 +385,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -422,7 +402,7 @@ tags=system.cpu6.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu6.test
+cpu_side=system.cpu6.port
 mem_side=system.toL2Bus.slave[6]
 
 [system.cpu6.l1c.tags]
@@ -438,23 +418,19 @@ size=32768
 [system.cpu7]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.cpu7.l1c.cpu_side
+system=system
+port=system.cpu7.l1c.cpu_side
 
 [system.cpu7.l1c]
 type=BaseCache
@@ -462,6 +438,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -478,7 +455,7 @@ tags=system.cpu7.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu7.test
+cpu_side=system.cpu7.port
 mem_side=system.toL2Bus.slave[7]
 
 [system.cpu7.l1c.tags]
@@ -507,35 +484,13 @@ eventq_index=0
 sys_clk_domain=system.clk_domain
 transition_latency=100000000
 
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-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
-bandwidth=73.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30000
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
 [system.l2c]
 type=BaseCache
 children=tags
 addr_ranges=0:18446744073709551615
 assoc=8
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=20
@@ -570,8 +525,11 @@ type=CoherentXBar
 children=snoop_filter
 clk_domain=system.clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
 snoop_filter=system.membus.snoop_filter
+snoop_response_latency=4
 system=system
 use_default_range=false
 width=16
@@ -581,7 +539,7 @@ slave=system.l2c.mem_side system.system_port
 [system.membus.snoop_filter]
 type=SnoopFilter
 eventq_index=0
-lookup_latency=3
+lookup_latency=1
 system=system
 
 [system.physmem]
@@ -602,18 +560,21 @@ type=CoherentXBar
 children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
 snoop_filter=system.toL2Bus.snoop_filter
+snoop_response_latency=1
 system=system
 use_default_range=false
-width=16
+width=32
 master=system.l2c.cpu_side
 slave=system.cpu0.l1c.mem_side system.cpu1.l1c.mem_side system.cpu2.l1c.mem_side system.cpu3.l1c.mem_side system.cpu4.l1c.mem_side system.cpu5.l1c.mem_side system.cpu6.l1c.mem_side system.cpu7.l1c.mem_side
 
 [system.toL2Bus.snoop_filter]
 type=SnoopFilter
 eventq_index=0
-lookup_latency=3
+lookup_latency=1
 system=system
 
 [system.voltage_domain]
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
index 06da0f372..a476e7586 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=System
-children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler funcbus funcmem l2c membus physmem toL2Bus voltage_domain
+children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_handler l2c membus physmem toL2Bus voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
@@ -22,7 +22,8 @@ load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
 mem_ranges=
-memories=system.physmem system.funcmem
+memories=system.physmem
+mmap_using_noreserve=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -46,23 +47,19 @@ voltage_domain=system.voltage_domain
 [system.cpu0]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[0]
-test=system.cpu0.l1c.cpu_side
+system=system
+port=system.cpu0.l1c.cpu_side
 
 [system.cpu0.l1c]
 type=BaseCache
@@ -70,6 +67,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -86,7 +84,7 @@ tags=system.cpu0.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu0.test
+cpu_side=system.cpu0.port
 mem_side=system.toL2Bus.slave[0]
 
 [system.cpu0.l1c.tags]
@@ -102,23 +100,19 @@ size=32768
 [system.cpu1]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[1]
-test=system.cpu1.l1c.cpu_side
+system=system
+port=system.cpu1.l1c.cpu_side
 
 [system.cpu1.l1c]
 type=BaseCache
@@ -126,6 +120,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -142,7 +137,7 @@ tags=system.cpu1.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu1.test
+cpu_side=system.cpu1.port
 mem_side=system.toL2Bus.slave[1]
 
 [system.cpu1.l1c.tags]
@@ -158,23 +153,19 @@ size=32768
 [system.cpu2]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[2]
-test=system.cpu2.l1c.cpu_side
+system=system
+port=system.cpu2.l1c.cpu_side
 
 [system.cpu2.l1c]
 type=BaseCache
@@ -182,6 +173,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -198,7 +190,7 @@ tags=system.cpu2.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu2.test
+cpu_side=system.cpu2.port
 mem_side=system.toL2Bus.slave[2]
 
 [system.cpu2.l1c.tags]
@@ -214,23 +206,19 @@ size=32768
 [system.cpu3]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[3]
-test=system.cpu3.l1c.cpu_side
+system=system
+port=system.cpu3.l1c.cpu_side
 
 [system.cpu3.l1c]
 type=BaseCache
@@ -238,6 +226,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -254,7 +243,7 @@ tags=system.cpu3.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu3.test
+cpu_side=system.cpu3.port
 mem_side=system.toL2Bus.slave[3]
 
 [system.cpu3.l1c.tags]
@@ -270,23 +259,19 @@ size=32768
 [system.cpu4]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[4]
-test=system.cpu4.l1c.cpu_side
+system=system
+port=system.cpu4.l1c.cpu_side
 
 [system.cpu4.l1c]
 type=BaseCache
@@ -294,6 +279,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -310,7 +296,7 @@ tags=system.cpu4.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu4.test
+cpu_side=system.cpu4.port
 mem_side=system.toL2Bus.slave[4]
 
 [system.cpu4.l1c.tags]
@@ -326,23 +312,19 @@ size=32768
 [system.cpu5]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[5]
-test=system.cpu5.l1c.cpu_side
+system=system
+port=system.cpu5.l1c.cpu_side
 
 [system.cpu5.l1c]
 type=BaseCache
@@ -350,6 +332,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -366,7 +349,7 @@ tags=system.cpu5.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu5.test
+cpu_side=system.cpu5.port
 mem_side=system.toL2Bus.slave[5]
 
 [system.cpu5.l1c.tags]
@@ -382,23 +365,19 @@ size=32768
 [system.cpu6]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[6]
-test=system.cpu6.l1c.cpu_side
+system=system
+port=system.cpu6.l1c.cpu_side
 
 [system.cpu6.l1c]
 type=BaseCache
@@ -406,6 +385,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -422,7 +402,7 @@ tags=system.cpu6.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu6.test
+cpu_side=system.cpu6.port
 mem_side=system.toL2Bus.slave[6]
 
 [system.cpu6.l1c.tags]
@@ -438,23 +418,19 @@ size=32768
 [system.cpu7]
 type=MemTest
 children=l1c
-atomic=false
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-issue_dmas=false
+interval=1
 max_loads=100000
-memory_size=65536
-percent_dest_unaligned=50
 percent_functional=50
 percent_reads=65
-percent_source_unaligned=50
 percent_uncacheable=10
+progress_check=5000000
 progress_interval=10000
+size=65536
 suppress_func_warnings=false
-sys=system
-trace_addr=0
-functional=system.funcbus.slave[7]
-test=system.cpu7.l1c.cpu_side
+system=system
+port=system.cpu7.l1c.cpu_side
 
 [system.cpu7.l1c]
 type=BaseCache
@@ -462,6 +438,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -478,7 +455,7 @@ tags=system.cpu7.l1c.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu7.test
+cpu_side=system.cpu7.port
 mem_side=system.toL2Bus.slave[7]
 
 [system.cpu7.l1c.tags]
@@ -507,35 +484,13 @@ eventq_index=0
 sys_clk_domain=system.clk_domain
 transition_latency=100000000
 
-[system.funcbus]
-type=NoncoherentXBar
-clk_domain=system.clk_domain
-eventq_index=0
-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
-bandwidth=73.000000
-clk_domain=system.clk_domain
-conf_table_reported=true
-eventq_index=0
-in_addr_map=false
-latency=30000
-latency_var=0
-null=false
-range=0:134217727
-port=system.funcbus.master[0]
-
 [system.l2c]
 type=BaseCache
 children=tags
 addr_ranges=0:18446744073709551615
 assoc=8
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=20
@@ -569,8 +524,11 @@ size=65536
 type=CoherentXBar
 clk_domain=system.clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
 snoop_filter=Null
+snoop_response_latency=4
 system=system
 use_default_range=false
 width=16
@@ -594,11 +552,14 @@ port=system.membus.master[0]
 type=CoherentXBar
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
 snoop_filter=Null
+snoop_response_latency=1
 system=system
 use_default_range=false
-width=16
+width=32
 master=system.l2c.cpu_side
 slave=system.cpu0.l1c.mem_side system.cpu1.l1c.mem_side system.cpu2.l1c.mem_side system.cpu3.l1c.mem_side system.cpu4.l1c.mem_side system.cpu5.l1c.mem_side system.cpu6.l1c.mem_side system.cpu7.l1c.mem_side