stats: updates due to recent ruby and x86 changes

Also updates many out of date config files.

3 files changed, 53 insertions, 22 deletions

diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
index 1f5f9ed94..00c794fb7 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
@@ -10,13 +10,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=clk_domain cpu physmem ruby sys_port_proxy voltage_domain
+children=clk_domain cpu dvfs_handler physmem ruby sys_port_proxy voltage_domain
 boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
 init_param=0
 kernel=
+kernel_addr_check=true
 load_addr_mask=1099511627775
 load_offset=0
 mem_mode=timing
@@ -37,7 +38,9 @@ system_port=system.sys_port_proxy.slave[0]
 [system.clk_domain]
 type=SrcClockDomain
 clock=1
+domain_id=-1
 eventq_index=0
+init_perf_level=0
 voltage_domain=system.voltage_domain
 
 [system.cpu]
@@ -76,7 +79,9 @@ icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 [system.cpu.clk_domain]
 type=SrcClockDomain
 clock=1
+domain_id=-1
 eventq_index=0
+init_perf_level=0
 voltage_domain=system.voltage_domain
 
 [system.cpu.dtb]
@@ -122,6 +127,14 @@ simpoint=0
 system=system
 uid=100
 
+[system.dvfs_handler]
+type=DVFSHandler
+domains=
+enable=false
+eventq_index=0
+sys_clk_domain=system.clk_domain
+transition_latency=100000
+
 [system.physmem]
 type=SimpleMemory
 bandwidth=0.000000
@@ -151,7 +164,9 @@ randomization=false
 [system.ruby.clk_domain]
 type=SrcClockDomain
 clock=1
+domain_id=-1
 eventq_index=0
+init_perf_level=0
 voltage_domain=system.voltage_domain
 
 [system.ruby.dir_cntrl0]
@@ -171,6 +186,9 @@ ruby_system=system.ruby
 to_mem_ctrl_latency=1
 transitions_per_cycle=4
 version=0
+requestToDir=system.ruby.network.master[5]
+responseFromDir=system.ruby.network.slave[6]
+responseToDir=system.ruby.network.master[6]
 
 [system.ruby.dir_cntrl0.directory]
 type=RubyDirectoryMemory
@@ -210,7 +228,7 @@ children=L1Dcache L1Icache prefetcher sequencer
 L1Dcache=system.ruby.l1_cntrl0.L1Dcache
 L1Icache=system.ruby.l1_cntrl0.L1Icache
 buffer_size=0
-clk_domain=system.ruby.clk_domain
+clk_domain=system.cpu.clk_domain
 cluster_id=0
 enable_prefetch=false
 eventq_index=0
@@ -227,6 +245,11 @@ sequencer=system.ruby.l1_cntrl0.sequencer
 to_l2_latency=1
 transitions_per_cycle=4
 version=0
+requestFromL1Cache=system.ruby.network.slave[0]
+requestToL1Cache=system.ruby.network.master[0]
+responseFromL1Cache=system.ruby.network.slave[1]
+responseToL1Cache=system.ruby.network.master[1]
+unblockFromL1Cache=system.ruby.network.slave[2]
 
 [system.ruby.l1_cntrl0.L1Dcache]
 type=RubyCache
@@ -272,7 +295,7 @@ unit_filter=8
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=false
-clk_domain=system.ruby.clk_domain
+clk_domain=system.cpu.clk_domain
 dcache=system.ruby.l1_cntrl0.L1Dcache
 deadlock_threshold=500000
 eventq_index=0
@@ -304,6 +327,12 @@ ruby_system=system.ruby
 to_l1_latency=1
 transitions_per_cycle=4
 version=0
+DirRequestFromL2Cache=system.ruby.network.slave[3]
+L1RequestFromL2Cache=system.ruby.network.slave[4]
+L1RequestToL2Cache=system.ruby.network.master[3]
+responseFromL2Cache=system.ruby.network.slave[5]
+responseToL2Cache=system.ruby.network.master[4]
+unblockToL2Cache=system.ruby.network.master[2]
 
 [system.ruby.l2_cntrl0.L2cache]
 type=RubyCache
@@ -342,6 +371,8 @@ number_of_virtual_networks=10
 routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3
 ruby_system=system.ruby
 topology=Crossbar
+master=system.ruby.l1_cntrl0.requestToL1Cache system.ruby.l1_cntrl0.responseToL1Cache system.ruby.l2_cntrl0.unblockToL2Cache system.ruby.l2_cntrl0.L1RequestToL2Cache system.ruby.l2_cntrl0.responseToL2Cache system.ruby.dir_cntrl0.requestToDir system.ruby.dir_cntrl0.responseToDir
+slave=system.ruby.l1_cntrl0.requestFromL1Cache system.ruby.l1_cntrl0.responseFromL1Cache system.ruby.l1_cntrl0.unblockFromL1Cache system.ruby.l2_cntrl0.DirRequestFromL2Cache system.ruby.l2_cntrl0.L1RequestFromL2Cache system.ruby.l2_cntrl0.responseFromL2Cache system.ruby.dir_cntrl0.responseFromDir
 
 [system.ruby.network.ext_links0]
 type=SimpleExtLink
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr
index a30a2a95c..a26365a1c 100755
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/simerr
@@ -3,4 +3,4 @@ warn: rounding error > tolerance
 warn: rounding error > tolerance
     0.072760 rounded to 0
 warn: Sockets disabled, not accepting gdb connections
-warn: ignoring syscall sigprocmask(18446744073709547831, 1, ...)
+warn: ignoring syscall sigprocmask(1, ...)
diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
index a58d5939b..8e4167e07 100644
--- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000053                       # Nu
 sim_ticks                                       52548                       # Number of ticks simulated
 final_tick                                      52548                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  36298                       # Simulator instruction rate (inst/s)
-host_op_rate                                    36291                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 739863                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 159844                       # Number of bytes of host memory used
-host_seconds                                     0.07                       # Real time elapsed on the host
+host_inst_rate                                  17447                       # Simulator instruction rate (inst/s)
+host_op_rate                                    17445                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 355681                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 176684                       # Number of bytes of host memory used
+host_seconds                                     0.15                       # Real time elapsed on the host
 sim_insts                                        2577                       # Number of instructions simulated
 sim_ops                                          2577                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -57,6 +57,7 @@ system.ruby.l1_cntrl0.L1Dcache.demand_accesses          709
 system.ruby.l1_cntrl0.L1Icache.demand_hits         2285                       # Number of cache demand hits
 system.ruby.l1_cntrl0.L1Icache.demand_misses          300                       # Number of cache demand misses
 system.ruby.l1_cntrl0.L1Icache.demand_accesses         2585                       # Number of cache demand accesses
+system.cpu.clk_domain.clock                         1                       # Clock period in ticks
 system.ruby.l1_cntrl0.prefetcher.miss_observed            0                       # number of misses observed
 system.ruby.l1_cntrl0.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
 system.ruby.l1_cntrl0.prefetcher.prefetches_requested            0                       # number of prefetch requests made
@@ -68,7 +69,7 @@ system.ruby.l1_cntrl0.prefetcher.pages_crossed            0
 system.ruby.l1_cntrl0.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
 system.ruby.network.routers0.percent_links_utilized     3.786062                      
 system.ruby.network.routers0.msg_count.Control::0          572                      
-system.ruby.network.routers0.msg_count.Request_Control::0          431                      
+system.ruby.network.routers0.msg_count.Request_Control::2          431                      
 system.ruby.network.routers0.msg_count.Response_Data::1          572                      
 system.ruby.network.routers0.msg_count.Response_Control::1          493                      
 system.ruby.network.routers0.msg_count.Response_Control::2          272                      
@@ -76,7 +77,7 @@ system.ruby.network.routers0.msg_count.Writeback_Data::0           45
 system.ruby.network.routers0.msg_count.Writeback_Data::1           62                      
 system.ruby.network.routers0.msg_count.Writeback_Control::0           79                      
 system.ruby.network.routers0.msg_bytes.Control::0         4576                      
-system.ruby.network.routers0.msg_bytes.Request_Control::0         3448                      
+system.ruby.network.routers0.msg_bytes.Request_Control::2         3448                      
 system.ruby.network.routers0.msg_bytes.Response_Data::1        41184                      
 system.ruby.network.routers0.msg_bytes.Response_Control::1         3944                      
 system.ruby.network.routers0.msg_bytes.Response_Control::2         2176                      
@@ -88,7 +89,7 @@ system.ruby.l2_cntrl0.L2cache.demand_misses          547                       #
 system.ruby.l2_cntrl0.L2cache.demand_accesses          572                       # Number of cache demand accesses
 system.ruby.network.routers1.percent_links_utilized     7.293332                      
 system.ruby.network.routers1.msg_count.Control::0         1119                      
-system.ruby.network.routers1.msg_count.Request_Control::0          431                      
+system.ruby.network.routers1.msg_count.Request_Control::2          431                      
 system.ruby.network.routers1.msg_count.Response_Data::1         1222                      
 system.ruby.network.routers1.msg_count.Response_Control::1         1468                      
 system.ruby.network.routers1.msg_count.Response_Control::2          272                      
@@ -96,7 +97,7 @@ system.ruby.network.routers1.msg_count.Writeback_Data::0           45
 system.ruby.network.routers1.msg_count.Writeback_Data::1           62                      
 system.ruby.network.routers1.msg_count.Writeback_Control::0           79                      
 system.ruby.network.routers1.msg_bytes.Control::0         8952                      
-system.ruby.network.routers1.msg_bytes.Request_Control::0         3448                      
+system.ruby.network.routers1.msg_bytes.Request_Control::2         3448                      
 system.ruby.network.routers1.msg_bytes.Response_Data::1        87984                      
 system.ruby.network.routers1.msg_bytes.Response_Control::1        11744                      
 system.ruby.network.routers1.msg_bytes.Response_Control::2         2176                      
@@ -125,7 +126,7 @@ system.ruby.network.routers2.msg_bytes.Response_Data::1        46800
 system.ruby.network.routers2.msg_bytes.Response_Control::1         7800                      
 system.ruby.network.routers3.percent_links_utilized     4.862221                      
 system.ruby.network.routers3.msg_count.Control::0         1119                      
-system.ruby.network.routers3.msg_count.Request_Control::0          431                      
+system.ruby.network.routers3.msg_count.Request_Control::2          431                      
 system.ruby.network.routers3.msg_count.Response_Data::1         1222                      
 system.ruby.network.routers3.msg_count.Response_Control::1         1468                      
 system.ruby.network.routers3.msg_count.Response_Control::2          272                      
@@ -133,7 +134,7 @@ system.ruby.network.routers3.msg_count.Writeback_Data::0           45
 system.ruby.network.routers3.msg_count.Writeback_Data::1           62                      
 system.ruby.network.routers3.msg_count.Writeback_Control::0           79                      
 system.ruby.network.routers3.msg_bytes.Control::0         8952                      
-system.ruby.network.routers3.msg_bytes.Request_Control::0         3448                      
+system.ruby.network.routers3.msg_bytes.Request_Control::2         3448                      
 system.ruby.network.routers3.msg_bytes.Response_Data::1        87984                      
 system.ruby.network.routers3.msg_bytes.Response_Control::1        11744                      
 system.ruby.network.routers3.msg_bytes.Response_Control::2         2176                      
@@ -152,7 +153,6 @@ system.ruby.network.msg_byte.Response_Data       263952
 system.ruby.network.msg_byte.Response_Control        41760                      
 system.ruby.network.msg_byte.Writeback_Data        23112                      
 system.ruby.network.msg_byte.Writeback_Control         1896                      
-system.cpu.clk_domain.clock                         1                       # Clock period in ticks
 system.cpu.dtb.fetch_hits                           0                       # ITB hits
 system.cpu.dtb.fetch_misses                         0                       # ITB misses
 system.cpu.dtb.fetch_acv                            0                       # ITB acv
@@ -245,10 +245,10 @@ system.cpu.op_class::IprAccess                      0      0.00%    100.00% # Cl
 system.cpu.op_class::InstPrefetch                   0      0.00%    100.00% # Class of executed instruction
 system.cpu.op_class::total                       2585                       # Class of executed instruction
 system.ruby.network.routers0.throttle0.link_utilization     5.426467                      
-system.ruby.network.routers0.throttle0.msg_count.Request_Control::0          431                      
+system.ruby.network.routers0.throttle0.msg_count.Request_Control::2          431                      
 system.ruby.network.routers0.throttle0.msg_count.Response_Data::1          572                      
 system.ruby.network.routers0.throttle0.msg_count.Response_Control::1          124                      
-system.ruby.network.routers0.throttle0.msg_bytes.Request_Control::0         3448                      
+system.ruby.network.routers0.throttle0.msg_bytes.Request_Control::2         3448                      
 system.ruby.network.routers0.throttle0.msg_bytes.Response_Data::1        41184                      
 system.ruby.network.routers0.throttle0.msg_bytes.Response_Control::1          992                      
 system.ruby.network.routers0.throttle1.link_utilization     2.145657                      
@@ -281,11 +281,11 @@ system.ruby.network.routers1.throttle0.msg_bytes.Writeback_Data::1         4464
 system.ruby.network.routers1.throttle0.msg_bytes.Writeback_Control::0          632                      
 system.ruby.network.routers1.throttle1.link_utilization     7.243853                      
 system.ruby.network.routers1.throttle1.msg_count.Control::0          547                      
-system.ruby.network.routers1.throttle1.msg_count.Request_Control::0          431                      
+system.ruby.network.routers1.throttle1.msg_count.Request_Control::2          431                      
 system.ruby.network.routers1.throttle1.msg_count.Response_Data::1          675                      
 system.ruby.network.routers1.throttle1.msg_count.Response_Control::1          560                      
 system.ruby.network.routers1.throttle1.msg_bytes.Control::0         4376                      
-system.ruby.network.routers1.throttle1.msg_bytes.Request_Control::0         3448                      
+system.ruby.network.routers1.throttle1.msg_bytes.Request_Control::2         3448                      
 system.ruby.network.routers1.throttle1.msg_bytes.Response_Data::1        48600                      
 system.ruby.network.routers1.throttle1.msg_bytes.Response_Control::1         4480                      
 system.ruby.network.routers2.throttle0.link_utilization     1.817386                      
@@ -301,10 +301,10 @@ system.ruby.network.routers2.throttle1.msg_count.Response_Control::1          53
 system.ruby.network.routers2.throttle1.msg_bytes.Response_Data::1        39384                      
 system.ruby.network.routers2.throttle1.msg_bytes.Response_Control::1         4312                      
 system.ruby.network.routers3.throttle0.link_utilization     5.426467                      
-system.ruby.network.routers3.throttle0.msg_count.Request_Control::0          431                      
+system.ruby.network.routers3.throttle0.msg_count.Request_Control::2          431                      
 system.ruby.network.routers3.throttle0.msg_count.Response_Data::1          572                      
 system.ruby.network.routers3.throttle0.msg_count.Response_Control::1          124                      
-system.ruby.network.routers3.throttle0.msg_bytes.Request_Control::0         3448                      
+system.ruby.network.routers3.throttle0.msg_bytes.Request_Control::2         3448                      
 system.ruby.network.routers3.throttle0.msg_bytes.Response_Data::1        41184                      
 system.ruby.network.routers3.throttle0.msg_bytes.Response_Control::1          992                      
 system.ruby.network.routers3.throttle1.link_utilization     7.342810