stats: updates statistics for ruby regressions

3 files changed, 27 insertions, 82 deletions

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