Stats: Back out broken update.

5 files changed, 136 insertions, 52 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 83237c30c..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
@@ -1,22 +1,13 @@
 [root]
 type=Root
 children=system
-time_sync_enable=false
-time_sync_period=100000000
-time_sync_spin_threshold=100000
+dummy=0
 
 [system]
 type=System
 children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 l2_cntrl0 physmem ruby
 mem_mode=timing
 physmem=system.physmem
-work_begin_ckpt_count=0
-work_begin_cpu_id_exit=-1
-work_begin_exit_count=0
-work_cpus_ckpt_count=0
-work_end_ckpt_count=0
-work_end_exit_count=0
-work_item_id=-1
 
 [system.cpu0]
 type=MemTest
@@ -501,7 +492,6 @@ tracer=system.ruby.tracer
 
 [system.ruby.cpu_ruby_ports0]
 type=RubySequencer
-access_phys_mem=true
 dcache=system.l1_cntrl0.L1DcacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl0.L1IcacheMemory
@@ -514,7 +504,6 @@ port=system.cpu0.test
 
 [system.ruby.cpu_ruby_ports1]
 type=RubySequencer
-access_phys_mem=true
 dcache=system.l1_cntrl1.L1DcacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl1.L1IcacheMemory
@@ -527,7 +516,6 @@ port=system.cpu1.test
 
 [system.ruby.cpu_ruby_ports2]
 type=RubySequencer
-access_phys_mem=true
 dcache=system.l1_cntrl2.L1DcacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl2.L1IcacheMemory
@@ -540,7 +528,6 @@ port=system.cpu2.test
 
 [system.ruby.cpu_ruby_ports3]
 type=RubySequencer
-access_phys_mem=true
 dcache=system.l1_cntrl3.L1DcacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl3.L1IcacheMemory
@@ -553,7 +540,6 @@ port=system.cpu3.test
 
 [system.ruby.cpu_ruby_ports4]
 type=RubySequencer
-access_phys_mem=true
 dcache=system.l1_cntrl4.L1DcacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl4.L1IcacheMemory
@@ -566,7 +552,6 @@ port=system.cpu4.test
 
 [system.ruby.cpu_ruby_ports5]
 type=RubySequencer
-access_phys_mem=true
 dcache=system.l1_cntrl5.L1DcacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl5.L1IcacheMemory
@@ -579,7 +564,6 @@ port=system.cpu5.test
 
 [system.ruby.cpu_ruby_ports6]
 type=RubySequencer
-access_phys_mem=true
 dcache=system.l1_cntrl6.L1DcacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl6.L1IcacheMemory
@@ -592,7 +576,6 @@ port=system.cpu6.test
 
 [system.ruby.cpu_ruby_ports7]
 type=RubySequencer
-access_phys_mem=true
 dcache=system.l1_cntrl7.L1DcacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl7.L1IcacheMemory
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 ad8a03637..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: Dec/01/2010 10:30:07
+Real time: Jan/13/2011 22:37:51
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 46
-Elapsed_time_in_minutes: 0.766667
-Elapsed_time_in_hours: 0.0127778
-Elapsed_time_in_days: 0.000532407
+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: 45.19
-Virtual_time_in_minutes: 0.753167
-Virtual_time_in_hours:   0.0125528
-Virtual_time_in_days:    0.000523032
+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: 34.6367
-mbytes_total: 335.688
-resident_ratio: 0.103205
+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: 44
+user_time: 82
 system_time: 0
-page_reclaims: 10049
+page_reclaims: 5799
 page_faults: 0
 swaps: 0
-block_inputs: 16
+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/simerr b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simerr
index 8e15caa61..e36729355 100755
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simerr
+++ b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simerr
@@ -1,15 +1,74 @@
-system.cpu1: completed 10000 read accesses @4267815
-system.cpu0: completed 10000 read accesses @4386665
-system.cpu7: completed 10000 read accesses @4430875
-system.cpu5: completed 10000 read accesses @4607545
-system.cpu2: completed 10000 read accesses @4619185
-system.cpu6: completed 10000 read accesses @4647575
-system.cpu4: completed 10000 read accesses @4703325
-system.cpu3: completed 10000 read accesses @4708885
-panic: Possible Deadlock detected. Aborting!
-version: 3 request.paddr: 0x10c0c3 m_readRequestTable: 8 current time: 5500000 issue_time: 4999950 difference: 500050
- @ cycle 5500000
-[wakeup:build/ALPHA_SE_MESI_CMP_directory/mem/ruby/system/Sequencer.cc, line 107]
-Memory Usage: 346324 KBytes
-For more information see: http://www.m5sim.org/panic/ee664ab2
-Program aborted at cycle 5500000
+system.cpu0: completed 10000 read accesses @371396
+system.cpu2: completed 10000 read accesses @374647
+system.cpu7: completed 10000 read accesses @377314
+system.cpu1: completed 10000 read accesses @379478
+system.cpu3: completed 10000 read accesses @380787
+system.cpu5: completed 10000 read accesses @386046
+system.cpu4: completed 10000 read accesses @386470
+system.cpu6: completed 10000 read accesses @394077
+system.cpu0: completed 20000 read accesses @748308
+system.cpu2: completed 20000 read accesses @750148
+system.cpu1: completed 20000 read accesses @752701
+system.cpu3: completed 20000 read accesses @761044
+system.cpu5: completed 20000 read accesses @762156
+system.cpu4: completed 20000 read accesses @766351
+system.cpu6: completed 20000 read accesses @775961
+system.cpu7: completed 20000 read accesses @776472
+system.cpu2: completed 30000 read accesses @1125160
+system.cpu1: completed 30000 read accesses @1125369
+system.cpu0: completed 30000 read accesses @1130636
+system.cpu3: completed 30000 read accesses @1139985
+system.cpu5: completed 30000 read accesses @1141453
+system.cpu4: completed 30000 read accesses @1142264
+system.cpu6: completed 30000 read accesses @1154957
+system.cpu7: completed 30000 read accesses @1163543
+system.cpu2: completed 40000 read accesses @1501376
+system.cpu1: completed 40000 read accesses @1506717
+system.cpu0: completed 40000 read accesses @1507617
+system.cpu3: completed 40000 read accesses @1521033
+system.cpu4: completed 40000 read accesses @1523666
+system.cpu5: completed 40000 read accesses @1527373
+system.cpu6: completed 40000 read accesses @1547890
+system.cpu7: completed 40000 read accesses @1551332
+system.cpu2: completed 50000 read accesses @1879261
+system.cpu0: completed 50000 read accesses @1879360
+system.cpu1: completed 50000 read accesses @1885794
+system.cpu3: completed 50000 read accesses @1900931
+system.cpu4: completed 50000 read accesses @1902181
+system.cpu5: completed 50000 read accesses @1910820
+system.cpu6: completed 50000 read accesses @1931247
+system.cpu7: completed 50000 read accesses @1940656
+system.cpu0: completed 60000 read accesses @2246405
+system.cpu1: completed 60000 read accesses @2255112
+system.cpu2: completed 60000 read accesses @2258276
+system.cpu3: completed 60000 read accesses @2284120
+system.cpu4: completed 60000 read accesses @2284604
+system.cpu5: completed 60000 read accesses @2293116
+system.cpu6: completed 60000 read accesses @2311203
+system.cpu7: completed 60000 read accesses @2336896
+system.cpu0: completed 70000 read accesses @2626542
+system.cpu1: completed 70000 read accesses @2633209
+system.cpu2: completed 70000 read accesses @2638509
+system.cpu4: completed 70000 read accesses @2659805
+system.cpu3: completed 70000 read accesses @2663605
+system.cpu5: completed 70000 read accesses @2671213
+system.cpu6: completed 70000 read accesses @2693680
+system.cpu7: completed 70000 read accesses @2725734
+system.cpu0: completed 80000 read accesses @2999116
+system.cpu1: completed 80000 read accesses @3008858
+system.cpu2: completed 80000 read accesses @3014566
+system.cpu3: completed 80000 read accesses @3028069
+system.cpu4: completed 80000 read accesses @3040014
+system.cpu5: completed 80000 read accesses @3055346
+system.cpu6: completed 80000 read accesses @3080851
+system.cpu7: completed 80000 read accesses @3115153
+system.cpu0: completed 90000 read accesses @3374370
+system.cpu1: completed 90000 read accesses @3384044
+system.cpu2: completed 90000 read accesses @3385035
+system.cpu3: completed 90000 read accesses @3412877
+system.cpu4: completed 90000 read accesses @3422171
+system.cpu5: completed 90000 read accesses @3435207
+system.cpu6: completed 90000 read accesses @3466955
+system.cpu7: completed 90000 read accesses @3499833
+system.cpu0: completed 100000 read accesses @3750455
+hack: be nice to actually delete the event here
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 7de418081..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,11 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Feb  6 2011 15:12:58
-M5 revision b885adc82ab4+ 7924+ default tip qtip brad/regress_updates
-M5 started Feb  6 2011 15:13:09
-M5 executing on svnxelk05
+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...
+Exiting @ tick 3750455 because maximum number of loads reached
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 e69de29bb..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
@@ -0,0 +1,34 @@
+
+---------- Begin Simulation Statistics ----------
+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
+system.cpu0.num_copies                              0                       # number of copy accesses completed
+system.cpu0.num_reads                          100000                       # number of read accesses completed
+system.cpu0.num_writes                          54108                       # number of write accesses completed
+system.cpu1.num_copies                              0                       # number of copy accesses completed
+system.cpu1.num_reads                           99918                       # number of read accesses completed
+system.cpu1.num_writes                          53757                       # number of write accesses completed
+system.cpu2.num_copies                              0                       # number of copy accesses completed
+system.cpu2.num_reads                           99521                       # number of read accesses completed
+system.cpu2.num_writes                          53948                       # number of write accesses completed
+system.cpu3.num_copies                              0                       # number of copy accesses completed
+system.cpu3.num_reads                           98786                       # number of read accesses completed
+system.cpu3.num_writes                          53362                       # number of write accesses completed
+system.cpu4.num_copies                              0                       # number of copy accesses completed
+system.cpu4.num_reads                           98631                       # number of read accesses completed
+system.cpu4.num_writes                          52746                       # number of write accesses completed
+system.cpu5.num_copies                              0                       # number of copy accesses completed
+system.cpu5.num_reads                           98242                       # number of read accesses completed
+system.cpu5.num_writes                          52924                       # number of write accesses completed
+system.cpu6.num_copies                              0                       # number of copy accesses completed
+system.cpu6.num_reads                           97407                       # number of read accesses completed
+system.cpu6.num_writes                          52658                       # number of write accesses completed
+system.cpu7.num_copies                              0                       # number of copy accesses completed
+system.cpu7.num_reads                           96638                       # number of read accesses completed
+system.cpu7.num_writes                          51757                       # number of write accesses completed
+
+---------- End Simulation Statistics   ----------