regressions: updates to config.ini for ruby tests

1 files changed, 77 insertions, 73 deletions

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]