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/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats
index bda71aafd..5ef992e40 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/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.24
-Virtual_time_in_minutes: 0.004
-Virtual_time_in_hours:   6.66667e-05
-Virtual_time_in_days:    2.77778e-06
+Virtual_time_in_seconds: 0.31
+Virtual_time_in_minutes: 0.00516667
+Virtual_time_in_hours:   8.61111e-05
+Virtual_time_in_days:    3.58796e-06
 
 Ruby_current_time: 104867
 Ruby_start_time: 0
 Ruby_cycles: 104867
 
-mbytes_resident: 45.8906
-mbytes_total: 218.43
-resident_ratio: 0.210093
+mbytes_resident: 46.8984
+mbytes_total: 218.785
+resident_ratio: 0.214358
 
 ruby_cycles_executed: [ 104868 ]
 
@@ -119,11 +119,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 12254
-page_faults: 0
+page_reclaims: 12410
+page_faults: 4
 swaps: 0
-block_inputs: 0
-block_outputs: 88
+block_inputs: 480
+block_outputs: 96
 
 Network Stats
 -------------
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout
index 59ad2cc4d..d8d70a93e 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/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/tru64/simple-timing-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/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/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
index bd57039cb..748d8a973 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
@@ -4,23 +4,35 @@ sim_seconds                                  0.000105                       # Nu
 sim_ticks                                      104867                       # Number of ticks simulated
 final_tick                                     104867                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  38145                       # Simulator instruction rate (inst/s)
-host_op_rate                                    38137                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                1551633                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 223676                       # Number of bytes of host memory used
-host_seconds                                     0.07                       # Real time elapsed on the host
+host_inst_rate                                   4864                       # Simulator instruction rate (inst/s)
+host_op_rate                                     4864                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 197908                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 224040                       # Number of bytes of host memory used
+host_seconds                                     0.53                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
-system.physmem.bytes_read                       13356                       # Number of bytes read from this memory
-system.physmem.bytes_inst_read                  10340                       # Number of instructions bytes read from this memory
-system.physmem.bytes_written                     2058                       # Number of bytes written to this memory
-system.physmem.num_reads                         3000                       # Number of read requests responded to by this memory
-system.physmem.num_writes                         294                       # 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                      127361324                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read                  98601085                       # Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_write                      19624858                       # Write bandwidth from this memory (bytes/s)
-system.physmem.bw_total                     146986182                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bytes_read::cpu.inst             10340                       # Number of bytes read from this memory
+system.physmem.bytes_read::cpu.data              3016                       # Number of bytes read from this memory
+system.physmem.bytes_read::total                13356                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read::cpu.inst        10340                       # Number of instructions bytes read from this memory
+system.physmem.bytes_inst_read::total           10340                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written::cpu.data           2058                       # Number of bytes written to this memory
+system.physmem.bytes_written::total              2058                       # Number of bytes written to this memory
+system.physmem.num_reads::cpu.inst               2585                       # Number of read requests responded to by this memory
+system.physmem.num_reads::cpu.data                415                       # Number of read requests responded to by this memory
+system.physmem.num_reads::total                  3000                       # Number of read requests responded to by this memory
+system.physmem.num_writes::cpu.data               294                       # Number of write requests responded to by this memory
+system.physmem.num_writes::total                  294                       # Number of write requests responded to by this memory
+system.physmem.bw_read::cpu.inst             98601085                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu.data             28760239                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::total               127361324                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::cpu.inst        98601085                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::total           98601085                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write::cpu.data            19624858                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_write::total               19624858                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total::cpu.inst            98601085                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::cpu.data            48385097                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::total              146986182                       # 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