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

4 files changed, 22 insertions, 34 deletions

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
index af42ad0ff..e3b9d4def 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
@@ -14,7 +14,7 @@ init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
-memories=system.funcmem system.physmem
+memories=system.physmem system.funcmem
 num_work_ids=16
 readfile=
 symbolfile=
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
index cb3fdaf16..c5ae1c27c 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: May/08/2012 15:42:43
+Real time: Jun/04/2012 14:45:30
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 365
-Elapsed_time_in_minutes: 6.08333
-Elapsed_time_in_hours: 0.101389
-Elapsed_time_in_days: 0.00422454
+Elapsed_time_in_seconds: 244
+Elapsed_time_in_minutes: 4.06667
+Elapsed_time_in_hours: 0.0677778
+Elapsed_time_in_days: 0.00282407
 
-Virtual_time_in_seconds: 361.58
-Virtual_time_in_minutes: 6.02633
-Virtual_time_in_hours:   0.100439
-Virtual_time_in_days:    0.00418495
+Virtual_time_in_seconds: 244.12
+Virtual_time_in_minutes: 4.06867
+Virtual_time_in_hours:   0.0678111
+Virtual_time_in_days:    0.00282546
 
 Ruby_current_time: 19400856
 Ruby_start_time: 0
 Ruby_cycles: 19400856
 
-mbytes_resident: 60.2344
-mbytes_total: 361.566
-resident_ratio: 0.166593
+mbytes_resident: 61.3008
+mbytes_total: 361.941
+resident_ratio: 0.169367
 
 ruby_cycles_executed: [ 19400857 19400857 19400857 19400857 19400857 19400857 19400857 19400857 ]
 
@@ -116,13 +116,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard dev
 Resource Usage
 --------------
 page_size: 4096
-user_time: 361
+user_time: 244
 system_time: 0
-page_reclaims: 15956
+page_reclaims: 16161
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 448
+block_outputs: 216
 
 Network Stats
 -------------
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
index 403e6654c..ca77e3fc7 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-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:26
+gem5 executing on zizzer
 command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_directory -re tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-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/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
index 9aec04ac2..fcc191198 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
@@ -4,21 +4,9 @@ sim_seconds                                  0.019401                       # Nu
 sim_ticks                                    19400856                       # Number of ticks simulated
 final_tick                                   19400856                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                  53186                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 370248                       # Number of bytes of host memory used
-host_seconds                                   364.77                       # 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                                  79524                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 370632                       # Number of bytes of host memory used
+host_seconds                                   243.96                       # Real time elapsed on the host
 system.cpu0.num_reads                           98844                       # number of read accesses completed
 system.cpu0.num_writes                          53478                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed