stats: updates statistics for ruby regressions

3 files changed, 22 insertions, 55 deletions

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   ----------