summaryrefslogtreecommitdiff
path: root/tests/quick/se/00.hello/ref/alpha/tru64
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2015-11-16 05:08:57 -0600
committerNilay Vaish <nilay@cs.wisc.edu>2015-11-16 05:08:57 -0600
commitde489e1997ee6c37aaf6e876e32622f6c648fe95 (patch)
tree40d4093453491b007167c971ebbb18c8ae0b77fa /tests/quick/se/00.hello/ref/alpha/tru64
parent08cec03f8ec3bc427700343a7bd7d216433f93fc (diff)
downloadgem5-de489e1997ee6c37aaf6e876e32622f6c648fe95.tar.xz
stats: updates due to recent chagnesets
Diffstat (limited to 'tests/quick/se/00.hello/ref/alpha/tru64')
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini17
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simerr1
-rwxr-xr-x[-rw-r--r--]tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simout11
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/stats.txt10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini17
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/o3-timing/simout12
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/stats.txt10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini1
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/simout11
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini96
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr1
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simout10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini97
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr1
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini2
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr1
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout12
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini106
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr1
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini87
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr1
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout10
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt8
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini17
-rwxr-xr-xtests/quick/se/00.hello/ref/alpha/tru64/simple-timing/simout13
-rw-r--r--tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/stats.txt10
32 files changed, 163 insertions, 460 deletions
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini
index 8a6e8b486..4b9cee722 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/config.ini
@@ -24,6 +24,7 @@ mem_mode=timing
mem_ranges=
memories=system.physmem
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
readfile=
symbolfile=
@@ -130,6 +131,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -146,6 +148,7 @@ system=system
tags=system.cpu.dcache.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu.dcache_port
mem_side=system.cpu.toL2Bus.slave[1]
@@ -553,6 +556,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -569,6 +573,7 @@ system=system
tags=system.cpu.icache.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=true
cpu_side=system.cpu.icache_port
mem_side=system.cpu.toL2Bus.slave[0]
@@ -602,6 +607,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -618,6 +624,7 @@ system=system
tags=system.cpu.l2cache.tags
tgts_per_mshr=12
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
@@ -633,12 +640,13 @@ size=2097152
[system.cpu.toL2Bus]
type=CoherentXBar
+children=snoop_filter
clk_domain=system.cpu_clk_domain
eventq_index=0
forward_latency=0
frontend_latency=1
response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
snoop_response_latency=1
system=system
use_default_range=false
@@ -646,6 +654,13 @@ width=32
master=system.cpu.l2cache.cpu_side
slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
[system.cpu.tracer]
type=ExeTracer
eventq_index=0
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simerr
index 0b3033cd9..c6957696d 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simerr
@@ -1,2 +1,3 @@
+warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
warn: Sockets disabled, not accepting gdb connections
warn: ignoring syscall sigprocmask(1, ...)
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simout b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simout
index 226c0e256..5008f8610 100644..100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simout
@@ -3,12 +3,13 @@ Redirecting stderr to build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/minor-
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 7 2014 10:41:53
-gem5 started May 7 2014 15:04:23
-gem5 executing on cz3212c2d7
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/minor-timing -re tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/minor-timing
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:29:19
+gem5 executing on ribera.cs.wisc.edu, pid 29096
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/minor-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/minor-timing
+
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
info: Increasing stack size by one page.
Hello world!
-Exiting @ tick 18715000 because target called exit()
+Exiting @ tick 20075000 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/stats.txt
index a420f2b35..23e24ae54 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.000020 # Nu
sim_ticks 20075000 # Number of ticks simulated
final_tick 20075000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 131673 # Simulator instruction rate (inst/s)
-host_op_rate 131586 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 1021264689 # Simulator tick rate (ticks/s)
-host_mem_usage 295944 # Number of bytes of host memory used
-host_seconds 0.02 # Real time elapsed on the host
+host_inst_rate 43924 # Simulator instruction rate (inst/s)
+host_op_rate 43910 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 340901575 # Simulator tick rate (ticks/s)
+host_mem_usage 289896 # Number of bytes of host memory used
+host_seconds 0.06 # Real time elapsed on the host
sim_insts 2585 # Number of instructions simulated
sim_ops 2585 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini
index e38c94875..52545812e 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/config.ini
@@ -24,6 +24,7 @@ mem_mode=timing
mem_ranges=
memories=system.physmem
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
readfile=
symbolfile=
@@ -155,6 +156,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -171,6 +173,7 @@ system=system
tags=system.cpu.dcache.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu.dcache_port
mem_side=system.cpu.toL2Bus.slave[1]
@@ -502,6 +505,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -518,6 +522,7 @@ system=system
tags=system.cpu.icache.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=true
cpu_side=system.cpu.icache_port
mem_side=system.cpu.toL2Bus.slave[0]
@@ -551,6 +556,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -567,6 +573,7 @@ system=system
tags=system.cpu.l2cache.tags
tgts_per_mshr=12
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
@@ -582,12 +589,13 @@ size=2097152
[system.cpu.toL2Bus]
type=CoherentXBar
+children=snoop_filter
clk_domain=system.cpu_clk_domain
eventq_index=0
forward_latency=0
frontend_latency=1
response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
snoop_response_latency=1
system=system
use_default_range=false
@@ -595,6 +603,13 @@ width=32
master=system.cpu.l2cache.cpu_side
slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
[system.cpu.tracer]
type=ExeTracer
eventq_index=0
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/simout b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/simout
index f46bd1a4d..f9b960e18 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/simout
@@ -1,13 +1,15 @@
+Redirecting stdout to build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/o3-timing/simout
+Redirecting stderr to build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/o3-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 22 2015 07:55:25
-gem5 started Apr 22 2015 08:43:58
-gem5 executing on phenom
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/o3-timing
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:30:33
+gem5 executing on ribera.cs.wisc.edu, pid 29168
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/o3-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
info: Increasing stack size by one page.
Hello world!
-Exiting @ tick 12774000 because target called exit()
+Exiting @ tick 12363500 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/stats.txt
index 3ae294d1b..bccbaf2cd 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.000012 # Nu
sim_ticks 12363500 # Number of ticks simulated
final_tick 12363500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 83593 # Simulator instruction rate (inst/s)
-host_op_rate 83552 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 432562452 # Simulator tick rate (ticks/s)
-host_mem_usage 295260 # Number of bytes of host memory used
-host_seconds 0.03 # Real time elapsed on the host
+host_inst_rate 30943 # Simulator instruction rate (inst/s)
+host_op_rate 30935 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 160195252 # Simulator tick rate (ticks/s)
+host_mem_usage 290920 # Number of bytes of host memory used
+host_seconds 0.08 # Real time elapsed on the host
sim_insts 2387 # Number of instructions simulated
sim_ops 2387 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini
index b1961bd8d..1735b311b 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/config.ini
@@ -24,6 +24,7 @@ mem_mode=atomic
mem_ranges=
memories=system.physmem
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
readfile=
symbolfile=
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/simout
index 33ba2e738..6c71bef9a 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-atomic/simout
@@ -1,10 +1,13 @@
+Redirecting stdout to build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-atomic/simout
+Redirecting stderr to build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-atomic/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jan 22 2014 16:27:55
-gem5 started Jan 22 2014 17:24:20
-gem5 executing on u200540-lin
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-atomic -re tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-atomic
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:28:24
+gem5 executing on ribera.cs.wisc.edu, pid 29046
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-atomic -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-atomic
+
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
info: Increasing stack size by one page.
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
index 0c42ac84b..30657f384 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
@@ -24,6 +24,7 @@ mem_mode=timing
mem_ranges=0:268435455
memories=system.mem_ctrls
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
readfile=
symbolfile=
@@ -227,6 +228,7 @@ eventq_index=0
hot_lines=false
memory_size_bits=48
num_of_sequencers=1
+number_of_virtual_networks=3
phys_mem=Null
randomization=false
@@ -273,7 +275,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[5]
[system.ruby.dir_cntrl0.responseFromDir]
@@ -282,7 +283,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[6]
[system.ruby.dir_cntrl0.responseFromMemory]
@@ -291,7 +291,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.dir_cntrl0.responseToDir]
type=MessageBuffer
@@ -299,7 +298,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[6]
[system.ruby.l1_cntrl0]
@@ -385,7 +383,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0.optionalQueue]
type=MessageBuffer
@@ -393,7 +390,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0.prefetcher]
type=Prefetcher
@@ -413,7 +409,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[0]
[system.ruby.l1_cntrl0.requestToL1Cache]
@@ -422,7 +417,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[0]
[system.ruby.l1_cntrl0.responseFromL1Cache]
@@ -431,7 +425,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[1]
[system.ruby.l1_cntrl0.responseToL1Cache]
@@ -440,7 +433,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[1]
[system.ruby.l1_cntrl0.sequencer]
@@ -468,7 +460,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[2]
[system.ruby.l2_cntrl0]
@@ -501,7 +492,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[3]
[system.ruby.l2_cntrl0.L1RequestFromL2Cache]
@@ -510,7 +500,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[4]
[system.ruby.l2_cntrl0.L1RequestToL2Cache]
@@ -519,7 +508,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[3]
[system.ruby.l2_cntrl0.L2cache]
@@ -551,7 +539,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
master=system.ruby.network.slave[5]
[system.ruby.l2_cntrl0.responseToL2Cache]
@@ -560,7 +547,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[4]
[system.ruby.l2_cntrl0.unblockToL2Cache]
@@ -569,7 +555,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[2]
[system.ruby.memctrl_clk_domain]
@@ -592,7 +577,6 @@ int_link_buffers=system.ruby.network.int_link_buffers00 system.ruby.network.int_
int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
netifs=
number_of_virtual_networks=3
-recycle_latency=0
routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
ruby_system=system.ruby
topology=Crossbar
@@ -635,7 +619,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers01]
type=MessageBuffer
@@ -643,7 +626,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers02]
type=MessageBuffer
@@ -651,7 +633,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers03]
type=MessageBuffer
@@ -659,7 +640,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers04]
type=MessageBuffer
@@ -667,7 +647,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers05]
type=MessageBuffer
@@ -675,7 +654,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers06]
type=MessageBuffer
@@ -683,7 +661,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers07]
type=MessageBuffer
@@ -691,7 +668,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers08]
type=MessageBuffer
@@ -699,7 +675,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers09]
type=MessageBuffer
@@ -707,7 +682,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers10]
type=MessageBuffer
@@ -715,7 +689,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers11]
type=MessageBuffer
@@ -723,7 +696,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers12]
type=MessageBuffer
@@ -731,7 +703,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers13]
type=MessageBuffer
@@ -739,7 +710,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers14]
type=MessageBuffer
@@ -747,7 +717,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers15]
type=MessageBuffer
@@ -755,7 +724,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers16]
type=MessageBuffer
@@ -763,7 +731,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers17]
type=MessageBuffer
@@ -771,7 +738,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_links0]
type=SimpleIntLink
@@ -809,7 +775,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
clk_domain=system.ruby.clk_domain
eventq_index=0
port_buffers=system.ruby.network.routers0.port_buffers00 system.ruby.network.routers0.port_buffers01 system.ruby.network.routers0.port_buffers02 system.ruby.network.routers0.port_buffers03 system.ruby.network.routers0.port_buffers04 system.ruby.network.routers0.port_buffers05 system.ruby.network.routers0.port_buffers06 system.ruby.network.routers0.port_buffers07 system.ruby.network.routers0.port_buffers08 system.ruby.network.routers0.port_buffers09 system.ruby.network.routers0.port_buffers10 system.ruby.network.routers0.port_buffers11
-recycle_latency=0
router_id=0
virt_nets=3
@@ -819,7 +784,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers01]
type=MessageBuffer
@@ -827,7 +791,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers02]
type=MessageBuffer
@@ -835,7 +798,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers03]
type=MessageBuffer
@@ -843,7 +805,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers04]
type=MessageBuffer
@@ -851,7 +812,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers05]
type=MessageBuffer
@@ -859,7 +819,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers06]
type=MessageBuffer
@@ -867,7 +826,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers07]
type=MessageBuffer
@@ -875,7 +833,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers08]
type=MessageBuffer
@@ -883,7 +840,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers09]
type=MessageBuffer
@@ -891,7 +847,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers10]
type=MessageBuffer
@@ -899,7 +854,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers11]
type=MessageBuffer
@@ -907,7 +861,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1]
type=Switch
@@ -915,7 +868,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
clk_domain=system.ruby.clk_domain
eventq_index=0
port_buffers=system.ruby.network.routers1.port_buffers00 system.ruby.network.routers1.port_buffers01 system.ruby.network.routers1.port_buffers02 system.ruby.network.routers1.port_buffers03 system.ruby.network.routers1.port_buffers04 system.ruby.network.routers1.port_buffers05 system.ruby.network.routers1.port_buffers06 system.ruby.network.routers1.port_buffers07 system.ruby.network.routers1.port_buffers08 system.ruby.network.routers1.port_buffers09 system.ruby.network.routers1.port_buffers10 system.ruby.network.routers1.port_buffers11
-recycle_latency=0
router_id=1
virt_nets=3
@@ -925,7 +877,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers01]
type=MessageBuffer
@@ -933,7 +884,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers02]
type=MessageBuffer
@@ -941,7 +891,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers03]
type=MessageBuffer
@@ -949,7 +898,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers04]
type=MessageBuffer
@@ -957,7 +905,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers05]
type=MessageBuffer
@@ -965,7 +912,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers06]
type=MessageBuffer
@@ -973,7 +919,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers07]
type=MessageBuffer
@@ -981,7 +926,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers08]
type=MessageBuffer
@@ -989,7 +933,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers09]
type=MessageBuffer
@@ -997,7 +940,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers10]
type=MessageBuffer
@@ -1005,7 +947,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers11]
type=MessageBuffer
@@ -1013,7 +954,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2]
type=Switch
@@ -1021,7 +961,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
clk_domain=system.ruby.clk_domain
eventq_index=0
port_buffers=system.ruby.network.routers2.port_buffers00 system.ruby.network.routers2.port_buffers01 system.ruby.network.routers2.port_buffers02 system.ruby.network.routers2.port_buffers03 system.ruby.network.routers2.port_buffers04 system.ruby.network.routers2.port_buffers05 system.ruby.network.routers2.port_buffers06 system.ruby.network.routers2.port_buffers07 system.ruby.network.routers2.port_buffers08 system.ruby.network.routers2.port_buffers09 system.ruby.network.routers2.port_buffers10 system.ruby.network.routers2.port_buffers11
-recycle_latency=0
router_id=2
virt_nets=3
@@ -1031,7 +970,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers01]
type=MessageBuffer
@@ -1039,7 +977,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers02]
type=MessageBuffer
@@ -1047,7 +984,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers03]
type=MessageBuffer
@@ -1055,7 +991,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers04]
type=MessageBuffer
@@ -1063,7 +998,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers05]
type=MessageBuffer
@@ -1071,7 +1005,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers06]
type=MessageBuffer
@@ -1079,7 +1012,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers07]
type=MessageBuffer
@@ -1087,7 +1019,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers08]
type=MessageBuffer
@@ -1095,7 +1026,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers09]
type=MessageBuffer
@@ -1103,7 +1033,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers10]
type=MessageBuffer
@@ -1111,7 +1040,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers11]
type=MessageBuffer
@@ -1119,7 +1047,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3]
type=Switch
@@ -1127,7 +1054,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
clk_domain=system.ruby.clk_domain
eventq_index=0
port_buffers=system.ruby.network.routers3.port_buffers00 system.ruby.network.routers3.port_buffers01 system.ruby.network.routers3.port_buffers02 system.ruby.network.routers3.port_buffers03 system.ruby.network.routers3.port_buffers04 system.ruby.network.routers3.port_buffers05 system.ruby.network.routers3.port_buffers06 system.ruby.network.routers3.port_buffers07 system.ruby.network.routers3.port_buffers08 system.ruby.network.routers3.port_buffers09 system.ruby.network.routers3.port_buffers10 system.ruby.network.routers3.port_buffers11 system.ruby.network.routers3.port_buffers12 system.ruby.network.routers3.port_buffers13 system.ruby.network.routers3.port_buffers14 system.ruby.network.routers3.port_buffers15 system.ruby.network.routers3.port_buffers16 system.ruby.network.routers3.port_buffers17
-recycle_latency=0
router_id=3
virt_nets=3
@@ -1137,7 +1063,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers01]
type=MessageBuffer
@@ -1145,7 +1070,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers02]
type=MessageBuffer
@@ -1153,7 +1077,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers03]
type=MessageBuffer
@@ -1161,7 +1084,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers04]
type=MessageBuffer
@@ -1169,7 +1091,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers05]
type=MessageBuffer
@@ -1177,7 +1098,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers06]
type=MessageBuffer
@@ -1185,7 +1105,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers07]
type=MessageBuffer
@@ -1193,7 +1112,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers08]
type=MessageBuffer
@@ -1201,7 +1119,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers09]
type=MessageBuffer
@@ -1209,7 +1126,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers10]
type=MessageBuffer
@@ -1217,7 +1133,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers11]
type=MessageBuffer
@@ -1225,7 +1140,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers12]
type=MessageBuffer
@@ -1233,7 +1147,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers13]
type=MessageBuffer
@@ -1241,7 +1154,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers14]
type=MessageBuffer
@@ -1249,7 +1161,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers15]
type=MessageBuffer
@@ -1257,7 +1168,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers16]
type=MessageBuffer
@@ -1265,7 +1175,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers17]
type=MessageBuffer
@@ -1273,7 +1182,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.sys_port_proxy]
type=RubyPortProxy
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr
index 6bae4074b..f6a02f021 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr
@@ -6,4 +6,5 @@ warn: rounding error > tolerance
1.250000 rounded to 1
warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
warn: ignoring syscall sigprocmask(1, ...)
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simout
index 239fd40f9..e7d16310d 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simout
+Redirecting stderr to build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Aug 13 2015 19:16:05
-gem5 started Aug 13 2015 20:15:42
-gem5 executing on artery
-command line: build/ALPHA_MESI_Two_Level/gem5.opt -d build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MESI_Two_Level -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MESI_Two_Level
+gem5 compiled Nov 15 2015 14:41:13
+gem5 started Nov 15 2015 14:41:38
+gem5 executing on ribera.cs.wisc.edu, pid 32151
+command line: build/ALPHA_MESI_Two_Level/gem5.opt -d build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MESI_Two_Level -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MESI_Two_Level
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
index 704d10ac7..582590dcc 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.000046 # Nu
sim_ticks 45733 # Number of ticks simulated
final_tick 45733 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 17774 # Simulator instruction rate (inst/s)
-host_op_rate 17773 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 315387 # Simulator tick rate (ticks/s)
-host_mem_usage 401732 # Number of bytes of host memory used
-host_seconds 0.15 # Real time elapsed on the host
+host_inst_rate 14502 # Simulator instruction rate (inst/s)
+host_op_rate 14500 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 257305 # Simulator tick rate (ticks/s)
+host_mem_usage 447076 # Number of bytes of host memory used
+host_seconds 0.18 # Real time elapsed on the host
sim_insts 2577 # Number of instructions simulated
sim_ops 2577 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
index f0b756165..55b3e2234 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-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=
@@ -227,6 +228,7 @@ eventq_index=0
hot_lines=false
memory_size_bits=48
num_of_sequencers=1
+number_of_virtual_networks=3
phys_mem=Null
randomization=false
@@ -274,7 +276,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]
@@ -283,7 +284,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]
@@ -292,7 +292,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]
@@ -301,7 +300,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.dir_cntrl0.responseToDir]
type=MessageBuffer
@@ -309,7 +307,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[6]
[system.ruby.l1_cntrl0]
@@ -391,7 +388,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0.requestFromL1Cache]
type=MessageBuffer
@@ -399,7 +395,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]
@@ -408,7 +403,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]
@@ -417,7 +411,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]
@@ -426,7 +419,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]
@@ -454,7 +446,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
[system.ruby.l2_cntrl0]
type=L2Cache_Controller
@@ -486,7 +477,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]
@@ -495,7 +485,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]
@@ -504,7 +493,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]
@@ -513,7 +501,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]
@@ -545,7 +532,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]
@@ -554,7 +540,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]
@@ -563,7 +548,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
[system.ruby.memctrl_clk_domain]
type=DerivedClockDomain
@@ -585,7 +569,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
@@ -628,7 +611,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers01]
type=MessageBuffer
@@ -636,7 +618,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers02]
type=MessageBuffer
@@ -644,7 +625,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers03]
type=MessageBuffer
@@ -652,7 +632,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers04]
type=MessageBuffer
@@ -660,7 +639,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers05]
type=MessageBuffer
@@ -668,7 +646,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers06]
type=MessageBuffer
@@ -676,7 +653,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers07]
type=MessageBuffer
@@ -684,7 +660,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers08]
type=MessageBuffer
@@ -692,7 +667,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers09]
type=MessageBuffer
@@ -700,7 +674,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers10]
type=MessageBuffer
@@ -708,7 +681,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers11]
type=MessageBuffer
@@ -716,7 +688,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers12]
type=MessageBuffer
@@ -724,7 +695,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers13]
type=MessageBuffer
@@ -732,7 +702,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers14]
type=MessageBuffer
@@ -740,7 +709,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers15]
type=MessageBuffer
@@ -748,7 +716,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers16]
type=MessageBuffer
@@ -756,7 +723,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers17]
type=MessageBuffer
@@ -764,7 +730,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_links0]
type=SimpleIntLink
@@ -802,7 +767,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
@@ -812,7 +776,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers01]
type=MessageBuffer
@@ -820,7 +783,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers02]
type=MessageBuffer
@@ -828,7 +790,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers03]
type=MessageBuffer
@@ -836,7 +797,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers04]
type=MessageBuffer
@@ -844,7 +804,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers05]
type=MessageBuffer
@@ -852,7 +811,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers06]
type=MessageBuffer
@@ -860,7 +818,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers07]
type=MessageBuffer
@@ -868,7 +825,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers08]
type=MessageBuffer
@@ -876,7 +832,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers09]
type=MessageBuffer
@@ -884,7 +839,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers10]
type=MessageBuffer
@@ -892,7 +846,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers11]
type=MessageBuffer
@@ -900,7 +853,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1]
type=Switch
@@ -908,7 +860,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
@@ -918,7 +869,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers01]
type=MessageBuffer
@@ -926,7 +876,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers02]
type=MessageBuffer
@@ -934,7 +883,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers03]
type=MessageBuffer
@@ -942,7 +890,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers04]
type=MessageBuffer
@@ -950,7 +897,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers05]
type=MessageBuffer
@@ -958,7 +904,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers06]
type=MessageBuffer
@@ -966,7 +911,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers07]
type=MessageBuffer
@@ -974,7 +918,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers08]
type=MessageBuffer
@@ -982,7 +925,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers09]
type=MessageBuffer
@@ -990,7 +932,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers10]
type=MessageBuffer
@@ -998,7 +939,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers11]
type=MessageBuffer
@@ -1006,7 +946,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2]
type=Switch
@@ -1014,7 +953,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
@@ -1024,7 +962,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers01]
type=MessageBuffer
@@ -1032,7 +969,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers02]
type=MessageBuffer
@@ -1040,7 +976,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers03]
type=MessageBuffer
@@ -1048,7 +983,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers04]
type=MessageBuffer
@@ -1056,7 +990,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers05]
type=MessageBuffer
@@ -1064,7 +997,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers06]
type=MessageBuffer
@@ -1072,7 +1004,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers07]
type=MessageBuffer
@@ -1080,7 +1011,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers08]
type=MessageBuffer
@@ -1088,7 +1018,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers09]
type=MessageBuffer
@@ -1096,7 +1025,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers10]
type=MessageBuffer
@@ -1104,7 +1032,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers11]
type=MessageBuffer
@@ -1112,7 +1039,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3]
type=Switch
@@ -1120,7 +1046,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
@@ -1130,7 +1055,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers01]
type=MessageBuffer
@@ -1138,7 +1062,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers02]
type=MessageBuffer
@@ -1146,7 +1069,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers03]
type=MessageBuffer
@@ -1154,7 +1076,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers04]
type=MessageBuffer
@@ -1162,7 +1083,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers05]
type=MessageBuffer
@@ -1170,7 +1090,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers06]
type=MessageBuffer
@@ -1178,7 +1097,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers07]
type=MessageBuffer
@@ -1186,7 +1104,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers08]
type=MessageBuffer
@@ -1194,7 +1111,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers09]
type=MessageBuffer
@@ -1202,7 +1118,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers10]
type=MessageBuffer
@@ -1210,7 +1125,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers11]
type=MessageBuffer
@@ -1218,7 +1132,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers12]
type=MessageBuffer
@@ -1226,7 +1139,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers13]
type=MessageBuffer
@@ -1234,7 +1146,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers14]
type=MessageBuffer
@@ -1242,7 +1153,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers15]
type=MessageBuffer
@@ -1250,7 +1160,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers16]
type=MessageBuffer
@@ -1258,7 +1167,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers3.port_buffers17]
type=MessageBuffer
@@ -1266,7 +1174,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.sys_port_proxy]
type=RubyPortProxy
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr
index 6bae4074b..f6a02f021 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr
@@ -6,4 +6,5 @@ warn: rounding error > tolerance
1.250000 rounded to 1
warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
warn: ignoring syscall sigprocmask(1, ...)
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
index 34fdc7e5e..d2de5ef65 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
+Redirecting stderr to build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-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:13
-gem5 executing on artery
-command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-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 1172
+command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
index 362696d3f..e28c30731 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.000042 # Nu
sim_ticks 41712 # Number of ticks simulated
final_tick 41712 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 24481 # Simulator instruction rate (inst/s)
-host_op_rate 24478 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 396175 # Simulator tick rate (ticks/s)
-host_mem_usage 403616 # Number of bytes of host memory used
-host_seconds 0.11 # Real time elapsed on the host
+host_inst_rate 17217 # Simulator instruction rate (inst/s)
+host_op_rate 17215 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 278615 # Simulator tick rate (ticks/s)
+host_mem_usage 449188 # Number of bytes of host memory used
+host_seconds 0.15 # Real time elapsed on the host
sim_insts 2577 # Number of instructions simulated
sim_ops 2577 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
index bd42a2bb0..fbc493fd6 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-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=
@@ -227,6 +228,7 @@ eventq_index=0
hot_lines=false
memory_size_bits=48
num_of_sequencers=1
+number_of_virtual_networks=6
phys_mem=Null
randomization=false
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr
index 6bae4074b..f6a02f021 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr
@@ -6,4 +6,5 @@ warn: rounding error > tolerance
1.250000 rounded to 1
warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
warn: ignoring syscall sigprocmask(1, ...)
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
index 5d96a3461..d9e7fd2c0 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
@@ -1,13 +1,15 @@
+Redirecting stdout to build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
+Redirecting stderr to build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-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:16:47
-gem5 executing on artery
-command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_token -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_token
+gem5 compiled Nov 15 2015 14:51:28
+gem5 started Nov 15 2015 14:51:55
+gem5 executing on ribera.cs.wisc.edu, pid 2889
+command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_token -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_token
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
info: Increasing stack size by one page.
Hello world!
-Exiting @ tick 40524 because target called exit()
+Exiting @ tick 40527 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
index 8530e7ad5..71fff3cd0 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.000041 # Nu
sim_ticks 40527 # Number of ticks simulated
final_tick 40527 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 34093 # Simulator instruction rate (inst/s)
-host_op_rate 34084 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 535893 # Simulator tick rate (ticks/s)
-host_mem_usage 445624 # Number of bytes of host memory used
-host_seconds 0.08 # Real time elapsed on the host
+host_inst_rate 24433 # Simulator instruction rate (inst/s)
+host_op_rate 24429 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 384119 # Simulator tick rate (ticks/s)
+host_mem_usage 448124 # Number of bytes of host memory used
+host_seconds 0.11 # Real time elapsed on the host
sim_insts 2577 # Number of instructions simulated
sim_ops 2577 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
index 6e0294d29..278928d1f 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-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=
@@ -227,6 +228,7 @@ eventq_index=0
hot_lines=false
memory_size_bits=48
num_of_sequencers=1
+number_of_virtual_networks=6
phys_mem=Null
randomization=false
@@ -281,7 +283,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]
@@ -290,7 +291,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]
@@ -299,7 +299,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]
@@ -331,7 +330,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]
@@ -340,7 +338,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]
@@ -349,7 +346,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.dir_cntrl0.responseToDir]
type=MessageBuffer
@@ -357,7 +353,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]
@@ -366,7 +361,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=10
[system.ruby.dir_cntrl0.unblockToDir]
type=MessageBuffer
@@ -374,7 +368,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
slave=system.ruby.network.master[2]
[system.ruby.l1_cntrl0]
@@ -482,7 +475,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]
@@ -491,7 +483,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0.requestFromCache]
type=MessageBuffer
@@ -499,7 +490,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]
@@ -508,7 +498,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]
@@ -517,7 +506,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]
@@ -545,7 +533,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0.unblockFromCache]
type=MessageBuffer
@@ -553,7 +540,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]
@@ -576,7 +562,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
@@ -609,7 +594,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers01]
type=MessageBuffer
@@ -617,7 +601,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers02]
type=MessageBuffer
@@ -625,7 +608,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers03]
type=MessageBuffer
@@ -633,7 +615,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers04]
type=MessageBuffer
@@ -641,7 +622,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers05]
type=MessageBuffer
@@ -649,7 +629,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers06]
type=MessageBuffer
@@ -657,7 +636,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers07]
type=MessageBuffer
@@ -665,7 +643,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers08]
type=MessageBuffer
@@ -673,7 +650,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers09]
type=MessageBuffer
@@ -681,7 +657,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers10]
type=MessageBuffer
@@ -689,7 +664,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers11]
type=MessageBuffer
@@ -697,7 +671,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers12]
type=MessageBuffer
@@ -705,7 +678,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers13]
type=MessageBuffer
@@ -713,7 +685,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers14]
type=MessageBuffer
@@ -721,7 +692,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers15]
type=MessageBuffer
@@ -729,7 +699,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers16]
type=MessageBuffer
@@ -737,7 +706,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers17]
type=MessageBuffer
@@ -745,7 +713,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers18]
type=MessageBuffer
@@ -753,7 +720,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers19]
type=MessageBuffer
@@ -761,7 +727,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers20]
type=MessageBuffer
@@ -769,7 +734,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers21]
type=MessageBuffer
@@ -777,7 +741,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers22]
type=MessageBuffer
@@ -785,7 +748,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers23]
type=MessageBuffer
@@ -793,7 +755,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_links0]
type=SimpleIntLink
@@ -821,7 +782,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
@@ -831,7 +791,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers01]
type=MessageBuffer
@@ -839,7 +798,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers02]
type=MessageBuffer
@@ -847,7 +805,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers03]
type=MessageBuffer
@@ -855,7 +812,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers04]
type=MessageBuffer
@@ -863,7 +819,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers05]
type=MessageBuffer
@@ -871,7 +826,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers06]
type=MessageBuffer
@@ -879,7 +833,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers07]
type=MessageBuffer
@@ -887,7 +840,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers08]
type=MessageBuffer
@@ -895,7 +847,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers09]
type=MessageBuffer
@@ -903,7 +854,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers10]
type=MessageBuffer
@@ -911,7 +861,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers11]
type=MessageBuffer
@@ -919,7 +868,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers12]
type=MessageBuffer
@@ -927,7 +875,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers13]
type=MessageBuffer
@@ -935,7 +882,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers14]
type=MessageBuffer
@@ -943,7 +889,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers15]
type=MessageBuffer
@@ -951,7 +896,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers16]
type=MessageBuffer
@@ -959,7 +903,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers17]
type=MessageBuffer
@@ -967,7 +910,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1]
type=Switch
@@ -975,7 +917,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
@@ -985,7 +926,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers01]
type=MessageBuffer
@@ -993,7 +933,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers02]
type=MessageBuffer
@@ -1001,7 +940,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers03]
type=MessageBuffer
@@ -1009,7 +947,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers04]
type=MessageBuffer
@@ -1017,7 +954,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers05]
type=MessageBuffer
@@ -1025,7 +961,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers06]
type=MessageBuffer
@@ -1033,7 +968,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers07]
type=MessageBuffer
@@ -1041,7 +975,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers08]
type=MessageBuffer
@@ -1049,7 +982,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers09]
type=MessageBuffer
@@ -1057,7 +989,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers10]
type=MessageBuffer
@@ -1065,7 +996,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers11]
type=MessageBuffer
@@ -1073,7 +1003,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers12]
type=MessageBuffer
@@ -1081,7 +1010,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers13]
type=MessageBuffer
@@ -1089,7 +1017,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers14]
type=MessageBuffer
@@ -1097,7 +1024,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers15]
type=MessageBuffer
@@ -1105,7 +1031,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers16]
type=MessageBuffer
@@ -1113,7 +1038,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers17]
type=MessageBuffer
@@ -1121,7 +1045,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2]
type=Switch
@@ -1129,7 +1052,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
@@ -1139,7 +1061,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers01]
type=MessageBuffer
@@ -1147,7 +1068,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers02]
type=MessageBuffer
@@ -1155,7 +1075,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers03]
type=MessageBuffer
@@ -1163,7 +1082,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers04]
type=MessageBuffer
@@ -1171,7 +1089,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers05]
type=MessageBuffer
@@ -1179,7 +1096,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers06]
type=MessageBuffer
@@ -1187,7 +1103,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers07]
type=MessageBuffer
@@ -1195,7 +1110,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers08]
type=MessageBuffer
@@ -1203,7 +1117,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers09]
type=MessageBuffer
@@ -1211,7 +1124,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers10]
type=MessageBuffer
@@ -1219,7 +1131,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers11]
type=MessageBuffer
@@ -1227,7 +1138,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers12]
type=MessageBuffer
@@ -1235,7 +1145,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers13]
type=MessageBuffer
@@ -1243,7 +1152,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers14]
type=MessageBuffer
@@ -1251,7 +1159,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers15]
type=MessageBuffer
@@ -1259,7 +1166,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers16]
type=MessageBuffer
@@ -1267,7 +1173,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers17]
type=MessageBuffer
@@ -1275,7 +1180,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers18]
type=MessageBuffer
@@ -1283,7 +1187,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers19]
type=MessageBuffer
@@ -1291,7 +1194,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers20]
type=MessageBuffer
@@ -1299,7 +1201,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers21]
type=MessageBuffer
@@ -1307,7 +1208,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers22]
type=MessageBuffer
@@ -1315,7 +1215,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers23]
type=MessageBuffer
@@ -1323,7 +1222,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.sys_port_proxy]
type=RubyPortProxy
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr
index 6bae4074b..f6a02f021 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr
@@ -6,4 +6,5 @@ warn: rounding error > tolerance
1.250000 rounded to 1
warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
warn: ignoring syscall sigprocmask(1, ...)
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
index 65828b040..1c8af2641 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
+Redirecting stderr to build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-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:17
-gem5 executing on artery
-command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_hammer -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_hammer
+gem5 compiled Nov 15 2015 14:35:53
+gem5 started Nov 15 2015 14:36:14
+gem5 executing on ribera.cs.wisc.edu, pid 30619
+command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_hammer -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_hammer
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
index 11602de7e..d397a34a5 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.000033 # Nu
sim_ticks 32936 # Number of ticks simulated
final_tick 32936 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 21294 # Simulator instruction rate (inst/s)
-host_op_rate 21292 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 272103 # Simulator tick rate (ticks/s)
-host_mem_usage 401708 # Number of bytes of host memory used
-host_seconds 0.12 # Real time elapsed on the host
+host_inst_rate 24441 # Simulator instruction rate (inst/s)
+host_op_rate 24437 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 312277 # Simulator tick rate (ticks/s)
+host_mem_usage 448040 # Number of bytes of host memory used
+host_seconds 0.11 # Real time elapsed on the host
sim_insts 2577 # Number of instructions simulated
sim_ops 2577 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
index 46fd0f447..808a3b8ef 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-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=
@@ -227,6 +228,7 @@ eventq_index=0
hot_lines=false
memory_size_bits=48
num_of_sequencers=1
+number_of_virtual_networks=5
phys_mem=Null
randomization=false
@@ -275,7 +277,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]
@@ -284,7 +285,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]
@@ -293,7 +293,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]
@@ -302,7 +301,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]
@@ -311,7 +309,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]
@@ -320,7 +317,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0]
type=L1Cache_Controller
@@ -375,7 +371,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]
@@ -384,7 +379,6 @@ buffer_size=0
eventq_index=0
ordered=false
randomization=false
-recycle_latency=10
[system.ruby.l1_cntrl0.requestFromCache]
type=MessageBuffer
@@ -392,7 +386,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]
@@ -401,7 +394,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]
@@ -410,7 +402,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]
@@ -452,7 +443,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
@@ -485,7 +475,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers01]
type=MessageBuffer
@@ -493,7 +482,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers02]
type=MessageBuffer
@@ -501,7 +489,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers03]
type=MessageBuffer
@@ -509,7 +496,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers04]
type=MessageBuffer
@@ -517,7 +503,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers05]
type=MessageBuffer
@@ -525,7 +510,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers06]
type=MessageBuffer
@@ -533,7 +517,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers07]
type=MessageBuffer
@@ -541,7 +524,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers08]
type=MessageBuffer
@@ -549,7 +531,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers09]
type=MessageBuffer
@@ -557,7 +538,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers10]
type=MessageBuffer
@@ -565,7 +545,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers11]
type=MessageBuffer
@@ -573,7 +552,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers12]
type=MessageBuffer
@@ -581,7 +559,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers13]
type=MessageBuffer
@@ -589,7 +566,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers14]
type=MessageBuffer
@@ -597,7 +573,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers15]
type=MessageBuffer
@@ -605,7 +580,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers16]
type=MessageBuffer
@@ -613,7 +587,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers17]
type=MessageBuffer
@@ -621,7 +594,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers18]
type=MessageBuffer
@@ -629,7 +601,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_link_buffers19]
type=MessageBuffer
@@ -637,7 +608,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.int_links0]
type=SimpleIntLink
@@ -665,7 +635,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
@@ -675,7 +644,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers01]
type=MessageBuffer
@@ -683,7 +651,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers02]
type=MessageBuffer
@@ -691,7 +658,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers03]
type=MessageBuffer
@@ -699,7 +665,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers04]
type=MessageBuffer
@@ -707,7 +672,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers05]
type=MessageBuffer
@@ -715,7 +679,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers06]
type=MessageBuffer
@@ -723,7 +686,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers07]
type=MessageBuffer
@@ -731,7 +693,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers08]
type=MessageBuffer
@@ -739,7 +700,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers09]
type=MessageBuffer
@@ -747,7 +707,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers10]
type=MessageBuffer
@@ -755,7 +714,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers11]
type=MessageBuffer
@@ -763,7 +721,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers12]
type=MessageBuffer
@@ -771,7 +728,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers13]
type=MessageBuffer
@@ -779,7 +735,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers0.port_buffers14]
type=MessageBuffer
@@ -787,7 +742,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1]
type=Switch
@@ -795,7 +749,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
@@ -805,7 +758,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers01]
type=MessageBuffer
@@ -813,7 +765,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers02]
type=MessageBuffer
@@ -821,7 +772,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers03]
type=MessageBuffer
@@ -829,7 +779,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers04]
type=MessageBuffer
@@ -837,7 +786,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers05]
type=MessageBuffer
@@ -845,7 +793,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers06]
type=MessageBuffer
@@ -853,7 +800,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers07]
type=MessageBuffer
@@ -861,7 +807,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers08]
type=MessageBuffer
@@ -869,7 +814,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers09]
type=MessageBuffer
@@ -877,7 +821,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers10]
type=MessageBuffer
@@ -885,7 +828,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers11]
type=MessageBuffer
@@ -893,7 +835,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers12]
type=MessageBuffer
@@ -901,7 +842,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers13]
type=MessageBuffer
@@ -909,7 +849,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers1.port_buffers14]
type=MessageBuffer
@@ -917,7 +856,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2]
type=Switch
@@ -925,7 +863,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
@@ -935,7 +872,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers01]
type=MessageBuffer
@@ -943,7 +879,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers02]
type=MessageBuffer
@@ -951,7 +886,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers03]
type=MessageBuffer
@@ -959,7 +893,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers04]
type=MessageBuffer
@@ -967,7 +900,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers05]
type=MessageBuffer
@@ -975,7 +907,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers06]
type=MessageBuffer
@@ -983,7 +914,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers07]
type=MessageBuffer
@@ -991,7 +921,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers08]
type=MessageBuffer
@@ -999,7 +928,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers09]
type=MessageBuffer
@@ -1007,7 +935,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers10]
type=MessageBuffer
@@ -1015,7 +942,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers11]
type=MessageBuffer
@@ -1023,7 +949,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers12]
type=MessageBuffer
@@ -1031,7 +956,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers13]
type=MessageBuffer
@@ -1039,7 +963,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers14]
type=MessageBuffer
@@ -1047,7 +970,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers15]
type=MessageBuffer
@@ -1055,7 +977,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers16]
type=MessageBuffer
@@ -1063,7 +984,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers17]
type=MessageBuffer
@@ -1071,7 +991,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers18]
type=MessageBuffer
@@ -1079,7 +998,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.ruby.network.routers2.port_buffers19]
type=MessageBuffer
@@ -1087,7 +1005,6 @@ buffer_size=0
eventq_index=0
ordered=true
randomization=false
-recycle_latency=0
[system.sys_port_proxy]
type=RubyPortProxy
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr
index 6bae4074b..f6a02f021 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr
@@ -6,4 +6,5 @@ warn: rounding error > tolerance
1.250000 rounded to 1
warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
warn: ignoring syscall sigprocmask(1, ...)
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout
index 406e847ac..014abbfca 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby/simout
+Redirecting stderr to build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-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:14:52
-gem5 executing on artery
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:30:22
+gem5 executing on ribera.cs.wisc.edu, pid 29157
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby
Global frequency set at 1000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
index a2a887a9d..87bfda259 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
@@ -4,10 +4,10 @@ sim_seconds 0.000042 # Nu
sim_ticks 41659 # Number of ticks simulated
final_tick 41659 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000 # Frequency of simulated ticks
-host_inst_rate 30850 # Simulator instruction rate (inst/s)
-host_op_rate 30846 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 498580 # Simulator tick rate (ticks/s)
-host_mem_usage 399460 # Number of bytes of host memory used
+host_inst_rate 33721 # Simulator instruction rate (inst/s)
+host_op_rate 33714 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 544888 # Simulator tick rate (ticks/s)
+host_mem_usage 445796 # Number of bytes of host memory used
host_seconds 0.08 # Real time elapsed on the host
sim_insts 2577 # Number of instructions simulated
sim_ops 2577 # Number of ops (including micro ops) simulated
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini
index d8f1b0ca1..43231249e 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/config.ini
@@ -24,6 +24,7 @@ mem_mode=timing
mem_ranges=
memories=system.physmem
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
readfile=
symbolfile=
@@ -83,6 +84,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -99,6 +101,7 @@ system=system
tags=system.cpu.dcache.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu.dcache_port
mem_side=system.cpu.toL2Bus.slave[1]
@@ -123,6 +126,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=2
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -139,6 +143,7 @@ system=system
tags=system.cpu.icache.tags
tgts_per_mshr=20
write_buffers=8
+writeback_clean=true
cpu_side=system.cpu.icache_port
mem_side=system.cpu.toL2Bus.slave[0]
@@ -172,6 +177,7 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
@@ -188,6 +194,7 @@ system=system
tags=system.cpu.l2cache.tags
tgts_per_mshr=12
write_buffers=8
+writeback_clean=false
cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
@@ -203,12 +210,13 @@ size=2097152
[system.cpu.toL2Bus]
type=CoherentXBar
+children=snoop_filter
clk_domain=system.cpu_clk_domain
eventq_index=0
forward_latency=0
frontend_latency=1
response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
snoop_response_latency=1
system=system
use_default_range=false
@@ -216,6 +224,13 @@ width=32
master=system.cpu.l2cache.cpu_side
slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
[system.cpu.tracer]
type=ExeTracer
eventq_index=0
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/simout
index cd7b05e76..cb26db96d 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/simout
@@ -1,12 +1,15 @@
+Redirecting stdout to build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing/simout
+Redirecting stderr to build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jan 22 2014 16:27:55
-gem5 started Jan 22 2014 17:24:26
-gem5 executing on u200540-lin
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing -re tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:29:57
+gem5 executing on ribera.cs.wisc.edu, pid 29136
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing
+
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
info: Increasing stack size by one page.
Hello world!
-Exiting @ tick 16524000 because target called exit()
+Exiting @ tick 18239500 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/stats.txt
index 9e7b361e2..b76987d8f 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.000018 # Nu
sim_ticks 18239500 # Number of ticks simulated
final_tick 18239500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 407753 # Simulator instruction rate (inst/s)
-host_op_rate 406852 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 2874172707 # Simulator tick rate (ticks/s)
-host_mem_usage 293212 # Number of bytes of host memory used
-host_seconds 0.01 # Real time elapsed on the host
+host_inst_rate 60500 # Simulator instruction rate (inst/s)
+host_op_rate 60473 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 427843204 # Simulator tick rate (ticks/s)
+host_mem_usage 288876 # Number of bytes of host memory used
+host_seconds 0.04 # Real time elapsed on the host
sim_insts 2577 # Number of instructions simulated
sim_ops 2577 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts