stats: update references

8 files changed, 470 insertions, 162 deletions

diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
index 8d136d962..a2f7231b1 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/config.ini
@@ -14,6 +14,7 @@ children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 exit_on_work_items=false
 init_param=0
@@ -27,6 +28,10 @@ memories=system.physmem
 mmap_using_noreserve=false
 multi_thread=false
 num_work_ids=16
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 readfile=
 symbolfile=
 thermal_components=
@@ -52,12 +57,17 @@ voltage_domain=system.voltage_domain
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -72,12 +82,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -96,8 +111,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -105,12 +125,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -125,12 +150,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -149,8 +179,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -158,12 +193,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -178,12 +218,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -202,8 +247,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -211,12 +261,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -231,12 +286,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -255,8 +315,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -264,12 +329,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -284,12 +354,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -308,8 +383,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -317,12 +397,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -337,12 +422,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -361,8 +451,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -370,12 +465,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -390,12 +490,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -414,8 +519,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -423,12 +533,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -443,12 +558,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -467,8 +587,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -495,12 +620,17 @@ addr_ranges=0:18446744073709551615
 assoc=8
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=20
 is_read_only=false
 max_miss_count=0
 mshrs=20
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=20
@@ -519,8 +649,13 @@ type=LRU
 assoc=8
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=20
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=65536
 
@@ -528,10 +663,15 @@ size=65536
 type=CoherentXBar
 children=snoop_filter
 clk_domain=system.clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 point_of_coherency=true
+power_model=Null
 response_latency=2
 snoop_filter=system.membus.snoop_filter
 snoop_response_latency=4
@@ -553,11 +693,16 @@ type=SimpleMemory
 bandwidth=73.000000
 clk_domain=system.clk_domain
 conf_table_reported=true
+default_p_state=UNDEFINED
 eventq_index=0
 in_addr_map=true
 latency=30000
 latency_var=0
 null=false
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 range=0:134217727
 port=system.membus.master[0]
 
@@ -565,10 +710,15 @@ port=system.membus.master[0]
 type=CoherentXBar
 children=snoop_filter
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 point_of_coherency=false
+power_model=Null
 response_latency=1
 snoop_filter=system.toL2Bus.snoop_filter
 snoop_response_latency=1
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simerr b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simerr
index 4771f3483..01d1cac03 100755
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simerr
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simerr
@@ -1,73 +1,73 @@
-system.cpu5: completed 10000 read, 5633 write accesses @60486000
-system.cpu4: completed 10000 read, 5582 write accesses @61180000
-system.cpu6: completed 10000 read, 5560 write accesses @61307500
-system.cpu7: completed 10000 read, 5599 write accesses @61402000
-system.cpu2: completed 10000 read, 5643 write accesses @61472000
-system.cpu1: completed 10000 read, 5506 write accesses @61551000
-system.cpu3: completed 10000 read, 5658 write accesses @61700000
-system.cpu0: completed 10000 read, 5706 write accesses @62631500
-system.cpu5: completed 20000 read, 11103 write accesses @113616000
-system.cpu6: completed 20000 read, 10976 write accesses @113920500
-system.cpu2: completed 20000 read, 11039 write accesses @113933500
-system.cpu3: completed 20000 read, 11207 write accesses @114624500
-system.cpu4: completed 20000 read, 11084 write accesses @114955000
-system.cpu0: completed 20000 read, 11085 write accesses @115057000
-system.cpu7: completed 20000 read, 11095 write accesses @115187000
-system.cpu1: completed 20000 read, 11193 write accesses @116687500
-system.cpu5: completed 30000 read, 16705 write accesses @166840500
-system.cpu2: completed 30000 read, 16691 write accesses @167354000
-system.cpu6: completed 30000 read, 16468 write accesses @167416000
-system.cpu4: completed 30000 read, 16533 write accesses @168175000
-system.cpu3: completed 30000 read, 16715 write accesses @168594500
-system.cpu7: completed 30000 read, 16620 write accesses @168682000
-system.cpu0: completed 30000 read, 16560 write accesses @168778500
-system.cpu1: completed 30000 read, 16873 write accesses @170313500
-system.cpu2: completed 40000 read, 22285 write accesses @220155500
-system.cpu3: completed 40000 read, 22038 write accesses @220636000
-system.cpu5: completed 40000 read, 22211 write accesses @221161500
-system.cpu6: completed 40000 read, 22097 write accesses @221217500
-system.cpu7: completed 40000 read, 22095 write accesses @221239000
-system.cpu0: completed 40000 read, 22196 write accesses @221351000
-system.cpu4: completed 40000 read, 21983 write accesses @222184000
-system.cpu1: completed 40000 read, 22367 write accesses @223407000
-system.cpu2: completed 50000 read, 27562 write accesses @273475000
-system.cpu6: completed 50000 read, 27553 write accesses @273666500
-system.cpu0: completed 50000 read, 27658 write accesses @274179000
-system.cpu4: completed 50000 read, 27584 write accesses @274332000
-system.cpu3: completed 50000 read, 27495 write accesses @274461500
-system.cpu7: completed 50000 read, 27568 write accesses @274681000
-system.cpu5: completed 50000 read, 27850 write accesses @275614000
-system.cpu1: completed 50000 read, 28070 write accesses @277107000
-system.cpu2: completed 60000 read, 33123 write accesses @327185500
-system.cpu6: completed 60000 read, 33149 write accesses @327223000
-system.cpu3: completed 60000 read, 32991 write accesses @327854000
-system.cpu7: completed 60000 read, 32997 write accesses @328407000
-system.cpu0: completed 60000 read, 33282 write accesses @328452500
-system.cpu4: completed 60000 read, 33164 write accesses @329017000
-system.cpu5: completed 60000 read, 33383 write accesses @329401500
-system.cpu1: completed 60000 read, 33681 write accesses @330675000
-system.cpu2: completed 70000 read, 38702 write accesses @380801000
-system.cpu3: completed 70000 read, 38442 write accesses @381181000
-system.cpu6: completed 70000 read, 38695 write accesses @381583500
-system.cpu7: completed 70000 read, 38573 write accesses @382302000
-system.cpu0: completed 70000 read, 38773 write accesses @382499000
-system.cpu4: completed 70000 read, 38793 write accesses @383094500
-system.cpu5: completed 70000 read, 38945 write accesses @383290000
-system.cpu1: completed 70000 read, 39200 write accesses @385376000
-system.cpu2: completed 80000 read, 44175 write accesses @434108000
-system.cpu6: completed 80000 read, 44138 write accesses @434454000
-system.cpu3: completed 80000 read, 43905 write accesses @434859000
-system.cpu7: completed 80000 read, 43929 write accesses @435594500
-system.cpu0: completed 80000 read, 44322 write accesses @435767000
-system.cpu4: completed 80000 read, 44313 write accesses @436517500
-system.cpu5: completed 80000 read, 44613 write accesses @436622000
-system.cpu1: completed 80000 read, 44739 write accesses @439209000
-system.cpu6: completed 90000 read, 49689 write accesses @488185000
-system.cpu3: completed 90000 read, 49429 write accesses @488562500
-system.cpu7: completed 90000 read, 49434 write accesses @488577000
-system.cpu2: completed 90000 read, 49778 write accesses @488987500
-system.cpu0: completed 90000 read, 49893 write accesses @489736000
-system.cpu5: completed 90000 read, 50116 write accesses @489869500
-system.cpu4: completed 90000 read, 49769 write accesses @490914000
-system.cpu1: completed 90000 read, 50142 write accesses @491765500
-system.cpu6: completed 100000 read, 55059 write accesses @540820000
+system.cpu3: completed 10000 read, 5503 write accesses @55915500
+system.cpu4: completed 10000 read, 5302 write accesses @55980000
+system.cpu7: completed 10000 read, 5500 write accesses @56129000
+system.cpu2: completed 10000 read, 5342 write accesses @56146500
+system.cpu6: completed 10000 read, 5358 write accesses @56494500
+system.cpu0: completed 10000 read, 5493 write accesses @56861500
+system.cpu1: completed 10000 read, 5676 write accesses @57033500
+system.cpu5: completed 10000 read, 5528 write accesses @57497500
+system.cpu4: completed 20000 read, 10871 write accesses @105086000
+system.cpu7: completed 20000 read, 11018 write accesses @105227000
+system.cpu6: completed 20000 read, 10904 write accesses @105245500
+system.cpu0: completed 20000 read, 10841 write accesses @105416500
+system.cpu3: completed 20000 read, 11147 write accesses @105878500
+system.cpu2: completed 20000 read, 10930 write accesses @106485500
+system.cpu5: completed 20000 read, 10954 write accesses @106687000
+system.cpu1: completed 20000 read, 11324 write accesses @107095000
+system.cpu4: completed 30000 read, 16387 write accesses @154433500
+system.cpu6: completed 30000 read, 16529 write accesses @154891500
+system.cpu2: completed 30000 read, 16387 write accesses @154906000
+system.cpu3: completed 30000 read, 16756 write accesses @155604500
+system.cpu7: completed 30000 read, 16642 write accesses @155734000
+system.cpu5: completed 30000 read, 16445 write accesses @156039500
+system.cpu0: completed 30000 read, 16469 write accesses @156104500
+system.cpu1: completed 30000 read, 16825 write accesses @156708500
+system.cpu6: completed 40000 read, 21980 write accesses @203895500
+system.cpu4: completed 40000 read, 22029 write accesses @204285000
+system.cpu3: completed 40000 read, 22257 write accesses @204704000
+system.cpu7: completed 40000 read, 22193 write accesses @205001500
+system.cpu2: completed 40000 read, 22047 write accesses @205470000
+system.cpu5: completed 40000 read, 22004 write accesses @206055000
+system.cpu0: completed 40000 read, 21987 write accesses @206174000
+system.cpu1: completed 40000 read, 22532 write accesses @206732500
+system.cpu4: completed 50000 read, 27591 write accesses @253615500
+system.cpu6: completed 50000 read, 27369 write accesses @253616500
+system.cpu2: completed 50000 read, 27561 write accesses @254261500
+system.cpu7: completed 50000 read, 27945 write accesses @254398000
+system.cpu5: completed 50000 read, 27346 write accesses @254644500
+system.cpu3: completed 50000 read, 27794 write accesses @254687000
+system.cpu0: completed 50000 read, 27491 write accesses @255540000
+system.cpu1: completed 50000 read, 28147 write accesses @256393500
+system.cpu4: completed 60000 read, 33155 write accesses @302912000
+system.cpu6: completed 60000 read, 33024 write accesses @303044500
+system.cpu5: completed 60000 read, 32819 write accesses @303948500
+system.cpu7: completed 60000 read, 33412 write accesses @304003500
+system.cpu2: completed 60000 read, 33183 write accesses @305097000
+system.cpu3: completed 60000 read, 33603 write accesses @305311500
+system.cpu1: completed 60000 read, 33393 write accesses @305569000
+system.cpu0: completed 60000 read, 33038 write accesses @305621500
+system.cpu4: completed 70000 read, 38636 write accesses @352443000
+system.cpu5: completed 70000 read, 38516 write accesses @353701000
+system.cpu6: completed 70000 read, 38725 write accesses @353942000
+system.cpu7: completed 70000 read, 39072 write accesses @354424000
+system.cpu2: completed 70000 read, 38818 write accesses @354701000
+system.cpu1: completed 70000 read, 38717 write accesses @354858500
+system.cpu3: completed 70000 read, 39274 write accesses @355379500
+system.cpu0: completed 70000 read, 38744 write accesses @355617500
+system.cpu4: completed 80000 read, 44404 write accesses @402767500
+system.cpu2: completed 80000 read, 44188 write accesses @403291500
+system.cpu5: completed 80000 read, 44099 write accesses @403371500
+system.cpu7: completed 80000 read, 44629 write accesses @403854500
+system.cpu6: completed 80000 read, 44307 write accesses @404062000
+system.cpu0: completed 80000 read, 44206 write accesses @404147000
+system.cpu1: completed 80000 read, 44256 write accesses @404649000
+system.cpu3: completed 80000 read, 44966 write accesses @406154000
+system.cpu4: completed 90000 read, 49951 write accesses @452283500
+system.cpu5: completed 90000 read, 49582 write accesses @452363500
+system.cpu2: completed 90000 read, 49727 write accesses @452365500
+system.cpu6: completed 90000 read, 49789 write accesses @453642000
+system.cpu0: completed 90000 read, 49883 write accesses @453665500
+system.cpu7: completed 90000 read, 50370 write accesses @454276500
+system.cpu1: completed 90000 read, 49817 write accesses @454621500
+system.cpu3: completed 90000 read, 50461 write accesses @455559000
+system.cpu5: completed 100000 read, 55110 write accesses @501584000
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simout b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simout
index 78aee4704..ee02aa361 100755
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simout
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/simout
@@ -1,11 +1,13 @@
+Redirecting stdout to build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter/simout
+Redirecting stderr to build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan 21 2016 14:20:17
-gem5 started Jan 21 2016 14:20:32
-gem5 executing on zizzer, pid 63114
-command line: build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter -re /z/atgutier/gem5/gem5-commit/tests/run.py build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter
+gem5 compiled Jul 21 2016 14:24:31
+gem5 started Jul 21 2016 14:24:50
+gem5 executing on e108600-lin, pid 18184
+command line: /work/curdun01/gem5-external.hg/build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest-filter -re /work/curdun01/gem5-external.hg/tests/testing/../run.py quick/se/50.memtest/null/none/memtest-filter
 
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
-Exiting @ tick 540820000 because maximum number of loads reached
+Exiting @ tick 501584000 because maximum number of loads reached
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/stats.txt b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/stats.txt
index 863fa9c63..a994433c5 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest-filter/stats.txt
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest-filter/stats.txt
@@ -4,9 +4,9 @@ sim_seconds                                  0.000502                       # Nu
 sim_ticks                                   501584000                       # Number of ticks simulated
 final_tick                                  501584000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_tick_rate                              130273139                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 277304                       # Number of bytes of host memory used
-host_seconds                                     3.85                       # Real time elapsed on the host
+host_tick_rate                               67567713                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 232512                       # Number of bytes of host memory used
+host_seconds                                     7.42                       # Real time elapsed on the host
 system.voltage_domain.voltage                       1                       # Voltage in Volts
 system.clk_domain.clock                          1000                       # Clock period in ticks
 system.physmem.pwrStateResidencyTicks::UNDEFINED    501584000                       # Cumulative time (in ticks) in various power states
@@ -1679,6 +1679,7 @@ system.membus.pkt_count::total                 377217                       # Pa
 system.membus.pkt_size_system.l2c.mem_side::system.physmem.port      1076434                       # Cumulative packet size per connected master and slave (bytes)
 system.membus.pkt_size::total                 1076434                       # Cumulative packet size per connected master and slave (bytes)
 system.membus.snoops                            56879                       # Total snoops (count)
+system.membus.snoopTraffic                          0                       # Total snoop traffic (bytes)
 system.membus.snoop_fanout::samples            245548                       # Request fanout histogram
 system.membus.snoop_fanout::mean                    0                       # Request fanout histogram
 system.membus.snoop_fanout::stdev                   0                       # Request fanout histogram
@@ -1730,6 +1731,7 @@ system.toL2Bus.pkt_size_system.cpu6.l1c.mem_side::system.l2c.cpu_side      17923
 system.toL2Bus.pkt_size_system.cpu7.l1c.mem_side::system.l2c.cpu_side      1782917                       # Cumulative packet size per connected master and slave (bytes)
 system.toL2Bus.pkt_size::total               14289488                       # Cumulative packet size per connected master and slave (bytes)
 system.toL2Bus.snoops                          336712                       # Total snoops (count)
+system.toL2Bus.snoopTraffic                  20380288                       # Total snoop traffic (bytes)
 system.toL2Bus.snoop_fanout::samples           624467                       # Request fanout histogram
 system.toL2Bus.snoop_fanout::mean            1.150434                       # Request fanout histogram
 system.toL2Bus.snoop_fanout::stdev           0.985907                       # Request fanout histogram
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
index 10563829b..cdf2da963 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini
@@ -14,6 +14,7 @@ children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain dvfs_
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 exit_on_work_items=false
 init_param=0
@@ -27,6 +28,10 @@ memories=system.physmem
 mmap_using_noreserve=false
 multi_thread=false
 num_work_ids=16
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 readfile=
 symbolfile=
 thermal_components=
@@ -52,12 +57,17 @@ voltage_domain=system.voltage_domain
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -72,12 +82,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -96,8 +111,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -105,12 +125,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -125,12 +150,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -149,8 +179,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -158,12 +193,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -178,12 +218,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -202,8 +247,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -211,12 +261,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -231,12 +286,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -255,8 +315,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -264,12 +329,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -284,12 +354,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -308,8 +383,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -317,12 +397,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -337,12 +422,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -361,8 +451,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -370,12 +465,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -390,12 +490,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -414,8 +519,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -423,12 +533,17 @@ size=32768
 type=MemTest
 children=l1c
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 interval=1
 max_loads=100000
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 percent_functional=50
 percent_reads=65
 percent_uncacheable=10
+power_model=Null
 progress_check=5000000
 progress_interval=10000
 size=65536
@@ -443,12 +558,17 @@ addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=2
 is_read_only=false
 max_miss_count=0
 mshrs=4
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=2
@@ -467,8 +587,13 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=2
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=32768
 
@@ -495,12 +620,17 @@ addr_ranges=0:18446744073709551615
 assoc=8
 clk_domain=system.cpu_clk_domain
 clusivity=mostly_incl
+default_p_state=UNDEFINED
 demand_mshr_reserve=1
 eventq_index=0
 hit_latency=20
 is_read_only=false
 max_miss_count=0
 mshrs=20
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 prefetch_on_access=false
 prefetcher=Null
 response_latency=20
@@ -519,18 +649,28 @@ type=LRU
 assoc=8
 block_size=64
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 hit_latency=20
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 sequential_access=false
 size=65536
 
 [system.membus]
 type=CoherentXBar
 clk_domain=system.clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 point_of_coherency=true
+power_model=Null
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
@@ -545,11 +685,16 @@ type=SimpleMemory
 bandwidth=73.000000
 clk_domain=system.clk_domain
 conf_table_reported=true
+default_p_state=UNDEFINED
 eventq_index=0
 in_addr_map=true
 latency=30000
 latency_var=0
 null=false
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
+power_model=Null
 range=0:134217727
 port=system.membus.master[0]
 
@@ -557,10 +702,15 @@ port=system.membus.master[0]
 type=CoherentXBar
 children=snoop_filter
 clk_domain=system.cpu_clk_domain
+default_p_state=UNDEFINED
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+p_state_clk_gate_bins=20
+p_state_clk_gate_max=1000000000000
+p_state_clk_gate_min=1000
 point_of_coherency=false
+power_model=Null
 response_latency=1
 snoop_filter=system.toL2Bus.snoop_filter
 snoop_response_latency=1
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/simerr b/tests/quick/se/50.memtest/ref/null/none/memtest/simerr
index 6df4b75be..2b36322d9 100755
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/simerr
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/simerr
@@ -1,73 +1,73 @@
-system.cpu6: completed 10000 read, 5487 write accesses @59571500
-system.cpu3: completed 10000 read, 5414 write accesses @59651500
-system.cpu7: completed 10000 read, 5388 write accesses @60317500
-system.cpu5: completed 10000 read, 5633 write accesses @60565500
-system.cpu0: completed 10000 read, 5554 write accesses @60812000
-system.cpu2: completed 10000 read, 5506 write accesses @60906000
-system.cpu4: completed 10000 read, 5667 write accesses @61020000
-system.cpu1: completed 10000 read, 5729 write accesses @61134500
-system.cpu6: completed 20000 read, 10937 write accesses @112006500
-system.cpu3: completed 20000 read, 10780 write accesses @112135000
-system.cpu7: completed 20000 read, 10967 write accesses @112826000
-system.cpu4: completed 20000 read, 11065 write accesses @113623000
-system.cpu5: completed 20000 read, 11211 write accesses @113744000
-system.cpu2: completed 20000 read, 11030 write accesses @114035000
-system.cpu0: completed 20000 read, 10992 write accesses @114045500
-system.cpu1: completed 20000 read, 11316 write accesses @114786000
-system.cpu7: completed 30000 read, 16437 write accesses @164923000
-system.cpu3: completed 30000 read, 16370 write accesses @165110500
-system.cpu6: completed 30000 read, 16452 write accesses @165210000
-system.cpu5: completed 30000 read, 16648 write accesses @166336000
-system.cpu2: completed 30000 read, 16509 write accesses @166732000
-system.cpu0: completed 30000 read, 16577 write accesses @167160500
-system.cpu4: completed 30000 read, 16715 write accesses @167466500
-system.cpu1: completed 30000 read, 16830 write accesses @168055000
-system.cpu6: completed 40000 read, 21969 write accesses @217981000
-system.cpu3: completed 40000 read, 21918 write accesses @218202000
-system.cpu7: completed 40000 read, 21990 write accesses @218219000
-system.cpu2: completed 40000 read, 21957 write accesses @218925500
-system.cpu5: completed 40000 read, 22088 write accesses @218962000
-system.cpu0: completed 40000 read, 22019 write accesses @220261500
-system.cpu4: completed 40000 read, 22141 write accesses @220429500
-system.cpu1: completed 40000 read, 22465 write accesses @221673500
-system.cpu6: completed 50000 read, 27340 write accesses @269928500
-system.cpu3: completed 50000 read, 27331 write accesses @269971000
-system.cpu7: completed 50000 read, 27530 write accesses @270791500
-system.cpu5: completed 50000 read, 27634 write accesses @271727500
-system.cpu2: completed 50000 read, 27623 write accesses @272554500
-system.cpu0: completed 50000 read, 27533 write accesses @273321500
-system.cpu4: completed 50000 read, 27756 write accesses @273793500
-system.cpu1: completed 50000 read, 28047 write accesses @275360000
-system.cpu6: completed 60000 read, 32844 write accesses @323017000
-system.cpu3: completed 60000 read, 32841 write accesses @324483500
-system.cpu5: completed 60000 read, 33251 write accesses @324526000
-system.cpu7: completed 60000 read, 33152 write accesses @324853000
-system.cpu0: completed 60000 read, 33006 write accesses @325804000
-system.cpu2: completed 60000 read, 33348 write accesses @325916500
-system.cpu4: completed 60000 read, 33317 write accesses @326721500
-system.cpu1: completed 60000 read, 33656 write accesses @328729000
-system.cpu6: completed 70000 read, 38487 write accesses @376493000
-system.cpu7: completed 70000 read, 38761 write accesses @377715000
-system.cpu3: completed 70000 read, 38353 write accesses @377922000
-system.cpu5: completed 70000 read, 38776 write accesses @378190500
-system.cpu2: completed 70000 read, 38794 write accesses @378444500
-system.cpu0: completed 70000 read, 38678 write accesses @379664500
-system.cpu4: completed 70000 read, 38900 write accesses @380595000
-system.cpu1: completed 70000 read, 39220 write accesses @382567000
-system.cpu6: completed 80000 read, 43956 write accesses @429072500
-system.cpu7: completed 80000 read, 44286 write accesses @430036500
-system.cpu5: completed 80000 read, 44299 write accesses @430673000
-system.cpu3: completed 80000 read, 43950 write accesses @431481500
-system.cpu2: completed 80000 read, 44367 write accesses @431856000
-system.cpu0: completed 80000 read, 44165 write accesses @433508500
-system.cpu4: completed 80000 read, 44456 write accesses @435070500
-system.cpu1: completed 80000 read, 44736 write accesses @436017000
-system.cpu6: completed 90000 read, 49535 write accesses @481570000
-system.cpu7: completed 90000 read, 49822 write accesses @483210500
-system.cpu5: completed 90000 read, 49824 write accesses @483444500
-system.cpu3: completed 90000 read, 49649 write accesses @484870500
-system.cpu2: completed 90000 read, 50045 write accesses @485829000
-system.cpu0: completed 90000 read, 49706 write accesses @486425000
-system.cpu4: completed 90000 read, 49831 write accesses @488248500
-system.cpu1: completed 90000 read, 50268 write accesses @489877001
-system.cpu6: completed 100000 read, 54955 write accesses @534039500
+system.cpu2: completed 10000 read, 5501 write accesses @55798000
+system.cpu1: completed 10000 read, 5520 write accesses @55942500
+system.cpu4: completed 10000 read, 5672 write accesses @55948000
+system.cpu0: completed 10000 read, 5544 write accesses @56022500
+system.cpu6: completed 10000 read, 5523 write accesses @56194500
+system.cpu5: completed 10000 read, 5576 write accesses @56196500
+system.cpu3: completed 10000 read, 5638 write accesses @56648500
+system.cpu7: completed 10000 read, 5609 write accesses @56820000
+system.cpu6: completed 20000 read, 11092 write accesses @104740000
+system.cpu4: completed 20000 read, 11217 write accesses @105227500
+system.cpu0: completed 20000 read, 11130 write accesses @105598500
+system.cpu5: completed 20000 read, 11119 write accesses @105604000
+system.cpu2: completed 20000 read, 11021 write accesses @105822000
+system.cpu7: completed 20000 read, 11085 write accesses @105988500
+system.cpu3: completed 20000 read, 11232 write accesses @106234000
+system.cpu1: completed 20000 read, 11093 write accesses @106248000
+system.cpu6: completed 30000 read, 16618 write accesses @154364000
+system.cpu4: completed 30000 read, 16727 write accesses @154528000
+system.cpu5: completed 30000 read, 16661 write accesses @154991500
+system.cpu0: completed 30000 read, 16578 write accesses @155150000
+system.cpu7: completed 30000 read, 16597 write accesses @155572000
+system.cpu3: completed 30000 read, 16777 write accesses @155692000
+system.cpu2: completed 30000 read, 16783 write accesses @155741500
+system.cpu1: completed 30000 read, 16605 write accesses @155757500
+system.cpu4: completed 40000 read, 22227 write accesses @203532500
+system.cpu0: completed 40000 read, 22094 write accesses @203735500
+system.cpu2: completed 40000 read, 22329 write accesses @204034500
+system.cpu6: completed 40000 read, 22323 write accesses @204341500
+system.cpu5: completed 40000 read, 22093 write accesses @204530500
+system.cpu3: completed 40000 read, 22449 write accesses @204979500
+system.cpu7: completed 40000 read, 22085 write accesses @205200000
+system.cpu1: completed 40000 read, 22157 write accesses @205324500
+system.cpu2: completed 50000 read, 27810 write accesses @252814500
+system.cpu0: completed 50000 read, 27524 write accesses @252975000
+system.cpu4: completed 50000 read, 27619 write accesses @253195000
+system.cpu6: completed 50000 read, 27815 write accesses @253668000
+system.cpu5: completed 50000 read, 27749 write accesses @254286500
+system.cpu3: completed 50000 read, 28015 write accesses @254662000
+system.cpu1: completed 50000 read, 27700 write accesses @255277000
+system.cpu7: completed 50000 read, 27537 write accesses @255788500
+system.cpu2: completed 60000 read, 33479 write accesses @302616500
+system.cpu4: completed 60000 read, 33151 write accesses @302639500
+system.cpu0: completed 60000 read, 33158 write accesses @302949000
+system.cpu5: completed 60000 read, 33293 write accesses @303327000
+system.cpu6: completed 60000 read, 33367 write accesses @303498500
+system.cpu3: completed 60000 read, 33551 write accesses @304167000
+system.cpu1: completed 60000 read, 33190 write accesses @304842500
+system.cpu7: completed 60000 read, 33105 write accesses @305455501
+system.cpu4: completed 70000 read, 38677 write accesses @351659000
+system.cpu0: completed 70000 read, 38797 write accesses @352214500
+system.cpu2: completed 70000 read, 39135 write accesses @352355500
+system.cpu6: completed 70000 read, 38839 write accesses @353200500
+system.cpu5: completed 70000 read, 38774 write accesses @353284000
+system.cpu3: completed 70000 read, 38980 write accesses @353497000
+system.cpu1: completed 70000 read, 38895 write accesses @355264000
+system.cpu7: completed 70000 read, 38703 write accesses @355598500
+system.cpu2: completed 80000 read, 44512 write accesses @400360000
+system.cpu4: completed 80000 read, 44241 write accesses @401405500
+system.cpu0: completed 80000 read, 44424 write accesses @401492500
+system.cpu6: completed 80000 read, 44426 write accesses @402695000
+system.cpu5: completed 80000 read, 44250 write accesses @402938000
+system.cpu3: completed 80000 read, 44495 write accesses @403103500
+system.cpu1: completed 80000 read, 44343 write accesses @403920500
+system.cpu7: completed 80000 read, 44194 write accesses @404626000
+system.cpu0: completed 90000 read, 49874 write accesses @450153000
+system.cpu2: completed 90000 read, 50018 write accesses @450453000
+system.cpu4: completed 90000 read, 49959 write accesses @452038500
+system.cpu3: completed 90000 read, 50050 write accesses @452249000
+system.cpu5: completed 90000 read, 49902 write accesses @452294500
+system.cpu6: completed 90000 read, 50125 write accesses @453074500
+system.cpu1: completed 90000 read, 49995 write accesses @453105500
+system.cpu7: completed 90000 read, 49805 write accesses @454516500
+system.cpu2: completed 100000 read, 55556 write accesses @500337000
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/simout b/tests/quick/se/50.memtest/ref/null/none/memtest/simout
index b41d812d8..b287697fe 100755
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/simout
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/simout
@@ -1,11 +1,13 @@
+Redirecting stdout to build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest/simout
+Redirecting stderr to build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan 21 2016 14:20:17
-gem5 started Jan 21 2016 14:20:31
-gem5 executing on zizzer, pid 63111
-command line: build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest -re /z/atgutier/gem5/gem5-commit/tests/run.py build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest
+gem5 compiled Jul 21 2016 14:24:31
+gem5 started Jul 21 2016 14:24:50
+gem5 executing on e108600-lin, pid 18186
+command line: /work/curdun01/gem5-external.hg/build/NULL/gem5.opt -d build/NULL/tests/opt/quick/se/50.memtest/null/none/memtest -re /work/curdun01/gem5-external.hg/tests/testing/../run.py quick/se/50.memtest/null/none/memtest
 
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
-Exiting @ tick 534039500 because maximum number of loads reached
+Exiting @ tick 500337000 because maximum number of loads reached
diff --git a/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt b/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt
index e55bb9c63..bfbf99e79 100644
--- a/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt
+++ b/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt
@@ -4,9 +4,9 @@ sim_seconds                                  0.000500                       # Nu
 sim_ticks                                   500337000                       # Number of ticks simulated
 final_tick                                  500337000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_tick_rate                              117513072                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 278328                       # Number of bytes of host memory used
-host_seconds                                     4.26                       # Real time elapsed on the host
+host_tick_rate                               71022114                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 232508                       # Number of bytes of host memory used
+host_seconds                                     7.04                       # Real time elapsed on the host
 system.voltage_domain.voltage                       1                       # Voltage in Volts
 system.clk_domain.clock                          1000                       # Clock period in ticks
 system.physmem.pwrStateResidencyTicks::UNDEFINED    500337000                       # Cumulative time (in ticks) in various power states
@@ -1672,6 +1672,7 @@ system.membus.pkt_count::total                 377440                       # Pa
 system.membus.pkt_size_system.l2c.mem_side::system.physmem.port      1081783                       # Cumulative packet size per connected master and slave (bytes)
 system.membus.pkt_size::total                 1081783                       # Cumulative packet size per connected master and slave (bytes)
 system.membus.snoops                            56900                       # Total snoops (count)
+system.membus.snoopTraffic                          0                       # Total snoop traffic (bytes)
 system.membus.snoop_fanout::samples            253448                       # Request fanout histogram
 system.membus.snoop_fanout::mean                    0                       # Request fanout histogram
 system.membus.snoop_fanout::stdev                   0                       # Request fanout histogram
@@ -1724,6 +1725,7 @@ system.toL2Bus.pkt_size_system.cpu6.l1c.mem_side::system.l2c.cpu_side      17966
 system.toL2Bus.pkt_size_system.cpu7.l1c.mem_side::system.l2c.cpu_side      1788086                       # Cumulative packet size per connected master and slave (bytes)
 system.toL2Bus.pkt_size::total               14339895                       # Cumulative packet size per connected master and slave (bytes)
 system.toL2Bus.snoops                          335681                       # Total snoops (count)
+system.toL2Bus.snoopTraffic                  20309376                       # Total snoop traffic (bytes)
 system.toL2Bus.snoop_fanout::samples           623777                       # Request fanout histogram
 system.toL2Bus.snoop_fanout::mean            1.148975                       # Request fanout histogram
 system.toL2Bus.snoop_fanout::stdev           0.984758                       # Request fanout histogram