stats: update stats for no_value -> nan

Lots of accumulated older changes too.

4 files changed, 107 insertions, 73 deletions

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
index bcc5fa575..744f07dc5 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
@@ -1,6 +1,7 @@
 [root]
 type=Root
 children=system
+full_system=false
 time_sync_enable=false
 time_sync_period=100000000
 time_sync_spin_threshold=100000
@@ -8,10 +9,15 @@ 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 physmem ruby sys_port_proxy
+boot_osflags=a
+init_param=0
+kernel=
+load_addr_mask=1099511627775
 mem_mode=timing
-memories=system.physmem system.funcmem
+memories=system.funcmem system.physmem
 num_work_ids=16
-physmem=system.physmem
+readfile=
+symbolfile=
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
 work_begin_exit_count=0
@@ -19,7 +25,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_port=system.sys_port_proxy.slave[0]
 
 [system.cpu0]
 type=MemTest
@@ -34,9 +40,10 @@ 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]
+test=system.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
 type=MemTest
@@ -51,9 +58,10 @@ 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]
+test=system.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
 type=MemTest
@@ -68,9 +76,10 @@ 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]
+test=system.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
 type=MemTest
@@ -85,9 +94,10 @@ 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]
+test=system.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
 type=MemTest
@@ -102,9 +112,10 @@ 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]
+test=system.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
 type=MemTest
@@ -119,9 +130,10 @@ 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]
+test=system.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
 type=MemTest
@@ -136,9 +148,10 @@ 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]
+test=system.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
 type=MemTest
@@ -153,9 +166,10 @@ 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]
+test=system.l1_cntrl7.sequencer.slave[0]
 
 [system.dir_cntrl0]
 type=Directory_Controller
@@ -175,7 +189,7 @@ version=0
 type=RubyDirectoryMemory
 map_levels=4
 numa_high_bit=6
-size=134217728
+size=268435456
 use_map=false
 version=0
 
@@ -201,8 +215,10 @@ tFaw=0
 version=0
 
 [system.funcmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=false
 latency=30
 latency_var=0
 null=false
@@ -221,6 +237,7 @@ issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
+send_evictions=false
 sequencer=system.l1_cntrl0.sequencer
 transitions_per_cycle=32
 version=0
@@ -241,13 +258,14 @@ dcache=system.l1_cntrl0.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl0.cacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-physMemPort=system.physmem.port[0]
-port=system.cpu0.test
+slave=system.cpu0.test
 
 [system.l1_cntrl1]
 type=L1Cache_Controller
@@ -260,6 +278,7 @@ issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
+send_evictions=false
 sequencer=system.l1_cntrl1.sequencer
 transitions_per_cycle=32
 version=1
@@ -280,13 +299,14 @@ dcache=system.l1_cntrl1.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl1.cacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=1
-physMemPort=system.physmem.port[1]
-port=system.cpu1.test
+slave=system.cpu1.test
 
 [system.l1_cntrl2]
 type=L1Cache_Controller
@@ -299,6 +319,7 @@ issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
+send_evictions=false
 sequencer=system.l1_cntrl2.sequencer
 transitions_per_cycle=32
 version=2
@@ -319,13 +340,14 @@ dcache=system.l1_cntrl2.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl2.cacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=2
-physMemPort=system.physmem.port[2]
-port=system.cpu2.test
+slave=system.cpu2.test
 
 [system.l1_cntrl3]
 type=L1Cache_Controller
@@ -338,6 +360,7 @@ issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
+send_evictions=false
 sequencer=system.l1_cntrl3.sequencer
 transitions_per_cycle=32
 version=3
@@ -358,13 +381,14 @@ dcache=system.l1_cntrl3.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl3.cacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=3
-physMemPort=system.physmem.port[3]
-port=system.cpu3.test
+slave=system.cpu3.test
 
 [system.l1_cntrl4]
 type=L1Cache_Controller
@@ -377,6 +401,7 @@ issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
+send_evictions=false
 sequencer=system.l1_cntrl4.sequencer
 transitions_per_cycle=32
 version=4
@@ -397,13 +422,14 @@ dcache=system.l1_cntrl4.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl4.cacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=4
-physMemPort=system.physmem.port[4]
-port=system.cpu4.test
+slave=system.cpu4.test
 
 [system.l1_cntrl5]
 type=L1Cache_Controller
@@ -416,6 +442,7 @@ issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
+send_evictions=false
 sequencer=system.l1_cntrl5.sequencer
 transitions_per_cycle=32
 version=5
@@ -436,13 +463,14 @@ dcache=system.l1_cntrl5.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl5.cacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=5
-physMemPort=system.physmem.port[5]
-port=system.cpu5.test
+slave=system.cpu5.test
 
 [system.l1_cntrl6]
 type=L1Cache_Controller
@@ -455,6 +483,7 @@ issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
+send_evictions=false
 sequencer=system.l1_cntrl6.sequencer
 transitions_per_cycle=32
 version=6
@@ -475,13 +504,14 @@ dcache=system.l1_cntrl6.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl6.cacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=6
-physMemPort=system.physmem.port[6]
-port=system.cpu6.test
+slave=system.cpu6.test
 
 [system.l1_cntrl7]
 type=L1Cache_Controller
@@ -494,6 +524,7 @@ issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
+send_evictions=false
 sequencer=system.l1_cntrl7.sequencer
 transitions_per_cycle=32
 version=7
@@ -514,30 +545,32 @@ dcache=system.l1_cntrl7.cacheMemory
 deadlock_threshold=1000000
 icache=system.l1_cntrl7.cacheMemory
 max_outstanding_requests=16
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=7
-physMemPort=system.physmem.port[7]
-port=system.cpu7.test
+slave=system.cpu7.test
 
 [system.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
 file=
+in_addr_map=true
 latency=30
 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 system.sys_port_proxy.physMemPort
 
 [system.ruby]
 type=RubySystem
 children=network profiler
 block_size_bytes=64
 clock=1
-mem_size=134217728
+mem_size=268435456
 no_mem_vec=false
 random_seed=1234
 randomization=false
@@ -775,11 +808,12 @@ ruby_system=system.ruby
 [system.sys_port_proxy]
 type=RubyPortProxy
 access_phys_mem=true
-physmem=system.physmem
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
 using_network_tester=false
 using_ruby_tester=false
 version=0
-physMemPort=system.physmem.port[8]
-port=system.system_port
+slave=system.system_port
 
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
index d3193509d..379029232 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
@@ -7,8 +7,8 @@ RubySystem config:
   cycle_period: 1
   block_size_bytes: 64
   block_size_bits: 6
-  memory_size_bytes: 134217728
-  memory_size_bits: 27
+  memory_size_bytes: 268435456
+  memory_size_bits: 28
 
 Network Configuration
 ---------------------
@@ -34,27 +34,27 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: Jan/23/2012 05:00:08
+Real time: May/08/2012 15:42:37
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 40
-Elapsed_time_in_minutes: 0.666667
-Elapsed_time_in_hours: 0.0111111
-Elapsed_time_in_days: 0.000462963
+Elapsed_time_in_seconds: 69
+Elapsed_time_in_minutes: 1.15
+Elapsed_time_in_hours: 0.0191667
+Elapsed_time_in_days: 0.000798611
 
-Virtual_time_in_seconds: 40.57
-Virtual_time_in_minutes: 0.676167
-Virtual_time_in_hours:   0.0112694
-Virtual_time_in_days:    0.00046956
+Virtual_time_in_seconds: 68.73
+Virtual_time_in_minutes: 1.1455
+Virtual_time_in_hours:   0.0190917
+Virtual_time_in_days:    0.000795486
 
 Ruby_current_time: 28725020
 Ruby_start_time: 0
 Ruby_cycles: 28725020
 
-mbytes_resident: 41.0898
-mbytes_total: 338.922
-resident_ratio: 0.121237
+mbytes_resident: 59.4102
+mbytes_total: 360.535
+resident_ratio: 0.164783
 
 ruby_cycles_executed: [ 28725021 28725021 28725021 28725021 28725021 28725021 28725021 28725021 ]
 
@@ -118,13 +118,13 @@ Total_nonPF_delay_cycles: [binsize: 1 max: 22 count: 1233888 average: 0.00745367
 Resource Usage
 --------------
 page_size: 4096
-user_time: 40
+user_time: 68
 system_time: 0
-page_reclaims: 10928
+page_reclaims: 15745
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 168
+block_outputs: 256
 
 Network Stats
 -------------
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout
index 0a1ec6a6d..4cb3155a6 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/simout
@@ -1,10 +1,10 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan 23 2012 04:48:33
-gem5 started Jan 23 2012 04:59:28
-gem5 executing on zizzer
-command line: build/ALPHA_SE/gem5.opt -d build/ALPHA_SE/tests/opt/quick/50.memtest/alpha/linux/memtest-ruby -re tests/run.py build/ALPHA_SE/tests/opt/quick/50.memtest/alpha/linux/memtest-ruby
+gem5 compiled May  8 2012 15:36:31
+gem5 started May  8 2012 15:41:28
+gem5 executing on piton
+command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby -re tests/run.py build/ALPHA/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby
 Global frequency set at 1000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 28725020 because maximum number of loads reached
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
index 95c30ab1c..12fdf4aa3 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
@@ -4,21 +4,21 @@ sim_seconds                                  0.028725                       # Nu
 sim_ticks                                    28725020                       # Number of ticks simulated
 final_tick                                   28725020                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                 711274                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 347060                       # Number of bytes of host memory used
-host_seconds                                    40.39                       # 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
+host_tick_rate                                 417169                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 369192                       # Number of bytes of host memory used
+host_seconds                                    68.86                       # 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
 system.cpu0.num_reads                          100000                       # number of read accesses completed
 system.cpu0.num_writes                          53147                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed