stats: updates due to recent ruby and x86 changes

Also updates many out of date config files.

2 files changed, 47 insertions, 16 deletions

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
index 27b1ed20b..1a2ad4916 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/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]
@@ -111,7 +116,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=tests/test-progs/hello/bin/alpha/linux/hello
+executable=/scratch/nilay/GEM5/gem5/tests/test-progs/hello/bin/alpha/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -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/linux/simple-timing-ruby-MESI_Two_Level/stats.txt b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
index 088293227..372180bd6 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
@@ -68,7 +68,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.776801                      
 system.ruby.network.routers0.msg_count.Control::0         1490                      
-system.ruby.network.routers0.msg_count.Request_Control::0         1041                      
+system.ruby.network.routers0.msg_count.Request_Control::2         1041                      
 system.ruby.network.routers0.msg_count.Response_Data::1         1490                      
 system.ruby.network.routers0.msg_count.Response_Control::1         1336                      
 system.ruby.network.routers0.msg_count.Response_Control::2          799                      
@@ -76,7 +76,7 @@ system.ruby.network.routers0.msg_count.Writeback_Data::0          145
 system.ruby.network.routers0.msg_count.Writeback_Data::1          141                      
 system.ruby.network.routers0.msg_count.Writeback_Control::0          291                      
 system.ruby.network.routers0.msg_bytes.Control::0        11920                      
-system.ruby.network.routers0.msg_bytes.Request_Control::0         8328                      
+system.ruby.network.routers0.msg_bytes.Request_Control::2         8328                      
 system.ruby.network.routers0.msg_bytes.Response_Data::1       107280                      
 system.ruby.network.routers0.msg_bytes.Response_Control::1        10688                      
 system.ruby.network.routers0.msg_bytes.Response_Control::2         6392                      
@@ -88,7 +88,7 @@ system.ruby.l2_cntrl0.L2cache.demand_misses         1460                       #
 system.ruby.l2_cntrl0.L2cache.demand_accesses         1490                       # Number of cache demand accesses
 system.ruby.network.routers1.percent_links_utilized     7.333389                      
 system.ruby.network.routers1.msg_count.Control::0         2950                      
-system.ruby.network.routers1.msg_count.Request_Control::0         1041                      
+system.ruby.network.routers1.msg_count.Request_Control::2         1041                      
 system.ruby.network.routers1.msg_count.Response_Data::1         3227                      
 system.ruby.network.routers1.msg_count.Response_Control::1         3963                      
 system.ruby.network.routers1.msg_count.Response_Control::2          799                      
@@ -96,7 +96,7 @@ system.ruby.network.routers1.msg_count.Writeback_Data::0          145
 system.ruby.network.routers1.msg_count.Writeback_Data::1          141                      
 system.ruby.network.routers1.msg_count.Writeback_Control::0          291                      
 system.ruby.network.routers1.msg_bytes.Control::0        23600                      
-system.ruby.network.routers1.msg_bytes.Request_Control::0         8328                      
+system.ruby.network.routers1.msg_bytes.Request_Control::2         8328                      
 system.ruby.network.routers1.msg_bytes.Response_Data::1       232344                      
 system.ruby.network.routers1.msg_bytes.Response_Control::1        31704                      
 system.ruby.network.routers1.msg_bytes.Response_Control::2         6392                      
@@ -126,7 +126,7 @@ system.ruby.network.routers2.msg_bytes.Response_Data::1       125064
 system.ruby.network.routers2.msg_bytes.Response_Control::1        21016                      
 system.ruby.network.routers3.percent_links_utilized     4.888926                      
 system.ruby.network.routers3.msg_count.Control::0         2950                      
-system.ruby.network.routers3.msg_count.Request_Control::0         1041                      
+system.ruby.network.routers3.msg_count.Request_Control::2         1041                      
 system.ruby.network.routers3.msg_count.Response_Data::1         3227                      
 system.ruby.network.routers3.msg_count.Response_Control::1         3963                      
 system.ruby.network.routers3.msg_count.Response_Control::2          799                      
@@ -134,7 +134,7 @@ system.ruby.network.routers3.msg_count.Writeback_Data::0          145
 system.ruby.network.routers3.msg_count.Writeback_Data::1          141                      
 system.ruby.network.routers3.msg_count.Writeback_Control::0          291                      
 system.ruby.network.routers3.msg_bytes.Control::0        23600                      
-system.ruby.network.routers3.msg_bytes.Request_Control::0         8328                      
+system.ruby.network.routers3.msg_bytes.Request_Control::2         8328                      
 system.ruby.network.routers3.msg_bytes.Response_Data::1       232344                      
 system.ruby.network.routers3.msg_bytes.Response_Control::1        31704                      
 system.ruby.network.routers3.msg_bytes.Response_Control::2         6392                      
@@ -246,10 +246,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                       6400                       # Class of executed instruction
 system.ruby.network.routers0.throttle0.link_utilization     5.369871                      
-system.ruby.network.routers0.throttle0.msg_count.Request_Control::0         1041                      
+system.ruby.network.routers0.throttle0.msg_count.Request_Control::2         1041                      
 system.ruby.network.routers0.throttle0.msg_count.Response_Data::1         1490                      
 system.ruby.network.routers0.throttle0.msg_count.Response_Control::1          436                      
-system.ruby.network.routers0.throttle0.msg_bytes.Request_Control::0         8328                      
+system.ruby.network.routers0.throttle0.msg_bytes.Request_Control::2         8328                      
 system.ruby.network.routers0.throttle0.msg_bytes.Response_Data::1       107280                      
 system.ruby.network.routers0.throttle0.msg_bytes.Response_Control::1         3488                      
 system.ruby.network.routers0.throttle1.link_utilization     2.183731                      
@@ -282,11 +282,11 @@ system.ruby.network.routers1.throttle0.msg_bytes.Writeback_Data::1        10152
 system.ruby.network.routers1.throttle0.msg_bytes.Writeback_Control::0         2328                      
 system.ruby.network.routers1.throttle1.link_utilization     7.219585                      
 system.ruby.network.routers1.throttle1.msg_count.Control::0         1460                      
-system.ruby.network.routers1.throttle1.msg_count.Request_Control::0         1041                      
+system.ruby.network.routers1.throttle1.msg_count.Request_Control::2         1041                      
 system.ruby.network.routers1.throttle1.msg_count.Response_Data::1         1767                      
 system.ruby.network.routers1.throttle1.msg_count.Response_Control::1         1611                      
 system.ruby.network.routers1.throttle1.msg_bytes.Control::0        11680                      
-system.ruby.network.routers1.throttle1.msg_bytes.Request_Control::0         8328                      
+system.ruby.network.routers1.throttle1.msg_bytes.Request_Control::2         8328                      
 system.ruby.network.routers1.throttle1.msg_bytes.Response_Data::1       127224                      
 system.ruby.network.routers1.throttle1.msg_bytes.Response_Control::1        12888                      
 system.ruby.network.routers2.throttle0.link_utilization     1.849714                      
@@ -302,10 +302,10 @@ system.ruby.network.routers2.throttle1.msg_count.Response_Control::1         145
 system.ruby.network.routers2.throttle1.msg_bytes.Response_Data::1       105120                      
 system.ruby.network.routers2.throttle1.msg_bytes.Response_Control::1        11616                      
 system.ruby.network.routers3.throttle0.link_utilization     5.369871                      
-system.ruby.network.routers3.throttle0.msg_count.Request_Control::0         1041                      
+system.ruby.network.routers3.throttle0.msg_count.Request_Control::2         1041                      
 system.ruby.network.routers3.throttle0.msg_count.Response_Data::1         1490                      
 system.ruby.network.routers3.throttle0.msg_count.Response_Control::1          436                      
-system.ruby.network.routers3.throttle0.msg_bytes.Request_Control::0         8328                      
+system.ruby.network.routers3.throttle0.msg_bytes.Request_Control::2         8328                      
 system.ruby.network.routers3.throttle0.msg_bytes.Response_Data::1       107280                      
 system.ruby.network.routers3.throttle0.msg_bytes.Response_Control::1         3488                      
 system.ruby.network.routers3.throttle1.link_utilization     7.447192