Regression Tests: Update the output for MESI_CMP_directory

This patch updates the output for regression tests that are carried out on
MESI_CMP_directory protocol. The changes made to the protocol in order to
remove the bugs present result in regression failure for the 60.rubytest.
Since the earlier protocol was incorrect, so we certainly cannot relay on the
earlier reference output. Hence, the update.

4 files changed, 30 insertions, 32 deletions

diff --git a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
index 82062647f..75b04f0f3 100644
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
@@ -478,10 +478,9 @@ port=system.ruby.cpu_ruby_ports0.physMemPort system.ruby.cpu_ruby_ports1.physMem
 
 [system.ruby]
 type=RubySystem
-children=cpu_ruby_ports0 cpu_ruby_ports1 cpu_ruby_ports2 cpu_ruby_ports3 cpu_ruby_ports4 cpu_ruby_ports5 cpu_ruby_ports6 cpu_ruby_ports7 debug network profiler tracer
+children=cpu_ruby_ports0 cpu_ruby_ports1 cpu_ruby_ports2 cpu_ruby_ports3 cpu_ruby_ports4 cpu_ruby_ports5 cpu_ruby_ports6 cpu_ruby_ports7 network profiler tracer
 block_size_bytes=64
 clock=1
-debug=system.ruby.debug
 mem_size=134217728
 network=system.ruby.network
 no_mem_vec=false
@@ -587,14 +586,6 @@ version=7
 physMemPort=system.physmem.port[7]
 port=system.cpu7.test
 
-[system.ruby.debug]
-type=RubyDebug
-filter_string=none
-output_filename=none
-protocol_trace=false
-start_time=1
-verbosity_string=none
-
 [system.ruby.network]
 type=SimpleNetwork
 children=topology
diff --git a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
index 7bfbcb96e..307193acf 100644
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/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: Aug/20/2010 12:05:50
+Real time: Jan/13/2011 22:37:51
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 39
-Elapsed_time_in_minutes: 0.65
-Elapsed_time_in_hours: 0.0108333
-Elapsed_time_in_days: 0.000451389
+Elapsed_time_in_seconds: 83
+Elapsed_time_in_minutes: 1.38333
+Elapsed_time_in_hours: 0.0230556
+Elapsed_time_in_days: 0.000960648
 
-Virtual_time_in_seconds: 39.83
-Virtual_time_in_minutes: 0.663833
-Virtual_time_in_hours:   0.0110639
-Virtual_time_in_days:    0.000460995
+Virtual_time_in_seconds: 82.77
+Virtual_time_in_minutes: 1.3795
+Virtual_time_in_hours:   0.0229917
+Virtual_time_in_days:    0.000957986
 
 Ruby_current_time: 3750455
 Ruby_start_time: 0
 Ruby_cycles: 3750455
 
-mbytes_resident: 32.6211
-mbytes_total: 333.473
-resident_ratio: 0.0978341
+mbytes_resident: 19.9609
+mbytes_total: 283.734
+resident_ratio: 0.0703783
 
 ruby_cycles_executed: [ 3750456 3750456 3750456 3750456 3750456 3750456 3750456 3750456 ]
 
@@ -116,12 +116,12 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 3 count: 1199123 average: 0.00254603
 Resource Usage
 --------------
 page_size: 4096
-user_time: 39
+user_time: 82
 system_time: 0
-page_reclaims: 9465
+page_reclaims: 5799
 page_faults: 0
 swaps: 0
-block_inputs: 56
+block_inputs: 0
 block_outputs: 0
 
 Network Stats
@@ -424,6 +424,13 @@ E_I  Ifetch [0 0 0 0 0 0 0 0 ] 0
 E_I  Store [0 0 0 0 0 0 0 0 ] 0
 E_I  L1_Replacement [0 0 0 0 0 0 0 0 ] 0
 
+SINK_WB_ACK  Load [0 0 0 0 0 0 0 0 ] 0
+SINK_WB_ACK  Ifetch [0 0 0 0 0 0 0 0 ] 0
+SINK_WB_ACK  Store [0 0 0 0 0 0 0 0 ] 0
+SINK_WB_ACK  Inv [0 0 0 0 0 0 0 0 ] 0
+SINK_WB_ACK  L1_Replacement [0 0 0 0 0 0 0 0 ] 0
+SINK_WB_ACK  WB_Ack [0 0 0 0 0 0 0 0 ] 0
+
 Cache Stats: system.l1_cntrl1.L1IcacheMemory
   system.l1_cntrl1.L1IcacheMemory_total_misses: 0
   system.l1_cntrl1.L1IcacheMemory_total_demand_misses: 0
diff --git a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
index 9fce5fb80..edd524f60 100755
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
+++ b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
@@ -5,10 +5,10 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Aug 20 2010 12:04:46
-M5 revision c4b5df973361 7570 default qtip tip brad/regress_updates
-M5 started Aug 20 2010 12:05:10
-M5 executing on SC2B0629
+M5 compiled Jan 13 2011 22:36:25
+M5 revision 81b32f1a8f29 7836 default MESI_CMP_update_ref.patch qtip tip
+M5 started Jan 13 2011 22:36:28
+M5 executing on scamorza.cs.wisc.edu
 command line: build/ALPHA_SE_MESI_CMP_directory/m5.fast -d build/ALPHA_SE_MESI_CMP_directory/tests/fast/quick/50.memtest/alpha/linux/memtest-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_SE_MESI_CMP_directory/tests/fast/quick/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/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
index e2e446721..ce3cfcb57 100644
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
@@ -1,8 +1,8 @@
 
 ---------- Begin Simulation Statistics ----------
-host_mem_usage                                 341480                       # Number of bytes of host memory used
-host_seconds                                    39.63                       # Real time elapsed on the host
-host_tick_rate                                  94625                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 290548                       # Number of bytes of host memory used
+host_seconds                                    82.41                       # Real time elapsed on the host
+host_tick_rate                                  45509                       # Simulator tick rate (ticks/s)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
 sim_seconds                                  0.003750                       # Number of seconds simulated
 sim_ticks                                     3750455                       # Number of ticks simulated