stats: ruby: updates due to recent changes.

3 files changed, 145 insertions, 112 deletions

diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
index 905ee5b1f..b14794472 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
@@ -8,14 +8,15 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu physmem ruby sys_port_proxy
+children=clk_domain cpu physmem ruby sys_port_proxy 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,12 +30,17 @@ 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.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts isa itb tracer workload
+children=clk_domain dtb interrupts isa itb tracer workload
 branchPred=Null
 checker=Null
-clock=1
+clk_domain=system.cpu.clk_domain
 cpu_id=0
 do_checkpoint_insts=true
 do_quiesce=true
@@ -52,6 +58,7 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+simpoint_start_insts=
 switched_out=false
 system=system
 tracer=system.cpu.tracer
@@ -59,6 +66,11 @@ workload=system.cpu.workload
 dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
 icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
+[system.cpu.clk_domain]
+type=SrcClockDomain
+clock=1
+voltage_domain=system.voltage_domain
+
 [system.cpu.dtb]
 type=SparcTLB
 size=64
@@ -98,31 +110,35 @@ uid=100
 [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=false
 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
@@ -131,14 +147,14 @@ number_of_TBEs=256
 peer=Null
 recycle_latency=10
 ruby_system=system.ruby
-transitions_per_cycle=32
+transitions_per_cycle=4
 version=0
 
 [system.ruby.dir_cntrl0.directory]
 type=RubyDirectoryMemory
 map_levels=4
 numa_high_bit=5
-size=134217728
+size=268435456
 use_map=false
 version=0
 
@@ -149,7 +165,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
@@ -170,7 +186,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
@@ -179,7 +195,7 @@ recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
 sequencer=system.ruby.l1_cntrl0.sequencer
-transitions_per_cycle=32
+transitions_per_cycle=4
 version=0
 
 [system.ruby.l1_cntrl0.cacheMemory]
@@ -199,7 +215,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
@@ -213,78 +229,80 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
+[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
@@ -295,7 +313,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
@@ -305,3 +323,7 @@ using_ruby_tester=false
 version=0
 slave=system.system_port
 
+[system.voltage_domain]
+type=VoltageDomain
+voltage=1.000000
+
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
index e224aa286..ec0034585 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Jun/24/2013 23:56:22
+Real time: Aug/29/2013 10:04:06
 
 Profiler Stats
 --------------
@@ -16,9 +16,9 @@ Ruby_current_time: 107952
 Ruby_start_time: 0
 Ruby_cycles: 107952
 
-mbytes_resident: 56.8633
-mbytes_total: 157.191
-resident_ratio: 0.361795
+mbytes_resident: 76.2656
+mbytes_total: 176.473
+resident_ratio: 0.432189
 
 Busy Controller Counts:
 L1Cache-0:0  
@@ -71,57 +71,3 @@ Total_delay_cycles: [binsize: 1 max: 0 count: 2574 average:     0 | standard dev
   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: 11996
-page_faults: 0
-swaps: 0
-block_inputs: 0
-block_outputs: 88
-
-Network Stats
--------------
-
-total_msg_count_Control: 3867 30936
-total_msg_count_Data: 3855 277560
-total_msg_count_Response_Data: 3867 278424
-total_msg_count_Writeback_Control: 3855 30840
-total_msgs: 15444 total_bytes: 617760
-
-switch_0_inlinks: 2
-switch_0_outlinks: 2
-links_utilized_percent_switch_0: 5.96098
-  links_utilized_percent_switch_0_link_0: 5.96839 bw: 16000 base_latency: 1
-  links_utilized_percent_switch_0_link_1: 5.95357 bw: 16000 base_latency: 1
-
-  outgoing_messages_switch_0_link_0_Response_Data: 1289 92808 [ 0 0 0 0 1289 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_0_link_0_Writeback_Control: 1285 10280 [ 0 0 0 1285 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_0_link_1_Control: 1289 10312 [ 0 0 1289 0 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_0_link_1_Data: 1285 92520 [ 0 0 1285 0 0 0 0 0 0 0 ] base_latency: 1
-
-switch_1_inlinks: 2
-switch_1_outlinks: 2
-links_utilized_percent_switch_1: 5.96098
-  links_utilized_percent_switch_1_link_0: 5.95357 bw: 16000 base_latency: 1
-  links_utilized_percent_switch_1_link_1: 5.96839 bw: 16000 base_latency: 1
-
-  outgoing_messages_switch_1_link_0_Control: 1289 10312 [ 0 0 1289 0 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_1_link_0_Data: 1285 92520 [ 0 0 1285 0 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_1_link_1_Response_Data: 1289 92808 [ 0 0 0 0 1289 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_1_link_1_Writeback_Control: 1285 10280 [ 0 0 0 1285 0 0 0 0 0 0 ] base_latency: 1
-
-switch_2_inlinks: 2
-switch_2_outlinks: 2
-links_utilized_percent_switch_2: 5.96098
-  links_utilized_percent_switch_2_link_0: 5.96839 bw: 16000 base_latency: 1
-  links_utilized_percent_switch_2_link_1: 5.95357 bw: 16000 base_latency: 1
-
-  outgoing_messages_switch_2_link_0_Response_Data: 1289 92808 [ 0 0 0 0 1289 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_2_link_0_Writeback_Control: 1285 10280 [ 0 0 0 1285 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_2_link_1_Control: 1289 10312 [ 0 0 1289 0 0 0 0 0 0 0 ] base_latency: 1
-  outgoing_messages_switch_2_link_1_Data: 1285 92520 [ 0 0 1285 0 0 0 0 0 0 0 ] base_latency: 1
-
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
index 87117a3bf..924fe00af 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
@@ -4,16 +4,25 @@ sim_seconds                                  0.000108                       # Nu
 sim_ticks                                      107952                       # Number of ticks simulated
 final_tick                                     107952                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  37306                       # Simulator instruction rate (inst/s)
-host_op_rate                                    37301                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 755806                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 148468                       # Number of bytes of host memory used
-host_seconds                                     0.14                       # Real time elapsed on the host
+host_inst_rate                                  23456                       # Simulator instruction rate (inst/s)
+host_op_rate                                    23454                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 475251                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 180712                       # Number of bytes of host memory used
+host_seconds                                     0.23                       # Real time elapsed on the host
 sim_insts                                        5327                       # Number of instructions simulated
 sim_ops                                          5327                       # Number of ops (including micro ops) simulated
 system.ruby.l1_cntrl0.cacheMemory.demand_hits         5469                       # Number of cache demand hits
 system.ruby.l1_cntrl0.cacheMemory.demand_misses         1289                       # Number of cache demand misses
 system.ruby.l1_cntrl0.cacheMemory.demand_accesses         6758                       # Number of cache demand accesses
+system.ruby.network.routers0.percent_links_utilized     5.960983                      
+system.ruby.network.routers0.msg_count.Control::2         1289                      
+system.ruby.network.routers0.msg_count.Data::2         1285                      
+system.ruby.network.routers0.msg_count.Response_Data::4         1289                      
+system.ruby.network.routers0.msg_count.Writeback_Control::3         1285                      
+system.ruby.network.routers0.msg_bytes.Control::2        10312                      
+system.ruby.network.routers0.msg_bytes.Data::2        92520                      
+system.ruby.network.routers0.msg_bytes.Response_Data::4        92808                      
+system.ruby.network.routers0.msg_bytes.Writeback_Control::3        10280                      
 system.ruby.dir_cntrl0.memBuffer.memReq          2574                       # Total number of memory requests
 system.ruby.dir_cntrl0.memBuffer.memRead         1289                       # Number of memory reads
 system.ruby.dir_cntrl0.memBuffer.memWrite         1285                       # Number of memory writes
@@ -29,6 +38,24 @@ system.ruby.dir_cntrl0.memBuffer.memArbWait           69                       #
 system.ruby.dir_cntrl0.memBuffer.memBankCount |         166      6.45%      6.45% |          40      1.55%      8.00% |          36      1.40%      9.40% |          48      1.86%     11.27% |         109      4.23%     15.50% |          42      1.63%     17.13% |          63      2.45%     19.58% |         241      9.36%     28.94% |          50      1.94%     30.89% |          34      1.32%     32.21% |          16      0.62%     32.83% |          26      1.01%     33.84% |          60      2.33%     36.17% |          64      2.49%     38.66% |          38      1.48%     40.13% |          46      1.79%     41.92% |          30      1.17%     43.08% |          88      3.42%     46.50% |         202      7.85%     54.35% |         144      5.59%     59.95% |          40      1.55%     61.50% |          58      2.25%     63.75% |          22      0.85%     64.61% |          20      0.78%     65.38% |          60      2.33%     67.72% |         120      4.66%     72.38% |         136      5.28%     77.66% |         125      4.86%     82.52% |          84      3.26%     85.78% |         134      5.21%     90.99% |         166      6.45%     97.44% |          66      2.56%    100.00% # Number of accesses per bank
 system.ruby.dir_cntrl0.memBuffer.memBankCount::total         2574                       # Number of accesses per bank
 
+system.ruby.network.routers1.percent_links_utilized     5.960983                      
+system.ruby.network.routers1.msg_count.Control::2         1289                      
+system.ruby.network.routers1.msg_count.Data::2         1285                      
+system.ruby.network.routers1.msg_count.Response_Data::4         1289                      
+system.ruby.network.routers1.msg_count.Writeback_Control::3         1285                      
+system.ruby.network.routers1.msg_bytes.Control::2        10312                      
+system.ruby.network.routers1.msg_bytes.Data::2        92520                      
+system.ruby.network.routers1.msg_bytes.Response_Data::4        92808                      
+system.ruby.network.routers1.msg_bytes.Writeback_Control::3        10280                      
+system.ruby.network.routers2.percent_links_utilized     5.960983                      
+system.ruby.network.routers2.msg_count.Control::2         1289                      
+system.ruby.network.routers2.msg_count.Data::2         1285                      
+system.ruby.network.routers2.msg_count.Response_Data::4         1289                      
+system.ruby.network.routers2.msg_count.Writeback_Control::3         1285                      
+system.ruby.network.routers2.msg_bytes.Control::2        10312                      
+system.ruby.network.routers2.msg_bytes.Data::2        92520                      
+system.ruby.network.routers2.msg_bytes.Response_Data::4        92808                      
+system.ruby.network.routers2.msg_bytes.Writeback_Control::3        10280                      
 system.cpu.workload.num_syscalls                   11                       # Number of system calls
 system.cpu.numCycles                           107952                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started
@@ -52,6 +79,36 @@ system.cpu.num_idle_cycles                          0                       # Nu
 system.cpu.num_busy_cycles                     107952                       # Number of busy cycles
 system.cpu.not_idle_fraction                        1                       # Percentage of non-idle cycles
 system.cpu.idle_fraction                            0                       # Percentage of idle cycles
+system.ruby.network.routers0.throttle0.link_utilization     5.968393                      
+system.ruby.network.routers0.throttle0.msg_count.Response_Data::4         1289                      
+system.ruby.network.routers0.throttle0.msg_count.Writeback_Control::3         1285                      
+system.ruby.network.routers0.throttle0.msg_bytes.Response_Data::4        92808                      
+system.ruby.network.routers0.throttle0.msg_bytes.Writeback_Control::3        10280                      
+system.ruby.network.routers0.throttle1.link_utilization     5.953572                      
+system.ruby.network.routers0.throttle1.msg_count.Control::2         1289                      
+system.ruby.network.routers0.throttle1.msg_count.Data::2         1285                      
+system.ruby.network.routers0.throttle1.msg_bytes.Control::2        10312                      
+system.ruby.network.routers0.throttle1.msg_bytes.Data::2        92520                      
+system.ruby.network.routers1.throttle0.link_utilization     5.953572                      
+system.ruby.network.routers1.throttle0.msg_count.Control::2         1289                      
+system.ruby.network.routers1.throttle0.msg_count.Data::2         1285                      
+system.ruby.network.routers1.throttle0.msg_bytes.Control::2        10312                      
+system.ruby.network.routers1.throttle0.msg_bytes.Data::2        92520                      
+system.ruby.network.routers1.throttle1.link_utilization     5.968393                      
+system.ruby.network.routers1.throttle1.msg_count.Response_Data::4         1289                      
+system.ruby.network.routers1.throttle1.msg_count.Writeback_Control::3         1285                      
+system.ruby.network.routers1.throttle1.msg_bytes.Response_Data::4        92808                      
+system.ruby.network.routers1.throttle1.msg_bytes.Writeback_Control::3        10280                      
+system.ruby.network.routers2.throttle0.link_utilization     5.968393                      
+system.ruby.network.routers2.throttle0.msg_count.Response_Data::4         1289                      
+system.ruby.network.routers2.throttle0.msg_count.Writeback_Control::3         1285                      
+system.ruby.network.routers2.throttle0.msg_bytes.Response_Data::4        92808                      
+system.ruby.network.routers2.throttle0.msg_bytes.Writeback_Control::3        10280                      
+system.ruby.network.routers2.throttle1.link_utilization     5.953572                      
+system.ruby.network.routers2.throttle1.msg_count.Control::2         1289                      
+system.ruby.network.routers2.throttle1.msg_count.Data::2         1285                      
+system.ruby.network.routers2.throttle1.msg_bytes.Control::2        10312                      
+system.ruby.network.routers2.throttle1.msg_bytes.Data::2        92520                      
 system.ruby.l1_cntrl0.Load                        715      0.00%      0.00%
 system.ruby.l1_cntrl0.Ifetch                     5370      0.00%      0.00%
 system.ruby.l1_cntrl0.Store                       673      0.00%      0.00%
@@ -68,6 +125,14 @@ system.ruby.l1_cntrl0.M.Replacement              1285      0.00%      0.00%
 system.ruby.l1_cntrl0.MI.Writeback_Ack           1285      0.00%      0.00%
 system.ruby.l1_cntrl0.IS.Data                    1110      0.00%      0.00%
 system.ruby.l1_cntrl0.IM.Data                     179      0.00%      0.00%
+system.ruby.network.msg_count.Control            3867                      
+system.ruby.network.msg_count.Data               3855                      
+system.ruby.network.msg_count.Response_Data         3867                      
+system.ruby.network.msg_count.Writeback_Control         3855                      
+system.ruby.network.msg_byte.Control            30936                      
+system.ruby.network.msg_byte.Data              277560                      
+system.ruby.network.msg_byte.Response_Data       278424                      
+system.ruby.network.msg_byte.Writeback_Control        30840                      
 system.ruby.dir_cntrl0.GETX                      1289      0.00%      0.00%
 system.ruby.dir_cntrl0.PUTX                      1285      0.00%      0.00%
 system.ruby.dir_cntrl0.Memory_Data               1289      0.00%      0.00%