diff options
Diffstat (limited to 'tests/quick')
23 files changed, 822 insertions, 846 deletions
diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini index 31e00d209..2ccf15086 100644 --- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini @@ -128,6 +128,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=6 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby to_mem_ctrl_latency=1 @@ -177,6 +178,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl0.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -251,6 +253,7 @@ cntrl_id=1 l2_request_latency=2 l2_response_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby to_l1_latency=1 @@ -273,105 +276,99 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 adaptive_routing=false buffer_size=0 clock=1 control_msg_size=8 endpoint_bandwidth=1000 +ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 +int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 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.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=4 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=5 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini index c87e942d1..80930f2bf 100644 --- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini @@ -128,6 +128,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=6 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -173,6 +174,7 @@ clock=1 cntrl_id=0 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby @@ -235,6 +237,7 @@ buffer_size=0 clock=1 cntrl_id=1 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 response_latency=2 @@ -258,105 +261,99 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 adaptive_routing=false buffer_size=0 clock=1 control_msg_size=8 endpoint_bandwidth=1000 +ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 +int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 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.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=4 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=5 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini index c5d180059..6eda0d2c3 100644 --- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini @@ -131,6 +131,7 @@ fixed_timeout_latency=100 l2_select_num_bits=0 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 reissue_wakeup_latency=10 ruby_system=system.ruby @@ -183,6 +184,7 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 reissue_wakeup_latency=10 retry_threshold=1 @@ -250,6 +252,7 @@ filtering_enabled=true l2_request_latency=5 l2_response_latency=5 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -271,105 +274,99 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 adaptive_routing=false buffer_size=0 clock=1 control_msg_size=8 endpoint_bandwidth=1000 +ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 +int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 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.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=4 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=5 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini index 8b34d6c94..97e4f32c9 100644 --- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini @@ -129,6 +129,7 @@ full_bit_dir_enabled=false memBuffer=system.ruby.dir_cntrl0.memBuffer memory_controller_latency=2 number_of_TBEs=256 +peer=Null probeFilter=system.ruby.dir_cntrl0.probeFilter probe_filter_enabled=false recycle_latency=10 @@ -194,6 +195,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -262,80 +264,74 @@ slave=system.cpu.icache_port system.cpu.dcache_port [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 int_links0 int_links1 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 int_links0 int_links1 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=2 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini index 94e065adc..7f0fbd9b6 100644 --- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini @@ -128,6 +128,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=12 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -173,6 +174,7 @@ clock=1 cntrl_id=0 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -213,80 +215,74 @@ slave=system.cpu.icache_port system.cpu.dcache_port [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 int_links0 int_links1 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 int_links0 int_links1 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=2 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini index 02d1e74cd..89c677e9f 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini @@ -128,6 +128,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=6 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby to_mem_ctrl_latency=1 @@ -177,6 +178,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl0.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -251,6 +253,7 @@ cntrl_id=1 l2_request_latency=2 l2_response_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby to_l1_latency=1 @@ -273,105 +276,99 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 adaptive_routing=false buffer_size=0 clock=1 control_msg_size=8 endpoint_bandwidth=1000 +ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 +int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 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.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=4 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=5 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini index 8a5d06b8c..fc72761f4 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini @@ -128,6 +128,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=6 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -173,6 +174,7 @@ clock=1 cntrl_id=0 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby @@ -235,6 +237,7 @@ buffer_size=0 clock=1 cntrl_id=1 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 response_latency=2 @@ -258,105 +261,99 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 adaptive_routing=false buffer_size=0 clock=1 control_msg_size=8 endpoint_bandwidth=1000 +ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 +int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 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.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=4 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=5 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini index 993dde609..e712900eb 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini @@ -131,6 +131,7 @@ fixed_timeout_latency=100 l2_select_num_bits=0 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 reissue_wakeup_latency=10 ruby_system=system.ruby @@ -183,6 +184,7 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 reissue_wakeup_latency=10 retry_threshold=1 @@ -250,6 +252,7 @@ filtering_enabled=true l2_request_latency=5 l2_response_latency=5 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -271,105 +274,99 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 adaptive_routing=false buffer_size=0 clock=1 control_msg_size=8 endpoint_bandwidth=1000 +ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 +int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 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.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=4 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=5 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini index a5efbb372..b21252b35 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini @@ -129,6 +129,7 @@ full_bit_dir_enabled=false memBuffer=system.ruby.dir_cntrl0.memBuffer memory_controller_latency=2 number_of_TBEs=256 +peer=Null probeFilter=system.ruby.dir_cntrl0.probeFilter probe_filter_enabled=false recycle_latency=10 @@ -194,6 +195,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -262,80 +264,74 @@ slave=system.cpu.icache_port system.cpu.dcache_port [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 int_links0 int_links1 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 int_links0 int_links1 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=2 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini index 10efd8028..2db9e78bb 100644 --- a/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini +++ b/tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini @@ -128,6 +128,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=12 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -173,6 +174,7 @@ clock=1 cntrl_id=0 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -213,80 +215,74 @@ slave=system.cpu.icache_port system.cpu.dcache_port [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 int_links0 int_links1 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 int_links0 int_links1 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=2 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] 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 ce3f1e030..0edac316d 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 @@ -130,6 +130,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=12 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -175,6 +176,7 @@ clock=1 cntrl_id=0 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -215,80 +217,74 @@ slave=system.cpu.icache_port system.cpu.dcache_port [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 int_links0 int_links1 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 int_links0 int_links1 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=2 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] 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 2e9b6fb35..905ee5b1f 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 @@ -128,6 +128,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=12 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -173,6 +174,7 @@ clock=1 cntrl_id=0 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -213,80 +215,74 @@ slave=system.cpu.icache_port system.cpu.dcache_port [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 int_links0 int_links1 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 int_links0 int_links1 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=2 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] 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 4e09173f3..1ca707553 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 @@ -152,6 +152,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=12 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -197,6 +198,7 @@ clock=1 cntrl_id=0 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -238,80 +240,74 @@ slave=system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port s [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 int_links0 int_links1 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 int_links0 int_links1 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=2 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini index e333e6d6e..510e4a26a 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini @@ -16,7 +16,7 @@ kernel= load_addr_mask=1099511627775 mem_mode=timing mem_ranges= -memories=system.funcmem system.physmem +memories=system.physmem system.funcmem num_work_ids=16 readfile= symbolfile= @@ -212,7 +212,7 @@ conf_table_reported=false in_addr_map=true latency=30 latency_var=0 -null=false +null=true range=0:134217727 zero=false @@ -237,6 +237,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=6 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby to_mem_ctrl_latency=1 @@ -286,6 +287,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl0.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -363,6 +365,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl1.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -440,6 +443,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl2.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -517,6 +521,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl3.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -594,6 +599,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl4.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -671,6 +677,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl5.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -748,6 +755,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl6.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -825,6 +833,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl7.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -899,6 +908,7 @@ cntrl_id=8 l2_request_latency=2 l2_response_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby to_l1_latency=1 @@ -921,280 +931,274 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 adaptive_routing=false buffer_size=0 clock=1 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 system.ruby.network.ext_links9 +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 system.ruby.network.int_links9 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.ext_links9.int_node system.ruby.network.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8 system.ruby.network.topology.ext_links9 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8 system.ruby.network.topology.int_links9 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.ext_links9.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl1 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl2 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.ext_links3] +[system.ruby.network.ext_links3] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl3 -int_node=system.ruby.network.topology.ext_links3.int_node +int_node=system.ruby.network.ext_links3.int_node latency=1 link_id=3 weight=1 -[system.ruby.network.topology.ext_links3.int_node] +[system.ruby.network.ext_links3.int_node] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.ext_links4] +[system.ruby.network.ext_links4] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl4 -int_node=system.ruby.network.topology.ext_links4.int_node +int_node=system.ruby.network.ext_links4.int_node latency=1 link_id=4 weight=1 -[system.ruby.network.topology.ext_links4.int_node] +[system.ruby.network.ext_links4.int_node] type=Switch clock=1 router_id=4 virt_nets=10 -[system.ruby.network.topology.ext_links5] +[system.ruby.network.ext_links5] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl5 -int_node=system.ruby.network.topology.ext_links5.int_node +int_node=system.ruby.network.ext_links5.int_node latency=1 link_id=5 weight=1 -[system.ruby.network.topology.ext_links5.int_node] +[system.ruby.network.ext_links5.int_node] type=Switch clock=1 router_id=5 virt_nets=10 -[system.ruby.network.topology.ext_links6] +[system.ruby.network.ext_links6] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl6 -int_node=system.ruby.network.topology.ext_links6.int_node +int_node=system.ruby.network.ext_links6.int_node latency=1 link_id=6 weight=1 -[system.ruby.network.topology.ext_links6.int_node] +[system.ruby.network.ext_links6.int_node] type=Switch clock=1 router_id=6 virt_nets=10 -[system.ruby.network.topology.ext_links7] +[system.ruby.network.ext_links7] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl7 -int_node=system.ruby.network.topology.ext_links7.int_node +int_node=system.ruby.network.ext_links7.int_node latency=1 link_id=7 weight=1 -[system.ruby.network.topology.ext_links7.int_node] +[system.ruby.network.ext_links7.int_node] type=Switch clock=1 router_id=7 virt_nets=10 -[system.ruby.network.topology.ext_links8] +[system.ruby.network.ext_links8] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links8.int_node +int_node=system.ruby.network.ext_links8.int_node latency=1 link_id=8 weight=1 -[system.ruby.network.topology.ext_links8.int_node] +[system.ruby.network.ext_links8.int_node] type=Switch clock=1 router_id=8 virt_nets=10 -[system.ruby.network.topology.ext_links9] +[system.ruby.network.ext_links9] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links9.int_node +int_node=system.ruby.network.ext_links9.int_node latency=1 link_id=9 weight=1 -[system.ruby.network.topology.ext_links9.int_node] +[system.ruby.network.ext_links9.int_node] type=Switch clock=1 router_id=9 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=10 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=10 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=11 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=12 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links3] +[system.ruby.network.int_links3] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=13 -node_a=system.ruby.network.topology.ext_links3.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links3.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links4] +[system.ruby.network.int_links4] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=14 -node_a=system.ruby.network.topology.ext_links4.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links4.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links5] +[system.ruby.network.int_links5] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=15 -node_a=system.ruby.network.topology.ext_links5.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links5.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links6] +[system.ruby.network.int_links6] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=16 -node_a=system.ruby.network.topology.ext_links6.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links6.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links7] +[system.ruby.network.int_links7] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=17 -node_a=system.ruby.network.topology.ext_links7.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links7.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links8] +[system.ruby.network.int_links8] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=18 -node_a=system.ruby.network.topology.ext_links8.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links8.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links9] +[system.ruby.network.int_links9] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=19 -node_a=system.ruby.network.topology.ext_links9.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links9.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini index d598cba69..a5a6e7d2f 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini @@ -212,7 +212,7 @@ conf_table_reported=false in_addr_map=true latency=30 latency_var=0 -null=false +null=true range=0:134217727 zero=false @@ -237,6 +237,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=6 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -282,6 +283,7 @@ clock=1 cntrl_id=0 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby @@ -346,6 +348,7 @@ clock=1 cntrl_id=1 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby @@ -410,6 +413,7 @@ clock=1 cntrl_id=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby @@ -474,6 +478,7 @@ clock=1 cntrl_id=3 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby @@ -538,6 +543,7 @@ clock=1 cntrl_id=4 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby @@ -602,6 +608,7 @@ clock=1 cntrl_id=5 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby @@ -666,6 +673,7 @@ clock=1 cntrl_id=6 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby @@ -730,6 +738,7 @@ clock=1 cntrl_id=7 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby @@ -792,6 +801,7 @@ buffer_size=0 clock=1 cntrl_id=8 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 response_latency=2 @@ -815,280 +825,274 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 adaptive_routing=false buffer_size=0 clock=1 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 system.ruby.network.ext_links9 +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 system.ruby.network.int_links9 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.ext_links9.int_node system.ruby.network.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8 system.ruby.network.topology.ext_links9 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8 system.ruby.network.topology.int_links9 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.ext_links9.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl1 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl2 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.ext_links3] +[system.ruby.network.ext_links3] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl3 -int_node=system.ruby.network.topology.ext_links3.int_node +int_node=system.ruby.network.ext_links3.int_node latency=1 link_id=3 weight=1 -[system.ruby.network.topology.ext_links3.int_node] +[system.ruby.network.ext_links3.int_node] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.ext_links4] +[system.ruby.network.ext_links4] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl4 -int_node=system.ruby.network.topology.ext_links4.int_node +int_node=system.ruby.network.ext_links4.int_node latency=1 link_id=4 weight=1 -[system.ruby.network.topology.ext_links4.int_node] +[system.ruby.network.ext_links4.int_node] type=Switch clock=1 router_id=4 virt_nets=10 -[system.ruby.network.topology.ext_links5] +[system.ruby.network.ext_links5] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl5 -int_node=system.ruby.network.topology.ext_links5.int_node +int_node=system.ruby.network.ext_links5.int_node latency=1 link_id=5 weight=1 -[system.ruby.network.topology.ext_links5.int_node] +[system.ruby.network.ext_links5.int_node] type=Switch clock=1 router_id=5 virt_nets=10 -[system.ruby.network.topology.ext_links6] +[system.ruby.network.ext_links6] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl6 -int_node=system.ruby.network.topology.ext_links6.int_node +int_node=system.ruby.network.ext_links6.int_node latency=1 link_id=6 weight=1 -[system.ruby.network.topology.ext_links6.int_node] +[system.ruby.network.ext_links6.int_node] type=Switch clock=1 router_id=6 virt_nets=10 -[system.ruby.network.topology.ext_links7] +[system.ruby.network.ext_links7] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl7 -int_node=system.ruby.network.topology.ext_links7.int_node +int_node=system.ruby.network.ext_links7.int_node latency=1 link_id=7 weight=1 -[system.ruby.network.topology.ext_links7.int_node] +[system.ruby.network.ext_links7.int_node] type=Switch clock=1 router_id=7 virt_nets=10 -[system.ruby.network.topology.ext_links8] +[system.ruby.network.ext_links8] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links8.int_node +int_node=system.ruby.network.ext_links8.int_node latency=1 link_id=8 weight=1 -[system.ruby.network.topology.ext_links8.int_node] +[system.ruby.network.ext_links8.int_node] type=Switch clock=1 router_id=8 virt_nets=10 -[system.ruby.network.topology.ext_links9] +[system.ruby.network.ext_links9] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links9.int_node +int_node=system.ruby.network.ext_links9.int_node latency=1 link_id=9 weight=1 -[system.ruby.network.topology.ext_links9.int_node] +[system.ruby.network.ext_links9.int_node] type=Switch clock=1 router_id=9 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=10 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=10 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=11 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=12 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links3] +[system.ruby.network.int_links3] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=13 -node_a=system.ruby.network.topology.ext_links3.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links3.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links4] +[system.ruby.network.int_links4] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=14 -node_a=system.ruby.network.topology.ext_links4.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links4.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links5] +[system.ruby.network.int_links5] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=15 -node_a=system.ruby.network.topology.ext_links5.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links5.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links6] +[system.ruby.network.int_links6] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=16 -node_a=system.ruby.network.topology.ext_links6.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links6.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links7] +[system.ruby.network.int_links7] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=17 -node_a=system.ruby.network.topology.ext_links7.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links7.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links8] +[system.ruby.network.int_links8] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=18 -node_a=system.ruby.network.topology.ext_links8.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links8.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links9] +[system.ruby.network.int_links9] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=19 -node_a=system.ruby.network.topology.ext_links9.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links9.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini index 6b761c13c..831205199 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini @@ -212,7 +212,7 @@ conf_table_reported=false in_addr_map=true latency=30 latency_var=0 -null=false +null=true range=0:134217727 zero=false @@ -240,7 +240,9 @@ fixed_timeout_latency=100 l2_select_num_bits=0 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 ruby_system=system.ruby transitions_per_cycle=32 version=0 @@ -291,12 +293,15 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 retry_threshold=1 ruby_system=system.ruby send_evictions=false sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=32 +use_timeout_latency=50 version=0 [system.ruby.l1_cntrl0.L1DcacheMemory] @@ -360,12 +365,15 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 retry_threshold=1 ruby_system=system.ruby send_evictions=false sequencer=system.ruby.l1_cntrl1.sequencer transitions_per_cycle=32 +use_timeout_latency=50 version=1 [system.ruby.l1_cntrl1.L1DcacheMemory] @@ -429,12 +437,15 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 retry_threshold=1 ruby_system=system.ruby send_evictions=false sequencer=system.ruby.l1_cntrl2.sequencer transitions_per_cycle=32 +use_timeout_latency=50 version=2 [system.ruby.l1_cntrl2.L1DcacheMemory] @@ -498,12 +509,15 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 retry_threshold=1 ruby_system=system.ruby send_evictions=false sequencer=system.ruby.l1_cntrl3.sequencer transitions_per_cycle=32 +use_timeout_latency=50 version=3 [system.ruby.l1_cntrl3.L1DcacheMemory] @@ -567,12 +581,15 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 retry_threshold=1 ruby_system=system.ruby send_evictions=false sequencer=system.ruby.l1_cntrl4.sequencer transitions_per_cycle=32 +use_timeout_latency=50 version=4 [system.ruby.l1_cntrl4.L1DcacheMemory] @@ -636,12 +653,15 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 retry_threshold=1 ruby_system=system.ruby send_evictions=false sequencer=system.ruby.l1_cntrl5.sequencer transitions_per_cycle=32 +use_timeout_latency=50 version=5 [system.ruby.l1_cntrl5.L1DcacheMemory] @@ -705,12 +725,15 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 retry_threshold=1 ruby_system=system.ruby send_evictions=false sequencer=system.ruby.l1_cntrl6.sequencer transitions_per_cycle=32 +use_timeout_latency=50 version=6 [system.ruby.l1_cntrl6.L1DcacheMemory] @@ -774,12 +797,15 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 retry_threshold=1 ruby_system=system.ruby send_evictions=false sequencer=system.ruby.l1_cntrl7.sequencer transitions_per_cycle=32 +use_timeout_latency=50 version=7 [system.ruby.l1_cntrl7.L1DcacheMemory] @@ -839,6 +865,7 @@ filtering_enabled=true l2_request_latency=5 l2_response_latency=5 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -860,280 +887,274 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 adaptive_routing=false buffer_size=0 clock=1 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 system.ruby.network.ext_links9 +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 system.ruby.network.int_links9 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.ext_links9.int_node system.ruby.network.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 ext_links9 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 int_links9 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8 system.ruby.network.topology.ext_links9 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8 system.ruby.network.topology.int_links9 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.ext_links9.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl1 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl2 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.ext_links3] +[system.ruby.network.ext_links3] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl3 -int_node=system.ruby.network.topology.ext_links3.int_node +int_node=system.ruby.network.ext_links3.int_node latency=1 link_id=3 weight=1 -[system.ruby.network.topology.ext_links3.int_node] +[system.ruby.network.ext_links3.int_node] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.ext_links4] +[system.ruby.network.ext_links4] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl4 -int_node=system.ruby.network.topology.ext_links4.int_node +int_node=system.ruby.network.ext_links4.int_node latency=1 link_id=4 weight=1 -[system.ruby.network.topology.ext_links4.int_node] +[system.ruby.network.ext_links4.int_node] type=Switch clock=1 router_id=4 virt_nets=10 -[system.ruby.network.topology.ext_links5] +[system.ruby.network.ext_links5] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl5 -int_node=system.ruby.network.topology.ext_links5.int_node +int_node=system.ruby.network.ext_links5.int_node latency=1 link_id=5 weight=1 -[system.ruby.network.topology.ext_links5.int_node] +[system.ruby.network.ext_links5.int_node] type=Switch clock=1 router_id=5 virt_nets=10 -[system.ruby.network.topology.ext_links6] +[system.ruby.network.ext_links6] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl6 -int_node=system.ruby.network.topology.ext_links6.int_node +int_node=system.ruby.network.ext_links6.int_node latency=1 link_id=6 weight=1 -[system.ruby.network.topology.ext_links6.int_node] +[system.ruby.network.ext_links6.int_node] type=Switch clock=1 router_id=6 virt_nets=10 -[system.ruby.network.topology.ext_links7] +[system.ruby.network.ext_links7] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl7 -int_node=system.ruby.network.topology.ext_links7.int_node +int_node=system.ruby.network.ext_links7.int_node latency=1 link_id=7 weight=1 -[system.ruby.network.topology.ext_links7.int_node] +[system.ruby.network.ext_links7.int_node] type=Switch clock=1 router_id=7 virt_nets=10 -[system.ruby.network.topology.ext_links8] +[system.ruby.network.ext_links8] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links8.int_node +int_node=system.ruby.network.ext_links8.int_node latency=1 link_id=8 weight=1 -[system.ruby.network.topology.ext_links8.int_node] +[system.ruby.network.ext_links8.int_node] type=Switch clock=1 router_id=8 virt_nets=10 -[system.ruby.network.topology.ext_links9] +[system.ruby.network.ext_links9] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links9.int_node +int_node=system.ruby.network.ext_links9.int_node latency=1 link_id=9 weight=1 -[system.ruby.network.topology.ext_links9.int_node] +[system.ruby.network.ext_links9.int_node] type=Switch clock=1 router_id=9 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=10 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=10 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=11 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=12 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links3] +[system.ruby.network.int_links3] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=13 -node_a=system.ruby.network.topology.ext_links3.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links3.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links4] +[system.ruby.network.int_links4] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=14 -node_a=system.ruby.network.topology.ext_links4.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links4.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links5] +[system.ruby.network.int_links5] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=15 -node_a=system.ruby.network.topology.ext_links5.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links5.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links6] +[system.ruby.network.int_links6] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=16 -node_a=system.ruby.network.topology.ext_links6.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links6.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links7] +[system.ruby.network.int_links7] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=17 -node_a=system.ruby.network.topology.ext_links7.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links7.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links8] +[system.ruby.network.int_links8] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=18 -node_a=system.ruby.network.topology.ext_links8.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links8.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links9] +[system.ruby.network.int_links9] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=19 -node_a=system.ruby.network.topology.ext_links9.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links9.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] 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 f80cf2fbf..b267456f4 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 @@ -16,7 +16,7 @@ kernel= load_addr_mask=1099511627775 mem_mode=timing mem_ranges= -memories=system.funcmem system.physmem +memories=system.physmem system.funcmem num_work_ids=16 readfile= symbolfile= @@ -212,7 +212,7 @@ conf_table_reported=false in_addr_map=true latency=30 latency_var=0 -null=false +null=true range=0:134217727 zero=false @@ -238,6 +238,7 @@ full_bit_dir_enabled=false memBuffer=system.ruby.dir_cntrl0.memBuffer memory_controller_latency=2 number_of_TBEs=256 +peer=Null probeFilter=system.ruby.dir_cntrl0.probeFilter probe_filter_enabled=false recycle_latency=10 @@ -303,6 +304,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -383,6 +385,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -463,6 +466,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -543,6 +547,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -623,6 +628,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -703,6 +709,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -783,6 +790,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -863,6 +871,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -931,255 +940,249 @@ slave=system.cpu7.test [system.ruby.network] type=SimpleNetwork -children=topology +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 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -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 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl1 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl2 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.ext_links3] +[system.ruby.network.ext_links3] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl3 -int_node=system.ruby.network.topology.ext_links3.int_node +int_node=system.ruby.network.ext_links3.int_node latency=1 link_id=3 weight=1 -[system.ruby.network.topology.ext_links3.int_node] +[system.ruby.network.ext_links3.int_node] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.ext_links4] +[system.ruby.network.ext_links4] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl4 -int_node=system.ruby.network.topology.ext_links4.int_node +int_node=system.ruby.network.ext_links4.int_node latency=1 link_id=4 weight=1 -[system.ruby.network.topology.ext_links4.int_node] +[system.ruby.network.ext_links4.int_node] type=Switch clock=1 router_id=4 virt_nets=10 -[system.ruby.network.topology.ext_links5] +[system.ruby.network.ext_links5] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl5 -int_node=system.ruby.network.topology.ext_links5.int_node +int_node=system.ruby.network.ext_links5.int_node latency=1 link_id=5 weight=1 -[system.ruby.network.topology.ext_links5.int_node] +[system.ruby.network.ext_links5.int_node] type=Switch clock=1 router_id=5 virt_nets=10 -[system.ruby.network.topology.ext_links6] +[system.ruby.network.ext_links6] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl6 -int_node=system.ruby.network.topology.ext_links6.int_node +int_node=system.ruby.network.ext_links6.int_node latency=1 link_id=6 weight=1 -[system.ruby.network.topology.ext_links6.int_node] +[system.ruby.network.ext_links6.int_node] type=Switch clock=1 router_id=6 virt_nets=10 -[system.ruby.network.topology.ext_links7] +[system.ruby.network.ext_links7] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl7 -int_node=system.ruby.network.topology.ext_links7.int_node +int_node=system.ruby.network.ext_links7.int_node latency=1 link_id=7 weight=1 -[system.ruby.network.topology.ext_links7.int_node] +[system.ruby.network.ext_links7.int_node] type=Switch clock=1 router_id=7 virt_nets=10 -[system.ruby.network.topology.ext_links8] +[system.ruby.network.ext_links8] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links8.int_node +int_node=system.ruby.network.ext_links8.int_node latency=1 link_id=8 weight=1 -[system.ruby.network.topology.ext_links8.int_node] +[system.ruby.network.ext_links8.int_node] type=Switch clock=1 router_id=8 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=9 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=9 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=10 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=11 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links3] +[system.ruby.network.int_links3] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=12 -node_a=system.ruby.network.topology.ext_links3.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links3.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links4] +[system.ruby.network.int_links4] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=13 -node_a=system.ruby.network.topology.ext_links4.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links4.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links5] +[system.ruby.network.int_links5] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=14 -node_a=system.ruby.network.topology.ext_links5.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links5.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links6] +[system.ruby.network.int_links6] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=15 -node_a=system.ruby.network.topology.ext_links6.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links6.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links7] +[system.ruby.network.int_links7] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=16 -node_a=system.ruby.network.topology.ext_links7.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links7.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links8] +[system.ruby.network.int_links8] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=17 -node_a=system.ruby.network.topology.ext_links8.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links8.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini index 07ef89806..a222111a4 100644 --- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini +++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini @@ -212,7 +212,7 @@ conf_table_reported=false in_addr_map=true latency=30 latency_var=0 -null=false +null=true range=0:134217727 zero=false @@ -237,6 +237,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=12 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -282,6 +283,7 @@ clock=1 cntrl_id=0 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -330,6 +332,7 @@ clock=1 cntrl_id=1 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -378,6 +381,7 @@ clock=1 cntrl_id=2 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -426,6 +430,7 @@ clock=1 cntrl_id=3 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -474,6 +479,7 @@ clock=1 cntrl_id=4 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -522,6 +528,7 @@ clock=1 cntrl_id=5 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -570,6 +577,7 @@ clock=1 cntrl_id=6 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -618,6 +626,7 @@ clock=1 cntrl_id=7 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -658,255 +667,249 @@ slave=system.cpu7.test [system.ruby.network] type=SimpleNetwork -children=topology +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 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -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 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl1 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl2 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.ext_links3] +[system.ruby.network.ext_links3] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl3 -int_node=system.ruby.network.topology.ext_links3.int_node +int_node=system.ruby.network.ext_links3.int_node latency=1 link_id=3 weight=1 -[system.ruby.network.topology.ext_links3.int_node] +[system.ruby.network.ext_links3.int_node] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.ext_links4] +[system.ruby.network.ext_links4] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl4 -int_node=system.ruby.network.topology.ext_links4.int_node +int_node=system.ruby.network.ext_links4.int_node latency=1 link_id=4 weight=1 -[system.ruby.network.topology.ext_links4.int_node] +[system.ruby.network.ext_links4.int_node] type=Switch clock=1 router_id=4 virt_nets=10 -[system.ruby.network.topology.ext_links5] +[system.ruby.network.ext_links5] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl5 -int_node=system.ruby.network.topology.ext_links5.int_node +int_node=system.ruby.network.ext_links5.int_node latency=1 link_id=5 weight=1 -[system.ruby.network.topology.ext_links5.int_node] +[system.ruby.network.ext_links5.int_node] type=Switch clock=1 router_id=5 virt_nets=10 -[system.ruby.network.topology.ext_links6] +[system.ruby.network.ext_links6] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl6 -int_node=system.ruby.network.topology.ext_links6.int_node +int_node=system.ruby.network.ext_links6.int_node latency=1 link_id=6 weight=1 -[system.ruby.network.topology.ext_links6.int_node] +[system.ruby.network.ext_links6.int_node] type=Switch clock=1 router_id=6 virt_nets=10 -[system.ruby.network.topology.ext_links7] +[system.ruby.network.ext_links7] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl7 -int_node=system.ruby.network.topology.ext_links7.int_node +int_node=system.ruby.network.ext_links7.int_node latency=1 link_id=7 weight=1 -[system.ruby.network.topology.ext_links7.int_node] +[system.ruby.network.ext_links7.int_node] type=Switch clock=1 router_id=7 virt_nets=10 -[system.ruby.network.topology.ext_links8] +[system.ruby.network.ext_links8] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links8.int_node +int_node=system.ruby.network.ext_links8.int_node latency=1 link_id=8 weight=1 -[system.ruby.network.topology.ext_links8.int_node] +[system.ruby.network.ext_links8.int_node] type=Switch clock=1 router_id=8 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=9 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=9 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=10 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=11 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links3] +[system.ruby.network.int_links3] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=12 -node_a=system.ruby.network.topology.ext_links3.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links3.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links4] +[system.ruby.network.int_links4] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=13 -node_a=system.ruby.network.topology.ext_links4.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links4.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links5] +[system.ruby.network.int_links5] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=14 -node_a=system.ruby.network.topology.ext_links5.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links5.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links6] +[system.ruby.network.int_links6] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=15 -node_a=system.ruby.network.topology.ext_links6.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links6.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links7] +[system.ruby.network.int_links7] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=16 -node_a=system.ruby.network.topology.ext_links7.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links7.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links8] +[system.ruby.network.int_links8] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=17 -node_a=system.ruby.network.topology.ext_links8.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links8.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini index cfaf3b4cc..1a8271571 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini @@ -37,7 +37,7 @@ conf_table_reported=false in_addr_map=true latency=30 latency_var=0 -null=false +null=true range=0:134217727 zero=false @@ -62,6 +62,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=6 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby to_mem_ctrl_latency=1 @@ -111,6 +112,7 @@ l1_request_latency=2 l1_response_latency=2 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null prefetcher=system.ruby.l1_cntrl0.prefetcher recycle_latency=10 ruby_system=system.ruby @@ -185,6 +187,7 @@ cntrl_id=1 l2_request_latency=2 l2_response_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby to_l1_latency=1 @@ -207,105 +210,99 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 adaptive_routing=false buffer_size=0 clock=1 control_msg_size=8 endpoint_bandwidth=1000 +ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 +int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 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.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=4 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=5 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini index c6d6fc44e..9c22c6c66 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini @@ -37,7 +37,7 @@ conf_table_reported=false in_addr_map=true latency=30 latency_var=0 -null=false +null=true range=0:134217727 zero=false @@ -62,6 +62,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=6 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -107,12 +108,14 @@ clock=1 cntrl_id=0 l2_select_num_bits=0 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 ruby_system=system.ruby send_evictions=false sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=32 +use_timeout_latency=50 version=0 [system.ruby.l1_cntrl0.L1DcacheMemory] @@ -168,6 +171,7 @@ buffer_size=0 clock=1 cntrl_id=1 number_of_TBEs=256 +peer=Null recycle_latency=10 request_latency=2 response_latency=2 @@ -191,105 +195,99 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 adaptive_routing=false buffer_size=0 clock=1 control_msg_size=8 endpoint_bandwidth=1000 +ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 +int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 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.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=4 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=5 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini index 7fac9388b..3680dd5b9 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini @@ -37,7 +37,7 @@ conf_table_reported=false in_addr_map=true latency=30 latency_var=0 -null=false +null=true range=0:134217727 zero=false @@ -65,7 +65,9 @@ fixed_timeout_latency=100 l2_select_num_bits=0 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 ruby_system=system.ruby transitions_per_cycle=32 version=0 @@ -116,12 +118,15 @@ l1_response_latency=2 l2_select_num_bits=0 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 +reissue_wakeup_latency=10 retry_threshold=1 ruby_system=system.ruby send_evictions=false sequencer=system.ruby.l1_cntrl0.sequencer transitions_per_cycle=32 +use_timeout_latency=50 version=0 [system.ruby.l1_cntrl0.L1DcacheMemory] @@ -181,6 +186,7 @@ filtering_enabled=true l2_request_latency=5 l2_response_latency=5 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -202,105 +208,99 @@ tagArrayBanks=1 [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 adaptive_routing=false buffer_size=0 clock=1 control_msg_size=8 endpoint_bandwidth=1000 +ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 +int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 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.int_links0.node_b ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l2_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.ext_links2] +[system.ruby.network.ext_links2] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links2.int_node +int_node=system.ruby.network.ext_links2.int_node latency=1 link_id=2 weight=1 -[system.ruby.network.topology.ext_links2.int_node] +[system.ruby.network.ext_links2.int_node] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=3 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=4 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links2] +[system.ruby.network.int_links2] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=5 -node_a=system.ruby.network.topology.ext_links2.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links2.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini index 17b6da2d7..92b7ed6f5 100644 --- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini +++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini @@ -37,7 +37,7 @@ conf_table_reported=false in_addr_map=true latency=30 latency_var=0 -null=false +null=true range=0:134217727 zero=false @@ -63,6 +63,7 @@ full_bit_dir_enabled=false memBuffer=system.ruby.dir_cntrl0.memBuffer memory_controller_latency=2 number_of_TBEs=256 +peer=Null probeFilter=system.ruby.dir_cntrl0.probeFilter probe_filter_enabled=false recycle_latency=10 @@ -128,6 +129,7 @@ issue_latency=2 l2_cache_hit_latency=10 no_mig_atomic=true number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -196,80 +198,74 @@ slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0] [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 int_links0 int_links1 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 int_links0 int_links1 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=2 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] 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 e897d9566..625ab8bf3 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 @@ -37,7 +37,7 @@ conf_table_reported=false in_addr_map=true latency=30 latency_var=0 -null=false +null=true range=0:134217727 zero=false @@ -62,6 +62,7 @@ directory=system.ruby.dir_cntrl0.directory directory_latency=12 memBuffer=system.ruby.dir_cntrl0.memBuffer number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby transitions_per_cycle=32 @@ -107,6 +108,7 @@ clock=1 cntrl_id=0 issue_latency=2 number_of_TBEs=256 +peer=Null recycle_latency=10 ruby_system=system.ruby send_evictions=false @@ -147,80 +149,74 @@ slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0] [system.ruby.network] type=SimpleNetwork -children=topology +children=ext_links0 ext_links1 int_links0 int_links1 adaptive_routing=false buffer_size=0 clock=1 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 ruby_system=system.ruby -topology=system.ruby.network.topology - -[system.ruby.network.topology] -type=Topology -children=ext_links0 ext_links1 int_links0 int_links1 -description=Crossbar -ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 -int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 -print_config=false -routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b +topology=Crossbar -[system.ruby.network.topology.ext_links0] +[system.ruby.network.ext_links0] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.l1_cntrl0 -int_node=system.ruby.network.topology.ext_links0.int_node +int_node=system.ruby.network.ext_links0.int_node latency=1 link_id=0 weight=1 -[system.ruby.network.topology.ext_links0.int_node] +[system.ruby.network.ext_links0.int_node] type=Switch clock=1 router_id=0 virt_nets=10 -[system.ruby.network.topology.ext_links1] +[system.ruby.network.ext_links1] type=SimpleExtLink children=int_node bandwidth_factor=16 ext_node=system.ruby.dir_cntrl0 -int_node=system.ruby.network.topology.ext_links1.int_node +int_node=system.ruby.network.ext_links1.int_node latency=1 link_id=1 weight=1 -[system.ruby.network.topology.ext_links1.int_node] +[system.ruby.network.ext_links1.int_node] type=Switch clock=1 router_id=1 virt_nets=10 -[system.ruby.network.topology.int_links0] +[system.ruby.network.int_links0] type=SimpleIntLink children=node_b bandwidth_factor=16 latency=1 link_id=2 -node_a=system.ruby.network.topology.ext_links0.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links0.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 -[system.ruby.network.topology.int_links0.node_b] +[system.ruby.network.int_links0.node_b] type=Switch clock=1 router_id=2 virt_nets=10 -[system.ruby.network.topology.int_links1] +[system.ruby.network.int_links1] type=SimpleIntLink bandwidth_factor=16 latency=1 link_id=3 -node_a=system.ruby.network.topology.ext_links1.int_node -node_b=system.ruby.network.topology.int_links0.node_b +node_a=system.ruby.network.ext_links1.int_node +node_b=system.ruby.network.int_links0.node_b weight=1 [system.ruby.profiler] |