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

3 files changed, 42 insertions, 30 deletions

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
index 24c3821ed..68ec07392 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: May/08/2012 15:36:31
+Real time: Jun/04/2012 13:41:27
 
 Profiler Stats
 --------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
 Elapsed_time_in_hours: 0
 Elapsed_time_in_days: 0
 
-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
+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
 
 Ruby_current_time: 208400
 Ruby_start_time: 0
 Ruby_cycles: 208400
 
-mbytes_resident: 46.2461
-mbytes_total: 218.586
-resident_ratio: 0.211569
+mbytes_resident: 47.2969
+mbytes_total: 218.926
+resident_ratio: 0.216041
 
 ruby_cycles_executed: [ 208401 ]
 
@@ -126,11 +126,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 12336
-page_faults: 10
+page_reclaims: 12505
+page_faults: 5
 swaps: 0
-block_inputs: 1632
-block_outputs: 88
+block_inputs: 1000
+block_outputs: 96
 
 Network Stats
 -------------
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
index 7aaac31e8..f1ba4ed84 100755
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/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:12:50
-gem5 started May  8 2012 15:36:31
-gem5 executing on piton
+gem5 compiled Jun  4 2012 11:51:44
+gem5 started Jun  4 2012 13:41:27
+gem5 executing on zizzer
 command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_hammer -re tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/00.hello/alpha/linux/simple-timing-ruby-MOESI_hammer
 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-MOESI_hammer/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
index 30017b1e1..842792d27 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
@@ -4,23 +4,35 @@ sim_seconds                                  0.000208                       # Nu
 sim_ticks                                      208400                       # Number of ticks simulated
 final_tick                                     208400                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  60692                       # Simulator instruction rate (inst/s)
-host_op_rate                                    60683                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                1974491                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 223836                       # Number of bytes of host memory used
-host_seconds                                     0.11                       # Real time elapsed on the host
+host_inst_rate                                  52133                       # Simulator instruction rate (inst/s)
+host_op_rate                                    52125                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                1696034                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 224184                       # Number of bytes of host memory used
+host_seconds                                     0.12                       # 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                      165355086                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read                 123109405                       # Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_write                      32130518                       # Write bandwidth from this memory (bytes/s)
-system.physmem.bw_total                     197485605                       # 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            123109405                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu.data             42245681                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::total               165355086                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::cpu.inst       123109405                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::total          123109405                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write::cpu.data            32130518                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_write::total               32130518                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total::cpu.inst           123109405                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::cpu.data            74376200                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::total              197485605                       # 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