stats: updates statistics for ruby regressions

14 files changed, 520 insertions, 1623 deletions

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
index 510e4a26a..6c883dde5 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
@@ -16,7 +16,7 @@ kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
 mem_ranges=
-memories=system.physmem system.funcmem
+memories=system.funcmem system.physmem
 num_work_ids=16
 readfile=
 symbolfile=
@@ -276,9 +276,9 @@ version=0
 
 [system.ruby.l1_cntrl0]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory
+children=L1Dcache L1Icache prefetcher sequencer
+L1Dcache=system.ruby.l1_cntrl0.L1Dcache
+L1Icache=system.ruby.l1_cntrl0.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=0
@@ -297,7 +297,7 @@ to_l2_latency=1
 transitions_per_cycle=32
 version=0
 
-[system.ruby.l1_cntrl0.L1DcacheMemory]
+[system.ruby.l1_cntrl0.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -311,7 +311,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -339,9 +339,9 @@ unit_filter=8
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl0.L1DcacheMemory
+dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -354,9 +354,9 @@ slave=system.cpu0.test
 
 [system.ruby.l1_cntrl1]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.ruby.l1_cntrl1.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl1.L1IcacheMemory
+children=L1Dcache L1Icache prefetcher sequencer
+L1Dcache=system.ruby.l1_cntrl1.L1Dcache
+L1Icache=system.ruby.l1_cntrl1.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=1
@@ -375,7 +375,7 @@ to_l2_latency=1
 transitions_per_cycle=32
 version=1
 
-[system.ruby.l1_cntrl1.L1DcacheMemory]
+[system.ruby.l1_cntrl1.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -389,7 +389,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl1.L1IcacheMemory]
+[system.ruby.l1_cntrl1.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -417,9 +417,9 @@ unit_filter=8
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl1.L1DcacheMemory
+dcache=system.ruby.l1_cntrl1.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl1.L1IcacheMemory
+icache=system.ruby.l1_cntrl1.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -432,9 +432,9 @@ slave=system.cpu1.test
 
 [system.ruby.l1_cntrl2]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.ruby.l1_cntrl2.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl2.L1IcacheMemory
+children=L1Dcache L1Icache prefetcher sequencer
+L1Dcache=system.ruby.l1_cntrl2.L1Dcache
+L1Icache=system.ruby.l1_cntrl2.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=2
@@ -453,7 +453,7 @@ to_l2_latency=1
 transitions_per_cycle=32
 version=2
 
-[system.ruby.l1_cntrl2.L1DcacheMemory]
+[system.ruby.l1_cntrl2.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -467,7 +467,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl2.L1IcacheMemory]
+[system.ruby.l1_cntrl2.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -495,9 +495,9 @@ unit_filter=8
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl2.L1DcacheMemory
+dcache=system.ruby.l1_cntrl2.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl2.L1IcacheMemory
+icache=system.ruby.l1_cntrl2.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -510,9 +510,9 @@ slave=system.cpu2.test
 
 [system.ruby.l1_cntrl3]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.ruby.l1_cntrl3.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl3.L1IcacheMemory
+children=L1Dcache L1Icache prefetcher sequencer
+L1Dcache=system.ruby.l1_cntrl3.L1Dcache
+L1Icache=system.ruby.l1_cntrl3.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=3
@@ -531,7 +531,7 @@ to_l2_latency=1
 transitions_per_cycle=32
 version=3
 
-[system.ruby.l1_cntrl3.L1DcacheMemory]
+[system.ruby.l1_cntrl3.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -545,7 +545,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl3.L1IcacheMemory]
+[system.ruby.l1_cntrl3.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -573,9 +573,9 @@ unit_filter=8
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl3.L1DcacheMemory
+dcache=system.ruby.l1_cntrl3.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl3.L1IcacheMemory
+icache=system.ruby.l1_cntrl3.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -588,9 +588,9 @@ slave=system.cpu3.test
 
 [system.ruby.l1_cntrl4]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.ruby.l1_cntrl4.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl4.L1IcacheMemory
+children=L1Dcache L1Icache prefetcher sequencer
+L1Dcache=system.ruby.l1_cntrl4.L1Dcache
+L1Icache=system.ruby.l1_cntrl4.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=4
@@ -609,7 +609,7 @@ to_l2_latency=1
 transitions_per_cycle=32
 version=4
 
-[system.ruby.l1_cntrl4.L1DcacheMemory]
+[system.ruby.l1_cntrl4.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -623,7 +623,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl4.L1IcacheMemory]
+[system.ruby.l1_cntrl4.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -651,9 +651,9 @@ unit_filter=8
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl4.L1DcacheMemory
+dcache=system.ruby.l1_cntrl4.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl4.L1IcacheMemory
+icache=system.ruby.l1_cntrl4.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -666,9 +666,9 @@ slave=system.cpu4.test
 
 [system.ruby.l1_cntrl5]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.ruby.l1_cntrl5.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl5.L1IcacheMemory
+children=L1Dcache L1Icache prefetcher sequencer
+L1Dcache=system.ruby.l1_cntrl5.L1Dcache
+L1Icache=system.ruby.l1_cntrl5.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=5
@@ -687,7 +687,7 @@ to_l2_latency=1
 transitions_per_cycle=32
 version=5
 
-[system.ruby.l1_cntrl5.L1DcacheMemory]
+[system.ruby.l1_cntrl5.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -701,7 +701,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl5.L1IcacheMemory]
+[system.ruby.l1_cntrl5.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -729,9 +729,9 @@ unit_filter=8
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl5.L1DcacheMemory
+dcache=system.ruby.l1_cntrl5.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl5.L1IcacheMemory
+icache=system.ruby.l1_cntrl5.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -744,9 +744,9 @@ slave=system.cpu5.test
 
 [system.ruby.l1_cntrl6]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.ruby.l1_cntrl6.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl6.L1IcacheMemory
+children=L1Dcache L1Icache prefetcher sequencer
+L1Dcache=system.ruby.l1_cntrl6.L1Dcache
+L1Icache=system.ruby.l1_cntrl6.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=6
@@ -765,7 +765,7 @@ to_l2_latency=1
 transitions_per_cycle=32
 version=6
 
-[system.ruby.l1_cntrl6.L1DcacheMemory]
+[system.ruby.l1_cntrl6.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -779,7 +779,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl6.L1IcacheMemory]
+[system.ruby.l1_cntrl6.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -807,9 +807,9 @@ unit_filter=8
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl6.L1DcacheMemory
+dcache=system.ruby.l1_cntrl6.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl6.L1IcacheMemory
+icache=system.ruby.l1_cntrl6.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -822,9 +822,9 @@ slave=system.cpu6.test
 
 [system.ruby.l1_cntrl7]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.ruby.l1_cntrl7.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl7.L1IcacheMemory
+children=L1Dcache L1Icache prefetcher sequencer
+L1Dcache=system.ruby.l1_cntrl7.L1Dcache
+L1Icache=system.ruby.l1_cntrl7.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=7
@@ -843,7 +843,7 @@ to_l2_latency=1
 transitions_per_cycle=32
 version=7
 
-[system.ruby.l1_cntrl7.L1DcacheMemory]
+[system.ruby.l1_cntrl7.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -857,7 +857,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl7.L1IcacheMemory]
+[system.ruby.l1_cntrl7.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -885,9 +885,9 @@ unit_filter=8
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl7.L1DcacheMemory
+dcache=system.ruby.l1_cntrl7.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl7.L1IcacheMemory
+icache=system.ruby.l1_cntrl7.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -900,8 +900,8 @@ slave=system.cpu7.test
 
 [system.ruby.l2_cntrl0]
 type=L2Cache_Controller
-children=L2cacheMemory
-L2cacheMemory=system.ruby.l2_cntrl0.L2cacheMemory
+children=L2cache
+L2cache=system.ruby.l2_cntrl0.L2cache
 buffer_size=0
 clock=1
 cntrl_id=8
@@ -915,7 +915,7 @@ to_l1_latency=1
 transitions_per_cycle=32
 version=0
 
-[system.ruby.l2_cntrl0.L2cacheMemory]
+[system.ruby.l2_cntrl0.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
index 164aeb3c8..864f22205 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
@@ -293,26 +293,6 @@ links_utilized_percent_switch_10: 14.8743
   outgoing_messages_switch_10_link_9_Response_Data: 212955 15332760 [ 0 212955 0 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_10_link_9_Response_Control: 392034 3136272 [ 0 392034 0 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 76561
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 76561
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   65.0148%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   34.9852%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   76561    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [49778 49377 49516 49381 49747 49368 50044 49642 ] 396853
@@ -485,158 +465,6 @@ PF_IS_I  Data_Exclusive [0 0 0 0 0 0 0 0 ] 0
 PF_IS_I  DataS_fromL1 [0 0 0 0 0 0 0 0 ] 0
 PF_IS_I  Data_all_Acks [0 0 0 0 0 0 0 0 ] 0
 
-Cache Stats: system.ruby.l1_cntrl1.L1IcacheMemory
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl1.L1DcacheMemory
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_misses: 76056
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_demand_misses: 76056
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_LD:   64.9219%
-  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_ST:   35.0781%
-
-  system.ruby.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   76056    100%
-
-Cache Stats: system.ruby.l1_cntrl2.L1IcacheMemory
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl2.L1DcacheMemory
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_misses: 76165
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_demand_misses: 76165
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_LD:   65.0102%
-  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_ST:   34.9898%
-
-  system.ruby.l1_cntrl2.L1DcacheMemory_access_mode_type_Supervisor:   76165    100%
-
-Cache Stats: system.ruby.l1_cntrl3.L1IcacheMemory
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl3.L1DcacheMemory
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_misses: 75953
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_demand_misses: 75953
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_LD:   65.0126%
-  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_ST:   34.9874%
-
-  system.ruby.l1_cntrl3.L1DcacheMemory_access_mode_type_Supervisor:   75953    100%
-
-Cache Stats: system.ruby.l1_cntrl4.L1IcacheMemory
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl4.L1DcacheMemory
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_misses: 76641
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_demand_misses: 76641
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_LD:   64.9065%
-  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_ST:   35.0935%
-
-  system.ruby.l1_cntrl4.L1DcacheMemory_access_mode_type_Supervisor:   76641    100%
-
-Cache Stats: system.ruby.l1_cntrl5.L1IcacheMemory
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl5.L1DcacheMemory
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_misses: 75966
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_demand_misses: 75966
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_LD:   64.9857%
-  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_ST:   35.0143%
-
-  system.ruby.l1_cntrl5.L1DcacheMemory_access_mode_type_Supervisor:   75966    100%
-
-Cache Stats: system.ruby.l1_cntrl6.L1IcacheMemory
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl6.L1DcacheMemory
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_misses: 76675
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_demand_misses: 76675
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_LD:   65.2677%
-  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_ST:   34.7323%
-
-  system.ruby.l1_cntrl6.L1DcacheMemory_access_mode_type_Supervisor:   76675    100%
-
-Cache Stats: system.ruby.l1_cntrl7.L1IcacheMemory
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl7.L1DcacheMemory
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_misses: 76386
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_demand_misses: 76386
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_LD:   64.9857%
-  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_ST:   35.0143%
-
-  system.ruby.l1_cntrl7.L1DcacheMemory_access_mode_type_Supervisor:   76386    100%
-
-Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
-  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 610348
-  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 610348
-  system.ruby.l2_cntrl0.L2cacheMemory_total_prefetches: 0
-  system.ruby.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS:   65.0144%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   34.9856%
-
-  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   610348    100%
-
  --- L2Cache ---
  - Event Counts -
 L1_GET_INSTR [0 ] 0
@@ -799,17 +627,6 @@ MT_MB  Unblock_Cancel [0 ] 0
 MT_MB  Exclusive_Unblock [604164 ] 604164
 MT_MB  MEM_Inv [0 ] 0
 
-M_MB  L1_GET_INSTR [0 ] 0
-M_MB  L1_GETS [0 ] 0
-M_MB  L1_GETX [0 ] 0
-M_MB  L1_UPGRADE [0 ] 0
-M_MB  L1_PUTX [0 ] 0
-M_MB  L1_PUTX_old [0 ] 0
-M_MB  L2_Replacement [0 ] 0
-M_MB  L2_Replacement_clean [0 ] 0
-M_MB  Exclusive_Unblock [0 ] 0
-M_MB  MEM_Inv [0 ] 0
-
 MT_IIB  L1_GET_INSTR [0 ] 0
 MT_IIB  L1_GETS [2 ] 2
 MT_IIB  L1_GETX [1 ] 1
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
index 1cc7a22a4..fa768666b 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
@@ -4,21 +4,15 @@ sim_seconds                                  0.007257                       # Nu
 sim_ticks                                     7257449                       # Number of ticks simulated
 final_tick                                    7257449                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                  51998                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 251212                       # Number of bytes of host memory used
-host_seconds                                   139.57                       # Real time elapsed on the host
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+host_tick_rate                                  64474                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 299312                       # Number of bytes of host memory used
+host_seconds                                   112.56                       # Real time elapsed on the host
+system.ruby.l1_cntrl4.L1Dcache.demand_hits            2                       # Number of cache demand hits
+system.ruby.l1_cntrl4.L1Dcache.demand_misses        76641                       # Number of cache demand misses
+system.ruby.l1_cntrl4.L1Dcache.demand_accesses        76643                       # Number of cache demand accesses
+system.ruby.l1_cntrl4.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl4.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl4.L1Icache.demand_accesses            0                       # Number of cache demand accesses
 system.ruby.l1_cntrl4.prefetcher.miss_observed            0                       # number of misses observed
 system.ruby.l1_cntrl4.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
 system.ruby.l1_cntrl4.prefetcher.prefetches_requested            0                       # number of prefetch requests made
@@ -28,18 +22,12 @@ system.ruby.l1_cntrl4.prefetcher.hits               0                       # nu
 system.ruby.l1_cntrl4.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
 system.ruby.l1_cntrl4.prefetcher.pages_crossed            0                       # number of prefetches across pages
 system.ruby.l1_cntrl4.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl5.L1Dcache.demand_hits            2                       # Number of cache demand hits
+system.ruby.l1_cntrl5.L1Dcache.demand_misses        75966                       # Number of cache demand misses
+system.ruby.l1_cntrl5.L1Dcache.demand_accesses        75968                       # Number of cache demand accesses
+system.ruby.l1_cntrl5.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl5.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl5.L1Icache.demand_accesses            0                       # Number of cache demand accesses
 system.ruby.l1_cntrl5.prefetcher.miss_observed            0                       # number of misses observed
 system.ruby.l1_cntrl5.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
 system.ruby.l1_cntrl5.prefetcher.prefetches_requested            0                       # number of prefetch requests made
@@ -49,18 +37,12 @@ system.ruby.l1_cntrl5.prefetcher.hits               0                       # nu
 system.ruby.l1_cntrl5.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
 system.ruby.l1_cntrl5.prefetcher.pages_crossed            0                       # number of prefetches across pages
 system.ruby.l1_cntrl5.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl6.L1Dcache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl6.L1Dcache.demand_misses        76675                       # Number of cache demand misses
+system.ruby.l1_cntrl6.L1Dcache.demand_accesses        76675                       # Number of cache demand accesses
+system.ruby.l1_cntrl6.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl6.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl6.L1Icache.demand_accesses            0                       # Number of cache demand accesses
 system.ruby.l1_cntrl6.prefetcher.miss_observed            0                       # number of misses observed
 system.ruby.l1_cntrl6.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
 system.ruby.l1_cntrl6.prefetcher.prefetches_requested            0                       # number of prefetch requests made
@@ -70,18 +52,12 @@ system.ruby.l1_cntrl6.prefetcher.hits               0                       # nu
 system.ruby.l1_cntrl6.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
 system.ruby.l1_cntrl6.prefetcher.pages_crossed            0                       # number of prefetches across pages
 system.ruby.l1_cntrl6.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl7.L1Dcache.demand_hits            2                       # Number of cache demand hits
+system.ruby.l1_cntrl7.L1Dcache.demand_misses        76386                       # Number of cache demand misses
+system.ruby.l1_cntrl7.L1Dcache.demand_accesses        76388                       # Number of cache demand accesses
+system.ruby.l1_cntrl7.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl7.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl7.L1Icache.demand_accesses            0                       # Number of cache demand accesses
 system.ruby.l1_cntrl7.prefetcher.miss_observed            0                       # number of misses observed
 system.ruby.l1_cntrl7.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
 system.ruby.l1_cntrl7.prefetcher.prefetches_requested            0                       # number of prefetch requests made
@@ -91,18 +67,12 @@ system.ruby.l1_cntrl7.prefetcher.hits               0                       # nu
 system.ruby.l1_cntrl7.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
 system.ruby.l1_cntrl7.prefetcher.pages_crossed            0                       # number of prefetches across pages
 system.ruby.l1_cntrl7.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl0.L1Dcache.demand_hits            3                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses        76561                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses        76564                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses            0                       # Number of cache demand accesses
 system.ruby.l1_cntrl0.prefetcher.miss_observed            0                       # number of misses observed
 system.ruby.l1_cntrl0.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
 system.ruby.l1_cntrl0.prefetcher.prefetches_requested            0                       # number of prefetch requests made
@@ -112,18 +82,12 @@ system.ruby.l1_cntrl0.prefetcher.hits               0                       # nu
 system.ruby.l1_cntrl0.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
 system.ruby.l1_cntrl0.prefetcher.pages_crossed            0                       # number of prefetches across pages
 system.ruby.l1_cntrl0.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl1.L1Dcache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L1Dcache.demand_misses        76056                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L1Dcache.demand_accesses        76056                       # Number of cache demand accesses
+system.ruby.l1_cntrl1.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L1Icache.demand_accesses            0                       # Number of cache demand accesses
 system.ruby.l1_cntrl1.prefetcher.miss_observed            0                       # number of misses observed
 system.ruby.l1_cntrl1.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
 system.ruby.l1_cntrl1.prefetcher.prefetches_requested            0                       # number of prefetch requests made
@@ -133,18 +97,12 @@ system.ruby.l1_cntrl1.prefetcher.hits               0                       # nu
 system.ruby.l1_cntrl1.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
 system.ruby.l1_cntrl1.prefetcher.pages_crossed            0                       # number of prefetches across pages
 system.ruby.l1_cntrl1.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl2.L1Dcache.demand_hits            1                       # Number of cache demand hits
+system.ruby.l1_cntrl2.L1Dcache.demand_misses        76165                       # Number of cache demand misses
+system.ruby.l1_cntrl2.L1Dcache.demand_accesses        76166                       # Number of cache demand accesses
+system.ruby.l1_cntrl2.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl2.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl2.L1Icache.demand_accesses            0                       # Number of cache demand accesses
 system.ruby.l1_cntrl2.prefetcher.miss_observed            0                       # number of misses observed
 system.ruby.l1_cntrl2.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
 system.ruby.l1_cntrl2.prefetcher.prefetches_requested            0                       # number of prefetch requests made
@@ -154,18 +112,12 @@ system.ruby.l1_cntrl2.prefetcher.hits               0                       # nu
 system.ruby.l1_cntrl2.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
 system.ruby.l1_cntrl2.prefetcher.pages_crossed            0                       # number of prefetches across pages
 system.ruby.l1_cntrl2.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl3.L1Dcache.demand_hits            1                       # Number of cache demand hits
+system.ruby.l1_cntrl3.L1Dcache.demand_misses        75953                       # Number of cache demand misses
+system.ruby.l1_cntrl3.L1Dcache.demand_accesses        75954                       # Number of cache demand accesses
+system.ruby.l1_cntrl3.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl3.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl3.L1Icache.demand_accesses            0                       # Number of cache demand accesses
 system.ruby.l1_cntrl3.prefetcher.miss_observed            0                       # number of misses observed
 system.ruby.l1_cntrl3.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
 system.ruby.l1_cntrl3.prefetcher.prefetches_requested            0                       # number of prefetch requests made
@@ -175,12 +127,9 @@ system.ruby.l1_cntrl3.prefetcher.hits               0                       # nu
 system.ruby.l1_cntrl3.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
 system.ruby.l1_cntrl3.prefetcher.pages_crossed            0                       # number of prefetches across pages
 system.ruby.l1_cntrl3.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l2_cntrl0.L2cache.demand_hits           33                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses       610348                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses       610381                       # Number of cache demand accesses
 system.cpu0.num_reads                           99060                       # number of read accesses completed
 system.cpu0.num_writes                          53442                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
index dcffdd237..5c2435fa1 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
@@ -16,7 +16,7 @@ kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
 mem_ranges=
-memories=system.funcmem system.physmem
+memories=system.physmem system.funcmem
 num_work_ids=16
 readfile=
 symbolfile=
@@ -275,9 +275,9 @@ version=0
 
 [system.ruby.l1_cntrl0]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl0.L1Dcache
+L1Icache=system.ruby.l1_cntrl0.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=0
@@ -293,7 +293,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=0
 
-[system.ruby.l1_cntrl0.L1DcacheMemory]
+[system.ruby.l1_cntrl0.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -307,7 +307,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -325,9 +325,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl0.L1DcacheMemory
+dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -340,9 +340,9 @@ slave=system.cpu0.test
 
 [system.ruby.l1_cntrl1]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl1.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl1.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl1.L1Dcache
+L1Icache=system.ruby.l1_cntrl1.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=1
@@ -358,7 +358,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=1
 
-[system.ruby.l1_cntrl1.L1DcacheMemory]
+[system.ruby.l1_cntrl1.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -372,7 +372,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl1.L1IcacheMemory]
+[system.ruby.l1_cntrl1.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -390,9 +390,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl1.L1DcacheMemory
+dcache=system.ruby.l1_cntrl1.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl1.L1IcacheMemory
+icache=system.ruby.l1_cntrl1.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -405,9 +405,9 @@ slave=system.cpu1.test
 
 [system.ruby.l1_cntrl2]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl2.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl2.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl2.L1Dcache
+L1Icache=system.ruby.l1_cntrl2.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=2
@@ -423,7 +423,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=2
 
-[system.ruby.l1_cntrl2.L1DcacheMemory]
+[system.ruby.l1_cntrl2.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -437,7 +437,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl2.L1IcacheMemory]
+[system.ruby.l1_cntrl2.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -455,9 +455,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl2.L1DcacheMemory
+dcache=system.ruby.l1_cntrl2.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl2.L1IcacheMemory
+icache=system.ruby.l1_cntrl2.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -470,9 +470,9 @@ slave=system.cpu2.test
 
 [system.ruby.l1_cntrl3]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl3.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl3.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl3.L1Dcache
+L1Icache=system.ruby.l1_cntrl3.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=3
@@ -488,7 +488,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=3
 
-[system.ruby.l1_cntrl3.L1DcacheMemory]
+[system.ruby.l1_cntrl3.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -502,7 +502,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl3.L1IcacheMemory]
+[system.ruby.l1_cntrl3.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -520,9 +520,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl3.L1DcacheMemory
+dcache=system.ruby.l1_cntrl3.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl3.L1IcacheMemory
+icache=system.ruby.l1_cntrl3.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -535,9 +535,9 @@ slave=system.cpu3.test
 
 [system.ruby.l1_cntrl4]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl4.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl4.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl4.L1Dcache
+L1Icache=system.ruby.l1_cntrl4.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=4
@@ -553,7 +553,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=4
 
-[system.ruby.l1_cntrl4.L1DcacheMemory]
+[system.ruby.l1_cntrl4.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -567,7 +567,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl4.L1IcacheMemory]
+[system.ruby.l1_cntrl4.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -585,9 +585,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl4.L1DcacheMemory
+dcache=system.ruby.l1_cntrl4.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl4.L1IcacheMemory
+icache=system.ruby.l1_cntrl4.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -600,9 +600,9 @@ slave=system.cpu4.test
 
 [system.ruby.l1_cntrl5]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl5.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl5.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl5.L1Dcache
+L1Icache=system.ruby.l1_cntrl5.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=5
@@ -618,7 +618,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=5
 
-[system.ruby.l1_cntrl5.L1DcacheMemory]
+[system.ruby.l1_cntrl5.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -632,7 +632,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl5.L1IcacheMemory]
+[system.ruby.l1_cntrl5.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -650,9 +650,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl5.L1DcacheMemory
+dcache=system.ruby.l1_cntrl5.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl5.L1IcacheMemory
+icache=system.ruby.l1_cntrl5.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -665,9 +665,9 @@ slave=system.cpu5.test
 
 [system.ruby.l1_cntrl6]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl6.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl6.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl6.L1Dcache
+L1Icache=system.ruby.l1_cntrl6.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=6
@@ -683,7 +683,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=6
 
-[system.ruby.l1_cntrl6.L1DcacheMemory]
+[system.ruby.l1_cntrl6.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -697,7 +697,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl6.L1IcacheMemory]
+[system.ruby.l1_cntrl6.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -715,9 +715,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl6.L1DcacheMemory
+dcache=system.ruby.l1_cntrl6.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl6.L1IcacheMemory
+icache=system.ruby.l1_cntrl6.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -730,9 +730,9 @@ slave=system.cpu6.test
 
 [system.ruby.l1_cntrl7]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl7.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl7.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl7.L1Dcache
+L1Icache=system.ruby.l1_cntrl7.L1Icache
 buffer_size=0
 clock=1
 cntrl_id=7
@@ -748,7 +748,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=7
 
-[system.ruby.l1_cntrl7.L1DcacheMemory]
+[system.ruby.l1_cntrl7.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -762,7 +762,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl7.L1IcacheMemory]
+[system.ruby.l1_cntrl7.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -780,9 +780,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl7.L1DcacheMemory
+dcache=system.ruby.l1_cntrl7.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl7.L1IcacheMemory
+icache=system.ruby.l1_cntrl7.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -795,8 +795,8 @@ slave=system.cpu7.test
 
 [system.ruby.l2_cntrl0]
 type=L2Cache_Controller
-children=L2cacheMemory
-L2cacheMemory=system.ruby.l2_cntrl0.L2cacheMemory
+children=L2cache
+L2cache=system.ruby.l2_cntrl0.L2cache
 buffer_size=0
 clock=1
 cntrl_id=8
@@ -809,7 +809,7 @@ ruby_system=system.ruby
 transitions_per_cycle=32
 version=0
 
-[system.ruby.l2_cntrl0.L2cacheMemory]
+[system.ruby.l2_cntrl0.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
index 79036f78e..1fa14ea6e 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
@@ -373,22 +373,6 @@ links_utilized_percent_switch_10: 15.883
   outgoing_messages_switch_10_link_9_Writeback_Control: 994074 7952592 [ 0 604672 389402 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_10_link_9_Unblock_Control: 605124 4840992 [ 0 0 605124 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0
-
-
  --- L1Cache ---
  - Event Counts -
 Load [50249 50370 49923 50235 50375 50577 50611 50361 ] 402701
@@ -551,126 +535,6 @@ II  Writeback_Ack [0 0 0 0 0 0 0 0 ] 0
 II  Writeback_Ack_Data [338 299 298 364 330 322 350 387 ] 2688
 II  Writeback_Nack [7 4 0 3 1 0 1 1 ] 17
 
-Cache Stats: system.ruby.l1_cntrl1.L1IcacheMemory
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl1.L1DcacheMemory
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl2.L1IcacheMemory
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl2.L1DcacheMemory
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl3.L1IcacheMemory
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl3.L1DcacheMemory
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl4.L1IcacheMemory
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl4.L1DcacheMemory
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl5.L1IcacheMemory
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl5.L1DcacheMemory
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl6.L1IcacheMemory
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl6.L1DcacheMemory
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl7.L1IcacheMemory
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl7.L1DcacheMemory
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
-  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 0
-  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 0
-  system.ruby.l2_cntrl0.L2cacheMemory_total_prefetches: 0
-  system.ruby.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0
-
-
  --- L2Cache ---
  - Event Counts -
 L1_GETS [504389 ] 504389
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
index 16c080216..3d47d6198 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
@@ -4,111 +4,60 @@ sim_seconds                                  0.007481                       # Nu
 sim_ticks                                     7481441                       # Number of ticks simulated
 final_tick                                    7481441                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                  33553                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 250412                       # Number of bytes of host memory used
-host_seconds                                   222.97                       # Real time elapsed on the host
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+host_tick_rate                                  40613                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 299464                       # Number of bytes of host memory used
+host_seconds                                   184.21                       # Real time elapsed on the host
+system.ruby.l1_cntrl4.L1Dcache.demand_hits           21                       # Number of cache demand hits
+system.ruby.l1_cntrl4.L1Dcache.demand_misses        77428                       # Number of cache demand misses
+system.ruby.l1_cntrl4.L1Dcache.demand_accesses        77449                       # Number of cache demand accesses
+system.ruby.l1_cntrl4.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl4.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl4.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl5.L1Dcache.demand_hits           25                       # Number of cache demand hits
+system.ruby.l1_cntrl5.L1Dcache.demand_misses        77511                       # Number of cache demand misses
+system.ruby.l1_cntrl5.L1Dcache.demand_accesses        77536                       # Number of cache demand accesses
+system.ruby.l1_cntrl5.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl5.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl5.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl6.L1Dcache.demand_hits           21                       # Number of cache demand hits
+system.ruby.l1_cntrl6.L1Dcache.demand_misses        77666                       # Number of cache demand misses
+system.ruby.l1_cntrl6.L1Dcache.demand_accesses        77687                       # Number of cache demand accesses
+system.ruby.l1_cntrl6.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl6.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl6.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl7.L1Dcache.demand_hits           23                       # Number of cache demand hits
+system.ruby.l1_cntrl7.L1Dcache.demand_misses        77528                       # Number of cache demand misses
+system.ruby.l1_cntrl7.L1Dcache.demand_accesses        77551                       # Number of cache demand accesses
+system.ruby.l1_cntrl7.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl7.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl7.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits           27                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses        77272                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses        77299                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl1.L1Dcache.demand_hits           30                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L1Dcache.demand_misses        77679                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L1Dcache.demand_accesses        77709                       # Number of cache demand accesses
+system.ruby.l1_cntrl1.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl2.L1Dcache.demand_hits           14                       # Number of cache demand hits
+system.ruby.l1_cntrl2.L1Dcache.demand_misses        77082                       # Number of cache demand misses
+system.ruby.l1_cntrl2.L1Dcache.demand_accesses        77096                       # Number of cache demand accesses
+system.ruby.l1_cntrl2.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl2.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl2.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl3.L1Dcache.demand_hits           31                       # Number of cache demand hits
+system.ruby.l1_cntrl3.L1Dcache.demand_misses        77329                       # Number of cache demand misses
+system.ruby.l1_cntrl3.L1Dcache.demand_accesses        77360                       # Number of cache demand accesses
+system.ruby.l1_cntrl3.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl3.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl3.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l2_cntrl0.L2cache.demand_hits         5922                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses       613572                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses       619494                       # Number of cache demand accesses
 system.cpu0.num_reads                           99553                       # number of read accesses completed
 system.cpu0.num_writes                          54274                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
index 940350216..66942acd2 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
@@ -16,7 +16,7 @@ kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
 mem_ranges=
-memories=system.physmem system.funcmem
+memories=system.funcmem system.physmem
 num_work_ids=16
 readfile=
 symbolfile=
@@ -279,9 +279,9 @@ version=0
 
 [system.ruby.l1_cntrl0]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl0.L1Dcache
+L1Icache=system.ruby.l1_cntrl0.L1Icache
 N_tokens=9
 buffer_size=0
 clock=1
@@ -304,7 +304,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=0
 
-[system.ruby.l1_cntrl0.L1DcacheMemory]
+[system.ruby.l1_cntrl0.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -318,7 +318,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -336,9 +336,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl0.L1DcacheMemory
+dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -351,9 +351,9 @@ slave=system.cpu0.test
 
 [system.ruby.l1_cntrl1]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl1.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl1.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl1.L1Dcache
+L1Icache=system.ruby.l1_cntrl1.L1Icache
 N_tokens=9
 buffer_size=0
 clock=1
@@ -376,7 +376,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=1
 
-[system.ruby.l1_cntrl1.L1DcacheMemory]
+[system.ruby.l1_cntrl1.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -390,7 +390,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl1.L1IcacheMemory]
+[system.ruby.l1_cntrl1.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -408,9 +408,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl1.L1DcacheMemory
+dcache=system.ruby.l1_cntrl1.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl1.L1IcacheMemory
+icache=system.ruby.l1_cntrl1.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -423,9 +423,9 @@ slave=system.cpu1.test
 
 [system.ruby.l1_cntrl2]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl2.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl2.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl2.L1Dcache
+L1Icache=system.ruby.l1_cntrl2.L1Icache
 N_tokens=9
 buffer_size=0
 clock=1
@@ -448,7 +448,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=2
 
-[system.ruby.l1_cntrl2.L1DcacheMemory]
+[system.ruby.l1_cntrl2.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -462,7 +462,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl2.L1IcacheMemory]
+[system.ruby.l1_cntrl2.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -480,9 +480,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl2.L1DcacheMemory
+dcache=system.ruby.l1_cntrl2.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl2.L1IcacheMemory
+icache=system.ruby.l1_cntrl2.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -495,9 +495,9 @@ slave=system.cpu2.test
 
 [system.ruby.l1_cntrl3]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl3.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl3.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl3.L1Dcache
+L1Icache=system.ruby.l1_cntrl3.L1Icache
 N_tokens=9
 buffer_size=0
 clock=1
@@ -520,7 +520,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=3
 
-[system.ruby.l1_cntrl3.L1DcacheMemory]
+[system.ruby.l1_cntrl3.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -534,7 +534,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl3.L1IcacheMemory]
+[system.ruby.l1_cntrl3.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -552,9 +552,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl3.L1DcacheMemory
+dcache=system.ruby.l1_cntrl3.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl3.L1IcacheMemory
+icache=system.ruby.l1_cntrl3.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -567,9 +567,9 @@ slave=system.cpu3.test
 
 [system.ruby.l1_cntrl4]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl4.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl4.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl4.L1Dcache
+L1Icache=system.ruby.l1_cntrl4.L1Icache
 N_tokens=9
 buffer_size=0
 clock=1
@@ -592,7 +592,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=4
 
-[system.ruby.l1_cntrl4.L1DcacheMemory]
+[system.ruby.l1_cntrl4.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -606,7 +606,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl4.L1IcacheMemory]
+[system.ruby.l1_cntrl4.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -624,9 +624,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl4.L1DcacheMemory
+dcache=system.ruby.l1_cntrl4.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl4.L1IcacheMemory
+icache=system.ruby.l1_cntrl4.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -639,9 +639,9 @@ slave=system.cpu4.test
 
 [system.ruby.l1_cntrl5]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl5.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl5.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl5.L1Dcache
+L1Icache=system.ruby.l1_cntrl5.L1Icache
 N_tokens=9
 buffer_size=0
 clock=1
@@ -664,7 +664,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=5
 
-[system.ruby.l1_cntrl5.L1DcacheMemory]
+[system.ruby.l1_cntrl5.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -678,7 +678,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl5.L1IcacheMemory]
+[system.ruby.l1_cntrl5.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -696,9 +696,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl5.L1DcacheMemory
+dcache=system.ruby.l1_cntrl5.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl5.L1IcacheMemory
+icache=system.ruby.l1_cntrl5.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -711,9 +711,9 @@ slave=system.cpu5.test
 
 [system.ruby.l1_cntrl6]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl6.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl6.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl6.L1Dcache
+L1Icache=system.ruby.l1_cntrl6.L1Icache
 N_tokens=9
 buffer_size=0
 clock=1
@@ -736,7 +736,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=6
 
-[system.ruby.l1_cntrl6.L1DcacheMemory]
+[system.ruby.l1_cntrl6.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -750,7 +750,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl6.L1IcacheMemory]
+[system.ruby.l1_cntrl6.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -768,9 +768,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl6.L1DcacheMemory
+dcache=system.ruby.l1_cntrl6.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl6.L1IcacheMemory
+icache=system.ruby.l1_cntrl6.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -783,9 +783,9 @@ slave=system.cpu6.test
 
 [system.ruby.l1_cntrl7]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl7.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl7.L1IcacheMemory
+children=L1Dcache L1Icache sequencer
+L1Dcache=system.ruby.l1_cntrl7.L1Dcache
+L1Icache=system.ruby.l1_cntrl7.L1Icache
 N_tokens=9
 buffer_size=0
 clock=1
@@ -808,7 +808,7 @@ transitions_per_cycle=32
 use_timeout_latency=50
 version=7
 
-[system.ruby.l1_cntrl7.L1DcacheMemory]
+[system.ruby.l1_cntrl7.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -822,7 +822,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl7.L1IcacheMemory]
+[system.ruby.l1_cntrl7.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -840,9 +840,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl7.L1DcacheMemory
+dcache=system.ruby.l1_cntrl7.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl7.L1IcacheMemory
+icache=system.ruby.l1_cntrl7.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -855,8 +855,8 @@ slave=system.cpu7.test
 
 [system.ruby.l2_cntrl0]
 type=L2Cache_Controller
-children=L2cacheMemory
-L2cacheMemory=system.ruby.l2_cntrl0.L2cacheMemory
+children=L2cache
+L2cache=system.ruby.l2_cntrl0.L2cache
 N_tokens=9
 buffer_size=0
 clock=1
@@ -871,7 +871,7 @@ ruby_system=system.ruby
 transitions_per_cycle=32
 version=0
 
-[system.ruby.l2_cntrl0.L2cacheMemory]
+[system.ruby.l2_cntrl0.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
index d45693ce5..d37364c5c 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
@@ -399,26 +399,6 @@ links_utilized_percent_switch_10: 17.6719
   outgoing_messages_switch_10_link_9_Writeback_Control: 377581 3020648 [ 0 0 0 0 377581 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_10_link_9_Persistent_Control: 259692 2077536 [ 0 0 0 259692 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 77267
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 77267
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   65.1222%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   34.8778%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   77267    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [50331 49967 50254 50183 50017 50259 50136 50016 ] 401163
@@ -770,158 +750,6 @@ IS_L  Persistent_GETS [0 11 5 18 24 24 36 41 ] 159
 IS_L  Own_Lock_or_Unlock [204 226 218 212 235 219 224 238 ] 1776
 IS_L  Request_Timeout [277 242 190 265 341 233 222 251 ] 2021
 
-Cache Stats: system.ruby.l1_cntrl1.L1IcacheMemory
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl1.L1DcacheMemory
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_misses: 77262
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_demand_misses: 77262
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_LD:   64.6566%
-  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_ST:   35.3434%
-
-  system.ruby.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   77262    100%
-
-Cache Stats: system.ruby.l1_cntrl2.L1IcacheMemory
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl2.L1DcacheMemory
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_misses: 77078
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_demand_misses: 77078
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_LD:   65.1846%
-  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_ST:   34.8154%
-
-  system.ruby.l1_cntrl2.L1DcacheMemory_access_mode_type_Supervisor:   77078    100%
-
-Cache Stats: system.ruby.l1_cntrl3.L1IcacheMemory
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl3.L1DcacheMemory
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_misses: 76783
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_demand_misses: 76783
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_LD:   65.3348%
-  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_ST:   34.6652%
-
-  system.ruby.l1_cntrl3.L1DcacheMemory_access_mode_type_Supervisor:   76783    100%
-
-Cache Stats: system.ruby.l1_cntrl4.L1IcacheMemory
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl4.L1DcacheMemory
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_misses: 76947
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_demand_misses: 76947
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_LD:   64.9837%
-  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_ST:   35.0163%
-
-  system.ruby.l1_cntrl4.L1DcacheMemory_access_mode_type_Supervisor:   76947    100%
-
-Cache Stats: system.ruby.l1_cntrl5.L1IcacheMemory
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl5.L1DcacheMemory
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_misses: 77241
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_demand_misses: 77241
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_LD:   65.0496%
-  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_ST:   34.9504%
-
-  system.ruby.l1_cntrl5.L1DcacheMemory_access_mode_type_Supervisor:   77241    100%
-
-Cache Stats: system.ruby.l1_cntrl6.L1IcacheMemory
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl6.L1DcacheMemory
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_misses: 77320
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_demand_misses: 77320
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_LD:   64.8228%
-  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_ST:   35.1772%
-
-  system.ruby.l1_cntrl6.L1DcacheMemory_access_mode_type_Supervisor:   77320    100%
-
-Cache Stats: system.ruby.l1_cntrl7.L1IcacheMemory
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl7.L1DcacheMemory
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_misses: 76925
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_demand_misses: 76925
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_LD:   64.9984%
-  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_ST:   35.0016%
-
-  system.ruby.l1_cntrl7.L1DcacheMemory_access_mode_type_Supervisor:   76925    100%
-
-Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
-  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 615142
-  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 615142
-  system.ruby.l2_cntrl0.L2cacheMemory_total_prefetches: 0
-  system.ruby.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS:   65.0191%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   34.9809%
-
-  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   615142    100%
-
  --- L2Cache ---
  - Event Counts -
 L1_GETS [401048 ] 401048
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
index b069d8895..a0899442c 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
@@ -4,111 +4,60 @@ sim_seconds                                  0.006151                       # Nu
 sim_ticks                                     6151475                       # Number of ticks simulated
 final_tick                                    6151475                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                  38159                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 250384                       # Number of bytes of host memory used
-host_seconds                                   161.21                       # Real time elapsed on the host
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+host_tick_rate                                  46771                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 298400                       # Number of bytes of host memory used
+host_seconds                                   131.52                       # Real time elapsed on the host
+system.ruby.l1_cntrl4.L1Dcache.demand_hits           20                       # Number of cache demand hits
+system.ruby.l1_cntrl4.L1Dcache.demand_misses        76947                       # Number of cache demand misses
+system.ruby.l1_cntrl4.L1Dcache.demand_accesses        76967                       # Number of cache demand accesses
+system.ruby.l1_cntrl4.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl4.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl4.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl5.L1Dcache.demand_hits           25                       # Number of cache demand hits
+system.ruby.l1_cntrl5.L1Dcache.demand_misses        77241                       # Number of cache demand misses
+system.ruby.l1_cntrl5.L1Dcache.demand_accesses        77266                       # Number of cache demand accesses
+system.ruby.l1_cntrl5.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl5.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl5.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl6.L1Dcache.demand_hits           19                       # Number of cache demand hits
+system.ruby.l1_cntrl6.L1Dcache.demand_misses        77320                       # Number of cache demand misses
+system.ruby.l1_cntrl6.L1Dcache.demand_accesses        77339                       # Number of cache demand accesses
+system.ruby.l1_cntrl6.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl6.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl6.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl7.L1Dcache.demand_hits           21                       # Number of cache demand hits
+system.ruby.l1_cntrl7.L1Dcache.demand_misses        76925                       # Number of cache demand misses
+system.ruby.l1_cntrl7.L1Dcache.demand_accesses        76946                       # Number of cache demand accesses
+system.ruby.l1_cntrl7.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl7.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl7.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits           24                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses        77267                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses        77291                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl1.L1Dcache.demand_hits           17                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L1Dcache.demand_misses        77262                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L1Dcache.demand_accesses        77279                       # Number of cache demand accesses
+system.ruby.l1_cntrl1.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl2.L1Dcache.demand_hits           17                       # Number of cache demand hits
+system.ruby.l1_cntrl2.L1Dcache.demand_misses        77078                       # Number of cache demand misses
+system.ruby.l1_cntrl2.L1Dcache.demand_accesses        77095                       # Number of cache demand accesses
+system.ruby.l1_cntrl2.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl2.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl2.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl3.L1Dcache.demand_hits           22                       # Number of cache demand hits
+system.ruby.l1_cntrl3.L1Dcache.demand_misses        76783                       # Number of cache demand misses
+system.ruby.l1_cntrl3.L1Dcache.demand_accesses        76805                       # Number of cache demand accesses
+system.ruby.l1_cntrl3.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl3.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl3.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l2_cntrl0.L2cache.demand_hits         1681                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses       615142                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses       616823                       # Number of cache demand accesses
 system.cpu0.num_reads                          100000                       # number of read accesses completed
 system.cpu0.num_writes                          54250                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
index bc0318858..fdb5da322 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
@@ -16,7 +16,7 @@ kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
 mem_ranges=
-memories=system.funcmem system.physmem
+memories=system.physmem system.funcmem
 num_work_ids=16
 readfile=
 symbolfile=
@@ -292,10 +292,10 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl0]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory
-L2cacheMemory=system.ruby.l1_cntrl0.L2cacheMemory
+children=L1Dcache L1Icache L2cache sequencer
+L1Dcache=system.ruby.l1_cntrl0.L1Dcache
+L1Icache=system.ruby.l1_cntrl0.L1Icache
+L2cache=system.ruby.l1_cntrl0.L2cache
 buffer_size=0
 cache_response_latency=10
 clock=1
@@ -312,7 +312,7 @@ sequencer=system.ruby.l1_cntrl0.sequencer
 transitions_per_cycle=32
 version=0
 
-[system.ruby.l1_cntrl0.L1DcacheMemory]
+[system.ruby.l1_cntrl0.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -326,7 +326,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -340,7 +340,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl0.L2cacheMemory]
+[system.ruby.l1_cntrl0.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -358,9 +358,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl0.L1DcacheMemory
+dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -373,10 +373,10 @@ slave=system.cpu0.test
 
 [system.ruby.l1_cntrl1]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl1.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl1.L1IcacheMemory
-L2cacheMemory=system.ruby.l1_cntrl1.L2cacheMemory
+children=L1Dcache L1Icache L2cache sequencer
+L1Dcache=system.ruby.l1_cntrl1.L1Dcache
+L1Icache=system.ruby.l1_cntrl1.L1Icache
+L2cache=system.ruby.l1_cntrl1.L2cache
 buffer_size=0
 cache_response_latency=10
 clock=1
@@ -393,7 +393,7 @@ sequencer=system.ruby.l1_cntrl1.sequencer
 transitions_per_cycle=32
 version=1
 
-[system.ruby.l1_cntrl1.L1DcacheMemory]
+[system.ruby.l1_cntrl1.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -407,7 +407,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl1.L1IcacheMemory]
+[system.ruby.l1_cntrl1.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -421,7 +421,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl1.L2cacheMemory]
+[system.ruby.l1_cntrl1.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -439,9 +439,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl1.L1DcacheMemory
+dcache=system.ruby.l1_cntrl1.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl1.L1IcacheMemory
+icache=system.ruby.l1_cntrl1.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -454,10 +454,10 @@ slave=system.cpu1.test
 
 [system.ruby.l1_cntrl2]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl2.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl2.L1IcacheMemory
-L2cacheMemory=system.ruby.l1_cntrl2.L2cacheMemory
+children=L1Dcache L1Icache L2cache sequencer
+L1Dcache=system.ruby.l1_cntrl2.L1Dcache
+L1Icache=system.ruby.l1_cntrl2.L1Icache
+L2cache=system.ruby.l1_cntrl2.L2cache
 buffer_size=0
 cache_response_latency=10
 clock=1
@@ -474,7 +474,7 @@ sequencer=system.ruby.l1_cntrl2.sequencer
 transitions_per_cycle=32
 version=2
 
-[system.ruby.l1_cntrl2.L1DcacheMemory]
+[system.ruby.l1_cntrl2.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -488,7 +488,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl2.L1IcacheMemory]
+[system.ruby.l1_cntrl2.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -502,7 +502,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl2.L2cacheMemory]
+[system.ruby.l1_cntrl2.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -520,9 +520,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl2.L1DcacheMemory
+dcache=system.ruby.l1_cntrl2.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl2.L1IcacheMemory
+icache=system.ruby.l1_cntrl2.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -535,10 +535,10 @@ slave=system.cpu2.test
 
 [system.ruby.l1_cntrl3]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl3.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl3.L1IcacheMemory
-L2cacheMemory=system.ruby.l1_cntrl3.L2cacheMemory
+children=L1Dcache L1Icache L2cache sequencer
+L1Dcache=system.ruby.l1_cntrl3.L1Dcache
+L1Icache=system.ruby.l1_cntrl3.L1Icache
+L2cache=system.ruby.l1_cntrl3.L2cache
 buffer_size=0
 cache_response_latency=10
 clock=1
@@ -555,7 +555,7 @@ sequencer=system.ruby.l1_cntrl3.sequencer
 transitions_per_cycle=32
 version=3
 
-[system.ruby.l1_cntrl3.L1DcacheMemory]
+[system.ruby.l1_cntrl3.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -569,7 +569,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl3.L1IcacheMemory]
+[system.ruby.l1_cntrl3.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -583,7 +583,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl3.L2cacheMemory]
+[system.ruby.l1_cntrl3.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -601,9 +601,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl3.L1DcacheMemory
+dcache=system.ruby.l1_cntrl3.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl3.L1IcacheMemory
+icache=system.ruby.l1_cntrl3.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -616,10 +616,10 @@ slave=system.cpu3.test
 
 [system.ruby.l1_cntrl4]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl4.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl4.L1IcacheMemory
-L2cacheMemory=system.ruby.l1_cntrl4.L2cacheMemory
+children=L1Dcache L1Icache L2cache sequencer
+L1Dcache=system.ruby.l1_cntrl4.L1Dcache
+L1Icache=system.ruby.l1_cntrl4.L1Icache
+L2cache=system.ruby.l1_cntrl4.L2cache
 buffer_size=0
 cache_response_latency=10
 clock=1
@@ -636,7 +636,7 @@ sequencer=system.ruby.l1_cntrl4.sequencer
 transitions_per_cycle=32
 version=4
 
-[system.ruby.l1_cntrl4.L1DcacheMemory]
+[system.ruby.l1_cntrl4.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -650,7 +650,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl4.L1IcacheMemory]
+[system.ruby.l1_cntrl4.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -664,7 +664,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl4.L2cacheMemory]
+[system.ruby.l1_cntrl4.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -682,9 +682,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl4.L1DcacheMemory
+dcache=system.ruby.l1_cntrl4.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl4.L1IcacheMemory
+icache=system.ruby.l1_cntrl4.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -697,10 +697,10 @@ slave=system.cpu4.test
 
 [system.ruby.l1_cntrl5]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl5.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl5.L1IcacheMemory
-L2cacheMemory=system.ruby.l1_cntrl5.L2cacheMemory
+children=L1Dcache L1Icache L2cache sequencer
+L1Dcache=system.ruby.l1_cntrl5.L1Dcache
+L1Icache=system.ruby.l1_cntrl5.L1Icache
+L2cache=system.ruby.l1_cntrl5.L2cache
 buffer_size=0
 cache_response_latency=10
 clock=1
@@ -717,7 +717,7 @@ sequencer=system.ruby.l1_cntrl5.sequencer
 transitions_per_cycle=32
 version=5
 
-[system.ruby.l1_cntrl5.L1DcacheMemory]
+[system.ruby.l1_cntrl5.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -731,7 +731,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl5.L1IcacheMemory]
+[system.ruby.l1_cntrl5.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -745,7 +745,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl5.L2cacheMemory]
+[system.ruby.l1_cntrl5.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -763,9 +763,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl5.L1DcacheMemory
+dcache=system.ruby.l1_cntrl5.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl5.L1IcacheMemory
+icache=system.ruby.l1_cntrl5.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -778,10 +778,10 @@ slave=system.cpu5.test
 
 [system.ruby.l1_cntrl6]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl6.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl6.L1IcacheMemory
-L2cacheMemory=system.ruby.l1_cntrl6.L2cacheMemory
+children=L1Dcache L1Icache L2cache sequencer
+L1Dcache=system.ruby.l1_cntrl6.L1Dcache
+L1Icache=system.ruby.l1_cntrl6.L1Icache
+L2cache=system.ruby.l1_cntrl6.L2cache
 buffer_size=0
 cache_response_latency=10
 clock=1
@@ -798,7 +798,7 @@ sequencer=system.ruby.l1_cntrl6.sequencer
 transitions_per_cycle=32
 version=6
 
-[system.ruby.l1_cntrl6.L1DcacheMemory]
+[system.ruby.l1_cntrl6.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -812,7 +812,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl6.L1IcacheMemory]
+[system.ruby.l1_cntrl6.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -826,7 +826,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl6.L2cacheMemory]
+[system.ruby.l1_cntrl6.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -844,9 +844,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl6.L1DcacheMemory
+dcache=system.ruby.l1_cntrl6.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl6.L1IcacheMemory
+icache=system.ruby.l1_cntrl6.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -859,10 +859,10 @@ slave=system.cpu6.test
 
 [system.ruby.l1_cntrl7]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory L2cacheMemory sequencer
-L1DcacheMemory=system.ruby.l1_cntrl7.L1DcacheMemory
-L1IcacheMemory=system.ruby.l1_cntrl7.L1IcacheMemory
-L2cacheMemory=system.ruby.l1_cntrl7.L2cacheMemory
+children=L1Dcache L1Icache L2cache sequencer
+L1Dcache=system.ruby.l1_cntrl7.L1Dcache
+L1Icache=system.ruby.l1_cntrl7.L1Icache
+L2cache=system.ruby.l1_cntrl7.L2cache
 buffer_size=0
 cache_response_latency=10
 clock=1
@@ -879,7 +879,7 @@ sequencer=system.ruby.l1_cntrl7.sequencer
 transitions_per_cycle=32
 version=7
 
-[system.ruby.l1_cntrl7.L1DcacheMemory]
+[system.ruby.l1_cntrl7.L1Dcache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -893,7 +893,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl7.L1IcacheMemory]
+[system.ruby.l1_cntrl7.L1Icache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -907,7 +907,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.ruby.l1_cntrl7.L2cacheMemory]
+[system.ruby.l1_cntrl7.L2cache]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -925,9 +925,9 @@ tagArrayBanks=1
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.ruby.l1_cntrl7.L1DcacheMemory
+dcache=system.ruby.l1_cntrl7.L1Dcache
 deadlock_threshold=1000000
-icache=system.ruby.l1_cntrl7.L1IcacheMemory
+icache=system.ruby.l1_cntrl7.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
index a532ed140..75d9d7cf6 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
@@ -324,38 +324,6 @@ links_utilized_percent_switch_9: 18.0864
   outgoing_messages_switch_9_link_8_Writeback_Control: 950339 7602712 [ 0 0 582292 0 0 368047 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_9_link_8_Unblock_Control: 617596 4940768 [ 0 0 0 0 0 617596 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 76966
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 76966
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   65.2548%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   34.7452%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   76966    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L2cacheMemory
-  system.ruby.l1_cntrl0.L2cacheMemory_total_misses: 76966
-  system.ruby.l1_cntrl0.L2cacheMemory_total_demand_misses: 76966
-  system.ruby.l1_cntrl0.L2cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl0.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl0.L2cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl0.L2cacheMemory_request_type_LD:   65.2548%
-  system.ruby.l1_cntrl0.L2cacheMemory_request_type_ST:   34.7452%
-
-  system.ruby.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   76966    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [50266 50315 50271 50212 50263 50069 50306 49970 ] 401672
@@ -753,238 +721,6 @@ MM_WF  Ack [0 0 0 0 0 0 0 0 ] 0
 MM_WF  All_acks_no_sharers [0 0 0 0 0 0 0 0 ] 0
 MM_WF  Flush_line [0 0 0 0 0 0 0 0 ] 0
 
-Cache Stats: system.ruby.l1_cntrl1.L1IcacheMemory
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl1.L1DcacheMemory
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_misses: 77464
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_demand_misses: 77464
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_LD:   64.8972%
-  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_ST:   35.1028%
-
-  system.ruby.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   77464    100%
-
-Cache Stats: system.ruby.l1_cntrl1.L2cacheMemory
-  system.ruby.l1_cntrl1.L2cacheMemory_total_misses: 77464
-  system.ruby.l1_cntrl1.L2cacheMemory_total_demand_misses: 77464
-  system.ruby.l1_cntrl1.L2cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl1.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl1.L2cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl1.L2cacheMemory_request_type_LD:   64.8972%
-  system.ruby.l1_cntrl1.L2cacheMemory_request_type_ST:   35.1028%
-
-  system.ruby.l1_cntrl1.L2cacheMemory_access_mode_type_Supervisor:   77464    100%
-
-Cache Stats: system.ruby.l1_cntrl2.L1IcacheMemory
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl2.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl2.L1DcacheMemory
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_misses: 77315
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_demand_misses: 77315
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl2.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_LD:   64.9667%
-  system.ruby.l1_cntrl2.L1DcacheMemory_request_type_ST:   35.0333%
-
-  system.ruby.l1_cntrl2.L1DcacheMemory_access_mode_type_Supervisor:   77315    100%
-
-Cache Stats: system.ruby.l1_cntrl2.L2cacheMemory
-  system.ruby.l1_cntrl2.L2cacheMemory_total_misses: 77315
-  system.ruby.l1_cntrl2.L2cacheMemory_total_demand_misses: 77315
-  system.ruby.l1_cntrl2.L2cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl2.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl2.L2cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl2.L2cacheMemory_request_type_LD:   64.9667%
-  system.ruby.l1_cntrl2.L2cacheMemory_request_type_ST:   35.0333%
-
-  system.ruby.l1_cntrl2.L2cacheMemory_access_mode_type_Supervisor:   77315    100%
-
-Cache Stats: system.ruby.l1_cntrl3.L1IcacheMemory
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl3.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl3.L1DcacheMemory
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_misses: 77410
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_demand_misses: 77410
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl3.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_LD:   64.8069%
-  system.ruby.l1_cntrl3.L1DcacheMemory_request_type_ST:   35.1931%
-
-  system.ruby.l1_cntrl3.L1DcacheMemory_access_mode_type_Supervisor:   77410    100%
-
-Cache Stats: system.ruby.l1_cntrl3.L2cacheMemory
-  system.ruby.l1_cntrl3.L2cacheMemory_total_misses: 77410
-  system.ruby.l1_cntrl3.L2cacheMemory_total_demand_misses: 77410
-  system.ruby.l1_cntrl3.L2cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl3.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl3.L2cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl3.L2cacheMemory_request_type_LD:   64.8069%
-  system.ruby.l1_cntrl3.L2cacheMemory_request_type_ST:   35.1931%
-
-  system.ruby.l1_cntrl3.L2cacheMemory_access_mode_type_Supervisor:   77410    100%
-
-Cache Stats: system.ruby.l1_cntrl4.L1IcacheMemory
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl4.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl4.L1DcacheMemory
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_misses: 77212
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_demand_misses: 77212
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl4.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_LD:   65.0508%
-  system.ruby.l1_cntrl4.L1DcacheMemory_request_type_ST:   34.9492%
-
-  system.ruby.l1_cntrl4.L1DcacheMemory_access_mode_type_Supervisor:   77212    100%
-
-Cache Stats: system.ruby.l1_cntrl4.L2cacheMemory
-  system.ruby.l1_cntrl4.L2cacheMemory_total_misses: 77212
-  system.ruby.l1_cntrl4.L2cacheMemory_total_demand_misses: 77212
-  system.ruby.l1_cntrl4.L2cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl4.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl4.L2cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl4.L2cacheMemory_request_type_LD:   65.0508%
-  system.ruby.l1_cntrl4.L2cacheMemory_request_type_ST:   34.9492%
-
-  system.ruby.l1_cntrl4.L2cacheMemory_access_mode_type_Supervisor:   77212    100%
-
-Cache Stats: system.ruby.l1_cntrl5.L1IcacheMemory
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl5.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl5.L1DcacheMemory
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_misses: 77081
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_demand_misses: 77081
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl5.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_LD:   64.9032%
-  system.ruby.l1_cntrl5.L1DcacheMemory_request_type_ST:   35.0968%
-
-  system.ruby.l1_cntrl5.L1DcacheMemory_access_mode_type_Supervisor:   77081    100%
-
-Cache Stats: system.ruby.l1_cntrl5.L2cacheMemory
-  system.ruby.l1_cntrl5.L2cacheMemory_total_misses: 77081
-  system.ruby.l1_cntrl5.L2cacheMemory_total_demand_misses: 77081
-  system.ruby.l1_cntrl5.L2cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl5.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl5.L2cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl5.L2cacheMemory_request_type_LD:   64.9032%
-  system.ruby.l1_cntrl5.L2cacheMemory_request_type_ST:   35.0968%
-
-  system.ruby.l1_cntrl5.L2cacheMemory_access_mode_type_Supervisor:   77081    100%
-
-Cache Stats: system.ruby.l1_cntrl6.L1IcacheMemory
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl6.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl6.L1DcacheMemory
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_misses: 77611
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_demand_misses: 77611
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl6.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_LD:   64.7692%
-  system.ruby.l1_cntrl6.L1DcacheMemory_request_type_ST:   35.2308%
-
-  system.ruby.l1_cntrl6.L1DcacheMemory_access_mode_type_Supervisor:   77611    100%
-
-Cache Stats: system.ruby.l1_cntrl6.L2cacheMemory
-  system.ruby.l1_cntrl6.L2cacheMemory_total_misses: 77611
-  system.ruby.l1_cntrl6.L2cacheMemory_total_demand_misses: 77611
-  system.ruby.l1_cntrl6.L2cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl6.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl6.L2cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl6.L2cacheMemory_request_type_LD:   64.7692%
-  system.ruby.l1_cntrl6.L2cacheMemory_request_type_ST:   35.2308%
-
-  system.ruby.l1_cntrl6.L2cacheMemory_access_mode_type_Supervisor:   77611    100%
-
-Cache Stats: system.ruby.l1_cntrl7.L1IcacheMemory
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_misses: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_demand_misses: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl7.L1IcacheMemory_total_hw_prefetches: 0
-
-
-Cache Stats: system.ruby.l1_cntrl7.L1DcacheMemory
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_misses: 76964
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_demand_misses: 76964
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl7.L1DcacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_LD:   64.8654%
-  system.ruby.l1_cntrl7.L1DcacheMemory_request_type_ST:   35.1346%
-
-  system.ruby.l1_cntrl7.L1DcacheMemory_access_mode_type_Supervisor:   76964    100%
-
-Cache Stats: system.ruby.l1_cntrl7.L2cacheMemory
-  system.ruby.l1_cntrl7.L2cacheMemory_total_misses: 76964
-  system.ruby.l1_cntrl7.L2cacheMemory_total_demand_misses: 76964
-  system.ruby.l1_cntrl7.L2cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl7.L2cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl7.L2cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl7.L2cacheMemory_request_type_LD:   64.8654%
-  system.ruby.l1_cntrl7.L2cacheMemory_request_type_ST:   35.1346%
-
-  system.ruby.l1_cntrl7.L2cacheMemory_access_mode_type_Supervisor:   76964    100%
-
-Cache Stats: system.ruby.dir_cntrl0.probeFilter
-  system.ruby.dir_cntrl0.probeFilter_total_misses: 0
-  system.ruby.dir_cntrl0.probeFilter_total_demand_misses: 0
-  system.ruby.dir_cntrl0.probeFilter_total_prefetches: 0
-  system.ruby.dir_cntrl0.probeFilter_total_sw_prefetches: 0
-  system.ruby.dir_cntrl0.probeFilter_total_hw_prefetches: 0
-
-
 Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 811546
   memory_reads: 597507
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
index 85ee95513..781075885 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
@@ -4,159 +4,84 @@ sim_seconds                                  0.005796                       # Nu
 sim_ticks                                     5795833                       # Number of ticks simulated
 final_tick                                    5795833                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                  34597                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 250320                       # Number of bytes of host memory used
-host_seconds                                   167.53                       # Real time elapsed on the host
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl4.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl4.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl4.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl4.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl4.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl4.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl5.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl5.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl5.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl5.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl5.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl5.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl6.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl6.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl6.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl6.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl6.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl6.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl7.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl7.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl7.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl7.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl7.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl7.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl0.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl0.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl0.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl0.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl0.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl0.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl1.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl1.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl1.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl1.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl1.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl1.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl2.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl2.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl2.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl2.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl2.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl2.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl3.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl3.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl3.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl3.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl3.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl3.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.dir_cntrl0.probeFilter.num_data_array_reads            0                       # number of data array reads
-system.ruby.dir_cntrl0.probeFilter.num_data_array_writes            0                       # number of data array writes
-system.ruby.dir_cntrl0.probeFilter.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.dir_cntrl0.probeFilter.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.dir_cntrl0.probeFilter.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.dir_cntrl0.probeFilter.num_data_array_stalls            0                       # number of stalls caused by data array
+host_tick_rate                                  45179                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 298344                       # Number of bytes of host memory used
+host_seconds                                   128.29                       # Real time elapsed on the host
+system.ruby.l1_cntrl4.L1Dcache.demand_hits           14                       # Number of cache demand hits
+system.ruby.l1_cntrl4.L1Dcache.demand_misses        77212                       # Number of cache demand misses
+system.ruby.l1_cntrl4.L1Dcache.demand_accesses        77226                       # Number of cache demand accesses
+system.ruby.l1_cntrl4.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl4.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl4.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl4.L2cache.demand_hits           66                       # Number of cache demand hits
+system.ruby.l1_cntrl4.L2cache.demand_misses        77146                       # Number of cache demand misses
+system.ruby.l1_cntrl4.L2cache.demand_accesses        77212                       # Number of cache demand accesses
+system.ruby.l1_cntrl5.L1Dcache.demand_hits           28                       # Number of cache demand hits
+system.ruby.l1_cntrl5.L1Dcache.demand_misses        77076                       # Number of cache demand misses
+system.ruby.l1_cntrl5.L1Dcache.demand_accesses        77104                       # Number of cache demand accesses
+system.ruby.l1_cntrl5.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl5.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl5.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl5.L2cache.demand_hits           84                       # Number of cache demand hits
+system.ruby.l1_cntrl5.L2cache.demand_misses        76992                       # Number of cache demand misses
+system.ruby.l1_cntrl5.L2cache.demand_accesses        77076                       # Number of cache demand accesses
+system.ruby.l1_cntrl6.L1Dcache.demand_hits           12                       # Number of cache demand hits
+system.ruby.l1_cntrl6.L1Dcache.demand_misses        77608                       # Number of cache demand misses
+system.ruby.l1_cntrl6.L1Dcache.demand_accesses        77620                       # Number of cache demand accesses
+system.ruby.l1_cntrl6.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl6.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl6.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl6.L2cache.demand_hits           66                       # Number of cache demand hits
+system.ruby.l1_cntrl6.L2cache.demand_misses        77542                       # Number of cache demand misses
+system.ruby.l1_cntrl6.L2cache.demand_accesses        77608                       # Number of cache demand accesses
+system.ruby.l1_cntrl7.L1Dcache.demand_hits           14                       # Number of cache demand hits
+system.ruby.l1_cntrl7.L1Dcache.demand_misses        76959                       # Number of cache demand misses
+system.ruby.l1_cntrl7.L1Dcache.demand_accesses        76973                       # Number of cache demand accesses
+system.ruby.l1_cntrl7.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl7.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl7.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl7.L2cache.demand_hits           67                       # Number of cache demand hits
+system.ruby.l1_cntrl7.L2cache.demand_misses        76892                       # Number of cache demand misses
+system.ruby.l1_cntrl7.L2cache.demand_accesses        76959                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits           17                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses        76963                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses        76980                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L2cache.demand_hits           72                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L2cache.demand_misses        76891                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L2cache.demand_accesses        76963                       # Number of cache demand accesses
+system.ruby.l1_cntrl1.L1Dcache.demand_hits           22                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L1Dcache.demand_misses        77461                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L1Dcache.demand_accesses        77483                       # Number of cache demand accesses
+system.ruby.l1_cntrl1.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl1.L2cache.demand_hits           69                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L2cache.demand_misses        77392                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L2cache.demand_accesses        77461                       # Number of cache demand accesses
+system.ruby.l1_cntrl2.L1Dcache.demand_hits           12                       # Number of cache demand hits
+system.ruby.l1_cntrl2.L1Dcache.demand_misses        77314                       # Number of cache demand misses
+system.ruby.l1_cntrl2.L1Dcache.demand_accesses        77326                       # Number of cache demand accesses
+system.ruby.l1_cntrl2.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl2.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl2.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl2.L2cache.demand_hits           98                       # Number of cache demand hits
+system.ruby.l1_cntrl2.L2cache.demand_misses        77216                       # Number of cache demand misses
+system.ruby.l1_cntrl2.L2cache.demand_accesses        77314                       # Number of cache demand accesses
+system.ruby.l1_cntrl3.L1Dcache.demand_hits           19                       # Number of cache demand hits
+system.ruby.l1_cntrl3.L1Dcache.demand_misses        77408                       # Number of cache demand misses
+system.ruby.l1_cntrl3.L1Dcache.demand_accesses        77427                       # Number of cache demand accesses
+system.ruby.l1_cntrl3.L1Icache.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl3.L1Icache.demand_misses            0                       # Number of cache demand misses
+system.ruby.l1_cntrl3.L1Icache.demand_accesses            0                       # Number of cache demand accesses
+system.ruby.l1_cntrl3.L2cache.demand_hits           77                       # Number of cache demand hits
+system.ruby.l1_cntrl3.L2cache.demand_misses        77331                       # Number of cache demand misses
+system.ruby.l1_cntrl3.L2cache.demand_accesses        77408                       # Number of cache demand accesses
+system.ruby.dir_cntrl0.probeFilter.demand_hits            0                       # Number of cache demand hits
+system.ruby.dir_cntrl0.probeFilter.demand_misses            0                       # Number of cache demand misses
+system.ruby.dir_cntrl0.probeFilter.demand_accesses            0                       # Number of cache demand accesses
 system.cpu0.num_reads                           99395                       # number of read accesses completed
 system.cpu0.num_writes                          53721                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
index 0acb649d4..a22228475 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
@@ -237,18 +237,6 @@ links_utilized_percent_switch_9: 7.88828
   outgoing_messages_switch_9_link_8_Control: 617562 4940496 [ 0 0 617562 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_9_link_8_Data: 611948 44060256 [ 0 0 611948 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.cacheMemory
-  system.ruby.l1_cntrl0.cacheMemory_total_misses: 77377
-  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 77377
-  system.ruby.l1_cntrl0.cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl0.cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl0.cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl0.cacheMemory_request_type_LD:   65.0969%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   34.9031%
-
-  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   77377    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [50370 50258 50037 49672 50004 50305 50279 50578 ] 401503
@@ -288,90 +276,6 @@ IS  Data [50370 50258 50035 49669 50002 50301 50278 50576 ] 401489
 
 IM  Data [27005 26934 26786 27152 27327 27084 27074 26701 ] 216063
 
-Cache Stats: system.ruby.l1_cntrl1.cacheMemory
-  system.ruby.l1_cntrl1.cacheMemory_total_misses: 77193
-  system.ruby.l1_cntrl1.cacheMemory_total_demand_misses: 77193
-  system.ruby.l1_cntrl1.cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl1.cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl1.cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl1.cacheMemory_request_type_LD:   65.1069%
-  system.ruby.l1_cntrl1.cacheMemory_request_type_ST:   34.8931%
-
-  system.ruby.l1_cntrl1.cacheMemory_access_mode_type_Supervisor:   77193    100%
-
-Cache Stats: system.ruby.l1_cntrl2.cacheMemory
-  system.ruby.l1_cntrl2.cacheMemory_total_misses: 76824
-  system.ruby.l1_cntrl2.cacheMemory_total_demand_misses: 76824
-  system.ruby.l1_cntrl2.cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl2.cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl2.cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl2.cacheMemory_request_type_LD:   65.132%
-  system.ruby.l1_cntrl2.cacheMemory_request_type_ST:   34.868%
-
-  system.ruby.l1_cntrl2.cacheMemory_access_mode_type_Supervisor:   76824    100%
-
-Cache Stats: system.ruby.l1_cntrl3.cacheMemory
-  system.ruby.l1_cntrl3.cacheMemory_total_misses: 76825
-  system.ruby.l1_cntrl3.cacheMemory_total_demand_misses: 76825
-  system.ruby.l1_cntrl3.cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl3.cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl3.cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl3.cacheMemory_request_type_LD:   64.656%
-  system.ruby.l1_cntrl3.cacheMemory_request_type_ST:   35.344%
-
-  system.ruby.l1_cntrl3.cacheMemory_access_mode_type_Supervisor:   76825    100%
-
-Cache Stats: system.ruby.l1_cntrl4.cacheMemory
-  system.ruby.l1_cntrl4.cacheMemory_total_misses: 77331
-  system.ruby.l1_cntrl4.cacheMemory_total_demand_misses: 77331
-  system.ruby.l1_cntrl4.cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl4.cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl4.cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl4.cacheMemory_request_type_LD:   64.6623%
-  system.ruby.l1_cntrl4.cacheMemory_request_type_ST:   35.3377%
-
-  system.ruby.l1_cntrl4.cacheMemory_access_mode_type_Supervisor:   77331    100%
-
-Cache Stats: system.ruby.l1_cntrl5.cacheMemory
-  system.ruby.l1_cntrl5.cacheMemory_total_misses: 77389
-  system.ruby.l1_cntrl5.cacheMemory_total_demand_misses: 77389
-  system.ruby.l1_cntrl5.cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl5.cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl5.cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl5.cacheMemory_request_type_LD:   65.0028%
-  system.ruby.l1_cntrl5.cacheMemory_request_type_ST:   34.9972%
-
-  system.ruby.l1_cntrl5.cacheMemory_access_mode_type_Supervisor:   77389    100%
-
-Cache Stats: system.ruby.l1_cntrl6.cacheMemory
-  system.ruby.l1_cntrl6.cacheMemory_total_misses: 77354
-  system.ruby.l1_cntrl6.cacheMemory_total_demand_misses: 77354
-  system.ruby.l1_cntrl6.cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl6.cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl6.cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl6.cacheMemory_request_type_LD:   64.9986%
-  system.ruby.l1_cntrl6.cacheMemory_request_type_ST:   35.0014%
-
-  system.ruby.l1_cntrl6.cacheMemory_access_mode_type_Supervisor:   77354    100%
-
-Cache Stats: system.ruby.l1_cntrl7.cacheMemory
-  system.ruby.l1_cntrl7.cacheMemory_total_misses: 77281
-  system.ruby.l1_cntrl7.cacheMemory_total_demand_misses: 77281
-  system.ruby.l1_cntrl7.cacheMemory_total_prefetches: 0
-  system.ruby.l1_cntrl7.cacheMemory_total_sw_prefetches: 0
-  system.ruby.l1_cntrl7.cacheMemory_total_hw_prefetches: 0
-
-  system.ruby.l1_cntrl7.cacheMemory_request_type_LD:   65.4469%
-  system.ruby.l1_cntrl7.cacheMemory_request_type_ST:   34.5531%
-
-  system.ruby.l1_cntrl7.cacheMemory_access_mode_type_Supervisor:   77281    100%
-
 Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 1218678
   memory_reads: 609346
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
index f571f66e4..af88cf774 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
@@ -4,57 +4,33 @@ sim_seconds                                  0.008665                       # Nu
 sim_ticks                                     8664886                       # Number of ticks simulated
 final_tick                                    8664886                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                 164643                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 249776                       # Number of bytes of host memory used
-host_seconds                                    52.63                       # Real time elapsed on the host
-system.ruby.l1_cntrl4.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl4.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl4.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl4.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl4.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl4.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl5.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl5.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl5.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl5.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl5.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl5.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl6.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl6.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl6.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl6.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl6.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl6.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl7.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl7.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl7.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl7.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl7.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl7.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl0.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl0.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl0.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl0.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl0.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl0.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl1.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl1.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl1.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl1.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl1.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl1.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl2.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl2.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl2.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl2.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl2.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl2.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.ruby.l1_cntrl3.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.ruby.l1_cntrl3.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.ruby.l1_cntrl3.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.ruby.l1_cntrl3.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.ruby.l1_cntrl3.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.ruby.l1_cntrl3.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+host_tick_rate                                 174865                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 297912                       # Number of bytes of host memory used
+host_seconds                                    49.55                       # Real time elapsed on the host
+system.ruby.l1_cntrl4.cacheMemory.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl4.cacheMemory.demand_misses        77331                       # Number of cache demand misses
+system.ruby.l1_cntrl4.cacheMemory.demand_accesses        77331                       # Number of cache demand accesses
+system.ruby.l1_cntrl5.cacheMemory.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl5.cacheMemory.demand_misses        77389                       # Number of cache demand misses
+system.ruby.l1_cntrl5.cacheMemory.demand_accesses        77389                       # Number of cache demand accesses
+system.ruby.l1_cntrl6.cacheMemory.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl6.cacheMemory.demand_misses        77354                       # Number of cache demand misses
+system.ruby.l1_cntrl6.cacheMemory.demand_accesses        77354                       # Number of cache demand accesses
+system.ruby.l1_cntrl7.cacheMemory.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl7.cacheMemory.demand_misses        77281                       # Number of cache demand misses
+system.ruby.l1_cntrl7.cacheMemory.demand_accesses        77281                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.cacheMemory.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl0.cacheMemory.demand_misses        77377                       # Number of cache demand misses
+system.ruby.l1_cntrl0.cacheMemory.demand_accesses        77377                       # Number of cache demand accesses
+system.ruby.l1_cntrl1.cacheMemory.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl1.cacheMemory.demand_misses        77193                       # Number of cache demand misses
+system.ruby.l1_cntrl1.cacheMemory.demand_accesses        77193                       # Number of cache demand accesses
+system.ruby.l1_cntrl2.cacheMemory.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl2.cacheMemory.demand_misses        76824                       # Number of cache demand misses
+system.ruby.l1_cntrl2.cacheMemory.demand_accesses        76824                       # Number of cache demand accesses
+system.ruby.l1_cntrl3.cacheMemory.demand_hits            0                       # Number of cache demand hits
+system.ruby.l1_cntrl3.cacheMemory.demand_misses        76825                       # Number of cache demand misses
+system.ruby.l1_cntrl3.cacheMemory.demand_accesses        76825                       # Number of cache demand accesses
 system.cpu0.num_reads                           99885                       # number of read accesses completed
 system.cpu0.num_writes                          54375                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed