stats: updates statistics for ruby regressions

3 files changed, 57 insertions, 129 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