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, 58 insertions, 148 deletions

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 ba4f2ee21..459a4eba9 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
@@ -1,26 +1,24 @@
-Real time: Mar/11/2013 13:21:59
+Real time: Jun/08/2013 14:40:51
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 1
-Elapsed_time_in_minutes: 0.0166667
-Elapsed_time_in_hours: 0.000277778
-Elapsed_time_in_days: 1.15741e-05
+Elapsed_time_in_seconds: 0
+Elapsed_time_in_minutes: 0
+Elapsed_time_in_hours: 0
+Elapsed_time_in_days: 0
 
-Virtual_time_in_seconds: 0.6
-Virtual_time_in_minutes: 0.01
-Virtual_time_in_hours:   0.000166667
-Virtual_time_in_days:    6.94444e-06
+Virtual_time_in_seconds: 0.54
+Virtual_time_in_minutes: 0.009
+Virtual_time_in_hours:   0.00015
+Virtual_time_in_days:    6.25e-06
 
 Ruby_current_time: 121759
 Ruby_start_time: 0
 Ruby_cycles: 121759
 
-mbytes_resident: 66.582
-mbytes_total: 163.426
-resident_ratio: 0.407486
-
-ruby_cycles_executed: [ 121760 ]
+mbytes_resident: 66.5
+mbytes_total: 158.215
+resident_ratio: 0.420364
 
 Busy Controller Counts:
 L1Cache-0:0  
@@ -67,7 +65,6 @@ Request vs. RubySystem State Profile
 --------------------------------
 
 
-filter_action: [binsize: 1 max: 0 count: 0 average: NaN |standard deviation: NaN | 0 ]
 
 Message Delayed Cycles
 ----------------------
@@ -88,11 +85,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 14769
+page_reclaims: 13753
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 88
+block_outputs: 96
 
 Network Stats
 -------------
@@ -136,129 +133,3 @@ 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
 
- --- L1Cache ---
- - Event Counts -
-Load [1045 ] 1045
-Ifetch [6864 ] 6864
-Store [943 ] 943
-Data [1377 ] 1377
-Fwd_GETX [0 ] 0
-Inv [0 ] 0
-Replacement [1373 ] 1373
-Writeback_Ack [1373 ] 1373
-Writeback_Nack [0 ] 0
-
- - Transitions -
-I  Load [499 ] 499
-I  Ifetch [623 ] 623
-I  Store [255 ] 255
-I  Inv [0 ] 0
-I  Replacement [0 ] 0
-
-II  Writeback_Nack [0 ] 0
-
-M  Load [546 ] 546
-M  Ifetch [6241 ] 6241
-M  Store [688 ] 688
-M  Fwd_GETX [0 ] 0
-M  Inv [0 ] 0
-M  Replacement [1373 ] 1373
-
-MI  Fwd_GETX [0 ] 0
-MI  Inv [0 ] 0
-MI  Writeback_Ack [1373 ] 1373
-MI  Writeback_Nack [0 ] 0
-
-MII  Fwd_GETX [0 ] 0
-
-IS  Data [1122 ] 1122
-
-IM  Data [255 ] 255
-
-Memory controller: system.ruby.dir_cntrl0.memBuffer:
-  memory_total_requests: 2750
-  memory_reads: 1377
-  memory_writes: 1373
-  memory_refreshes: 846
-  memory_total_request_delays: 1968
-  memory_delays_per_request: 0.715636
-  memory_delays_in_input_queue: 0
-  memory_delays_behind_head_of_bank_queue: 3
-  memory_delays_stalled_at_head_of_bank_queue: 1965
-  memory_stalls_for_bank_busy: 823
-  memory_stalls_for_random_busy: 0
-  memory_stalls_for_anti_starvation: 0
-  memory_stalls_for_arbitration: 65
-  memory_stalls_for_bus: 1044
-  memory_stalls_for_tfaw: 0
-  memory_stalls_for_read_write_turnaround: 33
-  memory_stalls_for_read_read_turnaround: 0
-  accesses_per_bank: 160  144  210  146  196  96  66  38  22  20  184  297  71  124  60  18  84  6  8  14  92  56  14  60  34  58  84  66  42  122  104  54  
-
- --- Directory ---
- - Event Counts -
-GETX [1377 ] 1377
-GETS [0 ] 0
-PUTX [1373 ] 1373
-PUTX_NotOwner [0 ] 0
-DMA_READ [0 ] 0
-DMA_WRITE [0 ] 0
-Memory_Data [1377 ] 1377
-Memory_Ack [1373 ] 1373
-
- - Transitions -
-I  GETX [1377 ] 1377
-I  PUTX_NotOwner [0 ] 0
-I  DMA_READ [0 ] 0
-I  DMA_WRITE [0 ] 0
-
-M  GETX [0 ] 0
-M  PUTX [1373 ] 1373
-M  PUTX_NotOwner [0 ] 0
-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 [0 ] 0
-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 [1377 ] 1377
-
-MI  GETX [0 ] 0
-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 [1373 ] 1373
-
-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/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 db0163c4d..da9d2213e 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,16 +4,31 @@ 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                                  32232                       # Simulator instruction rate (inst/s)
-host_op_rate                                    58383                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 729156                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 170120                       # Number of bytes of host memory used
-host_seconds                                     0.17                       # Real time elapsed on the host
+host_inst_rate                                  37945                       # Simulator instruction rate (inst/s)
+host_op_rate                                    68729                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 858310                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 162016                       # Number of bytes of host memory used
+host_seconds                                     0.14                       # 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.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.ruby.dir_cntrl0.memBuffer.memReq          2750                       # Total number of memory requests
+system.ruby.dir_cntrl0.memBuffer.memRead         1377                       # Number of memory reads
+system.ruby.dir_cntrl0.memBuffer.memWrite         1373                       # Number of memory writes
+system.ruby.dir_cntrl0.memBuffer.memRefresh          846                       # Number of memory refreshes
+system.ruby.dir_cntrl0.memBuffer.memWaitCycles         1965                       # Delay stalled at the head of the bank queue
+system.ruby.dir_cntrl0.memBuffer.memBankQ            3                       # Delay behind the head of the bank queue
+system.ruby.dir_cntrl0.memBuffer.totalStalls         1968                       # Total number of stall cycles
+system.ruby.dir_cntrl0.memBuffer.stallsPerReq     0.715636                       # Expected number of stall cycles per request
+system.ruby.dir_cntrl0.memBuffer.memBankBusy          823                       # memory stalls due to busy bank
+system.ruby.dir_cntrl0.memBuffer.memBusBusy         1044                       # memory stalls due to busy bus
+system.ruby.dir_cntrl0.memBuffer.memReadWriteBusy           33                       # memory stalls due to read write turnaround
+system.ruby.dir_cntrl0.memBuffer.memArbWait           65                       # memory stalls due to arbitration
+system.ruby.dir_cntrl0.memBuffer.memBankCount |         160      5.82%      5.82% |         144      5.24%     11.05% |         210      7.64%     18.69% |         146      5.31%     24.00% |         196      7.13%     31.13% |          96      3.49%     34.62% |          66      2.40%     37.02% |          38      1.38%     38.40% |          22      0.80%     39.20% |          20      0.73%     39.93% |         184      6.69%     46.62% |         297     10.80%     57.42% |          71      2.58%     60.00% |         124      4.51%     64.51% |          60      2.18%     66.69% |          18      0.65%     67.35% |          84      3.05%     70.40% |           6      0.22%     70.62% |           8      0.29%     70.91% |          14      0.51%     71.42% |          92      3.35%     74.76% |          56      2.04%     76.80% |          14      0.51%     77.31% |          60      2.18%     79.49% |          34      1.24%     80.73% |          58      2.11%     82.84% |          84      3.05%     85.89% |          66      2.40%     88.29% |          42      1.53%     89.82% |         122      4.44%     94.25% |         104      3.78%     98.04% |          54      1.96%    100.00% # Number of accesses per bank
+system.ruby.dir_cntrl0.memBuffer.memBankCount::total         2750                       # Number of accesses per bank
+
 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
@@ -37,5 +52,29 @@ system.cpu.num_idle_cycles                          0                       # Nu
 system.cpu.num_busy_cycles                     121759                       # Number of busy cycles
 system.cpu.not_idle_fraction                        1                       # Percentage of non-idle cycles
 system.cpu.idle_fraction                            0                       # Percentage of idle cycles
+system.ruby.l1_cntrl0.Load                       1045      0.00%      0.00%
+system.ruby.l1_cntrl0.Ifetch                     6864      0.00%      0.00%
+system.ruby.l1_cntrl0.Store                       943      0.00%      0.00%
+system.ruby.l1_cntrl0.Data                       1377      0.00%      0.00%
+system.ruby.l1_cntrl0.Replacement                1373      0.00%      0.00%
+system.ruby.l1_cntrl0.Writeback_Ack              1373      0.00%      0.00%
+system.ruby.l1_cntrl0.I.Load                      499      0.00%      0.00%
+system.ruby.l1_cntrl0.I.Ifetch                    623      0.00%      0.00%
+system.ruby.l1_cntrl0.I.Store                     255      0.00%      0.00%
+system.ruby.l1_cntrl0.M.Load                      546      0.00%      0.00%
+system.ruby.l1_cntrl0.M.Ifetch                   6241      0.00%      0.00%
+system.ruby.l1_cntrl0.M.Store                     688      0.00%      0.00%
+system.ruby.l1_cntrl0.M.Replacement              1373      0.00%      0.00%
+system.ruby.l1_cntrl0.MI.Writeback_Ack           1373      0.00%      0.00%
+system.ruby.l1_cntrl0.IS.Data                    1122      0.00%      0.00%
+system.ruby.l1_cntrl0.IM.Data                     255      0.00%      0.00%
+system.ruby.dir_cntrl0.GETX                      1377      0.00%      0.00%
+system.ruby.dir_cntrl0.PUTX                      1373      0.00%      0.00%
+system.ruby.dir_cntrl0.Memory_Data               1377      0.00%      0.00%
+system.ruby.dir_cntrl0.Memory_Ack                1373      0.00%      0.00%
+system.ruby.dir_cntrl0.I.GETX                    1377      0.00%      0.00%
+system.ruby.dir_cntrl0.M.PUTX                    1373      0.00%      0.00%
+system.ruby.dir_cntrl0.IM.Memory_Data            1377      0.00%      0.00%
+system.ruby.dir_cntrl0.MI.Memory_Ack             1373      0.00%      0.00%
 
 ---------- End Simulation Statistics   ----------