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

3 files changed, 38 insertions, 26 deletions

diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
index 5940396eb..095eef676 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: May/08/2012 15:36:55
+Real time: Jun/04/2012 14:44:51
 
 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.28
-Virtual_time_in_minutes: 0.00466667
-Virtual_time_in_hours:   7.77778e-05
-Virtual_time_in_days:    3.24074e-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: 253364
 Ruby_start_time: 0
 Ruby_cycles: 253364
 
-mbytes_resident: 48.3438
-mbytes_total: 226.668
-resident_ratio: 0.21328
+mbytes_resident: 49.3359
+mbytes_total: 227.086
+resident_ratio: 0.217257
 
 ruby_cycles_executed: [ 253365 ]
 
@@ -122,7 +122,7 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 12864
+page_reclaims: 13015
 page_faults: 0
 swaps: 0
 block_inputs: 0
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout
index dd8a0a7b3..e4a7b2f0d 100755
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/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:05:42
-gem5 started May  8 2012 15:36:55
-gem5 executing on piton
+gem5 compiled Jun  4 2012 12:01:47
+gem5 started Jun  4 2012 14:44:51
+gem5 executing on zizzer
 command line: build/SPARC/gem5.opt -d build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing-ruby -re tests/run.py build/SPARC/tests/opt/quick/se/00.hello/sparc/linux/simple-timing-ruby
 Global frequency set at 1000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
index 362724c03..2f30e2be2 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
@@ -4,23 +4,35 @@ sim_seconds                                  0.000253                       # Nu
 sim_ticks                                      253364                       # Number of ticks simulated
 final_tick                                     253364                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  60301                       # Simulator instruction rate (inst/s)
-host_op_rate                                    60291                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                2860139                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 232112                       # Number of bytes of host memory used
+host_inst_rate                                  57491                       # Simulator instruction rate (inst/s)
+host_op_rate                                    57480                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                2726732                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 232540                       # Number of bytes of host memory used
 host_seconds                                     0.09                       # Real time elapsed on the host
 sim_insts                                        5340                       # Number of instructions simulated
 sim_ops                                          5340                       # Number of ops (including micro ops) simulated
-system.physmem.bytes_read                       26135                       # Number of bytes read from this memory
-system.physmem.bytes_inst_read                  21532                       # Number of instructions bytes read from this memory
-system.physmem.bytes_written                     5065                       # Number of bytes written to this memory
-system.physmem.num_reads                         6099                       # Number of read requests responded to by this memory
-system.physmem.num_writes                         673                       # 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                      103151987                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read                  84984449                       # Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_write                      19991001                       # Write bandwidth from this memory (bytes/s)
-system.physmem.bw_total                     123142988                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bytes_read::cpu.inst             21532                       # Number of bytes read from this memory
+system.physmem.bytes_read::cpu.data              4603                       # Number of bytes read from this memory
+system.physmem.bytes_read::total                26135                       # Number of bytes read from this memory
+system.physmem.bytes_inst_read::cpu.inst        21532                       # Number of instructions bytes read from this memory
+system.physmem.bytes_inst_read::total           21532                       # Number of instructions bytes read from this memory
+system.physmem.bytes_written::cpu.data           5065                       # Number of bytes written to this memory
+system.physmem.bytes_written::total              5065                       # Number of bytes written to this memory
+system.physmem.num_reads::cpu.inst               5383                       # Number of read requests responded to by this memory
+system.physmem.num_reads::cpu.data                716                       # Number of read requests responded to by this memory
+system.physmem.num_reads::total                  6099                       # Number of read requests responded to by this memory
+system.physmem.num_writes::cpu.data               673                       # Number of write requests responded to by this memory
+system.physmem.num_writes::total                  673                       # Number of write requests responded to by this memory
+system.physmem.bw_read::cpu.inst             84984449                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu.data             18167538                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::total               103151987                       # Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::cpu.inst        84984449                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::total           84984449                       # Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write::cpu.data            19991001                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_write::total               19991001                       # Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total::cpu.inst            84984449                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::cpu.data            38158539                       # Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::total              123142988                       # Total bandwidth to/from this memory (bytes/s)
 system.cpu.workload.num_syscalls                   11                       # Number of system calls
 system.cpu.numCycles                           253364                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started