1 files changed, 54 insertions, 43 deletions
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
index dacf2f87f..35cfc3441 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
@@ -14,9 +14,8 @@ init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
-memories=system.physmem system.funcmem
+memories=system.funcmem system.physmem
 num_work_ids=16
-physmem=system.physmem
 readfile=
 symbolfile=
 work_begin_ckpt_count=0
@@ -26,7 +25,7 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
-system_port=system.sys_port_proxy.port[0]
+system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu0]
 type=MemTest
@@ -44,7 +43,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcmem.port[0]
-test=system.l1_cntrl0.sequencer.port[0]
+test=system.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
@@ -62,7 +61,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcmem.port[1]
-test=system.l1_cntrl1.sequencer.port[0]
+test=system.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
@@ -80,7 +79,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcmem.port[2]
-test=system.l1_cntrl2.sequencer.port[0]
+test=system.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
@@ -98,7 +97,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcmem.port[3]
-test=system.l1_cntrl3.sequencer.port[0]
+test=system.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
@@ -116,7 +115,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcmem.port[4]
-test=system.l1_cntrl4.sequencer.port[0]
+test=system.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
@@ -134,7 +133,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcmem.port[5]
-test=system.l1_cntrl5.sequencer.port[0]
+test=system.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
@@ -152,7 +151,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcmem.port[6]
-test=system.l1_cntrl6.sequencer.port[0]
+test=system.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
@@ -170,7 +169,7 @@ suppress_func_warnings=true
 sys=system
 trace_addr=0
 functional=system.funcmem.port[7]
-test=system.l1_cntrl7.sequencer.port[0]
+test=system.l1_cntrl7.sequencer.slave[0]
 
 [system.dir_cntrl0]
 type=Directory_Controller
@@ -191,7 +190,7 @@ version=0
 type=RubyDirectoryMemory
 map_levels=4
 numa_high_bit=6
-size=134217728
+size=268435456
 use_map=false
 version=0
 
@@ -217,8 +216,10 @@ tFaw=0
 version=0
 
 [system.funcmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=false
 latency=30
 latency_var=0
 null=false
@@ -270,13 +271,14 @@ dcache=system.l1_cntrl0.L1DcacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl0.L1IcacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-physMemPort=system.physmem.port[0]
-port=system.cpu0.test
+slave=system.cpu0.test
 
 [system.l1_cntrl1]
 type=L1Cache_Controller
@@ -322,13 +324,14 @@ dcache=system.l1_cntrl1.L1DcacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl1.L1IcacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=1
-physMemPort=system.physmem.port[1]
-port=system.cpu1.test
+slave=system.cpu1.test
 
 [system.l1_cntrl2]
 type=L1Cache_Controller
@@ -374,13 +377,14 @@ dcache=system.l1_cntrl2.L1DcacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl2.L1IcacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=2
-physMemPort=system.physmem.port[2]
-port=system.cpu2.test
+slave=system.cpu2.test
 
 [system.l1_cntrl3]
 type=L1Cache_Controller
@@ -426,13 +430,14 @@ dcache=system.l1_cntrl3.L1DcacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl3.L1IcacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=3
-physMemPort=system.physmem.port[3]
-port=system.cpu3.test
+slave=system.cpu3.test
 
 [system.l1_cntrl4]
 type=L1Cache_Controller
@@ -478,13 +483,14 @@ dcache=system.l1_cntrl4.L1DcacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl4.L1IcacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=4
-physMemPort=system.physmem.port[4]
-port=system.cpu4.test
+slave=system.cpu4.test
 
 [system.l1_cntrl5]
 type=L1Cache_Controller
@@ -530,13 +536,14 @@ dcache=system.l1_cntrl5.L1DcacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl5.L1IcacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=5
-physMemPort=system.physmem.port[5]
-port=system.cpu5.test
+slave=system.cpu5.test
 
 [system.l1_cntrl6]
 type=L1Cache_Controller
@@ -582,13 +589,14 @@ dcache=system.l1_cntrl6.L1DcacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl6.L1IcacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=6
-physMemPort=system.physmem.port[6]
-port=system.cpu6.test
+slave=system.cpu6.test
 
 [system.l1_cntrl7]
 type=L1Cache_Controller
@@ -634,13 +642,14 @@ dcache=system.l1_cntrl7.L1DcacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl7.L1IcacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=7
-physMemPort=system.physmem.port[7]
-port=system.cpu7.test
+slave=system.cpu7.test
 
 [system.l2_cntrl0]
 type=L2Cache_Controller
@@ -667,21 +676,22 @@ size=512
 start_index_bit=6
 
 [system.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=30
 latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=system.l1_cntrl0.sequencer.physMemPort system.l1_cntrl1.sequencer.physMemPort system.l1_cntrl2.sequencer.physMemPort system.l1_cntrl3.sequencer.physMemPort system.l1_cntrl4.sequencer.physMemPort system.l1_cntrl5.sequencer.physMemPort system.l1_cntrl6.sequencer.physMemPort system.l1_cntrl7.sequencer.physMemPort system.sys_port_proxy.physMemPort
 
 [system.ruby]
 type=RubySystem
 children=network profiler
 block_size_bytes=64
 clock=1
-mem_size=134217728
+mem_size=268435456
 no_mem_vec=false
 random_seed=1234
 randomization=false
@@ -941,11 +951,12 @@ ruby_system=system.ruby
 [system.sys_port_proxy]
 type=RubyPortProxy
 access_phys_mem=true
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-physMemPort=system.physmem.port[8]
-port=system.system_port
+slave=system.system_port