regressions: updates to config.ini for ruby tests

5 files changed, 130 insertions, 143 deletions

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]