regressions: updates to config.ini for ruby tests

1 files changed, 47 insertions, 47 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
index ac44c189a..8e99c2af6 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
@@ -16,7 +16,7 @@ e820_table=system.e820_table
 init_param=0
 intel_mp_pointer=system.intel_mp_pointer
 intel_mp_table=system.intel_mp_table
-kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9.smp
+kernel=/panfs/panasas-01.cs.wisc.edu/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9.smp
 load_addr_mask=18446744073709551615
 mem_mode=timing
 mem_ranges=0:134217727
@@ -95,7 +95,7 @@ port=system.ruby.l1_cntrl0.sequencer.slave[3]
 
 [system.cpu0.interrupts]
 type=X86LocalApic
-clock=500
+clock=8000
 int_latency=1000
 pio_addr=2305843009213693952
 pio_latency=100000
@@ -166,7 +166,7 @@ port=system.ruby.l1_cntrl1.sequencer.slave[3]
 
 [system.cpu1.interrupts]
 type=X86LocalApic
-clock=500
+clock=8000
 int_latency=1000
 pio_addr=2305843009213693952
 pio_latency=100000
@@ -818,7 +818,7 @@ table_size=65536
 
 [system.pc.south_bridge.ide.disks0.image.child]
 type=RawDiskImage
-image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img
+image_file=/panfs/panasas-01.cs.wisc.edu/scratch/nilay/GEM5/system/disks/linux-x86.img
 read_only=true
 
 [system.pc.south_bridge.ide.disks1]
@@ -838,7 +838,7 @@ table_size=65536
 
 [system.pc.south_bridge.ide.disks1.image.child]
 type=RawDiskImage
-image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
+image_file=/panfs/panasas-01.cs.wisc.edu/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
 read_only=true
 
 [system.pc.south_bridge.int_lines0]
@@ -1006,6 +1006,7 @@ type=SimpleDRAM
 activation_limit=4
 addr_mapping=openmap
 banks_per_rank=8
+channels=1
 clock=1000
 conf_table_reported=false
 in_addr_map=true
@@ -1061,6 +1062,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
@@ -1105,6 +1107,7 @@ clock=500
 cntrl_id=4
 dma_sequencer=system.ruby.dma_cntrl0.dma_sequencer
 number_of_TBEs=256
+peer=Null
 recycle_latency=10
 request_latency=6
 ruby_system=system.ruby
@@ -1137,6 +1140,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
@@ -1215,6 +1219,7 @@ l1_request_latency=2
 l1_response_latency=2
 l2_select_num_bits=0
 number_of_TBEs=256
+peer=Null
 prefetcher=system.ruby.l1_cntrl1.prefetcher
 recycle_latency=10
 ruby_system=system.ruby
@@ -1290,6 +1295,7 @@ cntrl_id=2
 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
@@ -1312,155 +1318,149 @@ tagArrayBanks=1
 
 [system.ruby.network]
 type=SimpleNetwork
-children=topology
+children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 int_links0 int_links1 int_links2 int_links3 int_links4
 adaptive_routing=false
 buffer_size=0
 clock=500
 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
+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
 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.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 int_links0 int_links1 int_links2 int_links3 int_links4
-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
-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
-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.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=500
 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=500
 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.l2_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=500
 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.dir_cntrl0
-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=500
 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.dma_cntrl0
-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=500
 router_id=4
 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=5
-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=500
 router_id=5
 virt_nets=10
 
-[system.ruby.network.topology.int_links1]
+[system.ruby.network.int_links1]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=6
-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=7
-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=8
-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=9
-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.profiler]