stats: update stats for insts/ops and master id changes

4 files changed, 30 insertions, 25 deletions

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
index f1d5fb57f..dacf2f87f 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
@@ -41,6 +41,7 @@ percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
 suppress_func_warnings=true
+sys=system
 trace_addr=0
 functional=system.funcmem.port[0]
 test=system.l1_cntrl0.sequencer.port[0]
@@ -58,6 +59,7 @@ percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
 suppress_func_warnings=true
+sys=system
 trace_addr=0
 functional=system.funcmem.port[1]
 test=system.l1_cntrl1.sequencer.port[0]
@@ -75,6 +77,7 @@ percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
 suppress_func_warnings=true
+sys=system
 trace_addr=0
 functional=system.funcmem.port[2]
 test=system.l1_cntrl2.sequencer.port[0]
@@ -92,6 +95,7 @@ percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
 suppress_func_warnings=true
+sys=system
 trace_addr=0
 functional=system.funcmem.port[3]
 test=system.l1_cntrl3.sequencer.port[0]
@@ -109,6 +113,7 @@ percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
 suppress_func_warnings=true
+sys=system
 trace_addr=0
 functional=system.funcmem.port[4]
 test=system.l1_cntrl4.sequencer.port[0]
@@ -126,6 +131,7 @@ percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
 suppress_func_warnings=true
+sys=system
 trace_addr=0
 functional=system.funcmem.port[5]
 test=system.l1_cntrl5.sequencer.port[0]
@@ -143,6 +149,7 @@ percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
 suppress_func_warnings=true
+sys=system
 trace_addr=0
 functional=system.funcmem.port[6]
 test=system.l1_cntrl6.sequencer.port[0]
@@ -160,6 +167,7 @@ percent_source_unaligned=50
 percent_uncacheable=0
 progress_interval=10000
 suppress_func_warnings=true
+sys=system
 trace_addr=0
 functional=system.funcmem.port[7]
 test=system.l1_cntrl7.sequencer.port[0]
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 64437a4e3..e8a51599b 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,26 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: Feb/12/2012 12:58:05
+Real time: Feb/12/2012 15:36:31
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 110
-Elapsed_time_in_minutes: 1.83333
-Elapsed_time_in_hours: 0.0305556
-Elapsed_time_in_days: 0.00127315
+Elapsed_time_in_seconds: 190
+Elapsed_time_in_minutes: 3.16667
+Elapsed_time_in_hours: 0.0527778
+Elapsed_time_in_days: 0.00219907
 
-Virtual_time_in_seconds: 110.38
-Virtual_time_in_minutes: 1.83967
-Virtual_time_in_hours:   0.0306611
-Virtual_time_in_days:    0.00127755
+Virtual_time_in_seconds: 189.25
+Virtual_time_in_minutes: 3.15417
+Virtual_time_in_hours:   0.0525694
+Virtual_time_in_days:    0.00219039
 
 Ruby_current_time: 22495354
 Ruby_start_time: 0
 Ruby_cycles: 22495354
 
-mbytes_resident: 41.8164
-mbytes_total: 371.512
-resident_ratio: 0.112578
+mbytes_resident: 0
+mbytes_total: 0
 
 ruby_cycles_executed: [ 22495355 22495355 22495355 22495355 22495355 22495355 22495355 22495355 ]
 
@@ -116,13 +115,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 18 count: 3280807 average: 0.508064 |
 Resource Usage
 --------------
 page_size: 4096
-user_time: 110
+user_time: 188
 system_time: 0
-page_reclaims: 11719
-page_faults: 18
+page_reclaims: 12571
+page_faults: 0
 swaps: 0
-block_inputs: 0
-block_outputs: 0
+block_inputs: 1
+block_outputs: 44
 
 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 1577dfd47..f74c8ffd6 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,11 +1,9 @@
-Redirecting stdout to build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
-Redirecting stderr to build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 12 2012 12:56:01
-gem5 started Feb 12 2012 12:56:15
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Feb 12 2012 15:33:08
+gem5 started Feb 12 2012 15:33:21
+gem5 executing on Alis-MacBook-Pro.local
 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 04704faf4..1bc6a2ebb 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,9 +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                                 204320                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 380432                       # Number of bytes of host memory used
-host_seconds                                   110.10                       # Real time elapsed on the host
+host_tick_rate                                 118487                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 398520                       # Number of bytes of host memory used
+host_seconds                                   189.86                       # 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