From 001c16bc6d0511b469f29b52d86026305a895906 Mon Sep 17 00:00:00 2001
From: Brad Beckmann <Brad.Beckmann@amd.com>
Date: Thu, 28 Apr 2011 17:18:16 -0700
Subject: regress: updates after changing ruby network bandwidth

---
 .../linux/rubytest-ruby-MOESI_CMP_token/config.ini | 74 ++++++++++++++--------
 1 file changed, 49 insertions(+), 25 deletions(-)

(limited to 'tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini')

diff --git a/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini b/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
index 49751acb6..0b84aec81 100644
--- a/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
@@ -22,6 +22,7 @@ work_item_id=-1
 type=Directory_Controller
 children=directory memBuffer
 buffer_size=0
+cntrl_id=2
 directory=system.dir_cntrl0.directory
 directory_latency=5
 distributed_persistent=true
@@ -69,6 +70,7 @@ L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory
 L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory
 N_tokens=2
 buffer_size=0
+cntrl_id=0
 dynamic_timeout_enabled=true
 fixed_timeout_latency=300
 l1_request_latency=2
@@ -104,6 +106,7 @@ children=L2cacheMemory
 L2cacheMemory=system.l2_cntrl0.L2cacheMemory
 N_tokens=2
 buffer_size=0
+cntrl_id=1
 filtering_enabled=true
 l2_request_latency=5
 l2_response_latency=5
@@ -164,68 +167,89 @@ children=topology
 adaptive_routing=false
 buffer_size=0
 control_msg_size=8
-endpoint_bandwidth=10000
-link_latency=1
+endpoint_bandwidth=1000
 number_of_virtual_networks=10
 topology=system.ruby.network.topology
 
 [system.ruby.network.topology]
 type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
 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
-num_int_nodes=4
 print_config=false
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
 
 [system.ruby.network.topology.ext_links0]
-type=ExtLink
-bw_multiplier=64
+type=SimpleExtLink
+bandwidth_factor=16
 ext_node=system.l1_cntrl0
-int_node=0
+int_node=system.ruby.network.topology.routers0
 latency=1
+link_id=0
 weight=1
 
 [system.ruby.network.topology.ext_links1]
-type=ExtLink
-bw_multiplier=64
+type=SimpleExtLink
+bandwidth_factor=16
 ext_node=system.l2_cntrl0
-int_node=1
+int_node=system.ruby.network.topology.routers1
 latency=1
+link_id=1
 weight=1
 
 [system.ruby.network.topology.ext_links2]
-type=ExtLink
-bw_multiplier=64
+type=SimpleExtLink
+bandwidth_factor=16
 ext_node=system.dir_cntrl0
-int_node=2
+int_node=system.ruby.network.topology.routers2
 latency=1
+link_id=2
 weight=1
 
 [system.ruby.network.topology.int_links0]
-type=IntLink
-bw_multiplier=16
+type=SimpleIntLink
+bandwidth_factor=16
 latency=1
-node_a=0
-node_b=3
+link_id=3
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers3
 weight=1
 
 [system.ruby.network.topology.int_links1]
-type=IntLink
-bw_multiplier=16
+type=SimpleIntLink
+bandwidth_factor=16
 latency=1
-node_a=1
-node_b=3
+link_id=4
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers3
 weight=1
 
 [system.ruby.network.topology.int_links2]
-type=IntLink
-bw_multiplier=16
+type=SimpleIntLink
+bandwidth_factor=16
 latency=1
-node_a=2
-node_b=3
+link_id=5
+node_a=system.ruby.network.topology.routers2
+node_b=system.ruby.network.topology.routers3
 weight=1
 
+[system.ruby.network.topology.routers0]
+type=BasicRouter
+router_id=0
+
+[system.ruby.network.topology.routers1]
+type=BasicRouter
+router_id=1
+
+[system.ruby.network.topology.routers2]
+type=BasicRouter
+router_id=2
+
+[system.ruby.network.topology.routers3]
+type=BasicRouter
+router_id=3
+
 [system.ruby.profiler]
 type=RubyProfiler
 all_instructions=false
-- 
cgit v1.2.3