stats: ruby: updates due to recent changes.

1 files changed, 81 insertions, 52 deletions

diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
index 1ca707553..585043740 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/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=apic_clk_domain 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,16 @@ workload=system.cpu.workload
 dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
 icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
+[system.cpu.apic_clk_domain]
+type=DerivedClockDomain
+clk_divider=16
+clk_domain=system.cpu.clk_domain
+
+[system.cpu.clk_domain]
+type=SrcClockDomain
+clock=1
+voltage_domain=system.voltage_domain
+
 [system.cpu.dtb]
 type=X86TLB
 children=walker
@@ -67,13 +84,14 @@ walker=system.cpu.dtb.walker
 
 [system.cpu.dtb.walker]
 type=X86PagetableWalker
-clock=1
+clk_domain=system.cpu.clk_domain
+num_squash_per_cycle=4
 system=system
 port=system.ruby.l1_cntrl0.sequencer.slave[3]
 
 [system.cpu.interrupts]
 type=X86LocalApic
-clock=16
+clk_domain=system.cpu.apic_clk_domain
 int_latency=1
 pio_addr=2305843009213693952
 pio_latency=100
@@ -93,7 +111,8 @@ walker=system.cpu.itb.walker
 
 [system.cpu.itb.walker]
 type=X86PagetableWalker
-clock=1
+clk_domain=system.cpu.clk_domain
+num_squash_per_cycle=4
 system=system
 port=system.ruby.l1_cntrl0.sequencer.slave[2]
 
@@ -122,31 +141,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
@@ -155,14 +178,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
 
@@ -173,7 +196,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
@@ -194,7 +217,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
@@ -203,7 +226,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]
@@ -223,7 +246,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
@@ -238,78 +261,80 @@ version=0
 master=system.cpu.interrupts.pio system.cpu.interrupts.int_slave
 slave=system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.interrupts.int_master
 
+[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
@@ -320,7 +345,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
@@ -330,3 +355,7 @@ using_ruby_tester=false
 version=0
 slave=system.system_port
 
+[system.voltage_domain]
+type=VoltageDomain
+voltage=1.000000
+