stats: updates due to recent chagnesets

9 files changed, 47 insertions, 109 deletions

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