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

3 files changed, 21 insertions, 33 deletions

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
index b44d5a4c2..1cbda9483 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: May/08/2012 15:38:27
+Real time: Jun/04/2012 14:41:50
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 113
-Elapsed_time_in_minutes: 1.88333
-Elapsed_time_in_hours: 0.0313889
-Elapsed_time_in_days: 0.00130787
+Elapsed_time_in_seconds: 88
+Elapsed_time_in_minutes: 1.46667
+Elapsed_time_in_hours: 0.0244444
+Elapsed_time_in_days: 0.00101852
 
-Virtual_time_in_seconds: 112.14
-Virtual_time_in_minutes: 1.869
-Virtual_time_in_hours:   0.03115
-Virtual_time_in_days:    0.00129792
+Virtual_time_in_seconds: 87.84
+Virtual_time_in_minutes: 1.464
+Virtual_time_in_hours:   0.0244
+Virtual_time_in_days:    0.00101667
 
 Ruby_current_time: 22495354
 Ruby_start_time: 0
 Ruby_cycles: 22495354
 
-mbytes_resident: 60.2695
-mbytes_total: 361.398
-resident_ratio: 0.166768
+mbytes_resident: 61.2852
+mbytes_total: 361.766
+resident_ratio: 0.169406
 
 ruby_cycles_executed: [ 22495355 22495355 22495355 22495355 22495355 22495355 22495355 22495355 ]
 
@@ -116,13 +116,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 18 count: 3280807 average: 0.508064 |
 Resource Usage
 --------------
 page_size: 4096
-user_time: 112
+user_time: 87
 system_time: 0
-page_reclaims: 15932
+page_reclaims: 16135
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 232
+block_outputs: 216
 
 Network Stats
 -------------
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
index 26548e28d..4c179bc95 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-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 14:40:22
+gem5 executing on zizzer
 command line: build/ALPHA_MESI_CMP_directory/gem5.opt -d build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-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/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
index 1ae2ff15c..c7afc7b3a 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
@@ -4,21 +4,9 @@ sim_seconds                                  0.022495                       # Nu
 sim_ticks                                    22495354                       # Number of ticks simulated
 final_tick                                   22495354                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                 200233                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 370076                       # Number of bytes of host memory used
-host_seconds                                   112.35                       # Real time elapsed on the host
-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
-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
+host_tick_rate                                 256726                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 370452                       # Number of bytes of host memory used
+host_seconds                                    87.62                       # Real time elapsed on the host
 system.cpu0.num_reads                           99326                       # number of read accesses completed
 system.cpu0.num_writes                          53132                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed