all: Update stats for memory per master and total fix.

3 files changed, 46 insertions, 34 deletions

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
index ad599d493..a36a875c9 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: May/08/2012 15:36:34
+Real time: Jun/04/2012 13:42:36
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 0
-Elapsed_time_in_minutes: 0
-Elapsed_time_in_hours: 0
-Elapsed_time_in_days: 0
+Elapsed_time_in_seconds: 1
+Elapsed_time_in_minutes: 0.0166667
+Elapsed_time_in_hours: 0.000277778
+Elapsed_time_in_days: 1.15741e-05
 
-Virtual_time_in_seconds: 0.34
-Virtual_time_in_minutes: 0.00566667
-Virtual_time_in_hours:   9.44444e-05
-Virtual_time_in_days:    3.93519e-06
+Virtual_time_in_seconds: 0.43
+Virtual_time_in_minutes: 0.00716667
+Virtual_time_in_hours:   0.000119444
+Virtual_time_in_days:    4.97685e-06
 
 Ruby_current_time: 279353
 Ruby_start_time: 0
 Ruby_cycles: 279353
 
-mbytes_resident: 48.7227
-mbytes_total: 220.605
-resident_ratio: 0.220859
+mbytes_resident: 49.4727
+mbytes_total: 221.031
+resident_ratio: 0.223827
 
 ruby_cycles_executed: [ 279354 ]
 
@@ -119,11 +119,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 12930
-page_faults: 0
+page_reclaims: 13079
+page_faults: 9
 swaps: 0
-block_inputs: 8
-block_outputs: 88
+block_inputs: 1264
+block_outputs: 96
 
 Network Stats
 -------------
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
index 5a83168a9..0c7f2991f 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
@@ -1,9 +1,9 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled May  8 2012 15:08:30
-gem5 started May  8 2012 15:36:34
-gem5 executing on piton
+gem5 compiled Jun  4 2012 11:53:20
+gem5 started Jun  4 2012 13:42:35
+gem5 executing on zizzer
 command line: build/ALPHA_MESI_CMP_directory/gem5.opt -d build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MESI_CMP_directory
 Global frequency set at 1000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
index f4fb755b0..bae589857 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
@@ -4,23 +4,35 @@ sim_seconds                                  0.000279                       # Nu
 sim_ticks                                      279353                       # Number of ticks simulated
 final_tick                                     279353                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  40898                       # Simulator instruction rate (inst/s)
-host_op_rate                                    40895                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                1783759                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 225904                       # Number of bytes of host memory used
-host_seconds                                     0.16                       # Real time elapsed on the host
+host_inst_rate                                  12119                       # Simulator instruction rate (inst/s)
+host_op_rate                                    12118                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 528605                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 226340                       # Number of bytes of host memory used
+host_seconds                                     0.53                       # Real time elapsed on the host
 sim_insts                                        6404                       # Number of instructions simulated
 sim_ops                                          6404                       # Number of ops (including micro ops) simulated
-system.physmem.bytes_read                       34460                       # Number of bytes read from this memory
-system.physmem.bytes_inst_read                  25656                       # Number of instructions bytes read from this memory
-system.physmem.bytes_written                     6696                       # Number of bytes written to this memory
-system.physmem.num_reads                         7599                       # Number of read requests responded to by this memory
-system.physmem.num_writes                         865                       # Number of write requests responded to by this memory
-system.physmem.num_other                            0                       # Number of other requests responded to by this memory
-system.physmem.bw_read                      123356470                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read                  91840789                       # Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_write                      23969673                       # Write bandwidth from this memory (bytes/s)
-system.physmem.bw_total                     147326143                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bytes_read::cpu.inst             25656                       # Number of bytes read from this memory
+system.physmem.bytes_read::cpu.data              8804                       # Number of bytes read from this memory
+system.physmem.bytes_read::total                34460                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read::cpu.inst        25656                       # Number of instructions bytes read from this memory
+system.physmem.bytes_inst_read::total           25656                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written::cpu.data           6696                       # Number of bytes written to this memory
+system.physmem.bytes_written::total              6696                       # Number of bytes written to this memory
+system.physmem.num_reads::cpu.inst               6414                       # Number of read requests responded to by this memory
+system.physmem.num_reads::cpu.data               1185                       # Number of read requests responded to by this memory
+system.physmem.num_reads::total                  7599                       # Number of read requests responded to by this memory
+system.physmem.num_writes::cpu.data               865                       # Number of write requests responded to by this memory
+system.physmem.num_writes::total                  865                       # Number of write requests responded to by this memory
+system.physmem.bw_read::cpu.inst             91840789                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu.data             31515681                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::total               123356470                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::cpu.inst        91840789                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::total           91840789                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write::cpu.data            23969673                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_write::total               23969673                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total::cpu.inst            91840789                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::cpu.data            55485354                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::total              147326143                       # Total bandwidth to/from this memory (bytes/s)
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv