stats: ruby: updates due to recent changes.

3 files changed, 138 insertions, 111 deletions

diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
index 625ab8bf3..5aaa9746f 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
@@ -8,14 +8,15 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=physmem ruby sys_port_proxy tester
+children=clk_domain physmem ruby sys_port_proxy tester voltage_domain
 boot_osflags=a
-clock=1
+cache_line_size=64
+clk_domain=system.clk_domain
 init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
-mem_ranges=
+mem_ranges=0:268435455
 memories=system.physmem
 num_work_ids=16
 readfile=
@@ -29,34 +30,43 @@ work_end_exit_count=0
 work_item_id=-1
 system_port=system.sys_port_proxy.slave[0]
 
+[system.clk_domain]
+type=SrcClockDomain
+clock=1
+voltage_domain=system.voltage_domain
+
 [system.physmem]
 type=SimpleMemory
 bandwidth=0.000000
-clock=1
-conf_table_reported=false
+clk_domain=system.clk_domain
+conf_table_reported=true
 in_addr_map=true
 latency=30
 latency_var=0
 null=true
 range=0:134217727
-zero=false
 
 [system.ruby]
 type=RubySystem
-children=dir_cntrl0 l1_cntrl0 network profiler
+children=clk_domain dir_cntrl0 l1_cntrl0 memctrl_clk_domain network profiler
 block_size_bytes=64
-clock=1
-mem_size=134217728
+clk_domain=system.ruby.clk_domain
+mem_size=268435456
 no_mem_vec=false
 random_seed=1234
 randomization=true
 stats_filename=ruby.stats
 
+[system.ruby.clk_domain]
+type=SrcClockDomain
+clock=1
+voltage_domain=system.voltage_domain
+
 [system.ruby.dir_cntrl0]
 type=Directory_Controller
 children=directory memBuffer
 buffer_size=0
-clock=1
+clk_domain=system.ruby.clk_domain
 cntrl_id=1
 directory=system.ruby.dir_cntrl0.directory
 directory_latency=12
@@ -72,7 +82,7 @@ version=0
 type=RubyDirectoryMemory
 map_levels=4
 numa_high_bit=5
-size=134217728
+size=268435456
 use_map=false
 version=0
 
@@ -83,7 +93,7 @@ bank_busy_time=11
 bank_queue_size=12
 banks_per_rank=8
 basic_bus_busy_time=2
-clock=3
+clk_domain=system.ruby.memctrl_clk_domain
 dimm_bit_0=12
 dimms_per_channel=2
 mem_ctl_latency=12
@@ -104,7 +114,7 @@ children=cacheMemory sequencer
 buffer_size=0
 cacheMemory=system.ruby.l1_cntrl0.cacheMemory
 cache_response_latency=12
-clock=1
+clk_domain=system.ruby.clk_domain
 cntrl_id=0
 issue_latency=2
 number_of_TBEs=256
@@ -133,7 +143,7 @@ tagArrayBanks=1
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=false
-clock=1
+clk_domain=system.ruby.clk_domain
 dcache=system.ruby.l1_cntrl0.cacheMemory
 deadlock_threshold=500000
 icache=system.ruby.l1_cntrl0.cacheMemory
@@ -147,78 +157,80 @@ using_ruby_tester=true
 version=0
 slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0]
 
+[system.ruby.memctrl_clk_domain]
+type=DerivedClockDomain
+clk_divider=3
+clk_domain=system.ruby.clk_domain
+
 [system.ruby.network]
 type=SimpleNetwork
-children=ext_links0 ext_links1 int_links0 int_links1
+children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
 adaptive_routing=false
 buffer_size=0
-clock=1
+clk_domain=system.ruby.clk_domain
 control_msg_size=8
 endpoint_bandwidth=1000
 ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1
 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1
 number_of_virtual_networks=10
-routers=system.ruby.network.ext_links0.int_node system.ruby.network.ext_links1.int_node system.ruby.network.int_links0.node_b
+routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2
 ruby_system=system.ruby
 topology=Crossbar
 
 [system.ruby.network.ext_links0]
 type=SimpleExtLink
-children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.l1_cntrl0
-int_node=system.ruby.network.ext_links0.int_node
+int_node=system.ruby.network.routers0
 latency=1
 link_id=0
 weight=1
 
-[system.ruby.network.ext_links0.int_node]
-type=Switch
-clock=1
-router_id=0
-virt_nets=10
-
 [system.ruby.network.ext_links1]
 type=SimpleExtLink
-children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.dir_cntrl0
-int_node=system.ruby.network.ext_links1.int_node
+int_node=system.ruby.network.routers1
 latency=1
 link_id=1
 weight=1
 
-[system.ruby.network.ext_links1.int_node]
-type=Switch
-clock=1
-router_id=1
-virt_nets=10
-
 [system.ruby.network.int_links0]
 type=SimpleIntLink
-children=node_b
 bandwidth_factor=16
 latency=1
 link_id=2
-node_a=system.ruby.network.ext_links0.int_node
-node_b=system.ruby.network.int_links0.node_b
+node_a=system.ruby.network.routers0
+node_b=system.ruby.network.routers2
 weight=1
 
-[system.ruby.network.int_links0.node_b]
-type=Switch
-clock=1
-router_id=2
-virt_nets=10
-
 [system.ruby.network.int_links1]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=3
-node_a=system.ruby.network.ext_links1.int_node
-node_b=system.ruby.network.int_links0.node_b
+node_a=system.ruby.network.routers1
+node_b=system.ruby.network.routers2
 weight=1
 
+[system.ruby.network.routers0]
+type=Switch
+clk_domain=system.ruby.clk_domain
+router_id=0
+virt_nets=10
+
+[system.ruby.network.routers1]
+type=Switch
+clk_domain=system.ruby.clk_domain
+router_id=1
+virt_nets=10
+
+[system.ruby.network.routers2]
+type=Switch
+clk_domain=system.ruby.clk_domain
+router_id=2
+virt_nets=10
+
 [system.ruby.profiler]
 type=RubyProfiler
 all_instructions=false
@@ -229,7 +241,7 @@ ruby_system=system.ruby
 [system.sys_port_proxy]
 type=RubyPortProxy
 access_phys_mem=true
-clock=1
+clk_domain=system.clk_domain
 ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
@@ -243,7 +255,7 @@ slave=system.system_port
 type=RubyTester
 check_flush=false
 checks_to_complete=100
-clock=1
+clk_domain=system.clk_domain
 deadlock_threshold=50000
 num_cpus=1
 system=system
@@ -251,3 +263,7 @@ wakeup_frequency=10
 cpuDataPort=system.ruby.l1_cntrl0.sequencer.slave[0]
 cpuInstPort=system.ruby.l1_cntrl0.sequencer.slave[1]
 
+[system.voltage_domain]
+type=VoltageDomain
+voltage=1.000000
+
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
index dd0b319ad..cd80434d6 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Jun/24/2013 23:54:11
+Real time: Aug/29/2013 10:04:34
 
 Profiler Stats
 --------------
@@ -7,18 +7,18 @@ Elapsed_time_in_minutes: 0
 Elapsed_time_in_hours: 0
 Elapsed_time_in_days: 0
 
-Virtual_time_in_seconds: 0.51
-Virtual_time_in_minutes: 0.0085
-Virtual_time_in_hours:   0.000141667
-Virtual_time_in_days:    5.90278e-06
+Virtual_time_in_seconds: 0.48
+Virtual_time_in_minutes: 0.008
+Virtual_time_in_hours:   0.000133333
+Virtual_time_in_days:    5.55556e-06
 
 Ruby_current_time: 221941
 Ruby_start_time: 0
 Ruby_cycles: 221941
 
-mbytes_resident: 51.1953
-mbytes_total: 146.023
-resident_ratio: 0.35065
+mbytes_resident: 70.1602
+mbytes_total: 164.824
+resident_ratio: 0.42569
 
 Busy Controller Counts:
 L1Cache-0:0  
@@ -70,57 +70,3 @@ Total_delay_cycles: [binsize: 1 max: 12 count: 1828 average: 0.280088 | standard
   virtual_network_7_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard deviation: NaN | 0 ]
   virtual_network_8_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard deviation: NaN | 0 ]
   virtual_network_9_delay_cycles: [binsize: 1 max: 0 count: 0 average: NaN |standard deviation: NaN | 0 ]
-
-Resource Usage
---------------
-page_size: 4096
-user_time: 0
-system_time: 0
-page_reclaims: 9501
-page_faults: 0
-swaps: 0
-block_inputs: 0
-block_outputs: 88
-
-Network Stats
--------------
-
-total_msg_count_Control: 2748 21984
-total_msg_count_Data: 2742 197424
-total_msg_count_Response_Data: 2748 197856
-total_msg_count_Writeback_Control: 2739 21912
-total_msgs: 10977 total_bytes: 439176
-
-switch_0_inlinks: 2
-switch_0_outlinks: 2
-links_utilized_percent_switch_0: 2.06125
-  links_utilized_percent_switch_0_link_0: 2.06294 bw: 16000 base_latency: 1
-  links_utilized_percent_switch_0_link_1: 2.05956 bw: 16000 base_latency: 1
-
-  outgoing_messages_switch_0_link_0_Response_Data: 916 65952 [ 0 0 0 0 916 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_0_link_0_Writeback_Control: 913 7304 [ 0 0 0 913 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_0_link_1_Control: 916 7328 [ 0 0 916 0 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_0_link_1_Data: 914 65808 [ 0 0 914 0 0 0 0 0 0 0 ] base_latency: 1
-
-switch_1_inlinks: 2
-switch_1_outlinks: 2
-links_utilized_percent_switch_1: 2.06125
-  links_utilized_percent_switch_1_link_0: 2.05956 bw: 16000 base_latency: 1
-  links_utilized_percent_switch_1_link_1: 2.06294 bw: 16000 base_latency: 1
-
-  outgoing_messages_switch_1_link_0_Control: 916 7328 [ 0 0 916 0 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_1_link_0_Data: 914 65808 [ 0 0 914 0 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_1_link_1_Response_Data: 916 65952 [ 0 0 0 0 916 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_1_link_1_Writeback_Control: 913 7304 [ 0 0 0 913 0 0 0 0 0 0 ] base_latency: 1
-
-switch_2_inlinks: 2
-switch_2_outlinks: 2
-links_utilized_percent_switch_2: 2.06125
-  links_utilized_percent_switch_2_link_0: 2.06294 bw: 16000 base_latency: 1
-  links_utilized_percent_switch_2_link_1: 2.05956 bw: 16000 base_latency: 1
-
-  outgoing_messages_switch_2_link_0_Response_Data: 916 65952 [ 0 0 0 0 916 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_2_link_0_Writeback_Control: 913 7304 [ 0 0 0 913 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_2_link_1_Control: 916 7328 [ 0 0 916 0 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_2_link_1_Data: 914 65808 [ 0 0 914 0 0 0 0 0 0 0 ] base_latency: 1
-
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
index e77006cfe..c503a22e4 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
@@ -4,12 +4,21 @@ sim_seconds                                  0.000222                       # Nu
 sim_ticks                                      221941                       # Number of ticks simulated
 final_tick                                     221941                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                3023855                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 141832                       # Number of bytes of host memory used
-host_seconds                                     0.07                       # Real time elapsed on the host
+host_tick_rate                                2220183                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 168784                       # Number of bytes of host memory used
+host_seconds                                     0.10                       # Real time elapsed on the host
 system.ruby.l1_cntrl0.cacheMemory.demand_hits           38                       # Number of cache demand hits
 system.ruby.l1_cntrl0.cacheMemory.demand_misses          917                       # Number of cache demand misses
 system.ruby.l1_cntrl0.cacheMemory.demand_accesses          955                       # Number of cache demand accesses
+system.ruby.network.routers0.percent_links_utilized     2.061246                      
+system.ruby.network.routers0.msg_count.Control::2          916                      
+system.ruby.network.routers0.msg_count.Data::2          914                      
+system.ruby.network.routers0.msg_count.Response_Data::4          916                      
+system.ruby.network.routers0.msg_count.Writeback_Control::3          913                      
+system.ruby.network.routers0.msg_bytes.Control::2         7328                      
+system.ruby.network.routers0.msg_bytes.Data::2        65808                      
+system.ruby.network.routers0.msg_bytes.Response_Data::4        65952                      
+system.ruby.network.routers0.msg_bytes.Writeback_Control::3         7304                      
 system.ruby.dir_cntrl0.memBuffer.memReq          1830                       # Total number of memory requests
 system.ruby.dir_cntrl0.memBuffer.memRead          916                       # Number of memory reads
 system.ruby.dir_cntrl0.memBuffer.memWrite          914                       # Number of memory writes
@@ -27,6 +36,54 @@ system.ruby.dir_cntrl0.memBuffer.memArbWait          167                       #
 system.ruby.dir_cntrl0.memBuffer.memBankCount |          64      3.50%      3.50% |          60      3.28%      6.78% |          44      2.40%      9.18% |          96      5.25%     14.43% |         107      5.85%     20.27% |          64      3.50%     23.77% |          62      3.39%     27.16% |          38      2.08%     29.23% |          55      3.01%     32.24% |          54      2.95%     35.19% |          54      2.95%     38.14% |          36      1.97%     40.11% |          48      2.62%     42.73% |          34      1.86%     44.59% |          66      3.61%     48.20% |          48      2.62%     50.82% |          56      3.06%     53.88% |          54      2.95%     56.83% |          60      3.28%     60.11% |          70      3.83%     63.93% |          56      3.06%     66.99% |          62      3.39%     70.38% |          44      2.40%     72.79% |          62      3.39%     76.17% |          48      2.62%     78.80% |          58      3.17%     81.97% |          64      3.50%     85.46% |          72      3.93%     89.40% |          46      2.51%     91.91% |          46      2.51%     94.43% |          36      1.97%     96.39% |          66      3.61%    100.00% # Number of accesses per bank
 system.ruby.dir_cntrl0.memBuffer.memBankCount::total         1830                       # Number of accesses per bank
 
+system.ruby.network.routers1.percent_links_utilized     2.061246                      
+system.ruby.network.routers1.msg_count.Control::2          916                      
+system.ruby.network.routers1.msg_count.Data::2          914                      
+system.ruby.network.routers1.msg_count.Response_Data::4          916                      
+system.ruby.network.routers1.msg_count.Writeback_Control::3          913                      
+system.ruby.network.routers1.msg_bytes.Control::2         7328                      
+system.ruby.network.routers1.msg_bytes.Data::2        65808                      
+system.ruby.network.routers1.msg_bytes.Response_Data::4        65952                      
+system.ruby.network.routers1.msg_bytes.Writeback_Control::3         7304                      
+system.ruby.network.routers2.percent_links_utilized     2.061246                      
+system.ruby.network.routers2.msg_count.Control::2          916                      
+system.ruby.network.routers2.msg_count.Data::2          914                      
+system.ruby.network.routers2.msg_count.Response_Data::4          916                      
+system.ruby.network.routers2.msg_count.Writeback_Control::3          913                      
+system.ruby.network.routers2.msg_bytes.Control::2         7328                      
+system.ruby.network.routers2.msg_bytes.Data::2        65808                      
+system.ruby.network.routers2.msg_bytes.Response_Data::4        65952                      
+system.ruby.network.routers2.msg_bytes.Writeback_Control::3         7304                      
+system.ruby.network.routers0.throttle0.link_utilization     2.062936                      
+system.ruby.network.routers0.throttle0.msg_count.Response_Data::4          916                      
+system.ruby.network.routers0.throttle0.msg_count.Writeback_Control::3          913                      
+system.ruby.network.routers0.throttle0.msg_bytes.Response_Data::4        65952                      
+system.ruby.network.routers0.throttle0.msg_bytes.Writeback_Control::3         7304                      
+system.ruby.network.routers0.throttle1.link_utilization     2.059556                      
+system.ruby.network.routers0.throttle1.msg_count.Control::2          916                      
+system.ruby.network.routers0.throttle1.msg_count.Data::2          914                      
+system.ruby.network.routers0.throttle1.msg_bytes.Control::2         7328                      
+system.ruby.network.routers0.throttle1.msg_bytes.Data::2        65808                      
+system.ruby.network.routers1.throttle0.link_utilization     2.059556                      
+system.ruby.network.routers1.throttle0.msg_count.Control::2          916                      
+system.ruby.network.routers1.throttle0.msg_count.Data::2          914                      
+system.ruby.network.routers1.throttle0.msg_bytes.Control::2         7328                      
+system.ruby.network.routers1.throttle0.msg_bytes.Data::2        65808                      
+system.ruby.network.routers1.throttle1.link_utilization     2.062936                      
+system.ruby.network.routers1.throttle1.msg_count.Response_Data::4          916                      
+system.ruby.network.routers1.throttle1.msg_count.Writeback_Control::3          913                      
+system.ruby.network.routers1.throttle1.msg_bytes.Response_Data::4        65952                      
+system.ruby.network.routers1.throttle1.msg_bytes.Writeback_Control::3         7304                      
+system.ruby.network.routers2.throttle0.link_utilization     2.062936                      
+system.ruby.network.routers2.throttle0.msg_count.Response_Data::4          916                      
+system.ruby.network.routers2.throttle0.msg_count.Writeback_Control::3          913                      
+system.ruby.network.routers2.throttle0.msg_bytes.Response_Data::4        65952                      
+system.ruby.network.routers2.throttle0.msg_bytes.Writeback_Control::3         7304                      
+system.ruby.network.routers2.throttle1.link_utilization     2.059556                      
+system.ruby.network.routers2.throttle1.msg_count.Control::2          916                      
+system.ruby.network.routers2.throttle1.msg_count.Data::2          914                      
+system.ruby.network.routers2.throttle1.msg_bytes.Control::2         7328                      
+system.ruby.network.routers2.throttle1.msg_bytes.Data::2        65808                      
 system.ruby.l1_cntrl0.Load                         42      0.00%      0.00%
 system.ruby.l1_cntrl0.Ifetch                       58      0.00%      0.00%
 system.ruby.l1_cntrl0.Store                       855      0.00%      0.00%
@@ -42,6 +99,14 @@ system.ruby.l1_cntrl0.M.Replacement               914      0.00%      0.00%
 system.ruby.l1_cntrl0.MI.Writeback_Ack            912      0.00%      0.00%
 system.ruby.l1_cntrl0.IS.Data                      98      0.00%      0.00%
 system.ruby.l1_cntrl0.IM.Data                     818      0.00%      0.00%
+system.ruby.network.msg_count.Control            2748                      
+system.ruby.network.msg_count.Data               2742                      
+system.ruby.network.msg_count.Response_Data         2748                      
+system.ruby.network.msg_count.Writeback_Control         2739                      
+system.ruby.network.msg_byte.Control            21984                      
+system.ruby.network.msg_byte.Data              197424                      
+system.ruby.network.msg_byte.Response_Data       197856                      
+system.ruby.network.msg_byte.Writeback_Control        21912                      
 system.ruby.dir_cntrl0.GETX                       916      0.00%      0.00%
 system.ruby.dir_cntrl0.PUTX                       914      0.00%      0.00%
 system.ruby.dir_cntrl0.Memory_Data                916      0.00%      0.00%