From 04fe6b486addb75ebb7160dae01001561744d1a7 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Fri, 22 Mar 2013 17:21:25 -0500
Subject: regressions: updates to config.ini for ruby tests

---
 .../linux/memtest-ruby-MOESI_hammer/config.ini     | 139 +++++++++++----------
 1 file changed, 71 insertions(+), 68 deletions(-)

(limited to 'tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini')

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
index f80cf2fbf..b267456f4 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
@@ -16,7 +16,7 @@ kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
 mem_ranges=
-memories=system.funcmem system.physmem
+memories=system.physmem system.funcmem
 num_work_ids=16
 readfile=
 symbolfile=
@@ -212,7 +212,7 @@ conf_table_reported=false
 in_addr_map=true
 latency=30
 latency_var=0
-null=false
+null=true
 range=0:134217727
 zero=false
 
@@ -238,6 +238,7 @@ full_bit_dir_enabled=false
 memBuffer=system.ruby.dir_cntrl0.memBuffer
 memory_controller_latency=2
 number_of_TBEs=256
+peer=Null
 probeFilter=system.ruby.dir_cntrl0.probeFilter
 probe_filter_enabled=false
 recycle_latency=10
@@ -303,6 +304,7 @@ issue_latency=2
 l2_cache_hit_latency=10
 no_mig_atomic=true
 number_of_TBEs=256
+peer=Null
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
@@ -383,6 +385,7 @@ issue_latency=2
 l2_cache_hit_latency=10
 no_mig_atomic=true
 number_of_TBEs=256
+peer=Null
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
@@ -463,6 +466,7 @@ issue_latency=2
 l2_cache_hit_latency=10
 no_mig_atomic=true
 number_of_TBEs=256
+peer=Null
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
@@ -543,6 +547,7 @@ issue_latency=2
 l2_cache_hit_latency=10
 no_mig_atomic=true
 number_of_TBEs=256
+peer=Null
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
@@ -623,6 +628,7 @@ issue_latency=2
 l2_cache_hit_latency=10
 no_mig_atomic=true
 number_of_TBEs=256
+peer=Null
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
@@ -703,6 +709,7 @@ issue_latency=2
 l2_cache_hit_latency=10
 no_mig_atomic=true
 number_of_TBEs=256
+peer=Null
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
@@ -783,6 +790,7 @@ issue_latency=2
 l2_cache_hit_latency=10
 no_mig_atomic=true
 number_of_TBEs=256
+peer=Null
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
@@ -863,6 +871,7 @@ issue_latency=2
 l2_cache_hit_latency=10
 no_mig_atomic=true
 number_of_TBEs=256
+peer=Null
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
@@ -931,255 +940,249 @@ slave=system.cpu7.test
 
 [system.ruby.network]
 type=SimpleNetwork
-children=topology
+children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8
 adaptive_routing=false
 buffer_size=0
 clock=1
 control_msg_size=8
 endpoint_bandwidth=1000
+ext_links=system.ruby.network.ext_links0 system.ruby.network.ext_links1 system.ruby.network.ext_links2 system.ruby.network.ext_links3 system.ruby.network.ext_links4 system.ruby.network.ext_links5 system.ruby.network.ext_links6 system.ruby.network.ext_links7 system.ruby.network.ext_links8
+int_links=system.ruby.network.int_links0 system.ruby.network.int_links1 system.ruby.network.int_links2 system.ruby.network.int_links3 system.ruby.network.int_links4 system.ruby.network.int_links5 system.ruby.network.int_links6 system.ruby.network.int_links7 system.ruby.network.int_links8
 number_of_virtual_networks=10
+routers=system.ruby.network.ext_links0.int_node system.ruby.network.ext_links1.int_node system.ruby.network.ext_links2.int_node system.ruby.network.ext_links3.int_node system.ruby.network.ext_links4.int_node system.ruby.network.ext_links5.int_node system.ruby.network.ext_links6.int_node system.ruby.network.ext_links7.int_node system.ruby.network.ext_links8.int_node system.ruby.network.int_links0.node_b
 ruby_system=system.ruby
-topology=system.ruby.network.topology
-
-[system.ruby.network.topology]
-type=Topology
-children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8
-description=Crossbar
-ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8
-int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8
-print_config=false
-routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.int_node system.ruby.network.topology.int_links0.node_b
+topology=Crossbar
 
-[system.ruby.network.topology.ext_links0]
+[system.ruby.network.ext_links0]
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.l1_cntrl0
-int_node=system.ruby.network.topology.ext_links0.int_node
+int_node=system.ruby.network.ext_links0.int_node
 latency=1
 link_id=0
 weight=1
 
-[system.ruby.network.topology.ext_links0.int_node]
+[system.ruby.network.ext_links0.int_node]
 type=Switch
 clock=1
 router_id=0
 virt_nets=10
 
-[system.ruby.network.topology.ext_links1]
+[system.ruby.network.ext_links1]
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.l1_cntrl1
-int_node=system.ruby.network.topology.ext_links1.int_node
+int_node=system.ruby.network.ext_links1.int_node
 latency=1
 link_id=1
 weight=1
 
-[system.ruby.network.topology.ext_links1.int_node]
+[system.ruby.network.ext_links1.int_node]
 type=Switch
 clock=1
 router_id=1
 virt_nets=10
 
-[system.ruby.network.topology.ext_links2]
+[system.ruby.network.ext_links2]
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.l1_cntrl2
-int_node=system.ruby.network.topology.ext_links2.int_node
+int_node=system.ruby.network.ext_links2.int_node
 latency=1
 link_id=2
 weight=1
 
-[system.ruby.network.topology.ext_links2.int_node]
+[system.ruby.network.ext_links2.int_node]
 type=Switch
 clock=1
 router_id=2
 virt_nets=10
 
-[system.ruby.network.topology.ext_links3]
+[system.ruby.network.ext_links3]
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.l1_cntrl3
-int_node=system.ruby.network.topology.ext_links3.int_node
+int_node=system.ruby.network.ext_links3.int_node
 latency=1
 link_id=3
 weight=1
 
-[system.ruby.network.topology.ext_links3.int_node]
+[system.ruby.network.ext_links3.int_node]
 type=Switch
 clock=1
 router_id=3
 virt_nets=10
 
-[system.ruby.network.topology.ext_links4]
+[system.ruby.network.ext_links4]
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.l1_cntrl4
-int_node=system.ruby.network.topology.ext_links4.int_node
+int_node=system.ruby.network.ext_links4.int_node
 latency=1
 link_id=4
 weight=1
 
-[system.ruby.network.topology.ext_links4.int_node]
+[system.ruby.network.ext_links4.int_node]
 type=Switch
 clock=1
 router_id=4
 virt_nets=10
 
-[system.ruby.network.topology.ext_links5]
+[system.ruby.network.ext_links5]
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.l1_cntrl5
-int_node=system.ruby.network.topology.ext_links5.int_node
+int_node=system.ruby.network.ext_links5.int_node
 latency=1
 link_id=5
 weight=1
 
-[system.ruby.network.topology.ext_links5.int_node]
+[system.ruby.network.ext_links5.int_node]
 type=Switch
 clock=1
 router_id=5
 virt_nets=10
 
-[system.ruby.network.topology.ext_links6]
+[system.ruby.network.ext_links6]
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.l1_cntrl6
-int_node=system.ruby.network.topology.ext_links6.int_node
+int_node=system.ruby.network.ext_links6.int_node
 latency=1
 link_id=6
 weight=1
 
-[system.ruby.network.topology.ext_links6.int_node]
+[system.ruby.network.ext_links6.int_node]
 type=Switch
 clock=1
 router_id=6
 virt_nets=10
 
-[system.ruby.network.topology.ext_links7]
+[system.ruby.network.ext_links7]
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.l1_cntrl7
-int_node=system.ruby.network.topology.ext_links7.int_node
+int_node=system.ruby.network.ext_links7.int_node
 latency=1
 link_id=7
 weight=1
 
-[system.ruby.network.topology.ext_links7.int_node]
+[system.ruby.network.ext_links7.int_node]
 type=Switch
 clock=1
 router_id=7
 virt_nets=10
 
-[system.ruby.network.topology.ext_links8]
+[system.ruby.network.ext_links8]
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
 ext_node=system.ruby.dir_cntrl0
-int_node=system.ruby.network.topology.ext_links8.int_node
+int_node=system.ruby.network.ext_links8.int_node
 latency=1
 link_id=8
 weight=1
 
-[system.ruby.network.topology.ext_links8.int_node]
+[system.ruby.network.ext_links8.int_node]
 type=Switch
 clock=1
 router_id=8
 virt_nets=10
 
-[system.ruby.network.topology.int_links0]
+[system.ruby.network.int_links0]
 type=SimpleIntLink
 children=node_b
 bandwidth_factor=16
 latency=1
 link_id=9
-node_a=system.ruby.network.topology.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.ext_links0.int_node
+node_b=system.ruby.network.int_links0.node_b
 weight=1
 
-[system.ruby.network.topology.int_links0.node_b]
+[system.ruby.network.int_links0.node_b]
 type=Switch
 clock=1
 router_id=9
 virt_nets=10
 
-[system.ruby.network.topology.int_links1]
+[system.ruby.network.int_links1]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=10
-node_a=system.ruby.network.topology.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.ext_links1.int_node
+node_b=system.ruby.network.int_links0.node_b
 weight=1
 
-[system.ruby.network.topology.int_links2]
+[system.ruby.network.int_links2]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=11
-node_a=system.ruby.network.topology.ext_links2.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.ext_links2.int_node
+node_b=system.ruby.network.int_links0.node_b
 weight=1
 
-[system.ruby.network.topology.int_links3]
+[system.ruby.network.int_links3]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=12
-node_a=system.ruby.network.topology.ext_links3.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.ext_links3.int_node
+node_b=system.ruby.network.int_links0.node_b
 weight=1
 
-[system.ruby.network.topology.int_links4]
+[system.ruby.network.int_links4]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=13
-node_a=system.ruby.network.topology.ext_links4.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.ext_links4.int_node
+node_b=system.ruby.network.int_links0.node_b
 weight=1
 
-[system.ruby.network.topology.int_links5]
+[system.ruby.network.int_links5]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=14
-node_a=system.ruby.network.topology.ext_links5.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.ext_links5.int_node
+node_b=system.ruby.network.int_links0.node_b
 weight=1
 
-[system.ruby.network.topology.int_links6]
+[system.ruby.network.int_links6]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=15
-node_a=system.ruby.network.topology.ext_links6.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.ext_links6.int_node
+node_b=system.ruby.network.int_links0.node_b
 weight=1
 
-[system.ruby.network.topology.int_links7]
+[system.ruby.network.int_links7]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=16
-node_a=system.ruby.network.topology.ext_links7.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.ext_links7.int_node
+node_b=system.ruby.network.int_links0.node_b
 weight=1
 
-[system.ruby.network.topology.int_links8]
+[system.ruby.network.int_links8]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=17
-node_a=system.ruby.network.topology.ext_links8.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.ext_links8.int_node
+node_b=system.ruby.network.int_links0.node_b
 weight=1
 
 [system.ruby.profiler]
-- 
cgit v1.2.3