stats: updates due to recent chagnesets

4 files changed, 13 insertions, 102 deletions

diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini
index 8c46bff97..fcbaa0b2a 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-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=
@@ -153,6 +154,7 @@ eventq_index=0
 hot_lines=false
 memory_size_bits=48
 num_of_sequencers=1
+number_of_virtual_networks=3
 phys_mem=Null
 randomization=true
 
@@ -199,7 +201,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]
@@ -208,7 +209,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]
@@ -217,7 +217,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.dir_cntrl0.responseToDir]
 type=MessageBuffer
@@ -225,7 +224,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[6]
 
 [system.ruby.l1_cntrl0]
@@ -311,7 +309,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0.optionalQueue]
 type=MessageBuffer
@@ -319,7 +316,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0.prefetcher]
 type=Prefetcher
@@ -339,7 +335,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]
@@ -348,7 +343,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]
@@ -357,7 +351,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]
@@ -366,7 +359,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]
@@ -394,7 +386,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[2]
 
 [system.ruby.l2_cntrl0]
@@ -427,7 +418,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]
@@ -436,7 +426,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]
@@ -445,7 +434,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]
@@ -477,7 +465,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]
@@ -486,7 +473,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]
@@ -495,7 +481,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]
@@ -518,7 +503,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
@@ -561,7 +545,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers01]
 type=MessageBuffer
@@ -569,7 +552,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers02]
 type=MessageBuffer
@@ -577,7 +559,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers03]
 type=MessageBuffer
@@ -585,7 +566,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers04]
 type=MessageBuffer
@@ -593,7 +573,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers05]
 type=MessageBuffer
@@ -601,7 +580,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers06]
 type=MessageBuffer
@@ -609,7 +587,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers07]
 type=MessageBuffer
@@ -617,7 +594,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers08]
 type=MessageBuffer
@@ -625,7 +601,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers09]
 type=MessageBuffer
@@ -633,7 +608,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers10]
 type=MessageBuffer
@@ -641,7 +615,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers11]
 type=MessageBuffer
@@ -649,7 +622,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers12]
 type=MessageBuffer
@@ -657,7 +629,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers13]
 type=MessageBuffer
@@ -665,7 +636,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers14]
 type=MessageBuffer
@@ -673,7 +643,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers15]
 type=MessageBuffer
@@ -681,7 +650,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers16]
 type=MessageBuffer
@@ -689,7 +657,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers17]
 type=MessageBuffer
@@ -697,7 +664,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_links0]
 type=SimpleIntLink
@@ -735,7 +701,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
 
@@ -745,7 +710,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers01]
 type=MessageBuffer
@@ -753,7 +717,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers02]
 type=MessageBuffer
@@ -761,7 +724,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers03]
 type=MessageBuffer
@@ -769,7 +731,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers04]
 type=MessageBuffer
@@ -777,7 +738,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers05]
 type=MessageBuffer
@@ -785,7 +745,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers06]
 type=MessageBuffer
@@ -793,7 +752,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers07]
 type=MessageBuffer
@@ -801,7 +759,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers08]
 type=MessageBuffer
@@ -809,7 +766,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers09]
 type=MessageBuffer
@@ -817,7 +773,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers10]
 type=MessageBuffer
@@ -825,7 +780,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers11]
 type=MessageBuffer
@@ -833,7 +787,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1]
 type=Switch
@@ -841,7 +794,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
 
@@ -851,7 +803,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers01]
 type=MessageBuffer
@@ -859,7 +810,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers02]
 type=MessageBuffer
@@ -867,7 +817,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers03]
 type=MessageBuffer
@@ -875,7 +824,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers04]
 type=MessageBuffer
@@ -883,7 +831,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers05]
 type=MessageBuffer
@@ -891,7 +838,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers06]
 type=MessageBuffer
@@ -899,7 +845,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers07]
 type=MessageBuffer
@@ -907,7 +852,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers08]
 type=MessageBuffer
@@ -915,7 +859,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers09]
 type=MessageBuffer
@@ -923,7 +866,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers10]
 type=MessageBuffer
@@ -931,7 +873,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers11]
 type=MessageBuffer
@@ -939,7 +880,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2]
 type=Switch
@@ -947,7 +887,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
 
@@ -957,7 +896,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers01]
 type=MessageBuffer
@@ -965,7 +903,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers02]
 type=MessageBuffer
@@ -973,7 +910,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers03]
 type=MessageBuffer
@@ -981,7 +917,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers04]
 type=MessageBuffer
@@ -989,7 +924,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers05]
 type=MessageBuffer
@@ -997,7 +931,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers06]
 type=MessageBuffer
@@ -1005,7 +938,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers07]
 type=MessageBuffer
@@ -1013,7 +945,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers08]
 type=MessageBuffer
@@ -1021,7 +952,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers09]
 type=MessageBuffer
@@ -1029,7 +959,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers10]
 type=MessageBuffer
@@ -1037,7 +966,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers11]
 type=MessageBuffer
@@ -1045,7 +973,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3]
 type=Switch
@@ -1053,7 +980,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
 
@@ -1063,7 +989,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers01]
 type=MessageBuffer
@@ -1071,7 +996,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers02]
 type=MessageBuffer
@@ -1079,7 +1003,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers03]
 type=MessageBuffer
@@ -1087,7 +1010,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers04]
 type=MessageBuffer
@@ -1095,7 +1017,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers05]
 type=MessageBuffer
@@ -1103,7 +1024,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers06]
 type=MessageBuffer
@@ -1111,7 +1031,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers07]
 type=MessageBuffer
@@ -1119,7 +1038,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers08]
 type=MessageBuffer
@@ -1127,7 +1045,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers09]
 type=MessageBuffer
@@ -1135,7 +1052,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers10]
 type=MessageBuffer
@@ -1143,7 +1059,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers11]
 type=MessageBuffer
@@ -1151,7 +1066,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers12]
 type=MessageBuffer
@@ -1159,7 +1073,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers13]
 type=MessageBuffer
@@ -1167,7 +1080,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers14]
 type=MessageBuffer
@@ -1175,7 +1087,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers15]
 type=MessageBuffer
@@ -1183,7 +1094,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers16]
 type=MessageBuffer
@@ -1191,7 +1101,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers17]
 type=MessageBuffer
@@ -1199,7 +1108,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/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simerr b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simerr
index b95e81e6d..cee0dfc57 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simerr
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simerr
@@ -5,3 +5,4 @@ warn: rounding error > tolerance
 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: 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/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simout
index c5ae0d58e..8708a45b4 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simout
@@ -1,11 +1,13 @@
+Redirecting stdout to build/ALPHA_MESI_Two_Level/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MESI_Two_Level/simout
+Redirecting stderr to build/ALPHA_MESI_Two_Level/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-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:53
-gem5 executing on artery
-command line: build/ALPHA_MESI_Two_Level/gem5.opt -d build/ALPHA_MESI_Two_Level/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MESI_Two_Level -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA_MESI_Two_Level/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-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 32148
+command line: build/ALPHA_MESI_Two_Level/gem5.opt -d build/ALPHA_MESI_Two_Level/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MESI_Two_Level -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MESI_Two_Level/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MESI_Two_Level
 
 Global frequency set at 1000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
-Exiting @ tick 42571 because Ruby Tester completed
+Exiting @ tick 41751 because Ruby Tester completed
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt
index f452fe4e6..8246454e6 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt
@@ -4,9 +4,9 @@ sim_seconds                                  0.000042                       # Nu
 sim_ticks                                       41751                       # Number of ticks simulated
 final_tick                                      41751                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                 638805                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 452164                       # Number of bytes of host memory used
-host_seconds                                     0.07                       # Real time elapsed on the host
+host_tick_rate                                 456955                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 445744                       # Number of bytes of host memory used
+host_seconds                                     0.09                       # Real time elapsed on the host
 system.voltage_domain.voltage                       1                       # Voltage in Volts
 system.clk_domain.clock                             1                       # Clock period in ticks
 system.mem_ctrls.bytes_read::ruby.dir_cntrl0        55552                       # Number of bytes read from this memory