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

3 files changed, 22 insertions, 34 deletions

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
index 08a16b146..f9a059734 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: May/08/2012 15:38:42
+Real time: Jun/04/2012 13:44:25
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 131
-Elapsed_time_in_minutes: 2.18333
-Elapsed_time_in_hours: 0.0363889
-Elapsed_time_in_days: 0.0015162
+Elapsed_time_in_seconds: 111
+Elapsed_time_in_minutes: 1.85
+Elapsed_time_in_hours: 0.0308333
+Elapsed_time_in_days: 0.00128472
 
-Virtual_time_in_seconds: 129.82
-Virtual_time_in_minutes: 2.16367
-Virtual_time_in_hours:   0.0360611
-Virtual_time_in_days:    0.00150255
+Virtual_time_in_seconds: 111.55
+Virtual_time_in_minutes: 1.85917
+Virtual_time_in_hours:   0.0309861
+Virtual_time_in_days:    0.00129109
 
 Ruby_current_time: 19129199
 Ruby_start_time: 0
 Ruby_cycles: 19129199
 
-mbytes_resident: 59.6641
-mbytes_total: 360.938
-resident_ratio: 0.165303
+mbytes_resident: 60.7188
+mbytes_total: 361.293
+resident_ratio: 0.16806
 
 ruby_cycles_executed: [ 19129200 19129200 19129200 19129200 19129200 19129200 19129200 19129200 ]
 
@@ -124,13 +124,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard dev
 Resource Usage
 --------------
 page_size: 4096
-user_time: 129
+user_time: 111
 system_time: 0
-page_reclaims: 15794
+page_reclaims: 15994
 page_faults: 0
 swaps: 0
-block_inputs: 16
-block_outputs: 256
+block_inputs: 0
+block_outputs: 224
 
 Network Stats
 -------------
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
index 9fc5d7446..bc60d72d3 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-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:42:34
+gem5 executing on zizzer
 command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer -re tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer
 Global frequency set at 1000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
index cad2377ee..7c588684e 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
@@ -4,21 +4,9 @@ sim_seconds                                  0.019129                       # Nu
 sim_ticks                                    19129199                       # Number of ticks simulated
 final_tick                                   19129199                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                 146249                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 369604                       # Number of bytes of host memory used
-host_seconds                                   130.80                       # Real time elapsed on the host
-system.physmem.bytes_read                           0                       # Number of bytes read from this memory
-system.physmem.bytes_inst_read                      0                       # Number of instructions bytes read from this memory
-system.physmem.bytes_written                        0                       # Number of bytes written to this memory
-system.physmem.num_reads                            0                       # Number of read requests responded to by this memory
-system.physmem.num_writes                           0                       # Number of write requests responded to by this memory
-system.physmem.num_other                            0                       # Number of other requests responded to by this memory
-system.funcmem.bytes_read                           0                       # Number of bytes read from this memory
-system.funcmem.bytes_inst_read                      0                       # Number of instructions bytes read from this memory
-system.funcmem.bytes_written                        0                       # Number of bytes written to this memory
-system.funcmem.num_reads                            0                       # Number of read requests responded to by this memory
-system.funcmem.num_writes                           0                       # Number of write requests responded to by this memory
-system.funcmem.num_other                            0                       # Number of other requests responded to by this memory
+host_tick_rate                                 171697                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 369968                       # Number of bytes of host memory used
+host_seconds                                   111.41                       # Real time elapsed on the host
 system.cpu0.num_reads                          100000                       # number of read accesses completed
 system.cpu0.num_writes                          53893                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed