stats: updates due to recent chagnesets

4 files changed, 14 insertions, 104 deletions

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
index e1d5797c9..07526e3f6 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
@@ -24,6 +24,7 @@ mem_mode=timing
 mem_ranges=0:268435455
 memories=system.mem_ctrls
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -227,8 +228,8 @@ eventq_index=0
 hot_lines=false
 memory_size_bits=48
 num_of_sequencers=1
+number_of_virtual_networks=3
 phys_mem=Null
-random_seed=1234
 randomization=false
 
 [system.ruby.clk_domain]
@@ -274,7 +275,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[5]
 
 [system.ruby.dir_cntrl0.responseFromDir]
@@ -283,7 +283,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[6]
 
 [system.ruby.dir_cntrl0.responseFromMemory]
@@ -292,7 +291,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.dir_cntrl0.responseToDir]
 type=MessageBuffer
@@ -300,7 +298,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[6]
 
 [system.ruby.l1_cntrl0]
@@ -386,7 +383,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0.optionalQueue]
 type=MessageBuffer
@@ -394,7 +390,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0.prefetcher]
 type=Prefetcher
@@ -414,7 +409,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[0]
 
 [system.ruby.l1_cntrl0.requestToL1Cache]
@@ -423,7 +417,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[0]
 
 [system.ruby.l1_cntrl0.responseFromL1Cache]
@@ -432,7 +425,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[1]
 
 [system.ruby.l1_cntrl0.responseToL1Cache]
@@ -441,7 +433,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[1]
 
 [system.ruby.l1_cntrl0.sequencer]
@@ -469,7 +460,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[2]
 
 [system.ruby.l2_cntrl0]
@@ -502,7 +492,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[3]
 
 [system.ruby.l2_cntrl0.L1RequestFromL2Cache]
@@ -511,7 +500,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[4]
 
 [system.ruby.l2_cntrl0.L1RequestToL2Cache]
@@ -520,7 +508,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[3]
 
 [system.ruby.l2_cntrl0.L2cache]
@@ -552,7 +539,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[5]
 
 [system.ruby.l2_cntrl0.responseToL2Cache]
@@ -561,7 +547,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[4]
 
 [system.ruby.l2_cntrl0.unblockToL2Cache]
@@ -570,7 +555,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[2]
 
 [system.ruby.memctrl_clk_domain]
@@ -593,7 +577,6 @@ int_link_buffers=system.ruby.network.int_link_buffers00 system.ruby.network.int_
 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
 netifs=
 number_of_virtual_networks=3
-recycle_latency=0
 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
 ruby_system=system.ruby
 topology=Crossbar
@@ -636,7 +619,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers01]
 type=MessageBuffer
@@ -644,7 +626,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers02]
 type=MessageBuffer
@@ -652,7 +633,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers03]
 type=MessageBuffer
@@ -660,7 +640,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers04]
 type=MessageBuffer
@@ -668,7 +647,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers05]
 type=MessageBuffer
@@ -676,7 +654,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers06]
 type=MessageBuffer
@@ -684,7 +661,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers07]
 type=MessageBuffer
@@ -692,7 +668,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers08]
 type=MessageBuffer
@@ -700,7 +675,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers09]
 type=MessageBuffer
@@ -708,7 +682,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers10]
 type=MessageBuffer
@@ -716,7 +689,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers11]
 type=MessageBuffer
@@ -724,7 +696,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers12]
 type=MessageBuffer
@@ -732,7 +703,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers13]
 type=MessageBuffer
@@ -740,7 +710,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers14]
 type=MessageBuffer
@@ -748,7 +717,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers15]
 type=MessageBuffer
@@ -756,7 +724,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers16]
 type=MessageBuffer
@@ -764,7 +731,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers17]
 type=MessageBuffer
@@ -772,7 +738,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_links0]
 type=SimpleIntLink
@@ -810,7 +775,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
 clk_domain=system.ruby.clk_domain
 eventq_index=0
 port_buffers=system.ruby.network.routers0.port_buffers00 system.ruby.network.routers0.port_buffers01 system.ruby.network.routers0.port_buffers02 system.ruby.network.routers0.port_buffers03 system.ruby.network.routers0.port_buffers04 system.ruby.network.routers0.port_buffers05 system.ruby.network.routers0.port_buffers06 system.ruby.network.routers0.port_buffers07 system.ruby.network.routers0.port_buffers08 system.ruby.network.routers0.port_buffers09 system.ruby.network.routers0.port_buffers10 system.ruby.network.routers0.port_buffers11
-recycle_latency=0
 router_id=0
 virt_nets=3
 
@@ -820,7 +784,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers01]
 type=MessageBuffer
@@ -828,7 +791,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers02]
 type=MessageBuffer
@@ -836,7 +798,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers03]
 type=MessageBuffer
@@ -844,7 +805,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers04]
 type=MessageBuffer
@@ -852,7 +812,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers05]
 type=MessageBuffer
@@ -860,7 +819,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers06]
 type=MessageBuffer
@@ -868,7 +826,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers07]
 type=MessageBuffer
@@ -876,7 +833,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers08]
 type=MessageBuffer
@@ -884,7 +840,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers09]
 type=MessageBuffer
@@ -892,7 +847,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers10]
 type=MessageBuffer
@@ -900,7 +854,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers11]
 type=MessageBuffer
@@ -908,7 +861,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1]
 type=Switch
@@ -916,7 +868,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
 clk_domain=system.ruby.clk_domain
 eventq_index=0
 port_buffers=system.ruby.network.routers1.port_buffers00 system.ruby.network.routers1.port_buffers01 system.ruby.network.routers1.port_buffers02 system.ruby.network.routers1.port_buffers03 system.ruby.network.routers1.port_buffers04 system.ruby.network.routers1.port_buffers05 system.ruby.network.routers1.port_buffers06 system.ruby.network.routers1.port_buffers07 system.ruby.network.routers1.port_buffers08 system.ruby.network.routers1.port_buffers09 system.ruby.network.routers1.port_buffers10 system.ruby.network.routers1.port_buffers11
-recycle_latency=0
 router_id=1
 virt_nets=3
 
@@ -926,7 +877,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers01]
 type=MessageBuffer
@@ -934,7 +884,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers02]
 type=MessageBuffer
@@ -942,7 +891,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers03]
 type=MessageBuffer
@@ -950,7 +898,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers04]
 type=MessageBuffer
@@ -958,7 +905,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers05]
 type=MessageBuffer
@@ -966,7 +912,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers06]
 type=MessageBuffer
@@ -974,7 +919,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers07]
 type=MessageBuffer
@@ -982,7 +926,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers08]
 type=MessageBuffer
@@ -990,7 +933,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers09]
 type=MessageBuffer
@@ -998,7 +940,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers10]
 type=MessageBuffer
@@ -1006,7 +947,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers11]
 type=MessageBuffer
@@ -1014,7 +954,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2]
 type=Switch
@@ -1022,7 +961,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
 clk_domain=system.ruby.clk_domain
 eventq_index=0
 port_buffers=system.ruby.network.routers2.port_buffers00 system.ruby.network.routers2.port_buffers01 system.ruby.network.routers2.port_buffers02 system.ruby.network.routers2.port_buffers03 system.ruby.network.routers2.port_buffers04 system.ruby.network.routers2.port_buffers05 system.ruby.network.routers2.port_buffers06 system.ruby.network.routers2.port_buffers07 system.ruby.network.routers2.port_buffers08 system.ruby.network.routers2.port_buffers09 system.ruby.network.routers2.port_buffers10 system.ruby.network.routers2.port_buffers11
-recycle_latency=0
 router_id=2
 virt_nets=3
 
@@ -1032,7 +970,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers01]
 type=MessageBuffer
@@ -1040,7 +977,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers02]
 type=MessageBuffer
@@ -1048,7 +984,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers03]
 type=MessageBuffer
@@ -1056,7 +991,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers04]
 type=MessageBuffer
@@ -1064,7 +998,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers05]
 type=MessageBuffer
@@ -1072,7 +1005,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers06]
 type=MessageBuffer
@@ -1080,7 +1012,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers07]
 type=MessageBuffer
@@ -1088,7 +1019,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers08]
 type=MessageBuffer
@@ -1096,7 +1026,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers09]
 type=MessageBuffer
@@ -1104,7 +1033,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers10]
 type=MessageBuffer
@@ -1112,7 +1040,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers11]
 type=MessageBuffer
@@ -1120,7 +1047,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3]
 type=Switch
@@ -1128,7 +1054,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
 clk_domain=system.ruby.clk_domain
 eventq_index=0
 port_buffers=system.ruby.network.routers3.port_buffers00 system.ruby.network.routers3.port_buffers01 system.ruby.network.routers3.port_buffers02 system.ruby.network.routers3.port_buffers03 system.ruby.network.routers3.port_buffers04 system.ruby.network.routers3.port_buffers05 system.ruby.network.routers3.port_buffers06 system.ruby.network.routers3.port_buffers07 system.ruby.network.routers3.port_buffers08 system.ruby.network.routers3.port_buffers09 system.ruby.network.routers3.port_buffers10 system.ruby.network.routers3.port_buffers11 system.ruby.network.routers3.port_buffers12 system.ruby.network.routers3.port_buffers13 system.ruby.network.routers3.port_buffers14 system.ruby.network.routers3.port_buffers15 system.ruby.network.routers3.port_buffers16 system.ruby.network.routers3.port_buffers17
-recycle_latency=0
 router_id=3
 virt_nets=3
 
@@ -1138,7 +1063,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers01]
 type=MessageBuffer
@@ -1146,7 +1070,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers02]
 type=MessageBuffer
@@ -1154,7 +1077,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers03]
 type=MessageBuffer
@@ -1162,7 +1084,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers04]
 type=MessageBuffer
@@ -1170,7 +1091,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers05]
 type=MessageBuffer
@@ -1178,7 +1098,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers06]
 type=MessageBuffer
@@ -1186,7 +1105,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers07]
 type=MessageBuffer
@@ -1194,7 +1112,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers08]
 type=MessageBuffer
@@ -1202,7 +1119,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers09]
 type=MessageBuffer
@@ -1210,7 +1126,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers10]
 type=MessageBuffer
@@ -1218,7 +1133,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers11]
 type=MessageBuffer
@@ -1226,7 +1140,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers12]
 type=MessageBuffer
@@ -1234,7 +1147,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers13]
 type=MessageBuffer
@@ -1242,7 +1154,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers14]
 type=MessageBuffer
@@ -1250,7 +1161,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers15]
 type=MessageBuffer
@@ -1258,7 +1168,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers16]
 type=MessageBuffer
@@ -1266,7 +1175,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers17]
 type=MessageBuffer
@@ -1274,7 +1182,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.sys_port_proxy]
 type=RubyPortProxy
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr
index 21ea544b2..22fffb44f 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr
@@ -6,3 +6,4 @@ warn: rounding error > tolerance
     1.250000 rounded to 1
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
 warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout
index 90b6836e9..4b30a82ef 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout
+Redirecting stderr to build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Aug 13 2015 19:16:05
-gem5 started Aug 13 2015 20:15:31
-gem5 executing on artery
-command line: build/ALPHA_MESI_Two_Level/gem5.opt -d build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level
+gem5 compiled Nov 15 2015 14:41:13
+gem5 started Nov 15 2015 14:41:38
+gem5 executing on ribera.cs.wisc.edu, pid 32149
+command line: build/ALPHA_MESI_Two_Level/gem5.opt -d build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level
 
 Global frequency set at 1000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
index b3846c240..043f75704 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000121                       # Nu
 sim_ticks                                      121460                       # Number of ticks simulated
 final_tick                                     121460                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  22637                       # Simulator instruction rate (inst/s)
-host_op_rate                                    22636                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 430242                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 402016                       # Number of bytes of host memory used
-host_seconds                                     0.28                       # Real time elapsed on the host
+host_inst_rate                                  24898                       # Simulator instruction rate (inst/s)
+host_op_rate                                    24896                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 473190                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 448380                       # Number of bytes of host memory used
+host_seconds                                     0.26                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts