stats: updates statistics for ruby regressions

64 files changed, 915 insertions, 2734 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
index 6c0f26fdf..d3204d576 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
@@ -74,6 +74,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu0.tracer
@@ -145,6 +146,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu1.tracer
@@ -1010,7 +1012,7 @@ pio=system.piobus.master[9]
 [system.physmem]
 type=SimpleDRAM
 activation_limit=4
-addr_mapping=openmap
+addr_mapping=RaBaChCo
 banks_per_rank=8
 channels=1
 clock=1000
@@ -1135,9 +1137,9 @@ slave=system.pc.south_bridge.ide.dma
 
 [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=500
 cntrl_id=0
@@ -1156,7 +1158,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
@@ -1170,7 +1172,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
@@ -1198,9 +1200,9 @@ unit_filter=8
 type=RubySequencer
 access_phys_mem=true
 clock=500
-dcache=system.ruby.l1_cntrl0.L1DcacheMemory
+dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -1214,9 +1216,9 @@ slave=system.cpu0.icache_port system.cpu0.dcache_port system.cpu0.itb.walker.por
 
 [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=500
 cntrl_id=1
@@ -1235,7 +1237,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
@@ -1249,7 +1251,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
@@ -1277,9 +1279,9 @@ unit_filter=8
 type=RubySequencer
 access_phys_mem=true
 clock=500
-dcache=system.ruby.l1_cntrl1.L1DcacheMemory
+dcache=system.ruby.l1_cntrl1.L1Dcache
 deadlock_threshold=500000
-icache=system.ruby.l1_cntrl1.L1IcacheMemory
+icache=system.ruby.l1_cntrl1.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -1293,8 +1295,8 @@ slave=system.cpu1.icache_port system.cpu1.dcache_port system.cpu1.itb.walker.por
 
 [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=500
 cntrl_id=2
@@ -1308,7 +1310,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/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats
index 6d0e83626..ab98339a8 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Apr/22/2013 16:53:22
+Real time: May/15/2013 12:08:23
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 481
-Elapsed_time_in_minutes: 8.01667
-Elapsed_time_in_hours: 0.133611
-Elapsed_time_in_days: 0.00556713
+Elapsed_time_in_seconds: 796
+Elapsed_time_in_minutes: 13.2667
+Elapsed_time_in_hours: 0.221111
+Elapsed_time_in_days: 0.00921296
 
-Virtual_time_in_seconds: 480.45
-Virtual_time_in_minutes: 8.0075
-Virtual_time_in_hours:   0.133458
-Virtual_time_in_days:    0.00556076
+Virtual_time_in_seconds: 792.33
+Virtual_time_in_minutes: 13.2055
+Virtual_time_in_hours:   0.220092
+Virtual_time_in_days:    0.00917049
 
 Ruby_current_time: 10410297758
 Ruby_start_time: 0
 Ruby_cycles: 10410297758
 
-mbytes_resident: 604.641
-mbytes_total: 843.926
-resident_ratio: 0.716471
+mbytes_resident: 606.461
+mbytes_total: 851.852
+resident_ratio: 0.711942
 
 ruby_cycles_executed: [ 10410297759 10410297759 ]
 
@@ -86,13 +86,13 @@ Total_delay_cycles: [binsize: 1 max: 13 count: 10870925 average: 0.594928 | stan
 Resource Usage
 --------------
 page_size: 4096
-user_time: 479
+user_time: 791
 system_time: 0
-page_reclaims: 146294
-page_faults: 18
+page_reclaims: 146348
+page_faults: 22
 swaps: 0
-block_inputs: 16016
-block_outputs: 528
+block_inputs: 28560
+block_outputs: 552
 
 Network Stats
 -------------
@@ -194,29 +194,6 @@ links_utilized_percent_switch_5: 0.0454927
   outgoing_messages_switch_5_link_3_Response_Data: 97783 7040376 [ 0 97783 0 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_5_link_3_Response_Control: 16569 132552 [ 0 16569 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: 352190
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 352190
-  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
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   352190    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 550662
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 550662
-  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:   55.6706%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   44.3294%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   550662    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [6569518 8303439 ] 14872957
@@ -389,42 +366,6 @@ PF_IS_I  Data_Exclusive [0 0 ] 0
 PF_IS_I  DataS_fromL1 [0 0 ] 0
 PF_IS_I  Data_all_Acks [0 0 ] 0
 
-Cache Stats: system.ruby.l1_cntrl1.L1IcacheMemory
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_misses: 459847
-  system.ruby.l1_cntrl1.L1IcacheMemory_total_demand_misses: 459847
-  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
-
-  system.ruby.l1_cntrl1.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl1.L1IcacheMemory_access_mode_type_Supervisor:   459847    100%
-
-Cache Stats: system.ruby.l1_cntrl1.L1DcacheMemory
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_misses: 1291679
-  system.ruby.l1_cntrl1.L1DcacheMemory_total_demand_misses: 1291679
-  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:   83.797%
-  system.ruby.l1_cntrl1.L1DcacheMemory_request_type_ST:   16.203%
-
-  system.ruby.l1_cntrl1.L1DcacheMemory_access_mode_type_Supervisor:   1291679    100%
-
-Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
-  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 227803
-  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 227803
-  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:   25.6248%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   7.23871%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   67.1365%
-
-  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   227803    100%
-
  --- L2Cache ---
  - Event Counts -
 L1_GET_INSTR [812037 ] 812037
diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt
index 79f3ff0c1..e29eb22f7 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  5.205149                       # Nu
 sim_ticks                                5205148879000                       # Number of ticks simulated
 final_tick                               5205148879000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 128983                       # Simulator instruction rate (inst/s)
-host_op_rate                                   247272                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             6293860084                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 868904                       # Number of bytes of host memory used
-host_seconds                                   827.02                       # Real time elapsed on the host
+host_inst_rate                                 134092                       # Simulator instruction rate (inst/s)
+host_op_rate                                   257066                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             6543163557                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 872300                       # Number of bytes of host memory used
+host_seconds                                   795.51                       # Real time elapsed on the host
 sim_insts                                   106671342                       # Number of instructions simulated
 sim_ops                                     204498755                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::pc.south_bridge.ide        35240                       # Number of bytes read from this memory
@@ -227,18 +227,12 @@ system.pc.south_bridge.ide.disks1.dma_read_txs            0
 system.pc.south_bridge.ide.disks1.dma_write_full_pages            1                       # Number of full page size DMA writes.
 system.pc.south_bridge.ide.disks1.dma_write_bytes         4096                       # Number of bytes transfered via DMA writes.
 system.pc.south_bridge.ide.disks1.dma_write_txs            1                       # Number of DMA write transactions.
-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     11503621                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses       550662                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses     12054283                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits     70015833                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses       352190                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses     70368023                       # 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
@@ -248,18 +242,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     12163827                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L1Dcache.demand_misses      1291679                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L1Dcache.demand_accesses     13455506                       # Number of cache demand accesses
+system.ruby.l1_cntrl1.L1Icache.demand_hits     55549058                       # Number of cache demand hits
+system.ruby.l1_cntrl1.L1Icache.demand_misses       459847                       # Number of cache demand misses
+system.ruby.l1_cntrl1.L1Icache.demand_accesses     56008905                       # 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
@@ -269,12 +257,9 @@ 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.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      2426575                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses       227803                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses      2654378                       # Number of cache demand accesses
 system.cpu0.numCycles                     10410297758                       # number of cpu cycles simulated
 system.cpu0.numWorkItemsStarted                     0                       # number of work items this cpu started
 system.cpu0.numWorkItemsCompleted                   0                       # number of work items this cpu completed
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
index 2ccf15086..c5745408e 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
@@ -52,6 +52,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -167,9 +168,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
@@ -188,7 +189,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
@@ -202,7 +203,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
@@ -230,9 +231,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -245,8 +246,8 @@ slave=system.cpu.icache_port system.cpu.dcache_port
 
 [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=1
@@ -260,7 +261,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/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
index 58182901c..bdfda8e2d 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
@@ -160,29 +160,6 @@ links_utilized_percent_switch_3: 4.89085
   outgoing_messages_switch_3_link_2_Response_Data: 277 19944 [ 0 277 0 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Response_Control: 1175 9400 [ 0 1175 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: 691
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 691
-  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
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   691    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 799
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 799
-  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:   72.9662%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   27.0338%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   799    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [1183 ] 1183
@@ -355,19 +332,6 @@ PF_IS_I  Data_Exclusive [0 ] 0
 PF_IS_I  DataS_fromL1 [0 ] 0
 PF_IS_I  Data_all_Acks [0 ] 0
 
-Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
-  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 1460
-  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 1460
-  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:   39.0411%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   46.9863%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   13.9726%
-
-  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   1460    100%
-
  --- L2Cache ---
  - Event Counts -
 L1_GET_INSTR [691 ] 691
@@ -530,17 +494,6 @@ MT_MB  Unblock_Cancel [0 ] 0
 MT_MB  Exclusive_Unblock [799 ] 799
 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 [0 ] 0
 MT_IIB  L1_GETX [0 ] 0
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
index 1af842468..ffef61c0e 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
@@ -4,31 +4,22 @@ sim_seconds                                  0.000139                       # Nu
 sim_ticks                                      138616                       # Number of ticks simulated
 final_tick                                     138616                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  17199                       # Simulator instruction rate (inst/s)
-host_op_rate                                    17198                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 373054                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 151764                       # Number of bytes of host memory used
-host_seconds                                     0.37                       # Real time elapsed on the host
+host_inst_rate                                  20262                       # Simulator instruction rate (inst/s)
+host_op_rate                                    20260                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 439475                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 154624                       # Number of bytes of host memory used
+host_seconds                                     0.32                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
-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.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.l2_cntrl0.L2cache.demand_hits           30                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses         1460                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses         1490                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits         1249                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          799                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses         2048                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits         5709                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses          691                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses         6400                       # 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
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
index 80930f2bf..81fe5338f 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
@@ -52,6 +52,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -166,9 +167,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
@@ -184,7 +185,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
@@ -198,7 +199,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
@@ -216,9 +217,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -231,8 +232,8 @@ slave=system.cpu.icache_port system.cpu.dcache_port
 
 [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=1
@@ -245,7 +246,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/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
index f50b1223b..0ce1fd4ab 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
@@ -164,22 +164,6 @@ links_utilized_percent_switch_3: 6.64705
   outgoing_messages_switch_3_link_2_Writeback_Control: 1992 15936 [ 0 1093 899 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Unblock_Control: 1109 8872 [ 0 0 1109 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 [1183 ] 1183
@@ -342,14 +326,6 @@ II  Writeback_Ack [0 ] 0
 II  Writeback_Ack_Data [0 ] 0
 II  Writeback_Nack [0 ] 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 [1171 ] 1171
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
index 9fb780812..be314d3f7 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
@@ -4,31 +4,22 @@ sim_seconds                                  0.000118                       # Nu
 sim_ticks                                      117611                       # Number of ticks simulated
 final_tick                                     117611                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  10532                       # Simulator instruction rate (inst/s)
-host_op_rate                                    10532                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 193832                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 151932                       # Number of bytes of host memory used
-host_seconds                                     0.61                       # Real time elapsed on the host
+host_inst_rate                                  18838                       # Simulator instruction rate (inst/s)
+host_op_rate                                    18837                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 346683                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 154776                       # Number of bytes of host memory used
+host_seconds                                     0.34                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
-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.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.l2_cntrl0.L2cache.demand_hits          253                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses         1109                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses         1362                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits         1332                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          716                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses         2048                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits         5754                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses          646                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses         6400                       # Number of cache demand accesses
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
index 6eda0d2c3..69d3875e9 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
@@ -52,6 +52,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -170,9 +171,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=2
 buffer_size=0
 clock=1
@@ -195,7 +196,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
@@ -209,7 +210,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
@@ -227,9 +228,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -242,8 +243,8 @@ slave=system.cpu.icache_port system.cpu.dcache_port
 
 [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=2
 buffer_size=0
 clock=1
@@ -258,7 +259,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/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats
index 7342fd16c..6541fb769 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats
@@ -160,29 +160,6 @@ links_utilized_percent_switch_3: 4.4341
   outgoing_messages_switch_3_link_2_Writeback_Data: 229 16488 [ 0 0 0 0 229 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Writeback_Control: 967 7736 [ 0 0 0 0 967 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 646
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 646
-  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
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   646    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 736
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 736
-  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:   71.3315%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   28.6685%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   736    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [1183 ] 1183
@@ -534,18 +511,6 @@ IS_L  Persistent_GETS [0 ] 0
 IS_L  Own_Lock_or_Unlock [0 ] 0
 IS_L  Request_Timeout [0 ] 0
 
-Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
-  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 1195
-  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 1195
-  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:   84.5188%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   15.4812%
-
-  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   1195    100%
-
  --- L2Cache ---
  - Event Counts -
 L1_GETS [1122 ] 1122
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
index 6b0e07c9d..959a1bade 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
@@ -4,31 +4,22 @@ sim_seconds                                  0.000114                       # Nu
 sim_ticks                                      113627                       # Number of ticks simulated
 final_tick                                     113627                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  16133                       # Simulator instruction rate (inst/s)
-host_op_rate                                    16132                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 286847                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 149700                       # Number of bytes of host memory used
-host_seconds                                     0.40                       # Real time elapsed on the host
+host_inst_rate                                  26434                       # Simulator instruction rate (inst/s)
+host_op_rate                                    26432                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 469977                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 153588                       # Number of bytes of host memory used
+host_seconds                                     0.24                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
-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.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.l2_cntrl0.L2cache.demand_hits          187                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses         1195                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses         1382                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits         1312                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          736                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses         2048                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits         5754                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses          646                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses         6400                       # Number of cache demand accesses
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
index 97e4f32c9..56cc19d50 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
@@ -52,6 +52,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -183,10 +184,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
@@ -203,7 +204,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
@@ -217,7 +218,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
@@ -231,7 +232,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
@@ -249,9 +250,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
index 1b4fa1d87..ecbf01672 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
@@ -144,42 +144,6 @@ links_utilized_percent_switch_2: 4.80443
   outgoing_messages_switch_2_link_1_Writeback_Control: 2066 16528 [ 0 0 1143 0 0 923 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Unblock_Control: 1159 9272 [ 0 0 0 0 0 1159 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 646
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 646
-  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
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   646    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 716
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 716
-  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:   73.324%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   26.676%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   716    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L2cacheMemory
-  system.ruby.l1_cntrl0.L2cacheMemory_total_misses: 1362
-  system.ruby.l1_cntrl0.L2cacheMemory_total_demand_misses: 1362
-  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:   38.5463%
-  system.ruby.l1_cntrl0.L2cacheMemory_request_type_ST:   14.0235%
-  system.ruby.l1_cntrl0.L2cacheMemory_request_type_IFETCH:   47.4302%
-
-  system.ruby.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   1362    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [1191 ] 1191
@@ -577,14 +541,6 @@ MM_WF  Ack [0 ] 0
 MM_WF  All_acks_no_sharers [0 ] 0
 MM_WF  Flush_line [0 ] 0
 
-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: 1379
   memory_reads: 1159
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
index 47bb986c1..aace843a9 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
@@ -4,37 +4,25 @@ sim_seconds                                  0.000093                       # Nu
 sim_ticks                                       93341                       # Number of ticks simulated
 final_tick                                      93341                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  19067                       # Simulator instruction rate (inst/s)
-host_op_rate                                    19065                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 278479                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 149628                       # Number of bytes of host memory used
-host_seconds                                     0.34                       # Real time elapsed on the host
+host_inst_rate                                  22966                       # Simulator instruction rate (inst/s)
+host_op_rate                                    22964                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 335419                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 152500                       # Number of bytes of host memory used
+host_seconds                                     0.28                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
-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.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
+system.ruby.l1_cntrl0.L1Dcache.demand_hits         1332                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          716                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses         2048                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits         5754                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses          646                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses         6400                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L2cache.demand_hits          203                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L2cache.demand_misses         1159                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L2cache.demand_accesses         1362                       # 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.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats
index 0916fd5d5..b561f1129 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats
@@ -133,19 +133,6 @@ links_utilized_percent_switch_2: 6.00613
   outgoing_messages_switch_2_link_1_Control: 1730 13840 [ 0 0 1730 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 1726 124272 [ 0 0 1726 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.cacheMemory
-  system.ruby.l1_cntrl0.cacheMemory_total_misses: 1730
-  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 1730
-  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:   42.0231%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   15.7803%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   42.1965%
-
-  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1730    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [1183 ] 1183
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
index db16b5ceb..e942e8340 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
@@ -4,19 +4,16 @@ sim_seconds                                  0.000144                       # Nu
 sim_ticks                                      143853                       # Number of ticks simulated
 final_tick                                     143853                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  25445                       # Simulator instruction rate (inst/s)
-host_op_rate                                    25443                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 572727                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 150220                       # Number of bytes of host memory used
-host_seconds                                     0.25                       # Real time elapsed on the host
+host_inst_rate                                  31570                       # Simulator instruction rate (inst/s)
+host_op_rate                                    31567                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 710572                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 153096                       # Number of bytes of host memory used
+host_seconds                                     0.20                       # Real time elapsed on the host
 sim_insts                                        6390                       # Number of instructions simulated
 sim_ops                                          6390                       # Number of ops (including micro ops) simulated
-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_cntrl0.cacheMemory.demand_hits         6718                       # Number of cache demand hits
+system.ruby.l1_cntrl0.cacheMemory.demand_misses         1730                       # Number of cache demand misses
+system.ruby.l1_cntrl0.cacheMemory.demand_accesses         8448                       # Number of cache demand accesses
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini
index 89c677e9f..070ef34da 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini
@@ -52,6 +52,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -167,9 +168,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
@@ -188,7 +189,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
@@ -202,7 +203,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
@@ -230,9 +231,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -245,8 +246,8 @@ slave=system.cpu.icache_port system.cpu.dcache_port
 
 [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=1
@@ -260,7 +261,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/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats
index 90fb6decb..e4af41b60 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats
@@ -160,29 +160,6 @@ links_utilized_percent_switch_3: 4.8648
   outgoing_messages_switch_3_link_2_Response_Data: 103 7416 [ 0 103 0 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Response_Control: 436 3488 [ 0 436 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: 300
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 300
-  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
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   300    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 272
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 272
-  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:   75%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   25%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   272    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [415 ] 415
@@ -355,19 +332,6 @@ PF_IS_I  Data_Exclusive [0 ] 0
 PF_IS_I  DataS_fromL1 [0 ] 0
 PF_IS_I  Data_all_Acks [0 ] 0
 
-Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
-  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 547
-  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 547
-  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:   35.1005%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   53.1993%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   11.7002%
-
-  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   547    100%
-
  --- L2Cache ---
  - Event Counts -
 L1_GET_INSTR [300 ] 300
@@ -530,17 +494,6 @@ MT_MB  Unblock_Cancel [0 ] 0
 MT_MB  Exclusive_Unblock [272 ] 272
 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 [0 ] 0
 MT_IIB  L1_GETX [0 ] 0
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
index c105d5894..e400893c2 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
@@ -4,31 +4,22 @@ sim_seconds                                  0.000053                       # Nu
 sim_ticks                                       52575                       # Number of ticks simulated
 final_tick                                      52575                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  13619                       # Simulator instruction rate (inst/s)
-host_op_rate                                    13618                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 277801                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 149308                       # Number of bytes of host memory used
-host_seconds                                     0.19                       # Real time elapsed on the host
+host_inst_rate                                  12497                       # Simulator instruction rate (inst/s)
+host_op_rate                                    12496                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 254920                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 152164                       # Number of bytes of host memory used
+host_seconds                                     0.21                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
-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.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.l2_cntrl0.L2cache.demand_hits           25                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses          547                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses          572                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits          437                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          272                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses          709                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits         2285                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses          300                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses         2585                       # 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
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
index fc72761f4..713cafbd1 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
@@ -52,6 +52,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -166,9 +167,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
@@ -184,7 +185,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
@@ -198,7 +199,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
@@ -216,9 +217,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -231,8 +232,8 @@ slave=system.cpu.icache_port system.cpu.dcache_port
 
 [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=1
@@ -245,7 +246,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/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
index 5885ff77b..1cbdf7fce 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
@@ -164,22 +164,6 @@ links_utilized_percent_switch_3: 6.52835
   outgoing_messages_switch_3_link_2_Writeback_Control: 738 5904 [ 0 407 331 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Unblock_Control: 423 3384 [ 0 0 423 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 [415 ] 415
@@ -342,14 +326,6 @@ II  Writeback_Ack [0 ] 0
 II  Writeback_Ack_Data [0 ] 0
 II  Writeback_Nack [0 ] 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 [454 ] 454
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
index 21dd911d3..8f2c45ec9 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
@@ -4,31 +4,22 @@ sim_seconds                                  0.000045                       # Nu
 sim_ticks                                       44968                       # Number of ticks simulated
 final_tick                                      44968                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                   8988                       # Simulator instruction rate (inst/s)
-host_op_rate                                     8987                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 156818                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 149468                       # Number of bytes of host memory used
-host_seconds                                     0.29                       # Real time elapsed on the host
+host_inst_rate                                  13243                       # Simulator instruction rate (inst/s)
+host_op_rate                                    13241                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 231036                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 152316                       # Number of bytes of host memory used
+host_seconds                                     0.19                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
-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.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.l2_cntrl0.L2cache.demand_hits           87                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses          423                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses          510                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits          469                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          240                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses          709                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits         2315                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses          270                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses         2585                       # Number of cache demand accesses
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
index e712900eb..c81d2d62c 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
@@ -52,6 +52,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -170,9 +171,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=2
 buffer_size=0
 clock=1
@@ -195,7 +196,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
@@ -209,7 +210,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
@@ -227,9 +228,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -242,8 +243,8 @@ slave=system.cpu.icache_port system.cpu.dcache_port
 
 [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=2
 buffer_size=0
 clock=1
@@ -258,7 +259,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/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats
index 24d750eb4..8d7b50556 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats
@@ -160,29 +160,6 @@ links_utilized_percent_switch_3: 4.36236
   outgoing_messages_switch_3_link_2_Writeback_Data: 84 6048 [ 0 0 0 0 84 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Writeback_Control: 365 2920 [ 0 0 0 0 365 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 270
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 270
-  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
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   270    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 248
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 248
-  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:   73.3871%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   26.6129%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   248    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [415 ] 415
@@ -534,18 +511,6 @@ IS_L  Persistent_GETS [0 ] 0
 IS_L  Own_Lock_or_Unlock [0 ] 0
 IS_L  Request_Timeout [0 ] 0
 
-Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
-  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 454
-  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 454
-  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:   87.2247%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   12.7753%
-
-  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   454    100%
-
  --- L2Cache ---
  - Event Counts -
 L1_GETS [448 ] 448
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
index 079440a44..2b0dd9ad2 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
@@ -4,31 +4,22 @@ sim_seconds                                  0.000043                       # Nu
 sim_ticks                                       43073                       # Number of ticks simulated
 final_tick                                      43073                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  13169                       # Simulator instruction rate (inst/s)
-host_op_rate                                    13168                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 220076                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 148388                       # Number of bytes of host memory used
-host_seconds                                     0.20                       # Real time elapsed on the host
+host_inst_rate                                  14561                       # Simulator instruction rate (inst/s)
+host_op_rate                                    14560                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 243330                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 151252                       # Number of bytes of host memory used
+host_seconds                                     0.18                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
-system.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.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.l2_cntrl0.L2cache.demand_hits           64                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses          454                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses          518                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits          461                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          248                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses          709                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits         2315                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses          270                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses         2585                       # Number of cache demand accesses
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
index b21252b35..0fadcc223 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
@@ -52,6 +52,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -183,10 +184,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
@@ -203,7 +204,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
@@ -217,7 +218,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
@@ -231,7 +232,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
@@ -249,9 +250,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats
index 55e7ee435..665871e67 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats
@@ -144,42 +144,6 @@ links_utilized_percent_switch_2: 4.77887
   outgoing_messages_switch_2_link_1_Writeback_Control: 769 6152 [ 0 0 425 0 0 344 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Unblock_Control: 440 3520 [ 0 0 0 0 0 440 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 270
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 270
-  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
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   270    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 240
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 240
-  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:   75.8333%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   24.1667%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   240    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L2cacheMemory
-  system.ruby.l1_cntrl0.L2cacheMemory_total_misses: 510
-  system.ruby.l1_cntrl0.L2cacheMemory_total_demand_misses: 510
-  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:   35.6863%
-  system.ruby.l1_cntrl0.L2cacheMemory_request_type_ST:   11.3725%
-  system.ruby.l1_cntrl0.L2cacheMemory_request_type_IFETCH:   52.9412%
-
-  system.ruby.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   510    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [422 ] 422
@@ -577,14 +541,6 @@ MM_WF  Ack [0 ] 0
 MM_WF  All_acks_no_sharers [0 ] 0
 MM_WF  Flush_line [0 ] 0
 
-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: 522
   memory_reads: 441
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
index 2f8e4f7f6..d3fbb9bcf 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
@@ -4,37 +4,25 @@ sim_seconds                                  0.000035                       # Nu
 sim_ticks                                       35432                       # Number of ticks simulated
 final_tick                                      35432                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  16513                       # Simulator instruction rate (inst/s)
-host_op_rate                                    16511                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 226994                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 148320                       # Number of bytes of host memory used
-host_seconds                                     0.16                       # Real time elapsed on the host
+host_inst_rate                                  17259                       # Simulator instruction rate (inst/s)
+host_op_rate                                    17257                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 237238                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 151196                       # Number of bytes of host memory used
+host_seconds                                     0.15                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
-system.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.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
+system.ruby.l1_cntrl0.L1Dcache.demand_hits          469                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          240                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses          709                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits         2315                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses          270                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses         2585                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L2cache.demand_hits           69                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L2cache.demand_misses          441                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L2cache.demand_accesses          510                       # 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.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats
index dd53859f3..819d00fb8 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats
@@ -133,19 +133,6 @@ links_utilized_percent_switch_2: 5.94308
   outgoing_messages_switch_2_link_1_Control: 626 5008 [ 0 0 626 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 622 44784 [ 0 0 622 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.cacheMemory
-  system.ruby.l1_cntrl0.cacheMemory_total_misses: 626
-  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 626
-  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:   39.1374%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   13.4185%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   47.4441%
-
-  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   626    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [415 ] 415
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
index 0ebf1503f..98abd69d6 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
@@ -4,19 +4,16 @@ sim_seconds                                  0.000052                       # Nu
 sim_ticks                                       52498                       # Number of ticks simulated
 final_tick                                      52498                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  17956                       # Simulator instruction rate (inst/s)
-host_op_rate                                    17953                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 365693                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 148916                       # Number of bytes of host memory used
-host_seconds                                     0.14                       # Real time elapsed on the host
+host_inst_rate                                   9649                       # Simulator instruction rate (inst/s)
+host_op_rate                                     9649                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 196549                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 151788                       # Number of bytes of host memory used
+host_seconds                                     0.27                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
-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_cntrl0.cacheMemory.demand_hits         2668                       # Number of cache demand hits
+system.ruby.l1_cntrl0.cacheMemory.demand_misses          626                       # Number of cache demand misses
+system.ruby.l1_cntrl0.cacheMemory.demand_accesses         3294                       # Number of cache demand accesses
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv
diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
index fc74fe784..2410b0ce7 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
@@ -4,19 +4,16 @@ sim_seconds                                  0.000125                       # Nu
 sim_ticks                                      125334                       # Number of ticks simulated
 final_tick                                     125334                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  22451                       # Simulator instruction rate (inst/s)
-host_op_rate                                    22449                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 483906                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 152108                       # Number of bytes of host memory used
-host_seconds                                     0.26                       # Real time elapsed on the host
+host_inst_rate                                  24800                       # Simulator instruction rate (inst/s)
+host_op_rate                                    24798                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 534538                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 154892                       # Number of bytes of host memory used
+host_seconds                                     0.23                       # Real time elapsed on the host
 sim_insts                                        5814                       # Number of instructions simulated
 sim_ops                                          5814                       # Number of ops (including micro ops) simulated
-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_cntrl0.cacheMemory.demand_hits         6410                       # Number of cache demand hits
+system.ruby.l1_cntrl0.cacheMemory.demand_misses         1493                       # Number of cache demand misses
+system.ruby.l1_cntrl0.cacheMemory.demand_accesses         7903                       # Number of cache demand accesses
 system.cpu.dtb.read_hits                            0                       # DTB read hits
 system.cpu.dtb.read_misses                          0                       # DTB read misses
 system.cpu.dtb.read_accesses                        0                       # DTB read accesses
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
index da8bc363f..97d6545aa 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
@@ -133,19 +133,6 @@ links_utilized_percent_switch_2: 5.96098
   outgoing_messages_switch_2_link_1_Control: 1289 10312 [ 0 0 1289 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 1285 92520 [ 0 0 1285 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.cacheMemory
-  system.ruby.l1_cntrl0.cacheMemory_total_misses: 1289
-  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 1289
-  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:   30.6439%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   13.8867%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   55.4694%
-
-  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1289    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [715 ] 715
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
index b4c8f8286..1ca0b6acd 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
@@ -4,19 +4,16 @@ sim_seconds                                  0.000108                       # Nu
 sim_ticks                                      107952                       # Number of ticks simulated
 final_tick                                     107952                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  19134                       # Simulator instruction rate (inst/s)
-host_op_rate                                    19132                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 387691                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 158116                       # Number of bytes of host memory used
-host_seconds                                     0.28                       # Real time elapsed on the host
+host_inst_rate                                  36056                       # Simulator instruction rate (inst/s)
+host_op_rate                                    36051                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 730482                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 160860                       # Number of bytes of host memory used
+host_seconds                                     0.15                       # Real time elapsed on the host
 sim_insts                                        5327                       # Number of instructions simulated
 sim_ops                                          5327                       # Number of ops (including micro ops) simulated
-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_cntrl0.cacheMemory.demand_hits         5469                       # Number of cache demand hits
+system.ruby.l1_cntrl0.cacheMemory.demand_misses         1289                       # Number of cache demand misses
+system.ruby.l1_cntrl0.cacheMemory.demand_accesses         6758                       # Number of cache demand accesses
 system.cpu.workload.num_syscalls                   11                       # Number of system calls
 system.cpu.numCycles                           107952                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
index 3bdc04678..ba4f2ee21 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
@@ -136,19 +136,6 @@ links_utilized_percent_switch_2: 5.6464
   outgoing_messages_switch_2_link_1_Control: 1377 11016 [ 0 0 1377 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 1373 98856 [ 0 0 1373 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.cacheMemory
-  system.ruby.l1_cntrl0.cacheMemory_total_misses: 1377
-  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 1377
-  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:   36.2382%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   18.5185%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   45.2433%
-
-  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1377    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [1045 ] 1045
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
index e2571982e..8f40b774d 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
@@ -4,19 +4,16 @@ sim_seconds                                  0.000122                       # Nu
 sim_ticks                                      121759                       # Number of ticks simulated
 final_tick                                     121759                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  25458                       # Simulator instruction rate (inst/s)
-host_op_rate                                    46114                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 575943                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 167352                       # Number of bytes of host memory used
-host_seconds                                     0.21                       # Real time elapsed on the host
+host_inst_rate                                   7080                       # Simulator instruction rate (inst/s)
+host_op_rate                                    12826                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 160202                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 170120                       # Number of bytes of host memory used
+host_seconds                                     0.76                       # Real time elapsed on the host
 sim_insts                                        5381                       # Number of instructions simulated
 sim_ops                                          9748                       # Number of ops (including micro ops) simulated
-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_cntrl0.cacheMemory.demand_hits         7475                       # Number of cache demand hits
+system.ruby.l1_cntrl0.cacheMemory.demand_misses         1377                       # Number of cache demand misses
+system.ruby.l1_cntrl0.cacheMemory.demand_accesses         8852                       # Number of cache demand accesses
 system.cpu.workload.num_syscalls                   11                       # Number of system calls
 system.cpu.numCycles                           121759                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started
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
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
index 1a8271571..ed2d6392c 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
@@ -101,9 +101,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
@@ -122,7 +122,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
@@ -136,7 +136,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
@@ -164,9 +164,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -179,8 +179,8 @@ slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0]
 
 [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=1
@@ -194,7 +194,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/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
index 71961244e..bcd995136 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
@@ -160,29 +160,6 @@ links_utilized_percent_switch_3: 2.05746
   outgoing_messages_switch_3_link_2_Response_Data: 786 56592 [ 0 786 0 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Response_Control: 84 672 [ 0 84 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: 56
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 56
-  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
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   56    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 861
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 861
-  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:   4.87805%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   95.122%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   861    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [44 ] 44
@@ -355,19 +332,6 @@ PF_IS_I  Data_Exclusive [0 ] 0
 PF_IS_I  DataS_fromL1 [0 ] 0
 PF_IS_I  Data_all_Acks [0 ] 0
 
-Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
-  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 874
-  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 874
-  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:   4.69108%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   5.26316%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   90.0458%
-
-  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   874    100%
-
  --- L2Cache ---
  - Event Counts -
 L1_GET_INSTR [56 ] 56
@@ -530,17 +494,6 @@ MT_MB  Unblock_Cancel [0 ] 0
 MT_MB  Exclusive_Unblock [848 ] 848
 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 [0 ] 0
 MT_IIB  L1_GETX [0 ] 0
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
index 6206d371a..00381e46a 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
@@ -4,27 +4,18 @@ sim_seconds                                  0.000318                       # Nu
 sim_ticks                                      318321                       # Number of ticks simulated
 final_tick                                     318321                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                1534160                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 277364                       # Number of bytes of host memory used
-host_seconds                                     0.21                       # Real time elapsed on the host
-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.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
+host_tick_rate                                1383719                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 149800                       # Number of bytes of host memory used
+host_seconds                                     0.23                       # Real time elapsed on the host
+system.ruby.l2_cntrl0.L2cache.demand_hits           43                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses          874                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses          917                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits           81                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          861                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses          942                       # 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           56                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses           56                       # 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
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
index 9c22c6c66..ce929ce15 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
@@ -100,9 +100,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
@@ -118,7 +118,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
@@ -132,7 +132,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
@@ -150,9 +150,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -165,8 +165,8 @@ slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0]
 
 [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=1
@@ -179,7 +179,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/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
index 312325e7d..6a1258780 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
@@ -164,22 +164,6 @@ links_utilized_percent_switch_3: 1.93247
   outgoing_messages_switch_3_link_2_Writeback_Control: 925 7400 [ 0 845 80 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Unblock_Control: 852 6816 [ 0 0 852 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 [44 ] 44
@@ -342,14 +326,6 @@ II  Writeback_Ack [0 ] 0
 II  Writeback_Ack_Data [0 ] 0
 II  Writeback_Nack [0 ] 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 [127 ] 127
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
index e190bc733..18d6ea72e 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
@@ -4,26 +4,17 @@ sim_seconds                                  0.000327                       # Nu
 sim_ticks                                      327361                       # Number of ticks simulated
 final_tick                                     327361                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                 853703                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 272160                       # Number of bytes of host memory used
-host_seconds                                     0.38                       # Real time elapsed on the host
-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.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
+host_tick_rate                                 517762                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 149964                       # Number of bytes of host memory used
+host_seconds                                     0.63                       # Real time elapsed on the host
+system.ruby.l2_cntrl0.L2cache.demand_hits           53                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses          855                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses          908                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits           78                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          852                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses          930                       # 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           56                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses           56                       # Number of cache demand accesses
 
 ---------- End Simulation Statistics   ----------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
index 3680dd5b9..21cd837a3 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
@@ -104,9 +104,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=2
 buffer_size=0
 clock=1
@@ -129,7 +129,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
@@ -143,7 +143,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
@@ -161,9 +161,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -176,8 +176,8 @@ slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0]
 
 [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=2
 buffer_size=0
 clock=1
@@ -192,7 +192,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/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats
index 1491d8a58..deefac4a6 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats
@@ -173,29 +173,6 @@ links_utilized_percent_switch_3: 1.99349
   outgoing_messages_switch_3_link_2_Writeback_Control: 72 576 [ 0 0 0 0 72 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Persistent_Control: 373 2984 [ 0 0 0 373 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 47
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 47
-  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
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   47    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 864
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 864
-  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:   5.55556%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   94.4444%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   864    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [53 ] 53
@@ -547,18 +524,6 @@ IS_L  Persistent_GETS [0 ] 0
 IS_L  Own_Lock_or_Unlock [0 ] 0
 IS_L  Request_Timeout [0 ] 0
 
-Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
-  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 872
-  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 872
-  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:   10.5505%
-  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   89.4495%
-
-  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   872    100%
-
  --- L2Cache ---
  - Event Counts -
 L1_GETS [95 ] 95
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
index f620f0e27..b9333bbb2 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
@@ -4,26 +4,17 @@ sim_seconds                                  0.000225                       # Nu
 sim_ticks                                      225141                       # Number of ticks simulated
 final_tick                                     225141                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                1324121                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 277532                       # Number of bytes of host memory used
-host_seconds                                     0.17                       # Real time elapsed on the host
-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.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
+host_tick_rate                                1225804                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 149920                       # Number of bytes of host memory used
+host_seconds                                     0.18                       # Real time elapsed on the host
+system.ruby.l2_cntrl0.L2cache.demand_hits           39                       # Number of cache demand hits
+system.ruby.l2_cntrl0.L2cache.demand_misses          872                       # Number of cache demand misses
+system.ruby.l2_cntrl0.L2cache.demand_accesses          911                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Dcache.demand_hits           82                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          864                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses          946                       # 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           47                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses           47                       # Number of cache demand accesses
 
 ---------- End Simulation Statistics   ----------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
index 92b7ed6f5..398b9112c 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
@@ -117,10 +117,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
@@ -137,7 +137,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
@@ -151,7 +151,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
@@ -165,7 +165,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
@@ -183,9 +183,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=500000
-icache=system.ruby.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1Icache
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
index 8fdc836f5..3336c8aea 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
@@ -145,44 +145,6 @@ links_utilized_percent_switch_2: 2.61613
   outgoing_messages_switch_2_link_1_Writeback_Control: 918 7344 [ 0 0 843 0 0 75 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Unblock_Control: 845 6760 [ 0 0 0 0 0 845 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 49
-  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 49
-  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
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
-
-  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   49    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 849
-  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 849
-  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:   5.41814%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   94.4641%
-  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_FLUSH:   0.117786%
-
-  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   849    100%
-
-Cache Stats: system.ruby.l1_cntrl0.L2cacheMemory
-  system.ruby.l1_cntrl0.L2cacheMemory_total_misses: 902
-  system.ruby.l1_cntrl0.L2cacheMemory_total_demand_misses: 902
-  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:   5.09978%
-  system.ruby.l1_cntrl0.L2cacheMemory_request_type_ST:   88.9135%
-  system.ruby.l1_cntrl0.L2cacheMemory_request_type_IFETCH:   5.43237%
-  system.ruby.l1_cntrl0.L2cacheMemory_request_type_FLUSH:   0.554324%
-
-  system.ruby.l1_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   902    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [52 ] 52
@@ -580,14 +542,6 @@ MM_WF  Ack [0 ] 0
 MM_WF  All_acks_no_sharers [4 ] 4
 MM_WF  Flush_line [0 ] 0
 
-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: 1617
   memory_reads: 850
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
index 17783b065..ea7e7e040 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
@@ -4,32 +4,20 @@ sim_seconds                                  0.000172                       # Nu
 sim_ticks                                      172201                       # Number of ticks simulated
 final_tick                                     172201                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                1354339                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 277516                       # Number of bytes of host memory used
+host_tick_rate                                1283391                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 149864                       # Number of bytes of host memory used
 host_seconds                                     0.13                       # Real time elapsed on the host
-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.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
+system.ruby.l1_cntrl0.L1Dcache.demand_hits           70                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Dcache.demand_misses          848                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Dcache.demand_accesses          918                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L1Icache.demand_hits            1                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L1Icache.demand_misses           49                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L1Icache.demand_accesses           50                       # Number of cache demand accesses
+system.ruby.l1_cntrl0.L2cache.demand_hits           49                       # Number of cache demand hits
+system.ruby.l1_cntrl0.L2cache.demand_misses          848                       # Number of cache demand misses
+system.ruby.l1_cntrl0.L2cache.demand_accesses          897                       # 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
 
 ---------- End Simulation Statistics   ----------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
index 967783f8c..f73b12883 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
@@ -132,19 +132,6 @@ links_utilized_percent_switch_2: 2.06125
   outgoing_messages_switch_2_link_1_Control: 916 7328 [ 0 0 916 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 914 65808 [ 0 0 914 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.ruby.l1_cntrl0.cacheMemory
-  system.ruby.l1_cntrl0.cacheMemory_total_misses: 917
-  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 917
-  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:   4.58015%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   89.313%
-  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   6.10687%
-
-  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   917    100%
-
  --- L1Cache ---
  - Event Counts -
 Load [42 ] 42
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
index 1a84d2d44..967007849 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
@@ -4,14 +4,11 @@ sim_seconds                                  0.000222                       # Nu
 sim_ticks                                      221941                       # Number of ticks simulated
 final_tick                                     221941                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                2209091                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 276976                       # Number of bytes of host memory used
+host_tick_rate                                2117650                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 149428                       # Number of bytes of host memory used
 host_seconds                                     0.10                       # Real time elapsed on the host
-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_cntrl0.cacheMemory.demand_hits           38                       # Number of cache demand hits
+system.ruby.l1_cntrl0.cacheMemory.demand_misses          917                       # Number of cache demand misses
+system.ruby.l1_cntrl0.cacheMemory.demand_accesses          955                       # Number of cache demand accesses
 
 ---------- End Simulation Statistics   ----------