Regression Tests: Update statistics

7 files changed, 250 insertions, 158 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 93b40e746..a34dc2d81 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
@@ -237,9 +237,9 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste
 
 [system.funcmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=false
 latency=30
 latency_var=0
@@ -791,9 +791,9 @@ tagArrayBanks=1
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30
 latency_var=0
@@ -843,8 +843,9 @@ link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
-type=BasicRouter
+type=Switch
 router_id=0
+virt_nets=10
 
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
@@ -857,8 +858,9 @@ link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
+type=Switch
 router_id=1
+virt_nets=10
 
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
@@ -871,8 +873,9 @@ link_id=2
 weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
+type=Switch
 router_id=2
+virt_nets=10
 
 [system.ruby.network.topology.ext_links3]
 type=SimpleExtLink
@@ -885,8 +888,9 @@ link_id=3
 weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
-type=BasicRouter
+type=Switch
 router_id=3
+virt_nets=10
 
 [system.ruby.network.topology.ext_links4]
 type=SimpleExtLink
@@ -899,8 +903,9 @@ link_id=4
 weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
-type=BasicRouter
+type=Switch
 router_id=4
+virt_nets=10
 
 [system.ruby.network.topology.ext_links5]
 type=SimpleExtLink
@@ -913,8 +918,9 @@ link_id=5
 weight=1
 
 [system.ruby.network.topology.ext_links5.int_node]
-type=BasicRouter
+type=Switch
 router_id=5
+virt_nets=10
 
 [system.ruby.network.topology.ext_links6]
 type=SimpleExtLink
@@ -927,8 +933,9 @@ link_id=6
 weight=1
 
 [system.ruby.network.topology.ext_links6.int_node]
-type=BasicRouter
+type=Switch
 router_id=6
+virt_nets=10
 
 [system.ruby.network.topology.ext_links7]
 type=SimpleExtLink
@@ -941,8 +948,9 @@ link_id=7
 weight=1
 
 [system.ruby.network.topology.ext_links7.int_node]
-type=BasicRouter
+type=Switch
 router_id=7
+virt_nets=10
 
 [system.ruby.network.topology.ext_links8]
 type=SimpleExtLink
@@ -955,8 +963,9 @@ link_id=8
 weight=1
 
 [system.ruby.network.topology.ext_links8.int_node]
-type=BasicRouter
+type=Switch
 router_id=8
+virt_nets=10
 
 [system.ruby.network.topology.ext_links9]
 type=SimpleExtLink
@@ -969,8 +978,9 @@ link_id=9
 weight=1
 
 [system.ruby.network.topology.ext_links9.int_node]
-type=BasicRouter
+type=Switch
 router_id=9
+virt_nets=10
 
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
@@ -983,8 +993,9 @@ node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
+type=Switch
 router_id=10
+virt_nets=10
 
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
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 42b10fe12..fd8f9a616 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
@@ -236,9 +236,9 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste
 
 [system.funcmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=false
 latency=30
 latency_var=0
@@ -773,9 +773,9 @@ tagArrayBanks=1
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30
 latency_var=0
@@ -825,8 +825,9 @@ link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
-type=BasicRouter
+type=Switch
 router_id=0
+virt_nets=10
 
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
@@ -839,8 +840,9 @@ link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
+type=Switch
 router_id=1
+virt_nets=10
 
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
@@ -853,8 +855,9 @@ link_id=2
 weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
+type=Switch
 router_id=2
+virt_nets=10
 
 [system.ruby.network.topology.ext_links3]
 type=SimpleExtLink
@@ -867,8 +870,9 @@ link_id=3
 weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
-type=BasicRouter
+type=Switch
 router_id=3
+virt_nets=10
 
 [system.ruby.network.topology.ext_links4]
 type=SimpleExtLink
@@ -881,8 +885,9 @@ link_id=4
 weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
-type=BasicRouter
+type=Switch
 router_id=4
+virt_nets=10
 
 [system.ruby.network.topology.ext_links5]
 type=SimpleExtLink
@@ -895,8 +900,9 @@ link_id=5
 weight=1
 
 [system.ruby.network.topology.ext_links5.int_node]
-type=BasicRouter
+type=Switch
 router_id=5
+virt_nets=10
 
 [system.ruby.network.topology.ext_links6]
 type=SimpleExtLink
@@ -909,8 +915,9 @@ link_id=6
 weight=1
 
 [system.ruby.network.topology.ext_links6.int_node]
-type=BasicRouter
+type=Switch
 router_id=6
+virt_nets=10
 
 [system.ruby.network.topology.ext_links7]
 type=SimpleExtLink
@@ -923,8 +930,9 @@ link_id=7
 weight=1
 
 [system.ruby.network.topology.ext_links7.int_node]
-type=BasicRouter
+type=Switch
 router_id=7
+virt_nets=10
 
 [system.ruby.network.topology.ext_links8]
 type=SimpleExtLink
@@ -937,8 +945,9 @@ link_id=8
 weight=1
 
 [system.ruby.network.topology.ext_links8.int_node]
-type=BasicRouter
+type=Switch
 router_id=8
+virt_nets=10
 
 [system.ruby.network.topology.ext_links9]
 type=SimpleExtLink
@@ -951,8 +960,9 @@ link_id=9
 weight=1
 
 [system.ruby.network.topology.ext_links9.int_node]
-type=BasicRouter
+type=Switch
 router_id=9
+virt_nets=10
 
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
@@ -965,8 +975,9 @@ node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
+type=Switch
 router_id=10
+virt_nets=10
 
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
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 b7ddefe55..cf4014ca2 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
@@ -239,9 +239,9 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste
 
 [system.funcmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=false
 latency=30
 latency_var=0
@@ -826,9 +826,9 @@ tagArrayBanks=1
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30
 latency_var=0
@@ -878,8 +878,9 @@ link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
-type=BasicRouter
+type=Switch
 router_id=0
+virt_nets=10
 
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
@@ -892,8 +893,9 @@ link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
+type=Switch
 router_id=1
+virt_nets=10
 
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
@@ -906,8 +908,9 @@ link_id=2
 weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
+type=Switch
 router_id=2
+virt_nets=10
 
 [system.ruby.network.topology.ext_links3]
 type=SimpleExtLink
@@ -920,8 +923,9 @@ link_id=3
 weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
-type=BasicRouter
+type=Switch
 router_id=3
+virt_nets=10
 
 [system.ruby.network.topology.ext_links4]
 type=SimpleExtLink
@@ -934,8 +938,9 @@ link_id=4
 weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
-type=BasicRouter
+type=Switch
 router_id=4
+virt_nets=10
 
 [system.ruby.network.topology.ext_links5]
 type=SimpleExtLink
@@ -948,8 +953,9 @@ link_id=5
 weight=1
 
 [system.ruby.network.topology.ext_links5.int_node]
-type=BasicRouter
+type=Switch
 router_id=5
+virt_nets=10
 
 [system.ruby.network.topology.ext_links6]
 type=SimpleExtLink
@@ -962,8 +968,9 @@ link_id=6
 weight=1
 
 [system.ruby.network.topology.ext_links6.int_node]
-type=BasicRouter
+type=Switch
 router_id=6
+virt_nets=10
 
 [system.ruby.network.topology.ext_links7]
 type=SimpleExtLink
@@ -976,8 +983,9 @@ link_id=7
 weight=1
 
 [system.ruby.network.topology.ext_links7.int_node]
-type=BasicRouter
+type=Switch
 router_id=7
+virt_nets=10
 
 [system.ruby.network.topology.ext_links8]
 type=SimpleExtLink
@@ -990,8 +998,9 @@ link_id=8
 weight=1
 
 [system.ruby.network.topology.ext_links8.int_node]
-type=BasicRouter
+type=Switch
 router_id=8
+virt_nets=10
 
 [system.ruby.network.topology.ext_links9]
 type=SimpleExtLink
@@ -1004,8 +1013,9 @@ link_id=9
 weight=1
 
 [system.ruby.network.topology.ext_links9.int_node]
-type=BasicRouter
+type=Switch
 router_id=9
+virt_nets=10
 
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
@@ -1018,8 +1028,9 @@ node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
+type=Switch
 router_id=10
+virt_nets=10
 
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
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 d06198c0e..2c0f889dc 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
@@ -253,9 +253,9 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste
 
 [system.funcmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=false
 latency=30
 latency_var=0
@@ -898,9 +898,9 @@ slave=system.cpu7.test
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30
 latency_var=0
@@ -950,8 +950,9 @@ link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
-type=BasicRouter
+type=Switch
 router_id=0
+virt_nets=10
 
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
@@ -964,8 +965,9 @@ link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
+type=Switch
 router_id=1
+virt_nets=10
 
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
@@ -978,8 +980,9 @@ link_id=2
 weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
+type=Switch
 router_id=2
+virt_nets=10
 
 [system.ruby.network.topology.ext_links3]
 type=SimpleExtLink
@@ -992,8 +995,9 @@ link_id=3
 weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
-type=BasicRouter
+type=Switch
 router_id=3
+virt_nets=10
 
 [system.ruby.network.topology.ext_links4]
 type=SimpleExtLink
@@ -1006,8 +1010,9 @@ link_id=4
 weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
-type=BasicRouter
+type=Switch
 router_id=4
+virt_nets=10
 
 [system.ruby.network.topology.ext_links5]
 type=SimpleExtLink
@@ -1020,8 +1025,9 @@ link_id=5
 weight=1
 
 [system.ruby.network.topology.ext_links5.int_node]
-type=BasicRouter
+type=Switch
 router_id=5
+virt_nets=10
 
 [system.ruby.network.topology.ext_links6]
 type=SimpleExtLink
@@ -1034,8 +1040,9 @@ link_id=6
 weight=1
 
 [system.ruby.network.topology.ext_links6.int_node]
-type=BasicRouter
+type=Switch
 router_id=6
+virt_nets=10
 
 [system.ruby.network.topology.ext_links7]
 type=SimpleExtLink
@@ -1048,8 +1055,9 @@ link_id=7
 weight=1
 
 [system.ruby.network.topology.ext_links7.int_node]
-type=BasicRouter
+type=Switch
 router_id=7
+virt_nets=10
 
 [system.ruby.network.topology.ext_links8]
 type=SimpleExtLink
@@ -1062,8 +1070,9 @@ link_id=8
 weight=1
 
 [system.ruby.network.topology.ext_links8.int_node]
-type=BasicRouter
+type=Switch
 router_id=8
+virt_nets=10
 
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
@@ -1076,8 +1085,9 @@ node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
+type=Switch
 router_id=9
+virt_nets=10
 
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
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 9db3e21d1..cb8e1b733 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
@@ -236,9 +236,9 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste
 
 [system.funcmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=false
 latency=30
 latency_var=0
@@ -625,9 +625,9 @@ slave=system.cpu7.test
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=0.000000
 clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30
 latency_var=0
@@ -677,8 +677,9 @@ link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
-type=BasicRouter
+type=Switch
 router_id=0
+virt_nets=10
 
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
@@ -691,8 +692,9 @@ link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
+type=Switch
 router_id=1
+virt_nets=10
 
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
@@ -705,8 +707,9 @@ link_id=2
 weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
+type=Switch
 router_id=2
+virt_nets=10
 
 [system.ruby.network.topology.ext_links3]
 type=SimpleExtLink
@@ -719,8 +722,9 @@ link_id=3
 weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
-type=BasicRouter
+type=Switch
 router_id=3
+virt_nets=10
 
 [system.ruby.network.topology.ext_links4]
 type=SimpleExtLink
@@ -733,8 +737,9 @@ link_id=4
 weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
-type=BasicRouter
+type=Switch
 router_id=4
+virt_nets=10
 
 [system.ruby.network.topology.ext_links5]
 type=SimpleExtLink
@@ -747,8 +752,9 @@ link_id=5
 weight=1
 
 [system.ruby.network.topology.ext_links5.int_node]
-type=BasicRouter
+type=Switch
 router_id=5
+virt_nets=10
 
 [system.ruby.network.topology.ext_links6]
 type=SimpleExtLink
@@ -761,8 +767,9 @@ link_id=6
 weight=1
 
 [system.ruby.network.topology.ext_links6.int_node]
-type=BasicRouter
+type=Switch
 router_id=6
+virt_nets=10
 
 [system.ruby.network.topology.ext_links7]
 type=SimpleExtLink
@@ -775,8 +782,9 @@ link_id=7
 weight=1
 
 [system.ruby.network.topology.ext_links7.int_node]
-type=BasicRouter
+type=Switch
 router_id=7
+virt_nets=10
 
 [system.ruby.network.topology.ext_links8]
 type=SimpleExtLink
@@ -789,8 +797,9 @@ link_id=8
 weight=1
 
 [system.ruby.network.topology.ext_links8.int_node]
-type=BasicRouter
+type=Switch
 router_id=8
+virt_nets=10
 
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
@@ -803,8 +812,9 @@ node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
+type=Switch
 router_id=9
+virt_nets=10
 
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini
index db9f08590..a24f176d8 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini
@@ -8,8 +8,9 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=System
-children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcmem l2c membus physmem toL2Bus
+children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcbus funcmem l2c membus physmem toL2Bus
 boot_osflags=a
+clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
@@ -31,6 +32,7 @@ system_port=system.membus.slave[1]
 type=MemTest
 children=l1c
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -43,7 +45,7 @@ progress_interval=10000
 suppress_func_warnings=false
 sys=system
 trace_addr=0
-functional=system.funcmem.port[0]
+functional=system.funcbus.slave[0]
 test=system.cpu0.l1c.cpu_side
 
 [system.cpu0.l1c]
@@ -51,16 +53,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=12
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=32768
 subblock_size=0
 system=system
@@ -75,6 +79,7 @@ mem_side=system.toL2Bus.slave[0]
 type=MemTest
 children=l1c
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -87,7 +92,7 @@ progress_interval=10000
 suppress_func_warnings=false
 sys=system
 trace_addr=0
-functional=system.funcmem.port[1]
+functional=system.funcbus.slave[1]
 test=system.cpu1.l1c.cpu_side
 
 [system.cpu1.l1c]
@@ -95,16 +100,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=12
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=32768
 subblock_size=0
 system=system
@@ -119,6 +126,7 @@ mem_side=system.toL2Bus.slave[1]
 type=MemTest
 children=l1c
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -131,7 +139,7 @@ progress_interval=10000
 suppress_func_warnings=false
 sys=system
 trace_addr=0
-functional=system.funcmem.port[2]
+functional=system.funcbus.slave[2]
 test=system.cpu2.l1c.cpu_side
 
 [system.cpu2.l1c]
@@ -139,16 +147,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=12
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=32768
 subblock_size=0
 system=system
@@ -163,6 +173,7 @@ mem_side=system.toL2Bus.slave[2]
 type=MemTest
 children=l1c
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -175,7 +186,7 @@ progress_interval=10000
 suppress_func_warnings=false
 sys=system
 trace_addr=0
-functional=system.funcmem.port[3]
+functional=system.funcbus.slave[3]
 test=system.cpu3.l1c.cpu_side
 
 [system.cpu3.l1c]
@@ -183,16 +194,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=12
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=32768
 subblock_size=0
 system=system
@@ -207,6 +220,7 @@ mem_side=system.toL2Bus.slave[3]
 type=MemTest
 children=l1c
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -219,7 +233,7 @@ progress_interval=10000
 suppress_func_warnings=false
 sys=system
 trace_addr=0
-functional=system.funcmem.port[4]
+functional=system.funcbus.slave[4]
 test=system.cpu4.l1c.cpu_side
 
 [system.cpu4.l1c]
@@ -227,16 +241,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=12
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=32768
 subblock_size=0
 system=system
@@ -251,6 +267,7 @@ mem_side=system.toL2Bus.slave[4]
 type=MemTest
 children=l1c
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -263,7 +280,7 @@ progress_interval=10000
 suppress_func_warnings=false
 sys=system
 trace_addr=0
-functional=system.funcmem.port[5]
+functional=system.funcbus.slave[5]
 test=system.cpu5.l1c.cpu_side
 
 [system.cpu5.l1c]
@@ -271,16 +288,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=12
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=32768
 subblock_size=0
 system=system
@@ -295,6 +314,7 @@ mem_side=system.toL2Bus.slave[5]
 type=MemTest
 children=l1c
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -307,7 +327,7 @@ progress_interval=10000
 suppress_func_warnings=false
 sys=system
 trace_addr=0
-functional=system.funcmem.port[6]
+functional=system.funcbus.slave[6]
 test=system.cpu6.l1c.cpu_side
 
 [system.cpu6.l1c]
@@ -315,16 +335,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=12
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=32768
 subblock_size=0
 system=system
@@ -339,6 +361,7 @@ mem_side=system.toL2Bus.slave[6]
 type=MemTest
 children=l1c
 atomic=false
+clock=1
 issue_dmas=false
 max_loads=100000
 memory_size=65536
@@ -351,7 +374,7 @@ progress_interval=10000
 suppress_func_warnings=false
 sys=system
 trace_addr=0
-functional=system.funcmem.port[7]
+functional=system.funcbus.slave[7]
 test=system.cpu7.l1c.cpu_side
 
 [system.cpu7.l1c]
@@ -359,16 +382,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=12
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=32768
 subblock_size=0
 system=system
@@ -379,33 +404,46 @@ write_buffers=8
 cpu_side=system.cpu7.test
 mem_side=system.toL2Bus.slave[7]
 
+[system.funcbus]
+type=NoncoherentBus
+block_size=64
+clock=1000
+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
+clock=1
 conf_table_reported=false
-file=
 in_addr_map=false
 latency=30000
 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.l2c]
 type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=8
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=10000
 is_top_level=false
-latency=10000
 max_miss_count=0
 mshrs=92
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=10000
 size=65536
 subblock_size=0
 system=system
@@ -423,13 +461,14 @@ clock=2
 header_cycles=1
 use_default_range=false
 width=16
-master=system.physmem.port[0]
+master=system.physmem.port
 slave=system.l2c.mem_side system.system_port
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=73.000000
+clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30000
 latency_var=0
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr b/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr
index b8bd8a115..e47dd4681 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr
@@ -1,74 +1,74 @@
-system.cpu3: completed 10000 read, 5269 write accesses @22241329
-system.cpu6: completed 10000 read, 5339 write accesses @22510874
-system.cpu4: completed 10000 read, 5452 write accesses @22618520
-system.cpu2: completed 10000 read, 5274 write accesses @22652245
-system.cpu5: completed 10000 read, 5225 write accesses @22698654
-system.cpu0: completed 10000 read, 5313 write accesses @22972460
-system.cpu1: completed 10000 read, 5425 write accesses @23112052
-system.cpu7: completed 10000 read, 5664 write accesses @23303588
-system.cpu3: completed 20000 read, 10591 write accesses @44494817
-system.cpu6: completed 20000 read, 10810 write accesses @44620430
-system.cpu2: completed 20000 read, 10802 write accesses @45009184
-system.cpu0: completed 20000 read, 10643 write accesses @45009224
-system.cpu5: completed 20000 read, 10647 write accesses @45039314
-system.cpu1: completed 20000 read, 10757 write accesses @45068735
-system.cpu4: completed 20000 read, 10808 write accesses @45199458
-system.cpu7: completed 20000 read, 11080 write accesses @45757070
-system.cpu2: completed 30000 read, 16115 write accesses @67069204
-system.cpu3: completed 30000 read, 16110 write accesses @67286000
-system.cpu5: completed 30000 read, 16163 write accesses @67388496
-system.cpu4: completed 30000 read, 16262 write accesses @67495238
-system.cpu6: completed 30000 read, 16234 write accesses @67566368
-system.cpu0: completed 30000 read, 16102 write accesses @67625583
-system.cpu1: completed 30000 read, 16288 write accesses @67665372
-system.cpu7: completed 30000 read, 16608 write accesses @68406261
-system.cpu4: completed 40000 read, 21521 write accesses @88522458
-system.cpu2: completed 40000 read, 21461 write accesses @88760475
-system.cpu5: completed 40000 read, 21540 write accesses @88851958
-system.cpu3: completed 40000 read, 21536 write accesses @88901742
-system.cpu6: completed 40000 read, 21498 write accesses @88910943
-system.cpu1: completed 40000 read, 21730 write accesses @89071047
-system.cpu0: completed 40000 read, 21414 write accesses @89232143
-system.cpu7: completed 40000 read, 22063 write accesses @90453997
-system.cpu4: completed 50000 read, 26910 write accesses @111349230
-system.cpu1: completed 50000 read, 26996 write accesses @111399385
-system.cpu2: completed 50000 read, 26807 write accesses @111571994
-system.cpu6: completed 50000 read, 26876 write accesses @111619105
-system.cpu3: completed 50000 read, 27009 write accesses @111789131
-system.cpu0: completed 50000 read, 26777 write accesses @111829265
-system.cpu5: completed 50000 read, 26952 write accesses @111861140
-system.cpu7: completed 50000 read, 27397 write accesses @112901639
-system.cpu1: completed 60000 read, 32331 write accesses @134016224
-system.cpu2: completed 60000 read, 32246 write accesses @134236668
-system.cpu4: completed 60000 read, 32290 write accesses @134236929
-system.cpu5: completed 60000 read, 32370 write accesses @134256674
-system.cpu6: completed 60000 read, 32444 write accesses @134707450
-system.cpu0: completed 60000 read, 32183 write accesses @134767456
-system.cpu3: completed 60000 read, 32423 write accesses @134996472
-system.cpu7: completed 60000 read, 32735 write accesses @135678114
-system.cpu2: completed 70000 read, 37600 write accesses @156516476
-system.cpu1: completed 70000 read, 37730 write accesses @156721328
-system.cpu5: completed 70000 read, 37748 write accesses @156805205
-system.cpu6: completed 70000 read, 37760 write accesses @156910635
-system.cpu4: completed 70000 read, 37725 write accesses @156961462
-system.cpu0: completed 70000 read, 37635 write accesses @158012668
-system.cpu3: completed 70000 read, 37942 write accesses @158279756
-system.cpu7: completed 70000 read, 38031 write accesses @158283192
-system.cpu5: completed 80000 read, 43255 write accesses @179067469
-system.cpu2: completed 80000 read, 43125 write accesses @179091672
-system.cpu1: completed 80000 read, 43134 write accesses @179182044
-system.cpu6: completed 80000 read, 43119 write accesses @179350821
-system.cpu4: completed 80000 read, 43054 write accesses @179621308
-system.cpu7: completed 80000 read, 43393 write accesses @180749386
-system.cpu0: completed 80000 read, 43229 write accesses @180793374
-system.cpu3: completed 80000 read, 43339 write accesses @180920432
-system.cpu6: completed 90000 read, 48363 write accesses @201441693
-system.cpu2: completed 90000 read, 48516 write accesses @201463344
-system.cpu5: completed 90000 read, 48731 write accesses @201471872
-system.cpu1: completed 90000 read, 48576 write accesses @201752753
-system.cpu4: completed 90000 read, 48432 write accesses @201853284
-system.cpu7: completed 90000 read, 48666 write accesses @202980078
-system.cpu3: completed 90000 read, 48647 write accesses @203163876
-system.cpu0: completed 90000 read, 48482 write accesses @203365064
-system.cpu6: completed 100000 read, 53510 write accesses @223713460
+system.cpu1: completed 10000 read, 5306 write accesses @32059956
+system.cpu6: completed 10000 read, 5293 write accesses @32275139
+system.cpu7: completed 10000 read, 5474 write accesses @32325344
+system.cpu3: completed 10000 read, 5220 write accesses @32355571
+system.cpu2: completed 10000 read, 5392 write accesses @32378350
+system.cpu4: completed 10000 read, 5411 write accesses @32427761
+system.cpu5: completed 10000 read, 5317 write accesses @32754271
+system.cpu0: completed 10000 read, 5539 write accesses @32833317
+system.cpu1: completed 20000 read, 10662 write accesses @55871338
+system.cpu3: completed 20000 read, 10529 write accesses @56061050
+system.cpu2: completed 20000 read, 10630 write accesses @56140317
+system.cpu4: completed 20000 read, 10816 write accesses @56432989
+system.cpu7: completed 20000 read, 10899 write accesses @56513495
+system.cpu6: completed 20000 read, 10845 write accesses @56565627
+system.cpu5: completed 20000 read, 10626 write accesses @57072718
+system.cpu0: completed 20000 read, 11113 write accesses @57586418
+system.cpu2: completed 30000 read, 16017 write accesses @79407742
+system.cpu1: completed 30000 read, 16151 write accesses @79725766
+system.cpu3: completed 30000 read, 15856 write accesses @79754749
+system.cpu6: completed 30000 read, 16195 write accesses @80206236
+system.cpu4: completed 30000 read, 16333 write accesses @80758801
+system.cpu7: completed 30000 read, 16467 write accesses @80845126
+system.cpu5: completed 30000 read, 16040 write accesses @81280754
+system.cpu0: completed 30000 read, 16740 write accesses @81836055
+system.cpu3: completed 40000 read, 21110 write accesses @102187140
+system.cpu1: completed 40000 read, 21543 write accesses @102788912
+system.cpu2: completed 40000 read, 21441 write accesses @103129249
+system.cpu6: completed 40000 read, 21490 write accesses @103224826
+system.cpu7: completed 40000 read, 21781 write accesses @104248123
+system.cpu4: completed 40000 read, 21750 write accesses @104259134
+system.cpu5: completed 40000 read, 21538 write accesses @104623876
+system.cpu0: completed 40000 read, 22049 write accesses @105025965
+system.cpu3: completed 50000 read, 26445 write accesses @126560435
+system.cpu1: completed 50000 read, 27002 write accesses @127296516
+system.cpu6: completed 50000 read, 26751 write accesses @127652113
+system.cpu2: completed 50000 read, 26915 write accesses @127863043
+system.cpu5: completed 50000 read, 26795 write accesses @128758388
+system.cpu7: completed 50000 read, 27154 write accesses @128837444
+system.cpu4: completed 50000 read, 27195 write accesses @128884190
+system.cpu0: completed 50000 read, 27370 write accesses @129107611
+system.cpu3: completed 60000 read, 31813 write accesses @150500482
+system.cpu1: completed 60000 read, 32357 write accesses @151324410
+system.cpu6: completed 60000 read, 32276 write accesses @152241130
+system.cpu2: completed 60000 read, 32455 write accesses @152510509
+system.cpu4: completed 60000 read, 32625 write accesses @152799581
+system.cpu5: completed 60000 read, 32145 write accesses @152911895
+system.cpu7: completed 60000 read, 32658 write accesses @153053742
+system.cpu0: completed 60000 read, 32669 write accesses @153243898
+system.cpu3: completed 70000 read, 37148 write accesses @174290350
+system.cpu1: completed 70000 read, 37719 write accesses @175320592
+system.cpu6: completed 70000 read, 37631 write accesses @176658170
+system.cpu4: completed 70000 read, 37993 write accesses @176957081
+system.cpu2: completed 70000 read, 37835 write accesses @177152761
+system.cpu5: completed 70000 read, 37525 write accesses @177243860
+system.cpu7: completed 70000 read, 38186 write accesses @177800828
+system.cpu0: completed 70000 read, 38119 write accesses @178467538
+system.cpu3: completed 80000 read, 42562 write accesses @198146360
+system.cpu1: completed 80000 read, 43234 write accesses @199454254
+system.cpu4: completed 80000 read, 43314 write accesses @200406450
+system.cpu5: completed 80000 read, 42980 write accesses @200646810
+system.cpu2: completed 80000 read, 43306 write accesses @200927158
+system.cpu6: completed 80000 read, 43086 write accesses @200956315
+system.cpu7: completed 80000 read, 43539 write accesses @201412026
+system.cpu0: completed 80000 read, 43547 write accesses @202267757
+system.cpu3: completed 90000 read, 47828 write accesses @222074356
+system.cpu1: completed 90000 read, 48627 write accesses @223900144
+system.cpu5: completed 90000 read, 48291 write accesses @224840552
+system.cpu4: completed 90000 read, 48802 write accesses @224884716
+system.cpu6: completed 90000 read, 48479 write accesses @224938254
+system.cpu2: completed 90000 read, 48708 write accesses @225566271
+system.cpu7: completed 90000 read, 48770 write accesses @225725770
+system.cpu0: completed 90000 read, 48880 write accesses @226596871
+system.cpu3: completed 100000 read, 53214 write accesses @246648467
 hack: be nice to actually delete the event here