stats: ruby: updates due to recent changes.

2 files changed, 141 insertions, 54 deletions

diff --git a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
index 0edac316d..62d44e3cc 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/mips/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=MipsTLB
 size=64
@@ -100,31 +112,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
@@ -133,14 +149,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
 
@@ -151,7 +167,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
@@ -172,7 +188,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
@@ -181,7 +197,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]
@@ -201,7 +217,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
@@ -215,78 +231,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
@@ -297,7 +315,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
@@ -307,3 +325,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/mips/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
index 7f2c21c70..481b5bfc9 100644
--- a/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
@@ -4,16 +4,25 @@ sim_seconds                                  0.000125                       # Nu
 sim_ticks                                      125334                       # Number of ticks simulated
 final_tick                                     125334                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  43626                       # Simulator instruction rate (inst/s)
-host_op_rate                                    43619                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 940162                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 147408                       # Number of bytes of host memory used
-host_seconds                                     0.13                       # Real time elapsed on the host
+host_inst_rate                                  33064                       # Simulator instruction rate (inst/s)
+host_op_rate                                    33061                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 712624                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 174400                       # Number of bytes of host memory used
+host_seconds                                     0.18                       # Real time elapsed on the host
 sim_insts                                        5814                       # Number of instructions simulated
 sim_ops                                          5814                       # Number of ops (including micro ops) simulated
 system.ruby.l1_cntrl0.cacheMemory.demand_hits         6410                       # Number of cache demand hits
 system.ruby.l1_cntrl0.cacheMemory.demand_misses         1493                       # Number of cache demand misses
 system.ruby.l1_cntrl0.cacheMemory.demand_accesses         7903                       # Number of cache demand accesses
+system.ruby.network.routers0.percent_links_utilized     5.948107                      
+system.ruby.network.routers0.msg_count.Control::2         1493                      
+system.ruby.network.routers0.msg_count.Data::2         1489                      
+system.ruby.network.routers0.msg_count.Response_Data::4         1493                      
+system.ruby.network.routers0.msg_count.Writeback_Control::3         1489                      
+system.ruby.network.routers0.msg_bytes.Control::2        11944                      
+system.ruby.network.routers0.msg_bytes.Data::2       107208                      
+system.ruby.network.routers0.msg_bytes.Response_Data::4       107496                      
+system.ruby.network.routers0.msg_bytes.Writeback_Control::3        11912                      
 system.ruby.dir_cntrl0.memBuffer.memReq          2982                       # Total number of memory requests
 system.ruby.dir_cntrl0.memBuffer.memRead         1493                       # Number of memory reads
 system.ruby.dir_cntrl0.memBuffer.memWrite         1489                       # Number of memory writes
@@ -29,6 +38,24 @@ system.ruby.dir_cntrl0.memBuffer.memArbWait           80                       #
 system.ruby.dir_cntrl0.memBuffer.memBankCount |         236      7.91%      7.91% |         108      3.62%     11.54% |          74      2.48%     14.02% |          51      1.71%     15.73% |          26      0.87%     16.60% |         104      3.49%     20.09% |          18      0.60%     20.69% |          38      1.27%     21.97% |          16      0.54%     22.50% |          52      1.74%     24.25% |         154      5.16%     29.41% |          50      1.68%     31.09% |          22      0.74%     31.82% |          70      2.35%     34.17% |          30      1.01%     35.18% |         220      7.38%     42.56% |          80      2.68%     45.24% |          58      1.95%     47.18% |          80      2.68%     49.87% |         118      3.96%     53.82% |          42      1.41%     55.23% |          52      1.74%     56.98% |          82      2.75%     59.73% |         168      5.63%     65.36% |         116      3.89%     69.25% |          80      2.68%     71.93% |         138      4.63%     76.56% |         110      3.69%     80.25% |         208      6.98%     87.22% |         273      9.15%     96.38% |          40      1.34%     97.72% |          68      2.28%    100.00% # Number of accesses per bank
 system.ruby.dir_cntrl0.memBuffer.memBankCount::total         2982                       # Number of accesses per bank
 
+system.ruby.network.routers1.percent_links_utilized     5.948107                      
+system.ruby.network.routers1.msg_count.Control::2         1493                      
+system.ruby.network.routers1.msg_count.Data::2         1489                      
+system.ruby.network.routers1.msg_count.Response_Data::4         1493                      
+system.ruby.network.routers1.msg_count.Writeback_Control::3         1489                      
+system.ruby.network.routers1.msg_bytes.Control::2        11944                      
+system.ruby.network.routers1.msg_bytes.Data::2       107208                      
+system.ruby.network.routers1.msg_bytes.Response_Data::4       107496                      
+system.ruby.network.routers1.msg_bytes.Writeback_Control::3        11912                      
+system.ruby.network.routers2.percent_links_utilized     5.948107                      
+system.ruby.network.routers2.msg_count.Control::2         1493                      
+system.ruby.network.routers2.msg_count.Data::2         1489                      
+system.ruby.network.routers2.msg_count.Response_Data::4         1493                      
+system.ruby.network.routers2.msg_count.Writeback_Control::3         1489                      
+system.ruby.network.routers2.msg_bytes.Control::2        11944                      
+system.ruby.network.routers2.msg_bytes.Data::2       107208                      
+system.ruby.network.routers2.msg_bytes.Response_Data::4       107496                      
+system.ruby.network.routers2.msg_bytes.Writeback_Control::3        11912                      
 system.cpu.dtb.read_hits                            0                       # DTB read hits
 system.cpu.dtb.read_misses                          0                       # DTB read misses
 system.cpu.dtb.read_accesses                        0                       # DTB read accesses
@@ -70,6 +97,36 @@ system.cpu.num_idle_cycles                          0                       # Nu
 system.cpu.num_busy_cycles                     125334                       # 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.954490                      
+system.ruby.network.routers0.throttle0.msg_count.Response_Data::4         1493                      
+system.ruby.network.routers0.throttle0.msg_count.Writeback_Control::3         1489                      
+system.ruby.network.routers0.throttle0.msg_bytes.Response_Data::4       107496                      
+system.ruby.network.routers0.throttle0.msg_bytes.Writeback_Control::3        11912                      
+system.ruby.network.routers0.throttle1.link_utilization     5.941724                      
+system.ruby.network.routers0.throttle1.msg_count.Control::2         1493                      
+system.ruby.network.routers0.throttle1.msg_count.Data::2         1489                      
+system.ruby.network.routers0.throttle1.msg_bytes.Control::2        11944                      
+system.ruby.network.routers0.throttle1.msg_bytes.Data::2       107208                      
+system.ruby.network.routers1.throttle0.link_utilization     5.941724                      
+system.ruby.network.routers1.throttle0.msg_count.Control::2         1493                      
+system.ruby.network.routers1.throttle0.msg_count.Data::2         1489                      
+system.ruby.network.routers1.throttle0.msg_bytes.Control::2        11944                      
+system.ruby.network.routers1.throttle0.msg_bytes.Data::2       107208                      
+system.ruby.network.routers1.throttle1.link_utilization     5.954490                      
+system.ruby.network.routers1.throttle1.msg_count.Response_Data::4         1493                      
+system.ruby.network.routers1.throttle1.msg_count.Writeback_Control::3         1489                      
+system.ruby.network.routers1.throttle1.msg_bytes.Response_Data::4       107496                      
+system.ruby.network.routers1.throttle1.msg_bytes.Writeback_Control::3        11912                      
+system.ruby.network.routers2.throttle0.link_utilization     5.954490                      
+system.ruby.network.routers2.throttle0.msg_count.Response_Data::4         1493                      
+system.ruby.network.routers2.throttle0.msg_count.Writeback_Control::3         1489                      
+system.ruby.network.routers2.throttle0.msg_bytes.Response_Data::4       107496                      
+system.ruby.network.routers2.throttle0.msg_bytes.Writeback_Control::3        11912                      
+system.ruby.network.routers2.throttle1.link_utilization     5.941724                      
+system.ruby.network.routers2.throttle1.msg_count.Control::2         1493                      
+system.ruby.network.routers2.throttle1.msg_count.Data::2         1489                      
+system.ruby.network.routers2.throttle1.msg_bytes.Control::2        11944                      
+system.ruby.network.routers2.throttle1.msg_bytes.Data::2       107208                      
 system.ruby.l1_cntrl0.Load                       1163      0.00%      0.00%
 system.ruby.l1_cntrl0.Ifetch                     5815      0.00%      0.00%
 system.ruby.l1_cntrl0.Store                       925      0.00%      0.00%
@@ -86,6 +143,14 @@ system.ruby.l1_cntrl0.M.Replacement              1489      0.00%      0.00%
 system.ruby.l1_cntrl0.MI.Writeback_Ack           1489      0.00%      0.00%
 system.ruby.l1_cntrl0.IS.Data                    1273      0.00%      0.00%
 system.ruby.l1_cntrl0.IM.Data                     220      0.00%      0.00%
+system.ruby.network.msg_count.Control            4479                      
+system.ruby.network.msg_count.Data               4467                      
+system.ruby.network.msg_count.Response_Data         4479                      
+system.ruby.network.msg_count.Writeback_Control         4467                      
+system.ruby.network.msg_byte.Control            35832                      
+system.ruby.network.msg_byte.Data              321624                      
+system.ruby.network.msg_byte.Response_Data       322488                      
+system.ruby.network.msg_byte.Writeback_Control        35736                      
 system.ruby.dir_cntrl0.GETX                      1493      0.00%      0.00%
 system.ruby.dir_cntrl0.PUTX                      1489      0.00%      0.00%
 system.ruby.dir_cntrl0.Memory_Data               1493      0.00%      0.00%