stats: Update stats for final tick and memory bandwidth patches

4 files changed, 68 insertions, 28 deletions

diff --git a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
index 0f765d7ae..84c75eb68 100644
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
@@ -7,8 +7,10 @@ time_sync_spin_threshold=100000
 
 [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
+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 sys_port_proxy
 mem_mode=timing
+memories=system.physmem system.funcmem
+num_work_ids=16
 physmem=system.physmem
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
@@ -17,6 +19,7 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
+system_port=system.sys_port_proxy.port[0]
 
 [system.cpu0]
 type=MemTest
@@ -235,6 +238,7 @@ version=0
 [system.l1_cntrl0.L1DcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -243,6 +247,7 @@ start_index_bit=6
 [system.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -288,6 +293,7 @@ version=1
 [system.l1_cntrl1.L1DcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -296,6 +302,7 @@ start_index_bit=6
 [system.l1_cntrl1.L1IcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -341,6 +348,7 @@ version=2
 [system.l1_cntrl2.L1DcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -349,6 +357,7 @@ start_index_bit=6
 [system.l1_cntrl2.L1IcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -394,6 +403,7 @@ version=3
 [system.l1_cntrl3.L1DcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -402,6 +412,7 @@ start_index_bit=6
 [system.l1_cntrl3.L1IcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -447,6 +458,7 @@ version=4
 [system.l1_cntrl4.L1DcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -455,6 +467,7 @@ start_index_bit=6
 [system.l1_cntrl4.L1IcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -500,6 +513,7 @@ version=5
 [system.l1_cntrl5.L1DcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -508,6 +522,7 @@ start_index_bit=6
 [system.l1_cntrl5.L1IcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -553,6 +568,7 @@ version=6
 [system.l1_cntrl6.L1DcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -561,6 +577,7 @@ start_index_bit=6
 [system.l1_cntrl6.L1IcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -606,6 +623,7 @@ version=7
 [system.l1_cntrl7.L1DcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -614,6 +632,7 @@ start_index_bit=6
 [system.l1_cntrl7.L1IcacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
 size=256
@@ -653,6 +672,7 @@ version=0
 [system.l2_cntrl0.L2cacheMemory]
 type=RubyCache
 assoc=2
+is_icache=false
 latency=10
 replacement_policy=PSEUDO_LRU
 size=512
@@ -666,11 +686,11 @@ latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=system.l1_cntrl0.sequencer.physMemPort system.l1_cntrl1.sequencer.physMemPort system.l1_cntrl2.sequencer.physMemPort system.l1_cntrl3.sequencer.physMemPort system.l1_cntrl4.sequencer.physMemPort system.l1_cntrl5.sequencer.physMemPort system.l1_cntrl6.sequencer.physMemPort system.l1_cntrl7.sequencer.physMemPort
+port=system.l1_cntrl0.sequencer.physMemPort system.l1_cntrl1.sequencer.physMemPort system.l1_cntrl2.sequencer.physMemPort system.l1_cntrl3.sequencer.physMemPort system.l1_cntrl4.sequencer.physMemPort system.l1_cntrl5.sequencer.physMemPort system.l1_cntrl6.sequencer.physMemPort system.l1_cntrl7.sequencer.physMemPort system.sys_port_proxy.physMemPort
 
 [system.ruby]
 type=RubySystem
-children=network profiler tracer
+children=network profiler
 block_size_bytes=64
 clock=1
 mem_size=134217728
@@ -930,8 +950,14 @@ hot_lines=false
 num_of_sequencers=8
 ruby_system=system.ruby
 
-[system.ruby.tracer]
-type=RubyTracer
+[system.sys_port_proxy]
+type=RubyPortProxy
+access_phys_mem=true
+physmem=system.physmem
 ruby_system=system.ruby
-warmup_length=100000
+using_network_tester=false
+using_ruby_tester=false
+version=0
+physMemPort=system.physmem.port[8]
+port=system.system_port
 
diff --git a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
index c2742878d..5b7a6fff2 100644
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
+++ b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: Jun/30/2011 15:40:53
+Real time: Jan/23/2012 04:24:27
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 176
-Elapsed_time_in_minutes: 2.93333
-Elapsed_time_in_hours: 0.0488889
-Elapsed_time_in_days: 0.00203704
+Elapsed_time_in_seconds: 120
+Elapsed_time_in_minutes: 2
+Elapsed_time_in_hours: 0.0333333
+Elapsed_time_in_days: 0.00138889
 
-Virtual_time_in_seconds: 175.47
-Virtual_time_in_minutes: 2.9245
-Virtual_time_in_hours:   0.0487417
-Virtual_time_in_days:    0.0020309
+Virtual_time_in_seconds: 119.35
+Virtual_time_in_minutes: 1.98917
+Virtual_time_in_hours:   0.0331528
+Virtual_time_in_days:    0.00138137
 
 Ruby_current_time: 19658320
 Ruby_start_time: 0
 Ruby_cycles: 19658320
 
-mbytes_resident: 38.5312
-mbytes_total: 350.477
-resident_ratio: 0.109951
+mbytes_resident: 41.6445
+mbytes_total: 339.402
+resident_ratio: 0.1227
 
 ruby_cycles_executed: [ 19658321 19658321 19658321 19658321 19658321 19658321 19658321 19658321 ]
 
@@ -125,13 +125,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard dev
 Resource Usage
 --------------
 page_size: 4096
-user_time: 175
+user_time: 119
 system_time: 0
-page_reclaims: 11261
+page_reclaims: 10999
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 0
+block_outputs: 208
 
 Network Stats
 -------------
@@ -1399,4 +1399,5 @@ DR_L  Tokens [0 ] 0
 DR_L  Request_Timeout [0 ] 0
 DR_L  DMA_READ [0 ] 0
 DR_L  DMA_WRITE [0 ] 0
-DR_L  DMA_WRITE_All_Tokens
\ No newline at end of file
+DR_L  DMA_WRITE_All_Tokens [0 ] 0
+
diff --git a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
index f3e44a721..0dc21efd5 100755
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
+++ b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
@@ -1,9 +1,9 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jun 30 2011 15:37:32
-gem5 started Jun 30 2011 15:37:57
-gem5 executing on SC2B0622
+gem5 compiled Jan 23 2012 03:50:16
+gem5 started Jan 23 2012 04:22:27
+gem5 executing on zizzer
 command line: build/ALPHA_SE_MOESI_CMP_token/gem5.opt -d build/ALPHA_SE_MOESI_CMP_token/tests/opt/quick/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token -re tests/run.py build/ALPHA_SE_MOESI_CMP_token/tests/opt/quick/50.memtest/alpha/linux/memtest-ruby-MOESI_CMP_token
 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-MOESI_CMP_token/stats.txt b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
index 96d2626d3..d79a41535 100644
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
@@ -2,10 +2,23 @@
 ---------- Begin Simulation Statistics ----------
 sim_seconds                                  0.019658                       # Number of seconds simulated
 sim_ticks                                    19658320                       # Number of ticks simulated
+final_tick                                   19658320                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                 112174                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 358892                       # Number of bytes of host memory used
-host_seconds                                   175.25                       # Real time elapsed on the host
+host_tick_rate                                 164666                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 347552                       # Number of bytes of host memory used
+host_seconds                                   119.38                       # 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
+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
+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.cpu0.num_reads                          100000                       # number of read accesses completed
 system.cpu0.num_writes                          53504                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed