stats: updates statistics for ruby regressions

3 files changed, 114 insertions, 348 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