diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2013-03-22 17:21:25 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2013-03-22 17:21:25 -0500 |
| commit | 04fe6b486addb75ebb7160dae01001561744d1a7 (patch) | |
| tree | dc15fa76909aa73c1d841ed9d6642e0caf88c35f /tests/quick/se/00.hello | |
| parent | b2c8c50f17b7d58755e7b1be20ba162773df4859 (diff) | |
| download | gem5-04fe6b486addb75ebb7160dae01001561744d1a7.tar.xz | |
regressions: updates to config.ini for ruby tests
Diffstat (limited to 'tests/quick/se/00.hello')
13 files changed, 302 insertions, 348 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] |