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

3 files changed, 39 insertions, 27 deletions

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
index 232722c59..0769bb48a 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: May/08/2012 15:36:38
+Real time: Jun/04/2012 14:41:15
 
 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.26
-Virtual_time_in_minutes: 0.00433333
-Virtual_time_in_hours:   7.22222e-05
-Virtual_time_in_days:    3.00926e-06
+Virtual_time_in_seconds: 0.3
+Virtual_time_in_minutes: 0.005
+Virtual_time_in_hours:   8.33333e-05
+Virtual_time_in_days:    3.47222e-06
 
 Ruby_current_time: 85418
 Ruby_start_time: 0
 Ruby_cycles: 85418
 
-mbytes_resident: 46.1016
-mbytes_total: 218.602
-resident_ratio: 0.210893
+mbytes_resident: 46.9141
+mbytes_total: 218.969
+resident_ratio: 0.21425
 
 ruby_cycles_executed: [ 85419 ]
 
@@ -119,11 +119,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 12263
+page_reclaims: 12428
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 80
+block_outputs: 88
 
 Network Stats
 -------------
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
index fe8db74fc..dc8b54148 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_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:14:18
-gem5 started May  8 2012 15:36:38
-gem5 executing on piton
+gem5 compiled Jun  4 2012 11:54:55
+gem5 started Jun  4 2012 14:41:15
+gem5 executing on zizzer
 command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory -re tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/00.hello/alpha/tru64/simple-timing-ruby-MOESI_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-MOESI_CMP_directory/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
index 5143cdcae..07e9173f4 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
@@ -4,23 +4,35 @@ sim_seconds                                  0.000085                       # Nu
 sim_ticks                                       85418                       # Number of ticks simulated
 final_tick                                      85418                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  33831                       # Simulator instruction rate (inst/s)
-host_op_rate                                    33824                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                1120953                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 223852                       # Number of bytes of host memory used
+host_inst_rate                                  30509                       # Simulator instruction rate (inst/s)
+host_op_rate                                    30502                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                1010829                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 224228                       # Number of bytes of host memory used
 host_seconds                                     0.08                       # 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                      156360486                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read                 121051769                       # Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_write                      24093282                       # Write bandwidth from this memory (bytes/s)
-system.physmem.bw_total                     180453769                       # 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            121051769                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu.data             35308717                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::total               156360486                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::cpu.inst       121051769                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::total          121051769                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write::cpu.data            24093282                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_write::total               24093282                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total::cpu.inst           121051769                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::cpu.data            59402000                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::total              180453769                       # 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