summaryrefslogtreecommitdiff
path: root/tests/quick/se/60.rubytest/ref
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/se/60.rubytest/ref')
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini96
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simerr1
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/simout12
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini97
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simerr1
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout12
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini2
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simerr1
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout12
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini106
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simerr1
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout12
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt6
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini87
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simerr1
-rwxr-xr-xtests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout10
-rw-r--r--tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt6
20 files changed, 64 insertions, 417 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
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
index 95197b990..150b166fb 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/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
@@ -200,7 +202,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[6]
[system.ruby.dir_cntrl0.requestToDir]
@@ -209,7 +210,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]
@@ -218,7 +218,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[5]
[system.ruby.dir_cntrl0.responseFromMemory]
@@ -227,7 +226,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.dir_cntrl0.responseToDir]
type=MessageBuffer
@@ -235,7 +233,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[6]
[system.ruby.l1_cntrl0]
@@ -317,7 +314,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0.requestFromL1Cache]
type=MessageBuffer
@@ -325,7 +321,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]
@@ -334,7 +329,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]
@@ -343,7 +337,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]
@@ -352,7 +345,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]
@@ -380,7 +372,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
[system.ruby.l2_cntrl0]
type=L2Cache_Controller
@@ -412,7 +403,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[2]
[system.ruby.l2_cntrl0.GlobalRequestToL2Cache]
@@ -421,7 +411,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[2]
[system.ruby.l2_cntrl0.L1RequestFromL2Cache]
@@ -430,7 +419,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[3]
[system.ruby.l2_cntrl0.L1RequestToL2Cache]
@@ -439,7 +427,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]
@@ -471,7 +458,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[4]
[system.ruby.l2_cntrl0.responseToL2Cache]
@@ -480,7 +466,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[4]
[system.ruby.l2_cntrl0.triggerQueue]
@@ -489,7 +474,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
[system.ruby.memctrl_clk_domain]
type=DerivedClockDomain
@@ -511,7 +495,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
@@ -554,7 +537,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers01]
type=MessageBuffer
@@ -562,7 +544,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers02]
type=MessageBuffer
@@ -570,7 +551,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers03]
type=MessageBuffer
@@ -578,7 +558,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers04]
type=MessageBuffer
@@ -586,7 +565,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers05]
type=MessageBuffer
@@ -594,7 +572,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers06]
type=MessageBuffer
@@ -602,7 +579,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers07]
type=MessageBuffer
@@ -610,7 +586,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers08]
type=MessageBuffer
@@ -618,7 +593,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers09]
type=MessageBuffer
@@ -626,7 +600,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers10]
type=MessageBuffer
@@ -634,7 +607,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers11]
type=MessageBuffer
@@ -642,7 +614,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers12]
type=MessageBuffer
@@ -650,7 +621,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers13]
type=MessageBuffer
@@ -658,7 +628,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers14]
type=MessageBuffer
@@ -666,7 +635,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers15]
type=MessageBuffer
@@ -674,7 +642,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers16]
type=MessageBuffer
@@ -682,7 +649,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers17]
type=MessageBuffer
@@ -690,7 +656,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_links0]
type=SimpleIntLink
@@ -728,7 +693,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
@@ -738,7 +702,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers01]
type=MessageBuffer
@@ -746,7 +709,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers02]
type=MessageBuffer
@@ -754,7 +716,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers03]
type=MessageBuffer
@@ -762,7 +723,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers04]
type=MessageBuffer
@@ -770,7 +730,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers05]
type=MessageBuffer
@@ -778,7 +737,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers06]
type=MessageBuffer
@@ -786,7 +744,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers07]
type=MessageBuffer
@@ -794,7 +751,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers08]
type=MessageBuffer
@@ -802,7 +758,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers09]
type=MessageBuffer
@@ -810,7 +765,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers10]
type=MessageBuffer
@@ -818,7 +772,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers11]
type=MessageBuffer
@@ -826,7 +779,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1]
type=Switch
@@ -834,7 +786,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
@@ -844,7 +795,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers01]
type=MessageBuffer
@@ -852,7 +802,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers02]
type=MessageBuffer
@@ -860,7 +809,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers03]
type=MessageBuffer
@@ -868,7 +816,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers04]
type=MessageBuffer
@@ -876,7 +823,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers05]
type=MessageBuffer
@@ -884,7 +830,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers06]
type=MessageBuffer
@@ -892,7 +837,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers07]
type=MessageBuffer
@@ -900,7 +844,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers08]
type=MessageBuffer
@@ -908,7 +851,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers09]
type=MessageBuffer
@@ -916,7 +858,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers10]
type=MessageBuffer
@@ -924,7 +865,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers11]
type=MessageBuffer
@@ -932,7 +872,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2]
type=Switch
@@ -940,7 +879,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
@@ -950,7 +888,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers01]
type=MessageBuffer
@@ -958,7 +895,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers02]
type=MessageBuffer
@@ -966,7 +902,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers03]
type=MessageBuffer
@@ -974,7 +909,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers04]
type=MessageBuffer
@@ -982,7 +916,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers05]
type=MessageBuffer
@@ -990,7 +923,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers06]
type=MessageBuffer
@@ -998,7 +930,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers07]
type=MessageBuffer
@@ -1006,7 +937,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers08]
type=MessageBuffer
@@ -1014,7 +944,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers09]
type=MessageBuffer
@@ -1022,7 +951,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers10]
type=MessageBuffer
@@ -1030,7 +958,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers11]
type=MessageBuffer
@@ -1038,7 +965,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3]
type=Switch
@@ -1046,7 +972,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
@@ -1056,7 +981,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers01]
type=MessageBuffer
@@ -1064,7 +988,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers02]
type=MessageBuffer
@@ -1072,7 +995,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers03]
type=MessageBuffer
@@ -1080,7 +1002,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers04]
type=MessageBuffer
@@ -1088,7 +1009,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers05]
type=MessageBuffer
@@ -1096,7 +1016,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers06]
type=MessageBuffer
@@ -1104,7 +1023,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers07]
type=MessageBuffer
@@ -1112,7 +1030,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers08]
type=MessageBuffer
@@ -1120,7 +1037,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers09]
type=MessageBuffer
@@ -1128,7 +1044,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers10]
type=MessageBuffer
@@ -1136,7 +1051,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers11]
type=MessageBuffer
@@ -1144,7 +1058,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers12]
type=MessageBuffer
@@ -1152,7 +1065,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers13]
type=MessageBuffer
@@ -1160,7 +1072,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers14]
type=MessageBuffer
@@ -1168,7 +1079,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers15]
type=MessageBuffer
@@ -1176,7 +1086,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers16]
type=MessageBuffer
@@ -1184,7 +1093,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers17]
type=MessageBuffer
@@ -1192,7 +1100,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-MOESI_CMP_directory/simerr b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simerr
index b95e81e6d..cee0dfc57 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simerr
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/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-MOESI_CMP_directory/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
index 4448be6ae..fd3b08a0c 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
@@ -1,11 +1,13 @@
+Redirecting stdout to build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
+Redirecting stderr to build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Aug 13 2015 19:22:33
-gem5 started Aug 13 2015 20:16:24
-gem5 executing on artery
-command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory
+gem5 compiled Nov 15 2015 14:46:21
+gem5 started Nov 15 2015 14:46:44
+gem5 executing on ribera.cs.wisc.edu, pid 1173
+command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 54131 because Ruby Tester completed
+Exiting @ tick 53711 because Ruby Tester completed
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
index 184c2afec..4699f60db 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.000054 # Nu
sim_ticks 53711 # Number of ticks simulated
final_tick 53711 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 508906 # Simulator tick rate (ticks/s)
-host_mem_usage 451636 # Number of bytes of host memory used
-host_seconds 0.11 # Real time elapsed on the host
+host_tick_rate 378504 # Simulator tick rate (ticks/s)
+host_mem_usage 447852 # Number of bytes of host memory used
+host_seconds 0.14 # 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 54528 # Number of bytes read from this memory
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
index 9b4854df8..7525ba3b1 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/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=6
phys_mem=Null
randomization=true
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simerr b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simerr
index b95e81e6d..cee0dfc57 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simerr
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/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-MOESI_CMP_token/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
index 1537c232f..37f2fa418 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
@@ -1,11 +1,13 @@
+Redirecting stdout to build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
+Redirecting stderr to build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Aug 13 2015 19:28:58
-gem5 started Aug 13 2015 20:17:44
-gem5 executing on artery
-command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token
+gem5 compiled Nov 15 2015 14:51:28
+gem5 started Nov 15 2015 14:51:52
+gem5 executing on ribera.cs.wisc.edu, pid 2888
+command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 50521 because Ruby Tester completed
+Exiting @ tick 53241 because Ruby Tester completed
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
index 4c7e247ea..56ffc198c 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.000053 # Nu
sim_ticks 53241 # Number of ticks simulated
final_tick 53241 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 858034 # Simulator tick rate (ticks/s)
-host_mem_usage 452700 # Number of bytes of host memory used
-host_seconds 0.06 # Real time elapsed on the host
+host_tick_rate 626475 # Simulator tick rate (ticks/s)
+host_mem_usage 446792 # 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 54016 # Number of bytes read from this memory
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
index 3e7f75c5f..860c1b559 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/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=6
phys_mem=Null
randomization=true
@@ -207,7 +209,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[5]
[system.ruby.dir_cntrl0.dmaResponseFromDir]
@@ -216,7 +217,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[5]
[system.ruby.dir_cntrl0.forwardFromDir]
@@ -225,7 +225,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[3]
[system.ruby.dir_cntrl0.probeFilter]
@@ -257,7 +256,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[4]
[system.ruby.dir_cntrl0.responseFromDir]
@@ -266,7 +264,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[4]
[system.ruby.dir_cntrl0.responseFromMemory]
@@ -275,7 +272,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.dir_cntrl0.responseToDir]
type=MessageBuffer
@@ -283,7 +279,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[3]
[system.ruby.dir_cntrl0.triggerQueue]
@@ -292,7 +287,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
[system.ruby.dir_cntrl0.unblockToDir]
type=MessageBuffer
@@ -300,7 +294,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[2]
[system.ruby.l1_cntrl0]
@@ -408,7 +401,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[0]
[system.ruby.l1_cntrl0.mandatoryQueue]
@@ -417,7 +409,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0.requestFromCache]
type=MessageBuffer
@@ -425,7 +416,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[0]
[system.ruby.l1_cntrl0.responseFromCache]
@@ -434,7 +424,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[1]
[system.ruby.l1_cntrl0.responseToCache]
@@ -443,7 +432,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]
@@ -471,7 +459,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0.unblockFromCache]
type=MessageBuffer
@@ -479,7 +466,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[2]
[system.ruby.memctrl_clk_domain]
@@ -502,7 +488,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
netifs=
number_of_virtual_networks=6
-recycle_latency=0
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
ruby_system=system.ruby
topology=Crossbar
@@ -535,7 +520,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers01]
type=MessageBuffer
@@ -543,7 +527,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers02]
type=MessageBuffer
@@ -551,7 +534,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers03]
type=MessageBuffer
@@ -559,7 +541,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers04]
type=MessageBuffer
@@ -567,7 +548,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers05]
type=MessageBuffer
@@ -575,7 +555,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers06]
type=MessageBuffer
@@ -583,7 +562,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers07]
type=MessageBuffer
@@ -591,7 +569,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers08]
type=MessageBuffer
@@ -599,7 +576,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers09]
type=MessageBuffer
@@ -607,7 +583,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers10]
type=MessageBuffer
@@ -615,7 +590,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers11]
type=MessageBuffer
@@ -623,7 +597,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers12]
type=MessageBuffer
@@ -631,7 +604,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers13]
type=MessageBuffer
@@ -639,7 +611,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers14]
type=MessageBuffer
@@ -647,7 +618,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers15]
type=MessageBuffer
@@ -655,7 +625,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers16]
type=MessageBuffer
@@ -663,7 +632,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers17]
type=MessageBuffer
@@ -671,7 +639,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers18]
type=MessageBuffer
@@ -679,7 +646,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers19]
type=MessageBuffer
@@ -687,7 +653,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers20]
type=MessageBuffer
@@ -695,7 +660,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers21]
type=MessageBuffer
@@ -703,7 +667,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers22]
type=MessageBuffer
@@ -711,7 +674,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers23]
type=MessageBuffer
@@ -719,7 +681,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_links0]
type=SimpleIntLink
@@ -747,7 +708,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 system.ruby.network.routers0.port_buffers12 system.ruby.network.routers0.port_buffers13 system.ruby.network.routers0.port_buffers14 system.ruby.network.routers0.port_buffers15 system.ruby.network.routers0.port_buffers16 system.ruby.network.routers0.port_buffers17
-recycle_latency=0
router_id=0
virt_nets=6
@@ -757,7 +717,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers01]
type=MessageBuffer
@@ -765,7 +724,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers02]
type=MessageBuffer
@@ -773,7 +731,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers03]
type=MessageBuffer
@@ -781,7 +738,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers04]
type=MessageBuffer
@@ -789,7 +745,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers05]
type=MessageBuffer
@@ -797,7 +752,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers06]
type=MessageBuffer
@@ -805,7 +759,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers07]
type=MessageBuffer
@@ -813,7 +766,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers08]
type=MessageBuffer
@@ -821,7 +773,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers09]
type=MessageBuffer
@@ -829,7 +780,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers10]
type=MessageBuffer
@@ -837,7 +787,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers11]
type=MessageBuffer
@@ -845,7 +794,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers12]
type=MessageBuffer
@@ -853,7 +801,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers13]
type=MessageBuffer
@@ -861,7 +808,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers14]
type=MessageBuffer
@@ -869,7 +815,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers15]
type=MessageBuffer
@@ -877,7 +822,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers16]
type=MessageBuffer
@@ -885,7 +829,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers17]
type=MessageBuffer
@@ -893,7 +836,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1]
type=Switch
@@ -901,7 +843,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 system.ruby.network.routers1.port_buffers12 system.ruby.network.routers1.port_buffers13 system.ruby.network.routers1.port_buffers14 system.ruby.network.routers1.port_buffers15 system.ruby.network.routers1.port_buffers16 system.ruby.network.routers1.port_buffers17
-recycle_latency=0
router_id=1
virt_nets=6
@@ -911,7 +852,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers01]
type=MessageBuffer
@@ -919,7 +859,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers02]
type=MessageBuffer
@@ -927,7 +866,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers03]
type=MessageBuffer
@@ -935,7 +873,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers04]
type=MessageBuffer
@@ -943,7 +880,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers05]
type=MessageBuffer
@@ -951,7 +887,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers06]
type=MessageBuffer
@@ -959,7 +894,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers07]
type=MessageBuffer
@@ -967,7 +901,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers08]
type=MessageBuffer
@@ -975,7 +908,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers09]
type=MessageBuffer
@@ -983,7 +915,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers10]
type=MessageBuffer
@@ -991,7 +922,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers11]
type=MessageBuffer
@@ -999,7 +929,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers12]
type=MessageBuffer
@@ -1007,7 +936,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers13]
type=MessageBuffer
@@ -1015,7 +943,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers14]
type=MessageBuffer
@@ -1023,7 +950,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers15]
type=MessageBuffer
@@ -1031,7 +957,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers16]
type=MessageBuffer
@@ -1039,7 +964,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers17]
type=MessageBuffer
@@ -1047,7 +971,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2]
type=Switch
@@ -1055,7 +978,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 system.ruby.network.routers2.port_buffers12 system.ruby.network.routers2.port_buffers13 system.ruby.network.routers2.port_buffers14 system.ruby.network.routers2.port_buffers15 system.ruby.network.routers2.port_buffers16 system.ruby.network.routers2.port_buffers17 system.ruby.network.routers2.port_buffers18 system.ruby.network.routers2.port_buffers19 system.ruby.network.routers2.port_buffers20 system.ruby.network.routers2.port_buffers21 system.ruby.network.routers2.port_buffers22 system.ruby.network.routers2.port_buffers23
-recycle_latency=0
router_id=2
virt_nets=6
@@ -1065,7 +987,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers01]
type=MessageBuffer
@@ -1073,7 +994,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers02]
type=MessageBuffer
@@ -1081,7 +1001,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers03]
type=MessageBuffer
@@ -1089,7 +1008,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers04]
type=MessageBuffer
@@ -1097,7 +1015,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers05]
type=MessageBuffer
@@ -1105,7 +1022,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers06]
type=MessageBuffer
@@ -1113,7 +1029,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers07]
type=MessageBuffer
@@ -1121,7 +1036,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers08]
type=MessageBuffer
@@ -1129,7 +1043,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers09]
type=MessageBuffer
@@ -1137,7 +1050,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers10]
type=MessageBuffer
@@ -1145,7 +1057,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers11]
type=MessageBuffer
@@ -1153,7 +1064,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers12]
type=MessageBuffer
@@ -1161,7 +1071,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers13]
type=MessageBuffer
@@ -1169,7 +1078,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers14]
type=MessageBuffer
@@ -1177,7 +1085,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers15]
type=MessageBuffer
@@ -1185,7 +1092,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers16]
type=MessageBuffer
@@ -1193,7 +1099,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers17]
type=MessageBuffer
@@ -1201,7 +1106,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers18]
type=MessageBuffer
@@ -1209,7 +1113,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers19]
type=MessageBuffer
@@ -1217,7 +1120,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers20]
type=MessageBuffer
@@ -1225,7 +1127,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers21]
type=MessageBuffer
@@ -1233,7 +1134,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers22]
type=MessageBuffer
@@ -1241,7 +1141,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers23]
type=MessageBuffer
@@ -1249,7 +1148,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-MOESI_hammer/simerr b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simerr
index b95e81e6d..cee0dfc57 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simerr
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/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-MOESI_hammer/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
index 53bff9b82..97d28f02f 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
@@ -1,11 +1,13 @@
+Redirecting stdout to build/ALPHA_MOESI_hammer/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer/simout
+Redirecting stderr to build/ALPHA_MOESI_hammer/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Aug 13 2015 19:09:46
-gem5 started Aug 13 2015 20:15:31
-gem5 executing on artery
-command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer
+gem5 compiled Nov 15 2015 14:35:53
+gem5 started Nov 15 2015 14:36:13
+gem5 executing on ribera.cs.wisc.edu, pid 30617
+command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 28761 because Ruby Tester completed
+Exiting @ tick 29631 because Ruby Tester completed
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
index f22219b78..811637401 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.000030 # Nu
sim_ticks 29631 # Number of ticks simulated
final_tick 29631 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 551942 # Simulator tick rate (ticks/s)
-host_mem_usage 451596 # Number of bytes of host memory used
-host_seconds 0.05 # Real time elapsed on the host
+host_tick_rate 374763 # Simulator tick rate (ticks/s)
+host_mem_usage 446704 # Number of bytes of host memory used
+host_seconds 0.08 # 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 55872 # Number of bytes read from this memory
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
index a8da47f38..a1a0f9e3b 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/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=5
phys_mem=Null
randomization=true
@@ -201,7 +203,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[3]
[system.ruby.dir_cntrl0.dmaResponseFromDir]
@@ -210,7 +211,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[3]
[system.ruby.dir_cntrl0.forwardFromDir]
@@ -219,7 +219,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[4]
[system.ruby.dir_cntrl0.requestToDir]
@@ -228,7 +227,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[2]
[system.ruby.dir_cntrl0.responseFromDir]
@@ -237,7 +235,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[2]
[system.ruby.dir_cntrl0.responseFromMemory]
@@ -246,7 +243,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0]
type=L1Cache_Controller
@@ -301,7 +297,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[0]
[system.ruby.l1_cntrl0.mandatoryQueue]
@@ -310,7 +305,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0.requestFromCache]
type=MessageBuffer
@@ -318,7 +312,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[0]
[system.ruby.l1_cntrl0.responseFromCache]
@@ -327,7 +320,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[1]
[system.ruby.l1_cntrl0.responseToCache]
@@ -336,7 +328,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[1]
[system.ruby.l1_cntrl0.sequencer]
@@ -378,7 +369,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
netifs=
number_of_virtual_networks=5
-recycle_latency=0
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
ruby_system=system.ruby
topology=Crossbar
@@ -411,7 +401,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers01]
type=MessageBuffer
@@ -419,7 +408,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers02]
type=MessageBuffer
@@ -427,7 +415,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers03]
type=MessageBuffer
@@ -435,7 +422,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers04]
type=MessageBuffer
@@ -443,7 +429,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers05]
type=MessageBuffer
@@ -451,7 +436,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers06]
type=MessageBuffer
@@ -459,7 +443,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers07]
type=MessageBuffer
@@ -467,7 +450,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers08]
type=MessageBuffer
@@ -475,7 +457,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers09]
type=MessageBuffer
@@ -483,7 +464,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers10]
type=MessageBuffer
@@ -491,7 +471,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers11]
type=MessageBuffer
@@ -499,7 +478,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers12]
type=MessageBuffer
@@ -507,7 +485,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers13]
type=MessageBuffer
@@ -515,7 +492,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers14]
type=MessageBuffer
@@ -523,7 +499,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers15]
type=MessageBuffer
@@ -531,7 +506,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers16]
type=MessageBuffer
@@ -539,7 +513,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers17]
type=MessageBuffer
@@ -547,7 +520,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers18]
type=MessageBuffer
@@ -555,7 +527,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers19]
type=MessageBuffer
@@ -563,7 +534,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_links0]
type=SimpleIntLink
@@ -591,7 +561,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 system.ruby.network.routers0.port_buffers12 system.ruby.network.routers0.port_buffers13 system.ruby.network.routers0.port_buffers14
-recycle_latency=0
router_id=0
virt_nets=5
@@ -601,7 +570,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers01]
type=MessageBuffer
@@ -609,7 +577,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers02]
type=MessageBuffer
@@ -617,7 +584,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers03]
type=MessageBuffer
@@ -625,7 +591,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers04]
type=MessageBuffer
@@ -633,7 +598,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers05]
type=MessageBuffer
@@ -641,7 +605,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers06]
type=MessageBuffer
@@ -649,7 +612,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers07]
type=MessageBuffer
@@ -657,7 +619,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers08]
type=MessageBuffer
@@ -665,7 +626,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers09]
type=MessageBuffer
@@ -673,7 +633,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers10]
type=MessageBuffer
@@ -681,7 +640,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers11]
type=MessageBuffer
@@ -689,7 +647,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers12]
type=MessageBuffer
@@ -697,7 +654,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers13]
type=MessageBuffer
@@ -705,7 +661,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers14]
type=MessageBuffer
@@ -713,7 +668,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1]
type=Switch
@@ -721,7 +675,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 system.ruby.network.routers1.port_buffers12 system.ruby.network.routers1.port_buffers13 system.ruby.network.routers1.port_buffers14
-recycle_latency=0
router_id=1
virt_nets=5
@@ -731,7 +684,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers01]
type=MessageBuffer
@@ -739,7 +691,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers02]
type=MessageBuffer
@@ -747,7 +698,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers03]
type=MessageBuffer
@@ -755,7 +705,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers04]
type=MessageBuffer
@@ -763,7 +712,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers05]
type=MessageBuffer
@@ -771,7 +719,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers06]
type=MessageBuffer
@@ -779,7 +726,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers07]
type=MessageBuffer
@@ -787,7 +733,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers08]
type=MessageBuffer
@@ -795,7 +740,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers09]
type=MessageBuffer
@@ -803,7 +747,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers10]
type=MessageBuffer
@@ -811,7 +754,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers11]
type=MessageBuffer
@@ -819,7 +761,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers12]
type=MessageBuffer
@@ -827,7 +768,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers13]
type=MessageBuffer
@@ -835,7 +775,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers14]
type=MessageBuffer
@@ -843,7 +782,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2]
type=Switch
@@ -851,7 +789,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 system.ruby.network.routers2.port_buffers12 system.ruby.network.routers2.port_buffers13 system.ruby.network.routers2.port_buffers14 system.ruby.network.routers2.port_buffers15 system.ruby.network.routers2.port_buffers16 system.ruby.network.routers2.port_buffers17 system.ruby.network.routers2.port_buffers18 system.ruby.network.routers2.port_buffers19
-recycle_latency=0
router_id=2
virt_nets=5
@@ -861,7 +798,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers01]
type=MessageBuffer
@@ -869,7 +805,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers02]
type=MessageBuffer
@@ -877,7 +812,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers03]
type=MessageBuffer
@@ -885,7 +819,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers04]
type=MessageBuffer
@@ -893,7 +826,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers05]
type=MessageBuffer
@@ -901,7 +833,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers06]
type=MessageBuffer
@@ -909,7 +840,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers07]
type=MessageBuffer
@@ -917,7 +847,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers08]
type=MessageBuffer
@@ -925,7 +854,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers09]
type=MessageBuffer
@@ -933,7 +861,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers10]
type=MessageBuffer
@@ -941,7 +868,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers11]
type=MessageBuffer
@@ -949,7 +875,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers12]
type=MessageBuffer
@@ -957,7 +882,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers13]
type=MessageBuffer
@@ -965,7 +889,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers14]
type=MessageBuffer
@@ -973,7 +896,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers15]
type=MessageBuffer
@@ -981,7 +903,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers16]
type=MessageBuffer
@@ -989,7 +910,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers17]
type=MessageBuffer
@@ -997,7 +917,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers18]
type=MessageBuffer
@@ -1005,7 +924,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers19]
type=MessageBuffer
@@ -1013,7 +931,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/simerr b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simerr
index b95e81e6d..cee0dfc57 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simerr
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/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/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
index 797c060bf..38918c59c 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/ALPHA/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby/simout
+Redirecting stderr to build/ALPHA/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Aug 13 2015 19:05:56
-gem5 started Aug 13 2015 20:15:05
-gem5 executing on artery
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:28:36
+gem5 executing on ribera.cs.wisc.edu, pid 29062
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
index 2a264f80e..e9c37efa5 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
@@ -4,9 +4,9 @@ sim_seconds 0.000038 # Nu
sim_ticks 37801 # Number of ticks simulated
final_tick 37801 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_tick_rate 411997 # Simulator tick rate (ticks/s)
-host_mem_usage 398128 # Number of bytes of host memory used
-host_seconds 0.09 # Real time elapsed on the host
+host_tick_rate 573737 # Simulator tick rate (ticks/s)
+host_mem_usage 444464 # Number of bytes of host memory used
+host_seconds 0.07 # 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 61504 # Number of bytes read from this memory