From ff87a0dd9c6db9907317f05f2713ef96318cce13 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Fri, 6 Sep 2013 16:21:36 -0500 Subject: stats: ruby: updates due to recent changes. --- .../linux/memtest-ruby-MOESI_hammer/config.ini | 294 +++++++++++---------- 1 file changed, 153 insertions(+), 141 deletions(-) (limited to 'tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini') diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini index fdb5da322..490bbc6b4 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini @@ -8,15 +8,16 @@ time_sync_spin_threshold=100000 [system] type=System -children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 funcbus funcmem physmem ruby sys_port_proxy +children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 cpu_clk_domain funcbus funcmem 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= -memories=system.physmem system.funcmem +mem_ranges=0:268435455 +memories=system.funcmem system.physmem num_work_ids=16 readfile= symbolfile= @@ -29,10 +30,15 @@ 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.cpu0] type=MemTest atomic=false -clock=1 +clk_domain=system.cpu_clk_domain issue_dmas=false max_loads=100000 memory_size=65536 @@ -51,7 +57,7 @@ test=system.ruby.l1_cntrl0.sequencer.slave[0] [system.cpu1] type=MemTest atomic=false -clock=1 +clk_domain=system.cpu_clk_domain issue_dmas=false max_loads=100000 memory_size=65536 @@ -70,7 +76,7 @@ test=system.ruby.l1_cntrl1.sequencer.slave[0] [system.cpu2] type=MemTest atomic=false -clock=1 +clk_domain=system.cpu_clk_domain issue_dmas=false max_loads=100000 memory_size=65536 @@ -89,7 +95,7 @@ test=system.ruby.l1_cntrl2.sequencer.slave[0] [system.cpu3] type=MemTest atomic=false -clock=1 +clk_domain=system.cpu_clk_domain issue_dmas=false max_loads=100000 memory_size=65536 @@ -108,7 +114,7 @@ test=system.ruby.l1_cntrl3.sequencer.slave[0] [system.cpu4] type=MemTest atomic=false -clock=1 +clk_domain=system.cpu_clk_domain issue_dmas=false max_loads=100000 memory_size=65536 @@ -127,7 +133,7 @@ test=system.ruby.l1_cntrl4.sequencer.slave[0] [system.cpu5] type=MemTest atomic=false -clock=1 +clk_domain=system.cpu_clk_domain issue_dmas=false max_loads=100000 memory_size=65536 @@ -146,7 +152,7 @@ test=system.ruby.l1_cntrl5.sequencer.slave[0] [system.cpu6] type=MemTest atomic=false -clock=1 +clk_domain=system.cpu_clk_domain issue_dmas=false max_loads=100000 memory_size=65536 @@ -165,7 +171,7 @@ test=system.ruby.l1_cntrl6.sequencer.slave[0] [system.cpu7] type=MemTest atomic=false -clock=1 +clk_domain=system.cpu_clk_domain issue_dmas=false max_loads=100000 memory_size=65536 @@ -181,10 +187,14 @@ trace_addr=0 functional=system.funcbus.slave[7] test=system.ruby.l1_cntrl7.sequencer.slave[0] +[system.cpu_clk_domain] +type=SrcClockDomain +clock=1 +voltage_domain=system.voltage_domain + [system.funcbus] type=NoncoherentBus -block_size=64 -clock=1 +clk_domain=system.clk_domain header_cycles=1 use_default_range=false width=8 @@ -194,44 +204,47 @@ slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional syste [system.funcmem] type=SimpleMemory bandwidth=0.000000 -clock=1 -conf_table_reported=false +clk_domain=system.clk_domain +conf_table_reported=true in_addr_map=false latency=30 latency_var=0 null=false range=0:134217727 -zero=false port=system.funcbus.master[0] [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 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 network profiler +children=clk_domain dir_cntrl0 l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 memctrl_clk_domain network profiler block_size_bytes=64 -clock=1 +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 probeFilter buffer_size=0 -clock=1 +clk_domain=system.ruby.clk_domain cntrl_id=8 directory=system.ruby.dir_cntrl0.directory full_bit_dir_enabled=false @@ -261,7 +274,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 @@ -298,7 +311,7 @@ L1Icache=system.ruby.l1_cntrl0.L1Icache L2cache=system.ruby.l1_cntrl0.L2cache buffer_size=0 cache_response_latency=10 -clock=1 +clk_domain=system.ruby.clk_domain cntrl_id=0 issue_latency=2 l2_cache_hit_latency=10 @@ -357,7 +370,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.L1Dcache deadlock_threshold=1000000 icache=system.ruby.l1_cntrl0.L1Icache @@ -379,7 +392,7 @@ L1Icache=system.ruby.l1_cntrl1.L1Icache L2cache=system.ruby.l1_cntrl1.L2cache buffer_size=0 cache_response_latency=10 -clock=1 +clk_domain=system.ruby.clk_domain cntrl_id=1 issue_latency=2 l2_cache_hit_latency=10 @@ -438,7 +451,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl1.sequencer] type=RubySequencer access_phys_mem=false -clock=1 +clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl1.L1Dcache deadlock_threshold=1000000 icache=system.ruby.l1_cntrl1.L1Icache @@ -460,7 +473,7 @@ L1Icache=system.ruby.l1_cntrl2.L1Icache L2cache=system.ruby.l1_cntrl2.L2cache buffer_size=0 cache_response_latency=10 -clock=1 +clk_domain=system.ruby.clk_domain cntrl_id=2 issue_latency=2 l2_cache_hit_latency=10 @@ -519,7 +532,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl2.sequencer] type=RubySequencer access_phys_mem=false -clock=1 +clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl2.L1Dcache deadlock_threshold=1000000 icache=system.ruby.l1_cntrl2.L1Icache @@ -541,7 +554,7 @@ L1Icache=system.ruby.l1_cntrl3.L1Icache L2cache=system.ruby.l1_cntrl3.L2cache buffer_size=0 cache_response_latency=10 -clock=1 +clk_domain=system.ruby.clk_domain cntrl_id=3 issue_latency=2 l2_cache_hit_latency=10 @@ -600,7 +613,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl3.sequencer] type=RubySequencer access_phys_mem=false -clock=1 +clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl3.L1Dcache deadlock_threshold=1000000 icache=system.ruby.l1_cntrl3.L1Icache @@ -622,7 +635,7 @@ L1Icache=system.ruby.l1_cntrl4.L1Icache L2cache=system.ruby.l1_cntrl4.L2cache buffer_size=0 cache_response_latency=10 -clock=1 +clk_domain=system.ruby.clk_domain cntrl_id=4 issue_latency=2 l2_cache_hit_latency=10 @@ -681,7 +694,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl4.sequencer] type=RubySequencer access_phys_mem=false -clock=1 +clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl4.L1Dcache deadlock_threshold=1000000 icache=system.ruby.l1_cntrl4.L1Icache @@ -703,7 +716,7 @@ L1Icache=system.ruby.l1_cntrl5.L1Icache L2cache=system.ruby.l1_cntrl5.L2cache buffer_size=0 cache_response_latency=10 -clock=1 +clk_domain=system.ruby.clk_domain cntrl_id=5 issue_latency=2 l2_cache_hit_latency=10 @@ -762,7 +775,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl5.sequencer] type=RubySequencer access_phys_mem=false -clock=1 +clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl5.L1Dcache deadlock_threshold=1000000 icache=system.ruby.l1_cntrl5.L1Icache @@ -784,7 +797,7 @@ L1Icache=system.ruby.l1_cntrl6.L1Icache L2cache=system.ruby.l1_cntrl6.L2cache buffer_size=0 cache_response_latency=10 -clock=1 +clk_domain=system.ruby.clk_domain cntrl_id=6 issue_latency=2 l2_cache_hit_latency=10 @@ -843,7 +856,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl6.sequencer] type=RubySequencer access_phys_mem=false -clock=1 +clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl6.L1Dcache deadlock_threshold=1000000 icache=system.ruby.l1_cntrl6.L1Icache @@ -865,7 +878,7 @@ L1Icache=system.ruby.l1_cntrl7.L1Icache L2cache=system.ruby.l1_cntrl7.L2cache buffer_size=0 cache_response_latency=10 -clock=1 +clk_domain=system.ruby.clk_domain cntrl_id=7 issue_latency=2 l2_cache_hit_latency=10 @@ -924,7 +937,7 @@ tagArrayBanks=1 [system.ruby.l1_cntrl7.sequencer] type=RubySequencer access_phys_mem=false -clock=1 +clk_domain=system.ruby.clk_domain dcache=system.ruby.l1_cntrl7.L1Dcache deadlock_threshold=1000000 icache=system.ruby.l1_cntrl7.L1Icache @@ -938,188 +951,123 @@ using_ruby_tester=false version=7 slave=system.cpu7.test +[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 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 +children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 routers0 routers1 routers2 routers3 routers4 routers5 routers6 routers7 routers8 routers9 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 system.ruby.network.ext_links2 system.ruby.network.ext_links3 system.ruby.network.ext_links4 system.ruby.network.ext_links5 system.ruby.network.ext_links6 system.ruby.network.ext_links7 system.ruby.network.ext_links8 int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 system.ruby.network.int_links3 system.ruby.network.int_links4 system.ruby.network.int_links5 system.ruby.network.int_links6 system.ruby.network.int_links7 system.ruby.network.int_links8 number_of_virtual_networks=10 -routers=system.ruby.network.ext_links0.int_node system.ruby.network.ext_links1.int_node system.ruby.network.ext_links2.int_node system.ruby.network.ext_links3.int_node system.ruby.network.ext_links4.int_node system.ruby.network.ext_links5.int_node system.ruby.network.ext_links6.int_node system.ruby.network.ext_links7.int_node system.ruby.network.ext_links8.int_node system.ruby.network.int_links0.node_b +routers=system.ruby.network.routers0 system.ruby.network.routers1 system.ruby.network.routers2 system.ruby.network.routers3 system.ruby.network.routers4 system.ruby.network.routers5 system.ruby.network.routers6 system.ruby.network.routers7 system.ruby.network.routers8 system.ruby.network.routers9 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.l1_cntrl1 -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.ext_links2] type=SimpleExtLink -children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl2 -int_node=system.ruby.network.ext_links2.int_node +int_node=system.ruby.network.routers2 latency=1 link_id=2 weight=1 -[system.ruby.network.ext_links2.int_node] -type=Switch -clock=1 -router_id=2 -virt_nets=10 - [system.ruby.network.ext_links3] type=SimpleExtLink -children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl3 -int_node=system.ruby.network.ext_links3.int_node +int_node=system.ruby.network.routers3 latency=1 link_id=3 weight=1 -[system.ruby.network.ext_links3.int_node] -type=Switch -clock=1 -router_id=3 -virt_nets=10 - [system.ruby.network.ext_links4] type=SimpleExtLink -children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl4 -int_node=system.ruby.network.ext_links4.int_node +int_node=system.ruby.network.routers4 latency=1 link_id=4 weight=1 -[system.ruby.network.ext_links4.int_node] -type=Switch -clock=1 -router_id=4 -virt_nets=10 - [system.ruby.network.ext_links5] type=SimpleExtLink -children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl5 -int_node=system.ruby.network.ext_links5.int_node +int_node=system.ruby.network.routers5 latency=1 link_id=5 weight=1 -[system.ruby.network.ext_links5.int_node] -type=Switch -clock=1 -router_id=5 -virt_nets=10 - [system.ruby.network.ext_links6] type=SimpleExtLink -children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl6 -int_node=system.ruby.network.ext_links6.int_node +int_node=system.ruby.network.routers6 latency=1 link_id=6 weight=1 -[system.ruby.network.ext_links6.int_node] -type=Switch -clock=1 -router_id=6 -virt_nets=10 - [system.ruby.network.ext_links7] type=SimpleExtLink -children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl7 -int_node=system.ruby.network.ext_links7.int_node +int_node=system.ruby.network.routers7 latency=1 link_id=7 weight=1 -[system.ruby.network.ext_links7.int_node] -type=Switch -clock=1 -router_id=7 -virt_nets=10 - [system.ruby.network.ext_links8] type=SimpleExtLink -children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.ext_links8.int_node +int_node=system.ruby.network.routers8 latency=1 link_id=8 weight=1 -[system.ruby.network.ext_links8.int_node] -type=Switch -clock=1 -router_id=8 -virt_nets=10 - [system.ruby.network.int_links0] type=SimpleIntLink -children=node_b bandwidth_factor=16 latency=1 link_id=9 -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.routers9 weight=1 -[system.ruby.network.int_links0.node_b] -type=Switch -clock=1 -router_id=9 -virt_nets=10 - [system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=10 -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.routers9 weight=1 [system.ruby.network.int_links2] @@ -1127,8 +1075,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=11 -node_a=system.ruby.network.ext_links2.int_node -node_b=system.ruby.network.int_links0.node_b +node_a=system.ruby.network.routers2 +node_b=system.ruby.network.routers9 weight=1 [system.ruby.network.int_links3] @@ -1136,8 +1084,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=12 -node_a=system.ruby.network.ext_links3.int_node -node_b=system.ruby.network.int_links0.node_b +node_a=system.ruby.network.routers3 +node_b=system.ruby.network.routers9 weight=1 [system.ruby.network.int_links4] @@ -1145,8 +1093,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=13 -node_a=system.ruby.network.ext_links4.int_node -node_b=system.ruby.network.int_links0.node_b +node_a=system.ruby.network.routers4 +node_b=system.ruby.network.routers9 weight=1 [system.ruby.network.int_links5] @@ -1154,8 +1102,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=14 -node_a=system.ruby.network.ext_links5.int_node -node_b=system.ruby.network.int_links0.node_b +node_a=system.ruby.network.routers5 +node_b=system.ruby.network.routers9 weight=1 [system.ruby.network.int_links6] @@ -1163,8 +1111,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=15 -node_a=system.ruby.network.ext_links6.int_node -node_b=system.ruby.network.int_links0.node_b +node_a=system.ruby.network.routers6 +node_b=system.ruby.network.routers9 weight=1 [system.ruby.network.int_links7] @@ -1172,8 +1120,8 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=16 -node_a=system.ruby.network.ext_links7.int_node -node_b=system.ruby.network.int_links0.node_b +node_a=system.ruby.network.routers7 +node_b=system.ruby.network.routers9 weight=1 [system.ruby.network.int_links8] @@ -1181,10 +1129,70 @@ type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=17 -node_a=system.ruby.network.ext_links8.int_node -node_b=system.ruby.network.int_links0.node_b +node_a=system.ruby.network.routers8 +node_b=system.ruby.network.routers9 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.network.routers3] +type=Switch +clk_domain=system.ruby.clk_domain +router_id=3 +virt_nets=10 + +[system.ruby.network.routers4] +type=Switch +clk_domain=system.ruby.clk_domain +router_id=4 +virt_nets=10 + +[system.ruby.network.routers5] +type=Switch +clk_domain=system.ruby.clk_domain +router_id=5 +virt_nets=10 + +[system.ruby.network.routers6] +type=Switch +clk_domain=system.ruby.clk_domain +router_id=6 +virt_nets=10 + +[system.ruby.network.routers7] +type=Switch +clk_domain=system.ruby.clk_domain +router_id=7 +virt_nets=10 + +[system.ruby.network.routers8] +type=Switch +clk_domain=system.ruby.clk_domain +router_id=8 +virt_nets=10 + +[system.ruby.network.routers9] +type=Switch +clk_domain=system.ruby.clk_domain +router_id=9 +virt_nets=10 + [system.ruby.profiler] type=RubyProfiler all_instructions=false @@ -1195,7 +1203,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 @@ -1205,3 +1213,7 @@ using_ruby_tester=false version=0 slave=system.system_port +[system.voltage_domain] +type=VoltageDomain +voltage=1.000000 + -- cgit v1.2.3