From de489e1997ee6c37aaf6e876e32622f6c648fe95 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 16 Nov 2015 05:08:57 -0600
Subject: stats: updates due to recent chagnesets

---
 .../ref/alpha/linux/minor-timing/config.ini        |  17 +++-
 .../00.hello/ref/alpha/linux/minor-timing/simerr   |   1 +
 .../00.hello/ref/alpha/linux/minor-timing/simout   |  11 ++-
 .../ref/alpha/linux/minor-timing/stats.txt         |  10 +-
 .../00.hello/ref/alpha/linux/o3-timing/config.ini  |  17 +++-
 .../se/00.hello/ref/alpha/linux/o3-timing/simout   |   6 +-
 .../00.hello/ref/alpha/linux/o3-timing/stats.txt   |  10 +-
 .../ref/alpha/linux/simple-atomic/config.ini       |   1 +
 .../00.hello/ref/alpha/linux/simple-atomic/simout  |  11 ++-
 .../simple-timing-ruby-MESI_Two_Level/config.ini   |  97 +------------------
 .../linux/simple-timing-ruby-MESI_Two_Level/simerr |   1 +
 .../linux/simple-timing-ruby-MESI_Two_Level/simout |  10 +-
 .../simple-timing-ruby-MESI_Two_Level/stats.txt    |  10 +-
 .../config.ini                                     |  98 +------------------
 .../simple-timing-ruby-MOESI_CMP_directory/simerr  |   1 +
 .../simple-timing-ruby-MOESI_CMP_directory/simout  |  10 +-
 .../stats.txt                                      |  10 +-
 .../simple-timing-ruby-MOESI_CMP_token/config.ini  |   2 +
 .../simple-timing-ruby-MOESI_CMP_token/simerr      |   1 +
 .../simple-timing-ruby-MOESI_CMP_token/simout      |  12 ++-
 .../simple-timing-ruby-MOESI_CMP_token/stats.txt   |   8 +-
 .../simple-timing-ruby-MOESI_hammer/config.ini     | 106 +--------------------
 .../linux/simple-timing-ruby-MOESI_hammer/simerr   |   1 +
 .../linux/simple-timing-ruby-MOESI_hammer/simout   |  10 +-
 .../simple-timing-ruby-MOESI_hammer/stats.txt      |  10 +-
 .../ref/alpha/linux/simple-timing-ruby/config.ini  |  87 +----------------
 .../ref/alpha/linux/simple-timing-ruby/simerr      |   1 +
 .../ref/alpha/linux/simple-timing-ruby/simout      |  10 +-
 .../ref/alpha/linux/simple-timing-ruby/stats.txt   |  10 +-
 .../ref/alpha/linux/simple-timing/config.ini       |  17 +++-
 .../00.hello/ref/alpha/linux/simple-timing/simout  |  13 ++-
 .../ref/alpha/linux/simple-timing/stats.txt        |  10 +-
 .../ref/alpha/tru64/minor-timing/config.ini        |  17 +++-
 .../00.hello/ref/alpha/tru64/minor-timing/simerr   |   1 +
 .../00.hello/ref/alpha/tru64/minor-timing/simout   |  11 ++-
 .../ref/alpha/tru64/minor-timing/stats.txt         |  10 +-
 .../00.hello/ref/alpha/tru64/o3-timing/config.ini  |  17 +++-
 .../se/00.hello/ref/alpha/tru64/o3-timing/simout   |  12 ++-
 .../00.hello/ref/alpha/tru64/o3-timing/stats.txt   |  10 +-
 .../ref/alpha/tru64/simple-atomic/config.ini       |   1 +
 .../00.hello/ref/alpha/tru64/simple-atomic/simout  |  11 ++-
 .../simple-timing-ruby-MESI_Two_Level/config.ini   |  96 +------------------
 .../tru64/simple-timing-ruby-MESI_Two_Level/simerr |   1 +
 .../tru64/simple-timing-ruby-MESI_Two_Level/simout |  10 +-
 .../simple-timing-ruby-MESI_Two_Level/stats.txt    |  10 +-
 .../config.ini                                     |  97 +------------------
 .../simple-timing-ruby-MOESI_CMP_directory/simerr  |   1 +
 .../simple-timing-ruby-MOESI_CMP_directory/simout  |  10 +-
 .../stats.txt                                      |  10 +-
 .../simple-timing-ruby-MOESI_CMP_token/config.ini  |   2 +
 .../simple-timing-ruby-MOESI_CMP_token/simerr      |   1 +
 .../simple-timing-ruby-MOESI_CMP_token/simout      |  12 ++-
 .../simple-timing-ruby-MOESI_CMP_token/stats.txt   |  10 +-
 .../simple-timing-ruby-MOESI_hammer/config.ini     | 106 +--------------------
 .../tru64/simple-timing-ruby-MOESI_hammer/simerr   |   1 +
 .../tru64/simple-timing-ruby-MOESI_hammer/simout   |  10 +-
 .../simple-timing-ruby-MOESI_hammer/stats.txt      |  10 +-
 .../ref/alpha/tru64/simple-timing-ruby/config.ini  |  87 +----------------
 .../ref/alpha/tru64/simple-timing-ruby/simerr      |   1 +
 .../ref/alpha/tru64/simple-timing-ruby/simout      |  10 +-
 .../ref/alpha/tru64/simple-timing-ruby/stats.txt   |   8 +-
 .../ref/alpha/tru64/simple-timing/config.ini       |  17 +++-
 .../00.hello/ref/alpha/tru64/simple-timing/simout  |  13 ++-
 .../ref/alpha/tru64/simple-timing/stats.txt        |  10 +-
 .../00.hello/ref/arm/linux/minor-timing/config.ini |  18 +++-
 .../se/00.hello/ref/arm/linux/minor-timing/simerr  |   1 +
 .../se/00.hello/ref/arm/linux/minor-timing/simout  |  12 +--
 .../00.hello/ref/arm/linux/minor-timing/stats.txt  |  10 +-
 .../ref/arm/linux/o3-timing-checker/config.ini     |  21 +++-
 .../ref/arm/linux/o3-timing-checker/simout         |   8 +-
 .../ref/arm/linux/o3-timing-checker/stats.txt      |  10 +-
 .../se/00.hello/ref/arm/linux/o3-timing/config.ini |  18 +++-
 .../se/00.hello/ref/arm/linux/o3-timing/simout     |  13 +--
 .../se/00.hello/ref/arm/linux/o3-timing/stats.txt  |  10 +-
 .../linux/simple-atomic-dummychecker/config.ini    |   5 +-
 .../arm/linux/simple-atomic-dummychecker/simout    |  15 +--
 .../arm/linux/simple-atomic-dummychecker/stats.txt |  10 +-
 .../ref/arm/linux/simple-atomic/config.ini         |   2 +
 .../se/00.hello/ref/arm/linux/simple-atomic/simout |  14 +--
 .../00.hello/ref/arm/linux/simple-atomic/stats.txt |  10 +-
 .../ref/arm/linux/simple-timing/config.ini         |  18 +++-
 .../se/00.hello/ref/arm/linux/simple-timing/simout |  14 +--
 .../00.hello/ref/arm/linux/simple-timing/stats.txt |  10 +-
 .../00.hello/ref/mips/linux/o3-timing/config.ini   |  17 +++-
 .../se/00.hello/ref/mips/linux/o3-timing/simout    |  12 ++-
 .../se/00.hello/ref/mips/linux/o3-timing/stats.txt |  10 +-
 .../ref/mips/linux/simple-atomic/config.ini        |   1 +
 .../00.hello/ref/mips/linux/simple-atomic/simerr   |   1 +
 .../00.hello/ref/mips/linux/simple-atomic/simout   |  13 ++-
 .../ref/mips/linux/simple-timing-ruby/config.ini   |  87 +----------------
 .../ref/mips/linux/simple-timing-ruby/simerr       |   1 +
 .../ref/mips/linux/simple-timing-ruby/simout       |  10 +-
 .../ref/mips/linux/simple-timing-ruby/stats.txt    |   8 +-
 .../ref/mips/linux/simple-timing/config.ini        |  17 +++-
 .../00.hello/ref/mips/linux/simple-timing/simerr   |   1 +
 .../00.hello/ref/mips/linux/simple-timing/simout   |  13 ++-
 .../ref/mips/linux/simple-timing/stats.txt         |  10 +-
 .../00.hello/ref/power/linux/o3-timing/config.ini  |  17 +++-
 .../se/00.hello/ref/power/linux/o3-timing/simout   |  12 ++-
 .../00.hello/ref/power/linux/o3-timing/stats.txt   |  10 +-
 .../ref/power/linux/simple-atomic/config.ini       |   1 +
 .../00.hello/ref/power/linux/simple-atomic/simout  |  11 ++-
 .../ref/sparc/linux/simple-atomic/config.ini       |   1 +
 .../00.hello/ref/sparc/linux/simple-atomic/simout  |   9 +-
 .../ref/sparc/linux/simple-timing-ruby/config.ini  |  87 +----------------
 .../ref/sparc/linux/simple-timing-ruby/simerr      |   1 +
 .../ref/sparc/linux/simple-timing-ruby/simout      |  10 +-
 .../ref/sparc/linux/simple-timing-ruby/stats.txt   |  10 +-
 .../ref/sparc/linux/simple-timing/config.ini       |  17 +++-
 .../00.hello/ref/sparc/linux/simple-timing/simout  |  11 ++-
 .../ref/sparc/linux/simple-timing/stats.txt        |  10 +-
 .../se/00.hello/ref/x86/linux/o3-timing/config.ini |  17 +++-
 .../se/00.hello/ref/x86/linux/o3-timing/simout     |  12 ++-
 .../se/00.hello/ref/x86/linux/o3-timing/stats.txt  |  10 +-
 .../ref/x86/linux/simple-atomic/config.ini         |   1 +
 .../se/00.hello/ref/x86/linux/simple-atomic/simout |  11 ++-
 .../00.hello/ref/x86/linux/simple-atomic/stats.txt |  10 +-
 .../ref/x86/linux/simple-timing-ruby/config.ini    |  87 +----------------
 .../ref/x86/linux/simple-timing-ruby/simerr        |   1 +
 .../ref/x86/linux/simple-timing-ruby/simout        |  10 +-
 .../ref/x86/linux/simple-timing-ruby/stats.txt     |  10 +-
 .../ref/x86/linux/simple-timing/config.ini         |  17 +++-
 .../se/00.hello/ref/x86/linux/simple-timing/simout |  11 ++-
 .../00.hello/ref/x86/linux/simple-timing/stats.txt |  10 +-
 124 files changed, 716 insertions(+), 1360 deletions(-)
 mode change 100644 => 100755 tests/quick/se/00.hello/ref/alpha/linux/minor-timing/simerr
 mode change 100644 => 100755 tests/quick/se/00.hello/ref/alpha/linux/minor-timing/simout
 mode change 100644 => 100755 tests/quick/se/00.hello/ref/alpha/tru64/minor-timing/simout
 mode change 100644 => 100755 tests/quick/se/00.hello/ref/arm/linux/minor-timing/simerr
 mode change 100644 => 100755 tests/quick/se/00.hello/ref/arm/linux/minor-timing/simout

(limited to 'tests/quick/se/00.hello')

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini
index 315443c4f..e814ae609 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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/linux/minor-timing/simerr b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/simerr
old mode 100644
new mode 100755
index 1a4f96712..341b479f7
--- a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/simerr
@@ -1 +1,2 @@
+warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
 warn: Sockets disabled, not accepting gdb connections
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/simout b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/simout
old mode 100644
new mode 100755
index bfafef07d..2ab88bf3d
--- a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/simout
@@ -3,12 +3,13 @@ Redirecting stderr to build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/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 10:42:15
-gem5 executing on cz3212c2d7
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/minor-timing -re tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/minor-timing
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:28:24
+gem5 executing on ribera.cs.wisc.edu, pid 29048
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/minor-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/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 35190500 because target called exit()
+Exiting @ tick 37553000 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/stats.txt
index e3deed2b6..3e65e72d2 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/minor-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000038                       # Nu
 sim_ticks                                    37553000                       # Number of ticks simulated
 final_tick                                   37553000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 161315                       # Simulator instruction rate (inst/s)
-host_op_rate                                   161262                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              945919395                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 296228                       # Number of bytes of host memory used
-host_seconds                                     0.04                       # Real time elapsed on the host
+host_inst_rate                                  55108                       # Simulator instruction rate (inst/s)
+host_op_rate                                    55099                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              323251479                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 290176                       # Number of bytes of host memory used
+host_seconds                                     0.12                       # Real time elapsed on the host
 sim_insts                                        6400                       # Number of instructions simulated
 sim_ops                                          6400                       # 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/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini
index 9dde3dbd5..78f16d59a 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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/linux/o3-timing/simout b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/simout
index 7f87c40d6..8209dc599 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/simout
@@ -3,9 +3,9 @@ Redirecting stderr to build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/o3-tim
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Sep 14 2015 20:54:01
-gem5 started Sep 14 2015 21:14:59
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:30:08
+gem5 executing on ribera.cs.wisc.edu, pid 29145
 command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt
index 2791307e9..8afeda809 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000022                       # Nu
 sim_ticks                                    21900500                       # Number of ticks simulated
 final_tick                                   21900500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 101932                       # Simulator instruction rate (inst/s)
-host_op_rate                                   101910                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              350189482                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 296592                       # Number of bytes of host memory used
-host_seconds                                     0.06                       # Real time elapsed on the host
+host_inst_rate                                  59160                       # Simulator instruction rate (inst/s)
+host_op_rate                                    59150                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              203265202                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 292228                       # Number of bytes of host memory used
+host_seconds                                     0.11                       # Real time elapsed on the host
 sim_insts                                        6372                       # Number of instructions simulated
 sim_ops                                          6372                       # 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/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini
index f5748224b..74d454994 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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/linux/simple-atomic/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/simout
index 1ccb73543..e1b630148 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-atomic/simout
@@ -1,10 +1,13 @@
+Redirecting stdout to build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-atomic/simout
+Redirecting stderr to build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/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:08
-gem5 executing on u200540-lin
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-atomic -re tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-atomic
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:28:47
+gem5 executing on ribera.cs.wisc.edu, pid 29075
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-atomic -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/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/linux/simple-timing-ruby-MESI_Two_Level/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
index e1d5797c9..07526e3f6 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
@@ -24,6 +24,7 @@ mem_mode=timing
 mem_ranges=0:268435455
 memories=system.mem_ctrls
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -227,8 +228,8 @@ eventq_index=0
 hot_lines=false
 memory_size_bits=48
 num_of_sequencers=1
+number_of_virtual_networks=3
 phys_mem=Null
-random_seed=1234
 randomization=false
 
 [system.ruby.clk_domain]
@@ -274,7 +275,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[5]
 
 [system.ruby.dir_cntrl0.responseFromDir]
@@ -283,7 +283,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[6]
 
 [system.ruby.dir_cntrl0.responseFromMemory]
@@ -292,7 +291,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.dir_cntrl0.responseToDir]
 type=MessageBuffer
@@ -300,7 +298,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[6]
 
 [system.ruby.l1_cntrl0]
@@ -386,7 +383,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0.optionalQueue]
 type=MessageBuffer
@@ -394,7 +390,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0.prefetcher]
 type=Prefetcher
@@ -414,7 +409,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[0]
 
 [system.ruby.l1_cntrl0.requestToL1Cache]
@@ -423,7 +417,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[0]
 
 [system.ruby.l1_cntrl0.responseFromL1Cache]
@@ -432,7 +425,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[1]
 
 [system.ruby.l1_cntrl0.responseToL1Cache]
@@ -441,7 +433,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[1]
 
 [system.ruby.l1_cntrl0.sequencer]
@@ -469,7 +460,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[2]
 
 [system.ruby.l2_cntrl0]
@@ -502,7 +492,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[3]
 
 [system.ruby.l2_cntrl0.L1RequestFromL2Cache]
@@ -511,7 +500,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[4]
 
 [system.ruby.l2_cntrl0.L1RequestToL2Cache]
@@ -520,7 +508,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[3]
 
 [system.ruby.l2_cntrl0.L2cache]
@@ -552,7 +539,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 master=system.ruby.network.slave[5]
 
 [system.ruby.l2_cntrl0.responseToL2Cache]
@@ -561,7 +547,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[4]
 
 [system.ruby.l2_cntrl0.unblockToL2Cache]
@@ -570,7 +555,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 slave=system.ruby.network.master[2]
 
 [system.ruby.memctrl_clk_domain]
@@ -593,7 +577,6 @@ int_link_buffers=system.ruby.network.int_link_buffers00 system.ruby.network.int_
 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2
 netifs=
 number_of_virtual_networks=3
-recycle_latency=0
 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
 ruby_system=system.ruby
 topology=Crossbar
@@ -636,7 +619,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers01]
 type=MessageBuffer
@@ -644,7 +626,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers02]
 type=MessageBuffer
@@ -652,7 +633,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers03]
 type=MessageBuffer
@@ -660,7 +640,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers04]
 type=MessageBuffer
@@ -668,7 +647,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers05]
 type=MessageBuffer
@@ -676,7 +654,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers06]
 type=MessageBuffer
@@ -684,7 +661,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers07]
 type=MessageBuffer
@@ -692,7 +668,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers08]
 type=MessageBuffer
@@ -700,7 +675,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers09]
 type=MessageBuffer
@@ -708,7 +682,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers10]
 type=MessageBuffer
@@ -716,7 +689,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers11]
 type=MessageBuffer
@@ -724,7 +696,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers12]
 type=MessageBuffer
@@ -732,7 +703,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers13]
 type=MessageBuffer
@@ -740,7 +710,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers14]
 type=MessageBuffer
@@ -748,7 +717,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers15]
 type=MessageBuffer
@@ -756,7 +724,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers16]
 type=MessageBuffer
@@ -764,7 +731,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers17]
 type=MessageBuffer
@@ -772,7 +738,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_links0]
 type=SimpleIntLink
@@ -810,7 +775,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
 clk_domain=system.ruby.clk_domain
 eventq_index=0
 port_buffers=system.ruby.network.routers0.port_buffers00 system.ruby.network.routers0.port_buffers01 system.ruby.network.routers0.port_buffers02 system.ruby.network.routers0.port_buffers03 system.ruby.network.routers0.port_buffers04 system.ruby.network.routers0.port_buffers05 system.ruby.network.routers0.port_buffers06 system.ruby.network.routers0.port_buffers07 system.ruby.network.routers0.port_buffers08 system.ruby.network.routers0.port_buffers09 system.ruby.network.routers0.port_buffers10 system.ruby.network.routers0.port_buffers11
-recycle_latency=0
 router_id=0
 virt_nets=3
 
@@ -820,7 +784,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers01]
 type=MessageBuffer
@@ -828,7 +791,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers02]
 type=MessageBuffer
@@ -836,7 +798,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers03]
 type=MessageBuffer
@@ -844,7 +805,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers04]
 type=MessageBuffer
@@ -852,7 +812,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers05]
 type=MessageBuffer
@@ -860,7 +819,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers06]
 type=MessageBuffer
@@ -868,7 +826,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers07]
 type=MessageBuffer
@@ -876,7 +833,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers08]
 type=MessageBuffer
@@ -884,7 +840,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers09]
 type=MessageBuffer
@@ -892,7 +847,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers10]
 type=MessageBuffer
@@ -900,7 +854,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers11]
 type=MessageBuffer
@@ -908,7 +861,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1]
 type=Switch
@@ -916,7 +868,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
 clk_domain=system.ruby.clk_domain
 eventq_index=0
 port_buffers=system.ruby.network.routers1.port_buffers00 system.ruby.network.routers1.port_buffers01 system.ruby.network.routers1.port_buffers02 system.ruby.network.routers1.port_buffers03 system.ruby.network.routers1.port_buffers04 system.ruby.network.routers1.port_buffers05 system.ruby.network.routers1.port_buffers06 system.ruby.network.routers1.port_buffers07 system.ruby.network.routers1.port_buffers08 system.ruby.network.routers1.port_buffers09 system.ruby.network.routers1.port_buffers10 system.ruby.network.routers1.port_buffers11
-recycle_latency=0
 router_id=1
 virt_nets=3
 
@@ -926,7 +877,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers01]
 type=MessageBuffer
@@ -934,7 +884,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers02]
 type=MessageBuffer
@@ -942,7 +891,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers03]
 type=MessageBuffer
@@ -950,7 +898,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers04]
 type=MessageBuffer
@@ -958,7 +905,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers05]
 type=MessageBuffer
@@ -966,7 +912,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers06]
 type=MessageBuffer
@@ -974,7 +919,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers07]
 type=MessageBuffer
@@ -982,7 +926,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers08]
 type=MessageBuffer
@@ -990,7 +933,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers09]
 type=MessageBuffer
@@ -998,7 +940,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers10]
 type=MessageBuffer
@@ -1006,7 +947,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers11]
 type=MessageBuffer
@@ -1014,7 +954,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2]
 type=Switch
@@ -1022,7 +961,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
 clk_domain=system.ruby.clk_domain
 eventq_index=0
 port_buffers=system.ruby.network.routers2.port_buffers00 system.ruby.network.routers2.port_buffers01 system.ruby.network.routers2.port_buffers02 system.ruby.network.routers2.port_buffers03 system.ruby.network.routers2.port_buffers04 system.ruby.network.routers2.port_buffers05 system.ruby.network.routers2.port_buffers06 system.ruby.network.routers2.port_buffers07 system.ruby.network.routers2.port_buffers08 system.ruby.network.routers2.port_buffers09 system.ruby.network.routers2.port_buffers10 system.ruby.network.routers2.port_buffers11
-recycle_latency=0
 router_id=2
 virt_nets=3
 
@@ -1032,7 +970,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers01]
 type=MessageBuffer
@@ -1040,7 +977,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers02]
 type=MessageBuffer
@@ -1048,7 +984,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers03]
 type=MessageBuffer
@@ -1056,7 +991,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers04]
 type=MessageBuffer
@@ -1064,7 +998,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers05]
 type=MessageBuffer
@@ -1072,7 +1005,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers06]
 type=MessageBuffer
@@ -1080,7 +1012,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers07]
 type=MessageBuffer
@@ -1088,7 +1019,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers08]
 type=MessageBuffer
@@ -1096,7 +1026,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers09]
 type=MessageBuffer
@@ -1104,7 +1033,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers10]
 type=MessageBuffer
@@ -1112,7 +1040,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers11]
 type=MessageBuffer
@@ -1120,7 +1047,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3]
 type=Switch
@@ -1128,7 +1054,6 @@ children=port_buffers00 port_buffers01 port_buffers02 port_buffers03 port_buffer
 clk_domain=system.ruby.clk_domain
 eventq_index=0
 port_buffers=system.ruby.network.routers3.port_buffers00 system.ruby.network.routers3.port_buffers01 system.ruby.network.routers3.port_buffers02 system.ruby.network.routers3.port_buffers03 system.ruby.network.routers3.port_buffers04 system.ruby.network.routers3.port_buffers05 system.ruby.network.routers3.port_buffers06 system.ruby.network.routers3.port_buffers07 system.ruby.network.routers3.port_buffers08 system.ruby.network.routers3.port_buffers09 system.ruby.network.routers3.port_buffers10 system.ruby.network.routers3.port_buffers11 system.ruby.network.routers3.port_buffers12 system.ruby.network.routers3.port_buffers13 system.ruby.network.routers3.port_buffers14 system.ruby.network.routers3.port_buffers15 system.ruby.network.routers3.port_buffers16 system.ruby.network.routers3.port_buffers17
-recycle_latency=0
 router_id=3
 virt_nets=3
 
@@ -1138,7 +1063,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers01]
 type=MessageBuffer
@@ -1146,7 +1070,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers02]
 type=MessageBuffer
@@ -1154,7 +1077,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers03]
 type=MessageBuffer
@@ -1162,7 +1084,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers04]
 type=MessageBuffer
@@ -1170,7 +1091,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers05]
 type=MessageBuffer
@@ -1178,7 +1098,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers06]
 type=MessageBuffer
@@ -1186,7 +1105,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers07]
 type=MessageBuffer
@@ -1194,7 +1112,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers08]
 type=MessageBuffer
@@ -1202,7 +1119,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers09]
 type=MessageBuffer
@@ -1210,7 +1126,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers10]
 type=MessageBuffer
@@ -1218,7 +1133,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers11]
 type=MessageBuffer
@@ -1226,7 +1140,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers12]
 type=MessageBuffer
@@ -1234,7 +1147,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers13]
 type=MessageBuffer
@@ -1242,7 +1154,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers14]
 type=MessageBuffer
@@ -1250,7 +1161,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers15]
 type=MessageBuffer
@@ -1258,7 +1168,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers16]
 type=MessageBuffer
@@ -1266,7 +1175,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers17]
 type=MessageBuffer
@@ -1274,7 +1182,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.sys_port_proxy]
 type=RubyPortProxy
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr
index 21ea544b2..22fffb44f 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr
@@ -6,3 +6,4 @@ warn: rounding error > tolerance
     1.250000 rounded to 1
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
 warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout
index 90b6836e9..4b30a82ef 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level/simout
+Redirecting stderr to build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Aug 13 2015 19:16:05
-gem5 started Aug 13 2015 20:15:31
-gem5 executing on artery
-command line: build/ALPHA_MESI_Two_Level/gem5.opt -d build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level
+gem5 compiled Nov 15 2015 14:41:13
+gem5 started Nov 15 2015 14:41:38
+gem5 executing on ribera.cs.wisc.edu, pid 32149
+command line: build/ALPHA_MESI_Two_Level/gem5.opt -d build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MESI_Two_Level/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_Two_Level
 
 Global frequency set at 1000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
index b3846c240..043f75704 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000121                       # Nu
 sim_ticks                                      121460                       # Number of ticks simulated
 final_tick                                     121460                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  22637                       # Simulator instruction rate (inst/s)
-host_op_rate                                    22636                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 430242                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 402016                       # Number of bytes of host memory used
-host_seconds                                     0.28                       # Real time elapsed on the host
+host_inst_rate                                  24898                       # Simulator instruction rate (inst/s)
+host_op_rate                                    24896                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 473190                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 448380                       # Number of bytes of host memory used
+host_seconds                                     0.26                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
index a0e9abc2b..efc6170cc 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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,8 +228,8 @@ eventq_index=0
 hot_lines=false
 memory_size_bits=48
 num_of_sequencers=1
+number_of_virtual_networks=3
 phys_mem=Null
-random_seed=1234
 randomization=false
 
 [system.ruby.clk_domain]
@@ -275,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]
@@ -284,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]
@@ -293,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]
@@ -302,7 +300,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.dir_cntrl0.responseToDir]
 type=MessageBuffer
@@ -310,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]
@@ -392,7 +388,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0.requestFromL1Cache]
 type=MessageBuffer
@@ -400,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]
@@ -409,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]
@@ -418,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]
@@ -427,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]
@@ -455,7 +446,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=10
 
 [system.ruby.l2_cntrl0]
 type=L2Cache_Controller
@@ -487,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]
@@ -496,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]
@@ -505,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]
@@ -514,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]
@@ -546,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]
@@ -555,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]
@@ -564,7 +548,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=10
 
 [system.ruby.memctrl_clk_domain]
 type=DerivedClockDomain
@@ -586,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
@@ -629,7 +611,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers01]
 type=MessageBuffer
@@ -637,7 +618,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers02]
 type=MessageBuffer
@@ -645,7 +625,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers03]
 type=MessageBuffer
@@ -653,7 +632,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers04]
 type=MessageBuffer
@@ -661,7 +639,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers05]
 type=MessageBuffer
@@ -669,7 +646,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers06]
 type=MessageBuffer
@@ -677,7 +653,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers07]
 type=MessageBuffer
@@ -685,7 +660,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers08]
 type=MessageBuffer
@@ -693,7 +667,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers09]
 type=MessageBuffer
@@ -701,7 +674,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers10]
 type=MessageBuffer
@@ -709,7 +681,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers11]
 type=MessageBuffer
@@ -717,7 +688,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers12]
 type=MessageBuffer
@@ -725,7 +695,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers13]
 type=MessageBuffer
@@ -733,7 +702,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers14]
 type=MessageBuffer
@@ -741,7 +709,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers15]
 type=MessageBuffer
@@ -749,7 +716,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers16]
 type=MessageBuffer
@@ -757,7 +723,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers17]
 type=MessageBuffer
@@ -765,7 +730,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_links0]
 type=SimpleIntLink
@@ -803,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
 
@@ -813,7 +776,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers01]
 type=MessageBuffer
@@ -821,7 +783,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers02]
 type=MessageBuffer
@@ -829,7 +790,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers03]
 type=MessageBuffer
@@ -837,7 +797,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers04]
 type=MessageBuffer
@@ -845,7 +804,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers05]
 type=MessageBuffer
@@ -853,7 +811,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers06]
 type=MessageBuffer
@@ -861,7 +818,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers07]
 type=MessageBuffer
@@ -869,7 +825,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers08]
 type=MessageBuffer
@@ -877,7 +832,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers09]
 type=MessageBuffer
@@ -885,7 +839,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers10]
 type=MessageBuffer
@@ -893,7 +846,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers11]
 type=MessageBuffer
@@ -901,7 +853,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1]
 type=Switch
@@ -909,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
 
@@ -919,7 +869,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers01]
 type=MessageBuffer
@@ -927,7 +876,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers02]
 type=MessageBuffer
@@ -935,7 +883,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers03]
 type=MessageBuffer
@@ -943,7 +890,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers04]
 type=MessageBuffer
@@ -951,7 +897,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers05]
 type=MessageBuffer
@@ -959,7 +904,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers06]
 type=MessageBuffer
@@ -967,7 +911,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers07]
 type=MessageBuffer
@@ -975,7 +918,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers08]
 type=MessageBuffer
@@ -983,7 +925,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers09]
 type=MessageBuffer
@@ -991,7 +932,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers10]
 type=MessageBuffer
@@ -999,7 +939,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers11]
 type=MessageBuffer
@@ -1007,7 +946,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2]
 type=Switch
@@ -1015,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
 
@@ -1025,7 +962,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers01]
 type=MessageBuffer
@@ -1033,7 +969,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers02]
 type=MessageBuffer
@@ -1041,7 +976,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers03]
 type=MessageBuffer
@@ -1049,7 +983,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers04]
 type=MessageBuffer
@@ -1057,7 +990,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers05]
 type=MessageBuffer
@@ -1065,7 +997,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers06]
 type=MessageBuffer
@@ -1073,7 +1004,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers07]
 type=MessageBuffer
@@ -1081,7 +1011,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers08]
 type=MessageBuffer
@@ -1089,7 +1018,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers09]
 type=MessageBuffer
@@ -1097,7 +1025,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers10]
 type=MessageBuffer
@@ -1105,7 +1032,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers11]
 type=MessageBuffer
@@ -1113,7 +1039,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3]
 type=Switch
@@ -1121,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
 
@@ -1131,7 +1055,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers01]
 type=MessageBuffer
@@ -1139,7 +1062,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers02]
 type=MessageBuffer
@@ -1147,7 +1069,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers03]
 type=MessageBuffer
@@ -1155,7 +1076,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers04]
 type=MessageBuffer
@@ -1163,7 +1083,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers05]
 type=MessageBuffer
@@ -1171,7 +1090,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers06]
 type=MessageBuffer
@@ -1179,7 +1097,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers07]
 type=MessageBuffer
@@ -1187,7 +1104,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers08]
 type=MessageBuffer
@@ -1195,7 +1111,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers09]
 type=MessageBuffer
@@ -1203,7 +1118,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers10]
 type=MessageBuffer
@@ -1211,7 +1125,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers11]
 type=MessageBuffer
@@ -1219,7 +1132,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers12]
 type=MessageBuffer
@@ -1227,7 +1139,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers13]
 type=MessageBuffer
@@ -1235,7 +1146,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers14]
 type=MessageBuffer
@@ -1243,7 +1153,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers15]
 type=MessageBuffer
@@ -1251,7 +1160,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers16]
 type=MessageBuffer
@@ -1259,7 +1167,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers3.port_buffers17]
 type=MessageBuffer
@@ -1267,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/linux/simple-timing-ruby-MOESI_CMP_directory/simerr b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simerr
index 21ea544b2..22fffb44f 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simerr
@@ -6,3 +6,4 @@ warn: rounding error > tolerance
     1.250000 rounded to 1
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
 warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
index 5a20e233f..65717d77c 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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/linux/simple-timing-ruby-MOESI_CMP_directory/simout
+Redirecting stderr to build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/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:04
-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/linux/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/linux/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 1174
+command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/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/linux/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/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
index fbfc4fe06..29f98e894 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000109                       # Nu
 sim_ticks                                      108694                       # Number of ticks simulated
 final_tick                                     108694                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  31686                       # Simulator instruction rate (inst/s)
-host_op_rate                                    31684                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 538927                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 405952                       # Number of bytes of host memory used
-host_seconds                                     0.20                       # Real time elapsed on the host
+host_inst_rate                                  34181                       # Simulator instruction rate (inst/s)
+host_op_rate                                    34178                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 581310                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 451520                       # Number of bytes of host memory used
+host_seconds                                     0.19                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
index 7fc51848b..1ff837e28 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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/linux/simple-timing-ruby-MOESI_CMP_token/simerr b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simerr
index 21ea544b2..22fffb44f 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simerr
@@ -6,3 +6,4 @@ warn: rounding error > tolerance
     1.250000 rounded to 1
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
 warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
index dcbd1a61f..4eaaba3b9 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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/linux/simple-timing-ruby-MOESI_CMP_token/simout
+Redirecting stderr to build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/linux/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:36
-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/linux/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/linux/simple-timing-ruby-MOESI_CMP_token
+gem5 compiled Nov 15 2015 14:51:28
+gem5 started Nov 15 2015 14:51:58
+gem5 executing on ribera.cs.wisc.edu, pid 2899
+command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/00.hello/alpha/linux/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/linux/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 108259 because target called exit()
+Exiting @ tick 108253 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
index 49c35cd93..790f718b6 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
@@ -4,10 +4,10 @@ sim_seconds                                  0.000108                       # Nu
 sim_ticks                                      108253                       # Number of ticks simulated
 final_tick                                     108253                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  35849                       # Simulator instruction rate (inst/s)
-host_op_rate                                    35846                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 607200                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 446936                       # Number of bytes of host memory used
+host_inst_rate                                  35277                       # Simulator instruction rate (inst/s)
+host_op_rate                                    35272                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 597494                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 449432                       # Number of bytes of host memory used
 host_seconds                                     0.18                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
index bf628f608..273c8001d 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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/linux/simple-timing-ruby-MOESI_hammer/simerr b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simerr
index 21ea544b2..22fffb44f 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simerr
@@ -6,3 +6,4 @@ warn: rounding error > tolerance
     1.250000 rounded to 1
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
 warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
index 5470cb52e..099b54752 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
+Redirecting stderr to build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/linux/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/linux/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/linux/simple-timing-ruby-MOESI_hammer
+gem5 compiled Nov 15 2015 14:35:53
+gem5 started Nov 15 2015 14:36:15
+gem5 executing on ribera.cs.wisc.edu, pid 30620
+command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_hammer -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/linux/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/linux/simple-timing-ruby-MOESI_hammer/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
index c8e8d4629..90da42d27 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000087                       # Nu
 sim_ticks                                       86673                       # Number of ticks simulated
 final_tick                                      86673                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  41119                       # Simulator instruction rate (inst/s)
-host_op_rate                                    41116                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 557651                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 401992                       # Number of bytes of host memory used
-host_seconds                                     0.16                       # Real time elapsed on the host
+host_inst_rate                                  33775                       # Simulator instruction rate (inst/s)
+host_op_rate                                    33772                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 458039                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 448324                       # Number of bytes of host memory used
+host_seconds                                     0.19                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
index 7d246ed9e..a7ddc6b79 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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/linux/simple-timing-ruby/simerr b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simerr
index 21ea544b2..22fffb44f 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simerr
@@ -6,3 +6,4 @@ warn: rounding error > tolerance
     1.250000 rounded to 1
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
 warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout
index f8bca7f67..b3ad94f5c 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby/simout
+Redirecting stderr to build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/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:39
-gem5 executing on artery
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby -re /home/joel/research/gem5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:30:20
+gem5 executing on ribera.cs.wisc.edu, pid 29152
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/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/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
index ca2d0dacc..98a79f3c9 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000107                       # Nu
 sim_ticks                                      107210                       # Number of ticks simulated
 final_tick                                     107210                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  29183                       # Simulator instruction rate (inst/s)
-host_op_rate                                    29181                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 489574                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 401792                       # Number of bytes of host memory used
-host_seconds                                     0.22                       # Real time elapsed on the host
+host_inst_rate                                  51155                       # Simulator instruction rate (inst/s)
+host_op_rate                                    51148                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 858029                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 447104                       # Number of bytes of host memory used
+host_seconds                                     0.13                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini
index e8e73054d..62573b17c 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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/linux/simple-timing/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/simout
index 03ecf7225..f0f9af956 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/simout
@@ -1,12 +1,15 @@
+Redirecting stdout to build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-timing/simout
+Redirecting stderr to build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/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:16
-gem5 executing on u200540-lin
-command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-timing -re tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-timing
+gem5 compiled Nov 15 2015 14:28:00
+gem5 started Nov 15 2015 14:29:46
+gem5 executing on ribera.cs.wisc.edu, pid 29113
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/simple-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ALPHA/tests/opt/quick/se/00.hello/alpha/linux/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 32544000 because target called exit()
+Exiting @ tick 35667500 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/stats.txt
index d82a69683..a6f593b8c 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000036                       # Nu
 sim_ticks                                    35667500                       # Number of ticks simulated
 final_tick                                   35667500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 607241                       # Simulator instruction rate (inst/s)
-host_op_rate                                   606492                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             3381446720                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 294520                       # Number of bytes of host memory used
-host_seconds                                     0.01                       # Real time elapsed on the host
+host_inst_rate                                 123464                       # Simulator instruction rate (inst/s)
+host_op_rate                                   123421                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              688686311                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 290180                       # Number of bytes of host memory used
+host_seconds                                     0.05                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
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
old mode 100644
new mode 100755
index 226c0e256..5008f8610
--- 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
diff --git a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini
index 6229ef3c3..6eeda81d4 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/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=
@@ -132,6 +133,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
@@ -148,6 +150,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]
 
@@ -591,6 +594,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
@@ -607,6 +611,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]
 
@@ -626,6 +631,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -701,6 +707,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
@@ -717,6 +724,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]
 
@@ -732,12 +740,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
@@ -745,6 +754,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[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/arm/linux/minor-timing/simerr b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/simerr
old mode 100644
new mode 100755
index 1a4f96712..341b479f7
--- a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/simerr
+++ b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/simerr
@@ -1 +1,2 @@
+warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
 warn: Sockets disabled, not accepting gdb connections
diff --git a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/simout b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/simout
old mode 100644
new mode 100755
index ccb773a26..dfde5d918
--- a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/simout
@@ -3,12 +3,12 @@ Redirecting stderr to build/ARM/tests/opt/quick/se/00.hello/arm/linux/minor-timi
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled May  7 2014 10:57:46
-gem5 started May  7 2014 13:43:16
-gem5 executing on cz3211bhr8
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/minor-timing -re tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/minor-timing
+gem5 compiled Nov 15 2015 15:24:37
+gem5 started Nov 15 2015 15:29:19
+gem5 executing on ribera.cs.wisc.edu, pid 11166
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/minor-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/minor-timing
+
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.isa: ISA system set to: 0 0x6c0c360
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
-Exiting @ tick 28041000 because target called exit()
+Exiting @ tick 29949500 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/stats.txt
index 084d8789f..7006e134f 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/minor-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/minor-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000030                       # Nu
 sim_ticks                                    29949500                       # Number of ticks simulated
 final_tick                                   29949500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 117235                       # Simulator instruction rate (inst/s)
-host_op_rate                                   137200                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              761957462                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 313960                       # Number of bytes of host memory used
-host_seconds                                     0.04                       # Real time elapsed on the host
+host_inst_rate                                  53802                       # Simulator instruction rate (inst/s)
+host_op_rate                                    62972                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              349767389                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 307220                       # Number of bytes of host memory used
+host_seconds                                     0.09                       # Real time elapsed on the host
 sim_insts                                        4605                       # Number of instructions simulated
 sim_ops                                          5391                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini
index 76e4b0b8e..ceb6c35e9 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/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=
@@ -166,7 +167,7 @@ eventq_index=0
 exitOnError=false
 function_trace=false
 function_trace_start=0
-interrupts=Null
+interrupts=
 isa=system.cpu.checker.isa
 istage2_mmu=system.cpu.checker.istage2_mmu
 itb=system.cpu.checker.itb
@@ -229,6 +230,7 @@ port=system.cpu.toL2Bus.slave[5]
 
 [system.cpu.checker.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -308,6 +310,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
@@ -324,6 +327,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]
 
@@ -691,6 +695,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
@@ -707,6 +712,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]
 
@@ -726,6 +732,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -801,6 +808,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
@@ -817,6 +825,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]
 
@@ -832,12 +841,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
@@ -845,6 +855,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.checker.itb.walker.port system.cpu.checker.dtb.walker.port
 
+[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/arm/linux/o3-timing-checker/simout b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/simout
index 800acea54..8119abd2f 100755
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/simout
@@ -3,12 +3,12 @@ Redirecting stderr to build/ARM/tests/opt/quick/se/00.hello/arm/linux/o3-timing-
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Sep 14 2015 23:29:19
-gem5 started Sep 14 2015 23:30:05
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Nov 15 2015 15:24:37
+gem5 started Nov 15 2015 15:29:13
+gem5 executing on ribera.cs.wisc.edu, pid 11155
 command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/o3-timing-checker -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/o3-timing-checker
 
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
-Exiting @ tick 17163000 because target called exit()
+Exiting @ tick 17170000 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt
index 0fdcdba71..8297b21bd 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000017                       # Nu
 sim_ticks                                    17170000                       # Number of ticks simulated
 final_tick                                   17170000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  54905                       # Simulator instruction rate (inst/s)
-host_op_rate                                    64292                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              205230571                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 313448                       # Number of bytes of host memory used
-host_seconds                                     0.08                       # Real time elapsed on the host
+host_inst_rate                                  30630                       # Simulator instruction rate (inst/s)
+host_op_rate                                    35868                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              114456188                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 308252                       # Number of bytes of host memory used
+host_seconds                                     0.15                       # Real time elapsed on the host
 sim_insts                                        4592                       # Number of instructions simulated
 sim_ops                                          5378                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini
index cc7bd2d63..9b45b3947 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/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=
@@ -154,6 +155,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
@@ -170,6 +172,7 @@ system=system
 tags=system.cpu.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -495,6 +498,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=false
@@ -511,6 +515,7 @@ system=system
 tags=system.cpu.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -530,6 +535,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -605,6 +611,7 @@ children=prefetcher tags
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_excl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
@@ -621,6 +628,7 @@ system=system
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -661,12 +669,13 @@ size=1048576
 
 [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
@@ -674,6 +683,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[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/arm/linux/o3-timing/simout b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/simout
index 8e08379a3..6e552ddd3 100755
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/simout
@@ -1,13 +1,14 @@
+Redirecting stdout to build/ARM/tests/opt/quick/se/00.hello/arm/linux/o3-timing/simout
+Redirecting stderr to build/ARM/tests/opt/quick/se/00.hello/arm/linux/o3-timing/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 11:26:41
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/o3-timing
+gem5 compiled Nov 15 2015 15:24:37
+gem5 started Nov 15 2015 15:25:11
+gem5 executing on ribera.cs.wisc.edu, pid 11031
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.isa: ISA system set to: 0 0x4144ba0
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
-Exiting @ tick 17911000 because target called exit()
+Exiting @ tick 18741000 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt
index 087d46b3f..ff1efaffe 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000019                       # Nu
 sim_ticks                                    18741000                       # Number of ticks simulated
 final_tick                                   18741000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  59386                       # Simulator instruction rate (inst/s)
-host_op_rate                                    69540                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              242288300                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 309720                       # Number of bytes of host memory used
-host_seconds                                     0.08                       # Real time elapsed on the host
+host_inst_rate                                   9085                       # Simulator instruction rate (inst/s)
+host_op_rate                                    10640                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               37077299                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 304792                       # Number of bytes of host memory used
+host_seconds                                     0.51                       # Real time elapsed on the host
 sim_insts                                        4592                       # Number of instructions simulated
 sim_ops                                          5378                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini
index af3e16c1f..0e179adcc 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/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=
@@ -98,7 +99,7 @@ eventq_index=0
 exitOnError=false
 function_trace=false
 function_trace_start=0
-interrupts=Null
+interrupts=
 isa=system.cpu.checker.isa
 istage2_mmu=system.cpu.checker.istage2_mmu
 itb=system.cpu.checker.itb
@@ -160,6 +161,7 @@ sys=system
 
 [system.cpu.checker.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -279,6 +281,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/simout b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/simout
index c5ba01efb..6af4d3ebe 100755
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/simout
@@ -1,13 +1,14 @@
+Redirecting stdout to build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic-dummychecker/simout
+Redirecting stderr to build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic-dummychecker/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan 23 2014 12:08:08
-gem5 started Jan 23 2014 17:06:13
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic-dummychecker -re tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic-dummychecker
+gem5 compiled Nov 15 2015 15:24:37
+gem5 started Nov 15 2015 15:28:19
+gem5 executing on ribera.cs.wisc.edu, pid 11113
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic-dummychecker -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic-dummychecker
+
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.checker.isa: ISA system set to: 0 0x4499a00
-      0: system.cpu.isa: ISA system set to: 0 0x4499a00
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
-Exiting @ tick 2870500 because target called exit()
+Exiting @ tick 2695000 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/stats.txt
index e88fbd103..01ab0217a 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000003                       # Nu
 sim_ticks                                     2695000                       # Number of ticks simulated
 final_tick                                    2695000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 803078                       # Simulator instruction rate (inst/s)
-host_op_rate                                   938405                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              469266934                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 299548                       # Number of bytes of host memory used
-host_seconds                                     0.01                       # Real time elapsed on the host
+host_inst_rate                                  30690                       # Simulator instruction rate (inst/s)
+host_op_rate                                    35938                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               18006429                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 296212                       # Number of bytes of host memory used
+host_seconds                                     0.15                       # Real time elapsed on the host
 sim_insts                                        4592                       # Number of instructions simulated
 sim_ops                                          5378                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini
index 8f14d69f7..6c0199ce8 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/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=
@@ -130,6 +131,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/simout b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/simout
index 380d567ec..cef38e51b 100755
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/simout
@@ -1,12 +1,14 @@
+Redirecting stdout to build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic/simout
+Redirecting stderr to build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan 23 2014 12:08:08
-gem5 started Jan 23 2014 17:06:03
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic -re tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic
+gem5 compiled Nov 15 2015 15:24:37
+gem5 started Nov 15 2015 15:29:18
+gem5 executing on ribera.cs.wisc.edu, pid 11161
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-atomic
+
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.isa: ISA system set to: 0 0x5df7a00
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
-Exiting @ tick 2870500 because target called exit()
+Exiting @ tick 2695000 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/stats.txt
index d7a1f965a..fed2195a4 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000003                       # Nu
 sim_ticks                                     2695000                       # Number of ticks simulated
 final_tick                                    2695000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 829930                       # Simulator instruction rate (inst/s)
-host_op_rate                                   969708                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              484799424                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 298800                       # Number of bytes of host memory used
-host_seconds                                     0.01                       # Real time elapsed on the host
+host_inst_rate                                  95191                       # Simulator instruction rate (inst/s)
+host_op_rate                                   111442                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               55823840                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 296212                       # Number of bytes of host memory used
+host_seconds                                     0.05                       # Real time elapsed on the host
 sim_insts                                        4592                       # Number of instructions simulated
 sim_ops                                          5378                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini
index 0e18c01bd..465454407 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/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=
@@ -85,6 +86,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
@@ -101,6 +103,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]
 
@@ -161,6 +164,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
@@ -177,6 +181,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]
 
@@ -196,6 +201,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -271,6 +277,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
@@ -287,6 +294,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]
 
@@ -302,12 +310,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
@@ -315,6 +324,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[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/arm/linux/simple-timing/simout b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/simout
index 16e7e5d49..119ed6702 100755
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/simout
@@ -1,12 +1,14 @@
+Redirecting stdout to build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-timing/simout
+Redirecting stderr to build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-timing/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan 23 2014 12:08:08
-gem5 started Jan 23 2014 17:06:24
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-timing -re tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-timing
+gem5 compiled Nov 15 2015 15:24:37
+gem5 started Nov 15 2015 15:28:09
+gem5 executing on ribera.cs.wisc.edu, pid 11108
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/se/00.hello/arm/linux/simple-timing
+
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.isa: ISA system set to: 0 0x5fe9040
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
-Exiting @ tick 25969000 because target called exit()
+Exiting @ tick 28298500 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/stats.txt
index 26cb25dcb..1d9382585 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000028                       # Nu
 sim_ticks                                    28298500                       # Number of ticks simulated
 final_tick                                   28298500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 321731                       # Simulator instruction rate (inst/s)
-host_op_rate                                   375194                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             1990329160                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 311896                       # Number of bytes of host memory used
-host_seconds                                     0.01                       # Real time elapsed on the host
+host_inst_rate                                 102105                       # Simulator instruction rate (inst/s)
+host_op_rate                                   119142                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              632323230                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 306200                       # Number of bytes of host memory used
+host_seconds                                     0.04                       # Real time elapsed on the host
 sim_insts                                        4566                       # Number of instructions simulated
 sim_ops                                          5330                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini
index 88581e265..40fc6aec5 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/linux/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]
 
@@ -553,6 +558,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
@@ -569,6 +575,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]
 
@@ -584,12 +591,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
@@ -597,6 +605,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/mips/linux/o3-timing/simout b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/simout
index a187c9ae2..b1bfd8b4f 100755
--- a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/simout
+++ b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/simout
@@ -1,13 +1,15 @@
+Redirecting stdout to build/MIPS/tests/opt/quick/se/00.hello/mips/linux/o3-timing/simout
+Redirecting stderr to build/MIPS/tests/opt/quick/se/00.hello/mips/linux/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:56:24
-gem5 started Apr 22 2015 08:02:17
-gem5 executing on phenom
-command line: build/MIPS/gem5.opt -d build/MIPS/tests/opt/quick/se/00.hello/mips/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/MIPS/tests/opt/quick/se/00.hello/mips/linux/o3-timing
+gem5 compiled Nov 15 2015 14:56:12
+gem5 started Nov 15 2015 14:56:33
+gem5 executing on ribera.cs.wisc.edu, pid 4270
+command line: build/MIPS/gem5.opt -d build/MIPS/tests/opt/quick/se/00.hello/mips/linux/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/MIPS/tests/opt/quick/se/00.hello/mips/linux/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 22762000 because target called exit()
+Exiting @ tick 22454000 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/stats.txt
index 63f392825..8a7487f02 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/mips/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000022                       # Nu
 sim_ticks                                    22454000                       # Number of ticks simulated
 final_tick                                   22454000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  82798                       # Simulator instruction rate (inst/s)
-host_op_rate                                    82780                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              372464129                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 294232                       # Number of bytes of host memory used
-host_seconds                                     0.06                       # Real time elapsed on the host
+host_inst_rate                                  46477                       # Simulator instruction rate (inst/s)
+host_op_rate                                    46469                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              209234861                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 289428                       # Number of bytes of host memory used
+host_seconds                                     0.11                       # Real time elapsed on the host
 sim_insts                                        4986                       # Number of instructions simulated
 sim_ops                                          4986                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini
index 3d063a0b8..29aa70342 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/linux/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/mips/linux/simple-atomic/simerr b/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/simerr
index 1a4f96712..0f553ea6b 100755
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/simerr
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/simerr
@@ -1 +1,2 @@
 warn: Sockets disabled, not accepting gdb connections
+warn: mmap failing: arguments not page-aligned: start 0x0 offset 0x7efefeff
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/simout b/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/simout
index 4635935c5..a8eb4f7df 100755
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/simout
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-atomic/simout
@@ -1,12 +1,15 @@
+Redirecting stdout to build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-atomic/simout
+Redirecting stderr to build/MIPS/tests/opt/quick/se/00.hello/mips/linux/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:53:01
-gem5 started Jan 22 2014 17:28:13
-gem5 executing on u200540-lin
-command line: build/MIPS/gem5.opt -d build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-atomic -re tests/run.py build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-atomic
+gem5 compiled Nov 15 2015 14:56:12
+gem5 started Nov 15 2015 14:56:34
+gem5 executing on ribera.cs.wisc.edu, pid 4273
+command line: build/MIPS/gem5.opt -d build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-atomic -re /scratch/nilay/GEM5/gem5/tests/run.py build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-atomic
+
 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 2907000 because target called exit()
+Exiting @ tick 2812000 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
index ff8cb9e3e..811500470 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/linux/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=
@@ -229,6 +230,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
 
@@ -277,7 +279,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]
@@ -286,7 +287,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]
@@ -295,7 +295,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]
@@ -304,7 +303,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]
@@ -313,7 +311,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]
@@ -322,7 +319,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0]
 type=L1Cache_Controller
@@ -377,7 +373,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]
@@ -386,7 +381,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0.requestFromCache]
 type=MessageBuffer
@@ -394,7 +388,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]
@@ -403,7 +396,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]
@@ -412,7 +404,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]
@@ -454,7 +445,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
@@ -487,7 +477,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers01]
 type=MessageBuffer
@@ -495,7 +484,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers02]
 type=MessageBuffer
@@ -503,7 +491,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers03]
 type=MessageBuffer
@@ -511,7 +498,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers04]
 type=MessageBuffer
@@ -519,7 +505,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers05]
 type=MessageBuffer
@@ -527,7 +512,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers06]
 type=MessageBuffer
@@ -535,7 +519,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers07]
 type=MessageBuffer
@@ -543,7 +526,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers08]
 type=MessageBuffer
@@ -551,7 +533,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers09]
 type=MessageBuffer
@@ -559,7 +540,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers10]
 type=MessageBuffer
@@ -567,7 +547,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers11]
 type=MessageBuffer
@@ -575,7 +554,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers12]
 type=MessageBuffer
@@ -583,7 +561,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers13]
 type=MessageBuffer
@@ -591,7 +568,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers14]
 type=MessageBuffer
@@ -599,7 +575,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers15]
 type=MessageBuffer
@@ -607,7 +582,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers16]
 type=MessageBuffer
@@ -615,7 +589,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers17]
 type=MessageBuffer
@@ -623,7 +596,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers18]
 type=MessageBuffer
@@ -631,7 +603,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers19]
 type=MessageBuffer
@@ -639,7 +610,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_links0]
 type=SimpleIntLink
@@ -667,7 +637,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
 
@@ -677,7 +646,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers01]
 type=MessageBuffer
@@ -685,7 +653,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers02]
 type=MessageBuffer
@@ -693,7 +660,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers03]
 type=MessageBuffer
@@ -701,7 +667,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers04]
 type=MessageBuffer
@@ -709,7 +674,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers05]
 type=MessageBuffer
@@ -717,7 +681,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers06]
 type=MessageBuffer
@@ -725,7 +688,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers07]
 type=MessageBuffer
@@ -733,7 +695,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers08]
 type=MessageBuffer
@@ -741,7 +702,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers09]
 type=MessageBuffer
@@ -749,7 +709,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers10]
 type=MessageBuffer
@@ -757,7 +716,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers11]
 type=MessageBuffer
@@ -765,7 +723,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers12]
 type=MessageBuffer
@@ -773,7 +730,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers13]
 type=MessageBuffer
@@ -781,7 +737,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers14]
 type=MessageBuffer
@@ -789,7 +744,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1]
 type=Switch
@@ -797,7 +751,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
 
@@ -807,7 +760,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers01]
 type=MessageBuffer
@@ -815,7 +767,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers02]
 type=MessageBuffer
@@ -823,7 +774,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers03]
 type=MessageBuffer
@@ -831,7 +781,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers04]
 type=MessageBuffer
@@ -839,7 +788,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers05]
 type=MessageBuffer
@@ -847,7 +795,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers06]
 type=MessageBuffer
@@ -855,7 +802,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers07]
 type=MessageBuffer
@@ -863,7 +809,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers08]
 type=MessageBuffer
@@ -871,7 +816,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers09]
 type=MessageBuffer
@@ -879,7 +823,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers10]
 type=MessageBuffer
@@ -887,7 +830,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers11]
 type=MessageBuffer
@@ -895,7 +837,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers12]
 type=MessageBuffer
@@ -903,7 +844,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers13]
 type=MessageBuffer
@@ -911,7 +851,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers14]
 type=MessageBuffer
@@ -919,7 +858,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2]
 type=Switch
@@ -927,7 +865,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
 
@@ -937,7 +874,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers01]
 type=MessageBuffer
@@ -945,7 +881,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers02]
 type=MessageBuffer
@@ -953,7 +888,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers03]
 type=MessageBuffer
@@ -961,7 +895,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers04]
 type=MessageBuffer
@@ -969,7 +902,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers05]
 type=MessageBuffer
@@ -977,7 +909,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers06]
 type=MessageBuffer
@@ -985,7 +916,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers07]
 type=MessageBuffer
@@ -993,7 +923,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers08]
 type=MessageBuffer
@@ -1001,7 +930,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers09]
 type=MessageBuffer
@@ -1009,7 +937,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers10]
 type=MessageBuffer
@@ -1017,7 +944,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers11]
 type=MessageBuffer
@@ -1025,7 +951,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers12]
 type=MessageBuffer
@@ -1033,7 +958,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers13]
 type=MessageBuffer
@@ -1041,7 +965,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers14]
 type=MessageBuffer
@@ -1049,7 +972,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers15]
 type=MessageBuffer
@@ -1057,7 +979,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers16]
 type=MessageBuffer
@@ -1065,7 +986,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers17]
 type=MessageBuffer
@@ -1073,7 +993,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers18]
 type=MessageBuffer
@@ -1081,7 +1000,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers19]
 type=MessageBuffer
@@ -1089,7 +1007,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/mips/linux/simple-timing-ruby/simerr b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simerr
index 3c36a8620..f56064f64 100755
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simerr
+++ b/tests/quick/se/00.hello/ref/mips/linux/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: mmap failing: arguments not page-aligned: start 0x0 offset 0x7efefeff
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout
index 669ad83ca..1b3bb65c4 100755
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-timing-ruby/simout
+Redirecting stderr to build/MIPS/tests/opt/quick/se/00.hello/mips/linux/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:34:57
-gem5 started Aug 13 2015 20:18:18
-gem5 executing on artery
-command line: build/MIPS/gem5.opt -d build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-timing-ruby -re /home/joel/research/gem5/gem5/tests/run.py build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-timing-ruby
+gem5 compiled Nov 15 2015 14:56:12
+gem5 started Nov 15 2015 14:56:33
+gem5 executing on ribera.cs.wisc.edu, pid 4271
+command line: build/MIPS/gem5.opt -d build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-timing-ruby -re /scratch/nilay/GEM5/gem5/tests/run.py build/MIPS/tests/opt/quick/se/00.hello/mips/linux/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/mips/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
index b4f5d898c..113091789 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
@@ -4,10 +4,10 @@ sim_seconds                                  0.000100                       # Nu
 sim_ticks                                      100307                       # Number of ticks simulated
 final_tick                                     100307                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  40999                       # Simulator instruction rate (inst/s)
-host_op_rate                                    40995                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 731101                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 399732                       # Number of bytes of host memory used
+host_inst_rate                                  40822                       # Simulator instruction rate (inst/s)
+host_op_rate                                    40816                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 727880                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 445332                       # Number of bytes of host memory used
 host_seconds                                     0.14                       # Real time elapsed on the host
 sim_insts                                        5624                       # Number of instructions simulated
 sim_ops                                          5624                       # Number of ops (including micro ops) simulated
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini
index 35443aac7..1901ec21e 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/linux/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]
 
@@ -174,6 +179,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
@@ -190,6 +196,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]
 
@@ -205,12 +212,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
@@ -218,6 +226,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/mips/linux/simple-timing/simerr b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/simerr
index 1a4f96712..0f553ea6b 100755
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/simerr
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/simerr
@@ -1 +1,2 @@
 warn: Sockets disabled, not accepting gdb connections
+warn: mmap failing: arguments not page-aligned: start 0x0 offset 0x7efefeff
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/simout b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/simout
index fe019aadb..d1e26f1bb 100755
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/simout
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/simout
@@ -1,12 +1,15 @@
+Redirecting stdout to build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-timing/simout
+Redirecting stderr to build/MIPS/tests/opt/quick/se/00.hello/mips/linux/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:53:01
-gem5 started Jan 22 2014 17:28:24
-gem5 executing on u200540-lin
-command line: build/MIPS/gem5.opt -d build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-timing -re tests/run.py build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-timing
+gem5 compiled Nov 15 2015 14:56:12
+gem5 started Nov 15 2015 14:56:35
+gem5 executing on ribera.cs.wisc.edu, pid 4274
+command line: build/MIPS/gem5.opt -d build/MIPS/tests/opt/quick/se/00.hello/mips/linux/simple-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/MIPS/tests/opt/quick/se/00.hello/mips/linux/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 31633000 because target called exit()
+Exiting @ tick 33912500 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/stats.txt b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/stats.txt
index d2f7b8e7a..b9fdba6a9 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000034                       # Nu
 sim_ticks                                    33912500                       # Number of ticks simulated
 final_tick                                   33912500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 492168                       # Simulator instruction rate (inst/s)
-host_op_rate                                   491565                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             2961014581                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 292188                       # Number of bytes of host memory used
-host_seconds                                     0.01                       # Real time elapsed on the host
+host_inst_rate                                 143778                       # Simulator instruction rate (inst/s)
+host_op_rate                                   143707                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              866170043                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 287376                       # Number of bytes of host memory used
+host_seconds                                     0.04                       # Real time elapsed on the host
 sim_insts                                        5624                       # Number of instructions simulated
 sim_ops                                          5624                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini
index d2c5f6d51..e92824841 100644
--- a/tests/quick/se/00.hello/ref/power/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/power/linux/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=
@@ -156,6 +157,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
@@ -172,6 +174,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]
 
@@ -503,6 +506,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
@@ -519,6 +523,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/power/linux/o3-timing/simout b/tests/quick/se/00.hello/ref/power/linux/o3-timing/simout
index decea3ffc..a61f46bc9 100755
--- a/tests/quick/se/00.hello/ref/power/linux/o3-timing/simout
+++ b/tests/quick/se/00.hello/ref/power/linux/o3-timing/simout
@@ -1,12 +1,14 @@
+Redirecting stdout to build/POWER/tests/opt/quick/se/00.hello/power/linux/o3-timing/simout
+Redirecting stderr to build/POWER/tests/opt/quick/se/00.hello/power/linux/o3-timing/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Apr 22 2015 08:07:28
-gem5 started Apr 22 2015 08:13:52
-gem5 executing on phenom
-command line: build/POWER/gem5.opt -d build/POWER/tests/opt/quick/se/00.hello/power/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/POWER/tests/opt/quick/se/00.hello/power/linux/o3-timing
+gem5 compiled Nov 15 2015 15:02:54
+gem5 started Nov 15 2015 15:03:14
+gem5 executing on ribera.cs.wisc.edu, pid 6374
+command line: build/POWER/gem5.opt -d build/POWER/tests/opt/quick/se/00.hello/power/linux/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/POWER/tests/opt/quick/se/00.hello/power/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
-Exiting @ tick 20101000 because target called exit()
+Exiting @ tick 19923000 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/power/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/power/linux/o3-timing/stats.txt
index 6fd010b82..725b64c93 100644
--- a/tests/quick/se/00.hello/ref/power/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/power/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000020                       # Nu
 sim_ticks                                    19923000                       # Number of ticks simulated
 final_tick                                   19923000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 101947                       # Simulator instruction rate (inst/s)
-host_op_rate                                   101922                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              350504038                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 292056                       # Number of bytes of host memory used
-host_seconds                                     0.06                       # Real time elapsed on the host
+host_inst_rate                                  49730                       # Simulator instruction rate (inst/s)
+host_op_rate                                    49722                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              171002739                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 287488                       # Number of bytes of host memory used
+host_seconds                                     0.12                       # Real time elapsed on the host
 sim_insts                                        5792                       # Number of instructions simulated
 sim_ops                                          5792                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini
index 3bfe108d2..3eda1abea 100644
--- a/tests/quick/se/00.hello/ref/power/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/power/linux/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/power/linux/simple-atomic/simout b/tests/quick/se/00.hello/ref/power/linux/simple-atomic/simout
index b419f1ee5..a6b463616 100755
--- a/tests/quick/se/00.hello/ref/power/linux/simple-atomic/simout
+++ b/tests/quick/se/00.hello/ref/power/linux/simple-atomic/simout
@@ -1,10 +1,13 @@
+Redirecting stdout to build/POWER/tests/opt/quick/se/00.hello/power/linux/simple-atomic/simout
+Redirecting stderr to build/POWER/tests/opt/quick/se/00.hello/power/linux/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:58:44
-gem5 started Jan 22 2014 17:29:13
-gem5 executing on u200540-lin
-command line: build/POWER/gem5.opt -d build/POWER/tests/opt/quick/se/00.hello/power/linux/simple-atomic -re tests/run.py build/POWER/tests/opt/quick/se/00.hello/power/linux/simple-atomic
+gem5 compiled Nov 15 2015 15:02:54
+gem5 started Nov 15 2015 15:03:14
+gem5 executing on ribera.cs.wisc.edu, pid 6373
+command line: build/POWER/gem5.opt -d build/POWER/tests/opt/quick/se/00.hello/power/linux/simple-atomic -re /scratch/nilay/GEM5/gem5/tests/run.py build/POWER/tests/opt/quick/se/00.hello/power/linux/simple-atomic
+
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini
index 4603bc218..b0ab8d7d5 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/sparc/linux/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/sparc/linux/simple-atomic/simout b/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/simout
index f0a77f8fa..64241bf2e 100755
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/simout
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-atomic/simout
@@ -3,10 +3,11 @@ Redirecting stderr to build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 15 2014 16:11:41
-gem5 started Feb 15 2014 16:12:32
-gem5 executing on ribera.cs.wisc.edu
-command line: build/SPARC/gem5.opt -d build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-atomic -re tests/run.py build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-atomic
+gem5 compiled Nov 15 2015 15:07:43
+gem5 started Nov 15 2015 15:08:09
+gem5 executing on ribera.cs.wisc.edu, pid 7745
+command line: build/SPARC/gem5.opt -d build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-atomic -re /scratch/nilay/GEM5/gem5/tests/run.py build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-atomic
+
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 Hello World!Exiting @ tick 2694500 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
index d45cde2de..cde660e5e 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/sparc/linux/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=
@@ -226,6 +227,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
 
@@ -274,7 +276,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]
@@ -283,7 +284,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]
@@ -292,7 +292,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]
@@ -301,7 +300,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]
@@ -310,7 +308,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]
@@ -319,7 +316,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0]
 type=L1Cache_Controller
@@ -374,7 +370,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]
@@ -383,7 +378,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0.requestFromCache]
 type=MessageBuffer
@@ -391,7 +385,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]
@@ -400,7 +393,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]
@@ -409,7 +401,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]
@@ -451,7 +442,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
@@ -484,7 +474,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers01]
 type=MessageBuffer
@@ -492,7 +481,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers02]
 type=MessageBuffer
@@ -500,7 +488,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers03]
 type=MessageBuffer
@@ -508,7 +495,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers04]
 type=MessageBuffer
@@ -516,7 +502,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers05]
 type=MessageBuffer
@@ -524,7 +509,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers06]
 type=MessageBuffer
@@ -532,7 +516,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers07]
 type=MessageBuffer
@@ -540,7 +523,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers08]
 type=MessageBuffer
@@ -548,7 +530,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers09]
 type=MessageBuffer
@@ -556,7 +537,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers10]
 type=MessageBuffer
@@ -564,7 +544,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers11]
 type=MessageBuffer
@@ -572,7 +551,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers12]
 type=MessageBuffer
@@ -580,7 +558,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers13]
 type=MessageBuffer
@@ -588,7 +565,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers14]
 type=MessageBuffer
@@ -596,7 +572,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers15]
 type=MessageBuffer
@@ -604,7 +579,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers16]
 type=MessageBuffer
@@ -612,7 +586,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers17]
 type=MessageBuffer
@@ -620,7 +593,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers18]
 type=MessageBuffer
@@ -628,7 +600,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers19]
 type=MessageBuffer
@@ -636,7 +607,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_links0]
 type=SimpleIntLink
@@ -664,7 +634,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
 
@@ -674,7 +643,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers01]
 type=MessageBuffer
@@ -682,7 +650,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers02]
 type=MessageBuffer
@@ -690,7 +657,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers03]
 type=MessageBuffer
@@ -698,7 +664,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers04]
 type=MessageBuffer
@@ -706,7 +671,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers05]
 type=MessageBuffer
@@ -714,7 +678,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers06]
 type=MessageBuffer
@@ -722,7 +685,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers07]
 type=MessageBuffer
@@ -730,7 +692,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers08]
 type=MessageBuffer
@@ -738,7 +699,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers09]
 type=MessageBuffer
@@ -746,7 +706,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers10]
 type=MessageBuffer
@@ -754,7 +713,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers11]
 type=MessageBuffer
@@ -762,7 +720,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers12]
 type=MessageBuffer
@@ -770,7 +727,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers13]
 type=MessageBuffer
@@ -778,7 +734,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers14]
 type=MessageBuffer
@@ -786,7 +741,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1]
 type=Switch
@@ -794,7 +748,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
 
@@ -804,7 +757,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers01]
 type=MessageBuffer
@@ -812,7 +764,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers02]
 type=MessageBuffer
@@ -820,7 +771,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers03]
 type=MessageBuffer
@@ -828,7 +778,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers04]
 type=MessageBuffer
@@ -836,7 +785,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers05]
 type=MessageBuffer
@@ -844,7 +792,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers06]
 type=MessageBuffer
@@ -852,7 +799,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers07]
 type=MessageBuffer
@@ -860,7 +806,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers08]
 type=MessageBuffer
@@ -868,7 +813,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers09]
 type=MessageBuffer
@@ -876,7 +820,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers10]
 type=MessageBuffer
@@ -884,7 +827,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers11]
 type=MessageBuffer
@@ -892,7 +834,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers12]
 type=MessageBuffer
@@ -900,7 +841,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers13]
 type=MessageBuffer
@@ -908,7 +848,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers14]
 type=MessageBuffer
@@ -916,7 +855,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2]
 type=Switch
@@ -924,7 +862,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
 
@@ -934,7 +871,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers01]
 type=MessageBuffer
@@ -942,7 +878,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers02]
 type=MessageBuffer
@@ -950,7 +885,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers03]
 type=MessageBuffer
@@ -958,7 +892,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers04]
 type=MessageBuffer
@@ -966,7 +899,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers05]
 type=MessageBuffer
@@ -974,7 +906,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers06]
 type=MessageBuffer
@@ -982,7 +913,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers07]
 type=MessageBuffer
@@ -990,7 +920,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers08]
 type=MessageBuffer
@@ -998,7 +927,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers09]
 type=MessageBuffer
@@ -1006,7 +934,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers10]
 type=MessageBuffer
@@ -1014,7 +941,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers11]
 type=MessageBuffer
@@ -1022,7 +948,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers12]
 type=MessageBuffer
@@ -1030,7 +955,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers13]
 type=MessageBuffer
@@ -1038,7 +962,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers14]
 type=MessageBuffer
@@ -1046,7 +969,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers15]
 type=MessageBuffer
@@ -1054,7 +976,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers16]
 type=MessageBuffer
@@ -1062,7 +983,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers17]
 type=MessageBuffer
@@ -1070,7 +990,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers18]
 type=MessageBuffer
@@ -1078,7 +997,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers19]
 type=MessageBuffer
@@ -1086,7 +1004,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/sparc/linux/simple-timing-ruby/simerr b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simerr
index 21ea544b2..22fffb44f 100755
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simerr
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simerr
@@ -6,3 +6,4 @@ warn: rounding error > tolerance
     1.250000 rounded to 1
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
 warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout
index 97cc36b41..fb8070fa2 100755
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing-ruby/simout
+Redirecting stderr to build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/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:50:15
-gem5 started Aug 13 2015 20:18:47
-gem5 executing on artery
-command line: build/SPARC/gem5.opt -d build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing-ruby -re /home/joel/research/gem5/gem5/tests/run.py build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing-ruby
+gem5 compiled Nov 15 2015 15:07:43
+gem5 started Nov 15 2015 15:08:11
+gem5 executing on ribera.cs.wisc.edu, pid 7749
+command line: build/SPARC/gem5.opt -d build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing-ruby -re /scratch/nilay/GEM5/gem5/tests/run.py build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/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/sparc/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
index f82677c51..ba5787926 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000082                       # Nu
 sim_ticks                                       81703                       # Number of ticks simulated
 final_tick                                      81703                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  27632                       # Simulator instruction rate (inst/s)
-host_op_rate                                    27631                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 423765                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 400152                       # Number of bytes of host memory used
-host_seconds                                     0.19                       # Real time elapsed on the host
+host_inst_rate                                  20108                       # Simulator instruction rate (inst/s)
+host_op_rate                                    20107                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 308374                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 445712                       # Number of bytes of host memory used
+host_seconds                                     0.27                       # Real time elapsed on the host
 sim_insts                                        5327                       # Number of instructions simulated
 sim_ops                                          5327                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini
index 3c63b5e9a..434b787b2 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/sparc/linux/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]
 
@@ -171,6 +176,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
@@ -187,6 +193,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]
 
@@ -202,12 +209,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
@@ -215,6 +223,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/sparc/linux/simple-timing/simout b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/simout
index 844fde87f..100cdc6d6 100755
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/simout
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/simout
@@ -3,10 +3,11 @@ Redirecting stderr to build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 15 2014 16:11:41
-gem5 started Feb 15 2014 16:11:56
-gem5 executing on ribera.cs.wisc.edu
-command line: build/SPARC/gem5.opt -d build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing -re tests/run.py build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing
+gem5 compiled Nov 15 2015 15:07:43
+gem5 started Nov 15 2015 15:08:47
+gem5 executing on ribera.cs.wisc.edu, pid 7821
+command line: build/SPARC/gem5.opt -d build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing
+
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
-Hello World!Exiting @ tick 27800000 because target called exit()
+Hello World!Exiting @ tick 30526500 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/stats.txt b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/stats.txt
index 22edb2de4..3e9a46a38 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000031                       # Nu
 sim_ticks                                    30526500                       # Number of ticks simulated
 final_tick                                   30526500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 511867                       # Simulator instruction rate (inst/s)
-host_op_rate                                   511179                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             2925956101                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 292840                       # Number of bytes of host memory used
-host_seconds                                     0.01                       # Real time elapsed on the host
+host_inst_rate                                 113634                       # Simulator instruction rate (inst/s)
+host_op_rate                                   113590                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              650686714                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 287764                       # Number of bytes of host memory used
+host_seconds                                     0.05                       # Real time elapsed on the host
 sim_insts                                        5327                       # Number of instructions simulated
 sim_ops                                          5327                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini
index 98c8dbffa..7f9baef70 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/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=
@@ -161,6 +162,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
@@ -177,6 +179,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]
 
@@ -518,6 +521,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
@@ -534,6 +538,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]
 
@@ -584,6 +589,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
@@ -600,6 +606,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]
 
@@ -615,12 +622,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
@@ -628,6 +636,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[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/x86/linux/o3-timing/simout b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout
index 4d21570e3..9966ec55f 100755
--- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout
+++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/simout
@@ -1,12 +1,14 @@
+Redirecting stdout to build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing/simout
+Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Apr 22 2015 08:10:29
-gem5 started Apr 22 2015 09:21:48
-gem5 executing on phenom
-command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing
+gem5 compiled Nov 15 2015 15:16:56
+gem5 started Nov 15 2015 15:17:38
+gem5 executing on ribera.cs.wisc.edu, pid 9899
+command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
-Exiting @ tick 21143500 because target called exit()
+Exiting @ tick 20818000 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt
index afb527d16..b913f5d1c 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000021                       # Nu
 sim_ticks                                    20818000                       # Number of ticks simulated
 final_tick                                   20818000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  50154                       # Simulator instruction rate (inst/s)
-host_op_rate                                    90851                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              194020392                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 314048                       # Number of bytes of host memory used
-host_seconds                                     0.11                       # Real time elapsed on the host
+host_inst_rate                                  30520                       # Simulator instruction rate (inst/s)
+host_op_rate                                    55287                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              118073605                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 307952                       # Number of bytes of host memory used
+host_seconds                                     0.18                       # Real time elapsed on the host
 sim_insts                                        5380                       # Number of instructions simulated
 sim_ops                                          9747                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini
index 938ee4ed9..a53809e58 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/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/x86/linux/simple-atomic/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout
index 6330d042a..32e53cc0f 100755
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/simout
@@ -1,10 +1,13 @@
+Redirecting stdout to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic/simout
+Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan 22 2014 17:10:34
-gem5 started Jan 22 2014 17:30:08
-gem5 executing on u200540-lin
-command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic -re tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic
+gem5 compiled Nov 15 2015 15:16:56
+gem5 started Nov 15 2015 15:17:25
+gem5 executing on ribera.cs.wisc.edu, pid 9884
+command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic -re /scratch/nilay/GEM5/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-atomic
+
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt
index decb816ca..532569e1f 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000006                       # Nu
 sim_ticks                                     5615000                       # Number of ticks simulated
 final_tick                                    5615000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  96804                       # Simulator instruction rate (inst/s)
-host_op_rate                                   175298                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              100934348                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 242164                       # Number of bytes of host memory used
-host_seconds                                     0.06                       # Real time elapsed on the host
+host_inst_rate                                  64313                       # Simulator instruction rate (inst/s)
+host_op_rate                                   116481                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               67080627                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 295912                       # Number of bytes of host memory used
+host_seconds                                     0.08                       # Real time elapsed on the host
 sim_insts                                        5381                       # Number of instructions simulated
 sim_ops                                          9748                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
index 56411f6d5..98eb89639 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/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=
@@ -260,6 +261,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
 
@@ -308,7 +310,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]
@@ -317,7 +318,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]
@@ -326,7 +326,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]
@@ -335,7 +334,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]
@@ -344,7 +342,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]
@@ -353,7 +350,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0]
 type=L1Cache_Controller
@@ -408,7 +404,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]
@@ -417,7 +412,6 @@ buffer_size=0
 eventq_index=0
 ordered=false
 randomization=false
-recycle_latency=10
 
 [system.ruby.l1_cntrl0.requestFromCache]
 type=MessageBuffer
@@ -425,7 +419,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]
@@ -434,7 +427,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]
@@ -443,7 +435,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]
@@ -486,7 +477,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
@@ -519,7 +509,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers01]
 type=MessageBuffer
@@ -527,7 +516,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers02]
 type=MessageBuffer
@@ -535,7 +523,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers03]
 type=MessageBuffer
@@ -543,7 +530,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers04]
 type=MessageBuffer
@@ -551,7 +537,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers05]
 type=MessageBuffer
@@ -559,7 +544,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers06]
 type=MessageBuffer
@@ -567,7 +551,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers07]
 type=MessageBuffer
@@ -575,7 +558,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers08]
 type=MessageBuffer
@@ -583,7 +565,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers09]
 type=MessageBuffer
@@ -591,7 +572,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers10]
 type=MessageBuffer
@@ -599,7 +579,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers11]
 type=MessageBuffer
@@ -607,7 +586,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers12]
 type=MessageBuffer
@@ -615,7 +593,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers13]
 type=MessageBuffer
@@ -623,7 +600,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers14]
 type=MessageBuffer
@@ -631,7 +607,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers15]
 type=MessageBuffer
@@ -639,7 +614,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers16]
 type=MessageBuffer
@@ -647,7 +621,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers17]
 type=MessageBuffer
@@ -655,7 +628,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers18]
 type=MessageBuffer
@@ -663,7 +635,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_link_buffers19]
 type=MessageBuffer
@@ -671,7 +642,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.int_links0]
 type=SimpleIntLink
@@ -699,7 +669,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
 
@@ -709,7 +678,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers01]
 type=MessageBuffer
@@ -717,7 +685,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers02]
 type=MessageBuffer
@@ -725,7 +692,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers03]
 type=MessageBuffer
@@ -733,7 +699,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers04]
 type=MessageBuffer
@@ -741,7 +706,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers05]
 type=MessageBuffer
@@ -749,7 +713,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers06]
 type=MessageBuffer
@@ -757,7 +720,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers07]
 type=MessageBuffer
@@ -765,7 +727,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers08]
 type=MessageBuffer
@@ -773,7 +734,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers09]
 type=MessageBuffer
@@ -781,7 +741,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers10]
 type=MessageBuffer
@@ -789,7 +748,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers11]
 type=MessageBuffer
@@ -797,7 +755,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers12]
 type=MessageBuffer
@@ -805,7 +762,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers13]
 type=MessageBuffer
@@ -813,7 +769,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers0.port_buffers14]
 type=MessageBuffer
@@ -821,7 +776,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1]
 type=Switch
@@ -829,7 +783,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
 
@@ -839,7 +792,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers01]
 type=MessageBuffer
@@ -847,7 +799,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers02]
 type=MessageBuffer
@@ -855,7 +806,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers03]
 type=MessageBuffer
@@ -863,7 +813,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers04]
 type=MessageBuffer
@@ -871,7 +820,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers05]
 type=MessageBuffer
@@ -879,7 +827,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers06]
 type=MessageBuffer
@@ -887,7 +834,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers07]
 type=MessageBuffer
@@ -895,7 +841,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers08]
 type=MessageBuffer
@@ -903,7 +848,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers09]
 type=MessageBuffer
@@ -911,7 +855,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers10]
 type=MessageBuffer
@@ -919,7 +862,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers11]
 type=MessageBuffer
@@ -927,7 +869,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers12]
 type=MessageBuffer
@@ -935,7 +876,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers13]
 type=MessageBuffer
@@ -943,7 +883,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers1.port_buffers14]
 type=MessageBuffer
@@ -951,7 +890,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2]
 type=Switch
@@ -959,7 +897,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
 
@@ -969,7 +906,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers01]
 type=MessageBuffer
@@ -977,7 +913,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers02]
 type=MessageBuffer
@@ -985,7 +920,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers03]
 type=MessageBuffer
@@ -993,7 +927,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers04]
 type=MessageBuffer
@@ -1001,7 +934,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers05]
 type=MessageBuffer
@@ -1009,7 +941,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers06]
 type=MessageBuffer
@@ -1017,7 +948,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers07]
 type=MessageBuffer
@@ -1025,7 +955,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers08]
 type=MessageBuffer
@@ -1033,7 +962,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers09]
 type=MessageBuffer
@@ -1041,7 +969,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers10]
 type=MessageBuffer
@@ -1049,7 +976,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers11]
 type=MessageBuffer
@@ -1057,7 +983,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers12]
 type=MessageBuffer
@@ -1065,7 +990,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers13]
 type=MessageBuffer
@@ -1073,7 +997,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers14]
 type=MessageBuffer
@@ -1081,7 +1004,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers15]
 type=MessageBuffer
@@ -1089,7 +1011,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers16]
 type=MessageBuffer
@@ -1097,7 +1018,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers17]
 type=MessageBuffer
@@ -1105,7 +1025,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers18]
 type=MessageBuffer
@@ -1113,7 +1032,6 @@ buffer_size=0
 eventq_index=0
 ordered=true
 randomization=false
-recycle_latency=0
 
 [system.ruby.network.routers2.port_buffers19]
 type=MessageBuffer
@@ -1121,7 +1039,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/x86/linux/simple-timing-ruby/simerr b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simerr
index 21ea544b2..22fffb44f 100755
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simerr
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simerr
@@ -6,3 +6,4 @@ warn: rounding error > tolerance
     1.250000 rounded to 1
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
 warn: Sockets disabled, not accepting gdb connections
+warn: Replacement policy updates recently became the responsibility of SLICC state machines. Make sure to setMRU() near callbacks in .sm files!
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
index ac116669b..8de8535c6 100755
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
@@ -1,10 +1,12 @@
+Redirecting stdout to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby/simout
+Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/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:59:06
-gem5 started Aug 13 2015 20:18:58
-gem5 executing on artery
-command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby -re /home/joel/research/gem5/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby
+gem5 compiled Nov 15 2015 15:16:56
+gem5 started Nov 15 2015 15:17:48
+gem5 executing on ribera.cs.wisc.edu, pid 9909
+command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing-ruby -re /scratch/nilay/GEM5/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/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/x86/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
index 10e4434eb..bd1187e03 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000088                       # Nu
 sim_ticks                                       87948                       # Number of ticks simulated
 final_tick                                      87948                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  39587                       # Simulator instruction rate (inst/s)
-host_op_rate                                    71707                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 646904                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 417864                       # Number of bytes of host memory used
-host_seconds                                     0.14                       # Real time elapsed on the host
+host_inst_rate                                  42645                       # Simulator instruction rate (inst/s)
+host_op_rate                                    77244                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 696812                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 463856                       # Number of bytes of host memory used
+host_seconds                                     0.13                       # Real time elapsed on the host
 sim_insts                                        5381                       # Number of instructions simulated
 sim_ops                                          9748                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini
index 940daad92..986daff98 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/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=
@@ -89,6 +90,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
@@ -105,6 +107,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]
 
@@ -139,6 +142,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
@@ -155,6 +159,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]
 
@@ -205,6 +210,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
@@ -221,6 +227,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]
 
@@ -236,12 +243,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
@@ -249,6 +257,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[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/x86/linux/simple-timing/simout b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout
index ac02fa74d..b1c38e57d 100755
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/simout
@@ -3,11 +3,12 @@ Redirecting stderr to build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-tim
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 15 2014 16:30:59
-gem5 started Feb 15 2014 16:31:13
-gem5 executing on ribera.cs.wisc.edu
-command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing -re tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing
+gem5 compiled Nov 15 2015 15:16:56
+gem5 started Nov 15 2015 15:17:36
+gem5 executing on ribera.cs.wisc.edu, pid 9893
+command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/X86/tests/opt/quick/se/00.hello/x86/linux/simple-timing
+
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 Hello world!
-Exiting @ tick 28358000 because target called exit()
+Exiting @ tick 30886500 because target called exit()
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt
index c28a44ceb..552701faf 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000031                       # Nu
 sim_ticks                                    30886500                       # Number of ticks simulated
 final_tick                                   30886500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 150745                       # Simulator instruction rate (inst/s)
-host_op_rate                                   272977                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              864611035                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 310988                       # Number of bytes of host memory used
-host_seconds                                     0.04                       # Real time elapsed on the host
+host_inst_rate                                  96344                       # Simulator instruction rate (inst/s)
+host_op_rate                                   174473                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              552644692                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 305908                       # Number of bytes of host memory used
+host_seconds                                     0.06                       # Real time elapsed on the host
 sim_insts                                        5381                       # Number of instructions simulated
 sim_ops                                          9748                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
-- 
cgit v1.2.3