stats: updates due to changes to ruby

Ruby's controller statistics have been mostly moved to stats.txt now.
Plus stats.txt for solaris/t1000-simple-atomic and arm/20.parser are
also being updated.

2 files changed, 100 insertions, 147 deletions

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 a22228475..f2ad839f7 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
@@ -1,26 +1,24 @@
-Real time: Apr/09/2013 01:55:51
+Real time: Jun/08/2013 13:42:59
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 52
-Elapsed_time_in_minutes: 0.866667
-Elapsed_time_in_hours: 0.0144444
-Elapsed_time_in_days: 0.000601852
+Elapsed_time_in_seconds: 38
+Elapsed_time_in_minutes: 0.633333
+Elapsed_time_in_hours: 0.0105556
+Elapsed_time_in_days: 0.000439815
 
-Virtual_time_in_seconds: 52.85
-Virtual_time_in_minutes: 0.880833
-Virtual_time_in_hours:   0.0146806
-Virtual_time_in_days:    0.00061169
+Virtual_time_in_seconds: 38.03
+Virtual_time_in_minutes: 0.633833
+Virtual_time_in_hours:   0.0105639
+Virtual_time_in_days:    0.000440162
 
 Ruby_current_time: 8664886
 Ruby_start_time: 0
 Ruby_cycles: 8664886
 
-mbytes_resident: 64.3945
-mbytes_total: 243.918
-resident_ratio: 0.264001
-
-ruby_cycles_executed: [ 8664887 8664887 8664887 8664887 8664887 8664887 8664887 8664887 ]
+mbytes_resident: 69.8516
+mbytes_total: 283.504
+resident_ratio: 0.246414
 
 Busy Controller Counts:
 L1Cache-0:0  L1Cache-1:0  L1Cache-2:0  L1Cache-3:0  L1Cache-4:0  L1Cache-5:0  L1Cache-6:0  L1Cache-7:0  
@@ -62,7 +60,6 @@ Request vs. RubySystem State Profile
 --------------------------------
 
 
-filter_action: [binsize: 1 max: 0 count: 0 average: NaN |standard deviation: NaN | 0 ]
 
 Message Delayed Cycles
 ----------------------
@@ -81,12 +78,12 @@ Total_delay_cycles: [binsize: 1 max: 22 count: 1237687 average: 0.00723931 | sta
 Resource Usage
 --------------
 page_size: 4096
-user_time: 52
+user_time: 37
 system_time: 0
-page_reclaims: 17037
+page_reclaims: 10989
 page_faults: 0
 swaps: 0
-block_inputs: 24
+block_inputs: 264
 block_outputs: 200
 
 Network Stats
@@ -237,129 +234,3 @@ 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
 
- --- L1Cache ---
- - Event Counts -
-Load [50370 50258 50037 49672 50004 50305 50279 50578 ] 401503
-Ifetch [0 0 0 0 0 0 0 0 ] 0
-Store [27007 26935 26787 27153 27327 27084 27075 26703 ] 216071
-Data [77375 77192 76821 76821 77329 77385 77352 77277 ] 617552
-Fwd_GETX [1048 1042 1040 1065 995 1001 998 1019 ] 8208
-Inv [0 0 0 0 0 0 0 0 ] 0
-Replacement [77373 77189 76820 76821 77327 77385 77350 77277 ] 617542
-Writeback_Ack [76323 76144 75775 75751 76330 76378 76350 76253 ] 609304
-Writeback_Nack [342 322 324 341 327 344 310 313 ] 2623
-
- - Transitions -
-I  Load [50370 50258 50037 49672 50004 50305 50279 50578 ] 401503
-I  Ifetch [0 0 0 0 0 0 0 0 ] 0
-I  Store [27007 26935 26787 27153 27327 27084 27075 26703 ] 216071
-I  Inv [0 0 0 0 0 0 0 0 ] 0
-I  Replacement [706 720 716 724 668 657 688 706 ] 5585
-
-II  Writeback_Nack [342 322 324 341 327 344 310 313 ] 2623
-
-M  Load [0 0 0 0 0 0 0 0 ] 0
-M  Ifetch [0 0 0 0 0 0 0 0 ] 0
-M  Store [0 0 0 0 0 0 0 0 ] 0
-M  Fwd_GETX [706 720 716 724 668 657 688 706 ] 5585
-M  Inv [0 0 0 0 0 0 0 0 ] 0
-M  Replacement [76667 76469 76104 76097 76659 76728 76662 76571 ] 611957
-
-MI  Fwd_GETX [342 322 324 341 327 344 310 313 ] 2623
-MI  Inv [0 0 0 0 0 0 0 0 ] 0
-MI  Writeback_Ack [76323 76144 75775 75751 76330 76378 76350 76253 ] 609304
-MI  Writeback_Nack [0 0 0 0 0 0 0 0 ] 0
-
-MII  Fwd_GETX [0 0 0 0 0 0 0 0 ] 0
-
-IS  Data [50370 50258 50035 49669 50002 50301 50278 50576 ] 401489
-
-IM  Data [27005 26934 26786 27152 27327 27084 27074 26701 ] 216063
-
-Memory controller: system.ruby.dir_cntrl0.memBuffer:
-  memory_total_requests: 1218678
-  memory_reads: 609346
-  memory_writes: 609308
-  memory_refreshes: 60173
-  memory_total_request_delays: 87480258
-  memory_delays_per_request: 71.7829
-  memory_delays_in_input_queue: 1522193
-  memory_delays_behind_head_of_bank_queue: 40100008
-  memory_delays_stalled_at_head_of_bank_queue: 45858057
-  memory_stalls_for_bank_busy: 7076344
-  memory_stalls_for_random_busy: 0
-  memory_stalls_for_anti_starvation: 11282671
-  memory_stalls_for_arbitration: 9195209
-  memory_stalls_for_bus: 12585722
-  memory_stalls_for_tfaw: 0
-  memory_stalls_for_read_write_turnaround: 4642017
-  memory_stalls_for_read_read_turnaround: 1076094
-  accesses_per_bank: 38404  37646  38381  38273  38109  38021  38580  38357  38057  38004  38123  37658  37751  38546  37560  38514  38232  38045  38749  38589  38066  37687  38032  38060  37804  38206  37726  38148  37682  38049  37701  37918  
-
- --- Directory ---
- - Event Counts -
-GETX [791175 ] 791175
-GETS [0 ] 0
-PUTX [609324 ] 609324
-PUTX_NotOwner [2623 ] 2623
-DMA_READ [0 ] 0
-DMA_WRITE [0 ] 0
-Memory_Data [609345 ] 609345
-Memory_Ack [609304 ] 609304
-
- - Transitions -
-I  GETX [609354 ] 609354
-I  PUTX_NotOwner [0 ] 0
-I  DMA_READ [0 ] 0
-I  DMA_WRITE [0 ] 0
-
-M  GETX [8208 ] 8208
-M  PUTX [609324 ] 609324
-M  PUTX_NotOwner [2623 ] 2623
-M  DMA_READ [0 ] 0
-M  DMA_WRITE [0 ] 0
-
-M_DRD  GETX [0 ] 0
-M_DRD  PUTX [0 ] 0
-
-M_DWR  GETX [0 ] 0
-M_DWR  PUTX [0 ] 0
-
-M_DWRI  GETX [0 ] 0
-M_DWRI  Memory_Ack [0 ] 0
-
-M_DRDI  GETX [0 ] 0
-M_DRDI  Memory_Ack [0 ] 0
-
-IM  GETX [65257 ] 65257
-IM  GETS [0 ] 0
-IM  PUTX [0 ] 0
-IM  PUTX_NotOwner [0 ] 0
-IM  DMA_READ [0 ] 0
-IM  DMA_WRITE [0 ] 0
-IM  Memory_Data [609345 ] 609345
-
-MI  GETX [108356 ] 108356
-MI  GETS [0 ] 0
-MI  PUTX [0 ] 0
-MI  PUTX_NotOwner [0 ] 0
-MI  DMA_READ [0 ] 0
-MI  DMA_WRITE [0 ] 0
-MI  Memory_Ack [609304 ] 609304
-
-ID  GETX [0 ] 0
-ID  GETS [0 ] 0
-ID  PUTX [0 ] 0
-ID  PUTX_NotOwner [0 ] 0
-ID  DMA_READ [0 ] 0
-ID  DMA_WRITE [0 ] 0
-ID  Memory_Data [0 ] 0
-
-ID_W  GETX [0 ] 0
-ID_W  GETS [0 ] 0
-ID_W  PUTX [0 ] 0
-ID_W  PUTX_NotOwner [0 ] 0
-ID_W  DMA_READ [0 ] 0
-ID_W  DMA_WRITE [0 ] 0
-ID_W  Memory_Ack [0 ] 0
-
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 007aee21a..bc2dd1118 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,9 +4,9 @@ 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                                 321644                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 252216                       # Number of bytes of host memory used
-host_seconds                                    26.94                       # Real time elapsed on the host
+host_tick_rate                                 229644                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 290312                       # Number of bytes of host memory used
+host_seconds                                    37.73                       # Real time elapsed on the host
 system.funcbus.throughput                           0                       # Throughput (bytes/s)
 system.funcbus.data_through_bus                     0                       # Total data (bytes)
 system.ruby.l1_cntrl4.cacheMemory.demand_hits            0                       # Number of cache demand hits
@@ -33,6 +33,24 @@ system.ruby.l1_cntrl2.cacheMemory.demand_accesses        76824
 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.ruby.dir_cntrl0.memBuffer.memReq       1218678                       # Total number of memory requests
+system.ruby.dir_cntrl0.memBuffer.memRead       609346                       # Number of memory reads
+system.ruby.dir_cntrl0.memBuffer.memWrite       609308                       # Number of memory writes
+system.ruby.dir_cntrl0.memBuffer.memRefresh        60173                       # Number of memory refreshes
+system.ruby.dir_cntrl0.memBuffer.memWaitCycles     45858057                       # Delay stalled at the head of the bank queue
+system.ruby.dir_cntrl0.memBuffer.memInputQ      1522193                       # Delay in the input queue
+system.ruby.dir_cntrl0.memBuffer.memBankQ     40100008                       # Delay behind the head of the bank queue
+system.ruby.dir_cntrl0.memBuffer.totalStalls     87480258                       # Total number of stall cycles
+system.ruby.dir_cntrl0.memBuffer.stallsPerReq    71.782914                       # Expected number of stall cycles per request
+system.ruby.dir_cntrl0.memBuffer.memBankBusy      7076344                       # memory stalls due to busy bank
+system.ruby.dir_cntrl0.memBuffer.memBusBusy     12585722                       # memory stalls due to busy bus
+system.ruby.dir_cntrl0.memBuffer.memReadWriteBusy      4642017                       # memory stalls due to read write turnaround
+system.ruby.dir_cntrl0.memBuffer.memDataBusBusy      1076094                       # memory stalls due to read read turnaround
+system.ruby.dir_cntrl0.memBuffer.memArbWait      9195209                       # memory stalls due to arbitration
+system.ruby.dir_cntrl0.memBuffer.memNotOld     11282671                       # memory stalls due to anti starvation
+system.ruby.dir_cntrl0.memBuffer.memBankCount |       38404      3.15%      3.15% |       37646      3.09%      6.24% |       38381      3.15%      9.39% |       38273      3.14%     12.53% |       38109      3.13%     15.66% |       38021      3.12%     18.78% |       38580      3.17%     21.94% |       38357      3.15%     25.09% |       38057      3.12%     28.21% |       38004      3.12%     31.33% |       38123      3.13%     34.46% |       37658      3.09%     37.55% |       37751      3.10%     40.65% |       38546      3.16%     43.81% |       37560      3.08%     46.89% |       38514      3.16%     50.05% |       38232      3.14%     53.19% |       38045      3.12%     56.31% |       38749      3.18%     59.49% |       38589      3.17%     62.66% |       38066      3.12%     65.78% |       37687      3.09%     68.87% |       38032      3.12%     71.99% |       38060      3.12%     75.12% |       37804      3.10%     78.22% |       38206      3.14%     81.35% |       37726      3.10%     84.45% |       38148      3.13%     87.58% |       37682      3.09%     90.67% |       38049      3.12%     93.79% |       37701      3.09%     96.89% |       37918      3.11%    100.00% # Number of accesses per bank
+system.ruby.dir_cntrl0.memBuffer.memBankCount::total      1218678                       # Number of accesses per bank
+
 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
@@ -57,5 +75,69 @@ system.cpu6.num_copies                              0                       # nu
 system.cpu7.num_reads                          100000                       # number of read accesses completed
 system.cpu7.num_writes                          53796                       # number of write accesses completed
 system.cpu7.num_copies                              0                       # number of copy accesses completed
+system.ruby.l1_cntrl0.Load               |       50370     12.55%     12.55% |       50258     12.52%     25.06% |       50037     12.46%     37.53% |       49672     12.37%     49.90% |       50004     12.45%     62.35% |       50305     12.53%     74.88% |       50279     12.52%     87.40% |       50578     12.60%    100.00%
+system.ruby.l1_cntrl0.Load::total              401503                      
+
+system.ruby.l1_cntrl0.Store              |       27007     12.50%     12.50% |       26935     12.47%     24.96% |       26787     12.40%     37.36% |       27153     12.57%     49.93% |       27327     12.65%     62.58% |       27084     12.53%     75.11% |       27075     12.53%     87.64% |       26703     12.36%    100.00%
+system.ruby.l1_cntrl0.Store::total             216071                      
+
+system.ruby.l1_cntrl0.Data               |       77375     12.53%     12.53% |       77192     12.50%     25.03% |       76821     12.44%     37.47% |       76821     12.44%     49.91% |       77329     12.52%     62.43% |       77385     12.53%     74.96% |       77352     12.53%     87.49% |       77277     12.51%    100.00%
+system.ruby.l1_cntrl0.Data::total              617552                      
+
+system.ruby.l1_cntrl0.Fwd_GETX           |        1048     12.77%     12.77% |        1042     12.69%     25.46% |        1040     12.67%     38.13% |        1065     12.98%     51.11% |         995     12.12%     63.23% |        1001     12.20%     75.43% |         998     12.16%     87.59% |        1019     12.41%    100.00%
+system.ruby.l1_cntrl0.Fwd_GETX::total            8208                      
+
+system.ruby.l1_cntrl0.Replacement        |       77373     12.53%     12.53% |       77189     12.50%     25.03% |       76820     12.44%     37.47% |       76821     12.44%     49.91% |       77327     12.52%     62.43% |       77385     12.53%     74.96% |       77350     12.53%     87.49% |       77277     12.51%    100.00%
+system.ruby.l1_cntrl0.Replacement::total       617542                      
+
+system.ruby.l1_cntrl0.Writeback_Ack      |       76323     12.53%     12.53% |       76144     12.50%     25.02% |       75775     12.44%     37.46% |       75751     12.43%     49.89% |       76330     12.53%     62.42% |       76378     12.54%     74.95% |       76350     12.53%     87.49% |       76253     12.51%    100.00%
+system.ruby.l1_cntrl0.Writeback_Ack::total       609304                      
+
+system.ruby.l1_cntrl0.Writeback_Nack     |         342     13.04%     13.04% |         322     12.28%     25.31% |         324     12.35%     37.67% |         341     13.00%     50.67% |         327     12.47%     63.13% |         344     13.11%     76.25% |         310     11.82%     88.07% |         313     11.93%    100.00%
+system.ruby.l1_cntrl0.Writeback_Nack::total         2623                      
+
+system.ruby.l1_cntrl0.I.Load             |       50370     12.55%     12.55% |       50258     12.52%     25.06% |       50037     12.46%     37.53% |       49672     12.37%     49.90% |       50004     12.45%     62.35% |       50305     12.53%     74.88% |       50279     12.52%     87.40% |       50578     12.60%    100.00%
+system.ruby.l1_cntrl0.I.Load::total            401503                      
+
+system.ruby.l1_cntrl0.I.Store            |       27007     12.50%     12.50% |       26935     12.47%     24.96% |       26787     12.40%     37.36% |       27153     12.57%     49.93% |       27327     12.65%     62.58% |       27084     12.53%     75.11% |       27075     12.53%     87.64% |       26703     12.36%    100.00%
+system.ruby.l1_cntrl0.I.Store::total           216071                      
+
+system.ruby.l1_cntrl0.I.Replacement      |         706     12.64%     12.64% |         720     12.89%     25.53% |         716     12.82%     38.35% |         724     12.96%     51.32% |         668     11.96%     63.28% |         657     11.76%     75.04% |         688     12.32%     87.36% |         706     12.64%    100.00%
+system.ruby.l1_cntrl0.I.Replacement::total         5585                      
+
+system.ruby.l1_cntrl0.II.Writeback_Nack  |         342     13.04%     13.04% |         322     12.28%     25.31% |         324     12.35%     37.67% |         341     13.00%     50.67% |         327     12.47%     63.13% |         344     13.11%     76.25% |         310     11.82%     88.07% |         313     11.93%    100.00%
+system.ruby.l1_cntrl0.II.Writeback_Nack::total         2623                      
+
+system.ruby.l1_cntrl0.M.Fwd_GETX         |         706     12.64%     12.64% |         720     12.89%     25.53% |         716     12.82%     38.35% |         724     12.96%     51.32% |         668     11.96%     63.28% |         657     11.76%     75.04% |         688     12.32%     87.36% |         706     12.64%    100.00%
+system.ruby.l1_cntrl0.M.Fwd_GETX::total          5585                      
+
+system.ruby.l1_cntrl0.M.Replacement      |       76667     12.53%     12.53% |       76469     12.50%     25.02% |       76104     12.44%     37.46% |       76097     12.44%     49.90% |       76659     12.53%     62.42% |       76728     12.54%     74.96% |       76662     12.53%     87.49% |       76571     12.51%    100.00%
+system.ruby.l1_cntrl0.M.Replacement::total       611957                      
+
+system.ruby.l1_cntrl0.MI.Fwd_GETX        |         342     13.04%     13.04% |         322     12.28%     25.31% |         324     12.35%     37.67% |         341     13.00%     50.67% |         327     12.47%     63.13% |         344     13.11%     76.25% |         310     11.82%     88.07% |         313     11.93%    100.00%
+system.ruby.l1_cntrl0.MI.Fwd_GETX::total         2623                      
+
+system.ruby.l1_cntrl0.MI.Writeback_Ack   |       76323     12.53%     12.53% |       76144     12.50%     25.02% |       75775     12.44%     37.46% |       75751     12.43%     49.89% |       76330     12.53%     62.42% |       76378     12.54%     74.95% |       76350     12.53%     87.49% |       76253     12.51%    100.00%
+system.ruby.l1_cntrl0.MI.Writeback_Ack::total       609304                      
+
+system.ruby.l1_cntrl0.IS.Data            |       50370     12.55%     12.55% |       50258     12.52%     25.06% |       50035     12.46%     37.53% |       49669     12.37%     49.90% |       50002     12.45%     62.35% |       50301     12.53%     74.88% |       50278     12.52%     87.40% |       50576     12.60%    100.00%
+system.ruby.l1_cntrl0.IS.Data::total           401489                      
+
+system.ruby.l1_cntrl0.IM.Data            |       27005     12.50%     12.50% |       26934     12.47%     24.96% |       26786     12.40%     37.36% |       27152     12.57%     49.93% |       27327     12.65%     62.58% |       27084     12.54%     75.11% |       27074     12.53%     87.64% |       26701     12.36%    100.00%
+system.ruby.l1_cntrl0.IM.Data::total           216063                      
+
+system.ruby.dir_cntrl0.GETX                    791175      0.00%      0.00%
+system.ruby.dir_cntrl0.PUTX                    609324      0.00%      0.00%
+system.ruby.dir_cntrl0.PUTX_NotOwner             2623      0.00%      0.00%
+system.ruby.dir_cntrl0.Memory_Data             609345      0.00%      0.00%
+system.ruby.dir_cntrl0.Memory_Ack              609304      0.00%      0.00%
+system.ruby.dir_cntrl0.I.GETX                  609354      0.00%      0.00%
+system.ruby.dir_cntrl0.M.GETX                    8208      0.00%      0.00%
+system.ruby.dir_cntrl0.M.PUTX                  609324      0.00%      0.00%
+system.ruby.dir_cntrl0.M.PUTX_NotOwner           2623      0.00%      0.00%
+system.ruby.dir_cntrl0.IM.GETX                  65257      0.00%      0.00%
+system.ruby.dir_cntrl0.IM.Memory_Data          609345      0.00%      0.00%
+system.ruby.dir_cntrl0.MI.GETX                 108356      0.00%      0.00%
+system.ruby.dir_cntrl0.MI.Memory_Ack           609304      0.00%      0.00%
 
 ---------- End Simulation Statistics   ----------