regressions: update stats due to changes in ruby obj hierarchy

1 files changed, 295 insertions, 274 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 0ce5d3fc8..e06ccfe9d 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
@@ -8,7 +8,7 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxX86System
-children=acpi_description_table_pointer cpu0 cpu1 dir_cntrl0 dma_cntrl0 e820_table intel_mp_pointer intel_mp_table intrctrl l1_cntrl0 l1_cntrl1 l2_cntrl0 pc physmem piobus ruby smbios_table sys_port_proxy
+children=acpi_description_table_pointer cpu0 cpu1 e820_table intel_mp_pointer intel_mp_table intrctrl pc physmem piobus ruby smbios_table sys_port_proxy
 acpi_description_table_pointer=system.acpi_description_table_pointer
 boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1
 clock=1000
@@ -19,6 +19,7 @@ intel_mp_table=system.intel_mp_table
 kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9.smp
 load_addr_mask=18446744073709551615
 mem_mode=timing
+mem_ranges=0:134217727
 memories=system.physmem
 num_work_ids=16
 readfile=tests/halt.sh
@@ -52,11 +53,10 @@ oem_table_id=
 
 [system.cpu0]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer
+children=dtb interrupts isa itb tracer
 checker=Null
 clock=500
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -64,6 +64,7 @@ dtb=system.cpu0.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu0.interrupts
+isa=system.cpu0.isa
 itb=system.cpu0.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -72,11 +73,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu0.tracer
 workload=
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu0.dtb]
 type=X86TLB
@@ -88,7 +90,7 @@ walker=system.cpu0.dtb.walker
 type=X86PagetableWalker
 clock=500
 system=system
-port=system.l1_cntrl0.sequencer.slave[3]
+port=system.ruby.l1_cntrl0.sequencer.slave[3]
 
 [system.cpu0.interrupts]
 type=X86LocalApic
@@ -101,6 +103,9 @@ int_master=system.piobus.slave[4]
 int_slave=system.piobus.master[19]
 pio=system.piobus.master[18]
 
+[system.cpu0.isa]
+type=X86ISA
+
 [system.cpu0.itb]
 type=X86TLB
 children=walker
@@ -111,18 +116,17 @@ walker=system.cpu0.itb.walker
 type=X86PagetableWalker
 clock=500
 system=system
-port=system.l1_cntrl0.sequencer.slave[2]
+port=system.ruby.l1_cntrl0.sequencer.slave[2]
 
 [system.cpu0.tracer]
 type=ExeTracer
 
 [system.cpu1]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer
+children=dtb interrupts isa itb tracer
 checker=Null
 clock=500
 cpu_id=1
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -130,6 +134,7 @@ dtb=system.cpu1.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu1.interrupts
+isa=system.cpu1.isa
 itb=system.cpu1.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -138,11 +143,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu1.tracer
 workload=
-dcache_port=system.l1_cntrl1.sequencer.slave[1]
-icache_port=system.l1_cntrl1.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl1.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu1.dtb]
 type=X86TLB
@@ -154,7 +160,7 @@ walker=system.cpu1.dtb.walker
 type=X86PagetableWalker
 clock=500
 system=system
-port=system.l1_cntrl1.sequencer.slave[3]
+port=system.ruby.l1_cntrl1.sequencer.slave[3]
 
 [system.cpu1.interrupts]
 type=X86LocalApic
@@ -167,6 +173,9 @@ int_master=system.piobus.slave[5]
 int_slave=system.piobus.master[21]
 pio=system.piobus.master[20]
 
+[system.cpu1.isa]
+type=X86ISA
+
 [system.cpu1.itb]
 type=X86TLB
 children=walker
@@ -177,82 +186,11 @@ walker=system.cpu1.itb.walker
 type=X86PagetableWalker
 clock=500
 system=system
-port=system.l1_cntrl1.sequencer.slave[2]
+port=system.ruby.l1_cntrl1.sequencer.slave[2]
 
 [system.cpu1.tracer]
 type=ExeTracer
 
-[system.dir_cntrl0]
-type=Directory_Controller
-children=directory memBuffer
-buffer_size=0
-cntrl_id=3
-directory=system.dir_cntrl0.directory
-directory_latency=6
-memBuffer=system.dir_cntrl0.memBuffer
-number_of_TBEs=256
-recycle_latency=10
-ruby_system=system.ruby
-to_mem_ctrl_latency=1
-transitions_per_cycle=32
-version=0
-
-[system.dir_cntrl0.directory]
-type=RubyDirectoryMemory
-map_levels=4
-numa_high_bit=5
-size=134217728
-use_map=false
-version=0
-
-[system.dir_cntrl0.memBuffer]
-type=RubyMemoryControl
-bank_bit_0=8
-bank_busy_time=11
-bank_queue_size=12
-banks_per_rank=8
-basic_bus_busy_time=2
-clock=2500
-dimm_bit_0=12
-dimms_per_channel=2
-mem_ctl_latency=12
-mem_fixed_delay=0
-mem_random_arbitrate=0
-rank_bit_0=11
-rank_rank_delay=1
-ranks_per_dimm=2
-read_write_delay=2
-refresh_period=1560
-ruby_system=system.ruby
-tFaw=0
-version=0
-
-[system.dma_cntrl0]
-type=DMA_Controller
-children=dma_sequencer
-buffer_size=0
-cntrl_id=4
-dma_sequencer=system.dma_cntrl0.dma_sequencer
-number_of_TBEs=256
-recycle_latency=10
-request_latency=6
-ruby_system=system.ruby
-transitions_per_cycle=32
-version=0
-
-[system.dma_cntrl0.dma_sequencer]
-type=DMASequencer
-access_phys_mem=true
-clock=1000
-ruby_system=system.ruby
-support_data_reqs=true
-support_inst_reqs=true
-system=system
-using_network_tester=false
-using_ruby_tester=false
-version=0
-slave=system.pc.south_bridge.ide.dma
-
 [system.e820_table]
 type=X86E820Table
 children=entries0 entries1
@@ -627,189 +565,6 @@ subtractive_decode=true
 type=IntrControl
 sys=system
 
-[system.l1_cntrl0]
-type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory
-buffer_size=0
-cntrl_id=0
-enable_prefetch=false
-l1_request_latency=2
-l1_response_latency=2
-l2_select_num_bits=0
-number_of_TBEs=256
-prefetcher=system.l1_cntrl0.prefetcher
-recycle_latency=10
-ruby_system=system.ruby
-send_evictions=false
-sequencer=system.l1_cntrl0.sequencer
-to_l2_latency=1
-transitions_per_cycle=32
-version=0
-
-[system.l1_cntrl0.L1DcacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=false
-latency=3
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=32768
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
-[system.l1_cntrl0.L1IcacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=true
-latency=3
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=32768
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
-[system.l1_cntrl0.prefetcher]
-type=Prefetcher
-cross_page=false
-nonunit_filter=8
-num_startup_pfs=1
-num_streams=4
-pf_per_stream=1
-train_misses=4
-unit_filter=8
-
-[system.l1_cntrl0.sequencer]
-type=RubySequencer
-access_phys_mem=true
-clock=1000
-dcache=system.l1_cntrl0.L1DcacheMemory
-deadlock_threshold=500000
-icache=system.l1_cntrl0.L1IcacheMemory
-max_outstanding_requests=16
-ruby_system=system.ruby
-support_data_reqs=true
-support_inst_reqs=true
-system=system
-using_network_tester=false
-using_ruby_tester=false
-version=0
-pio_port=system.piobus.slave[2]
-slave=system.cpu0.icache_port system.cpu0.dcache_port system.cpu0.itb.walker.port system.cpu0.dtb.walker.port
-
-[system.l1_cntrl1]
-type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl1.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl1.L1IcacheMemory
-buffer_size=0
-cntrl_id=1
-enable_prefetch=false
-l1_request_latency=2
-l1_response_latency=2
-l2_select_num_bits=0
-number_of_TBEs=256
-prefetcher=system.l1_cntrl1.prefetcher
-recycle_latency=10
-ruby_system=system.ruby
-send_evictions=false
-sequencer=system.l1_cntrl1.sequencer
-to_l2_latency=1
-transitions_per_cycle=32
-version=1
-
-[system.l1_cntrl1.L1DcacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=false
-latency=3
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=32768
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
-[system.l1_cntrl1.L1IcacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=true
-latency=3
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=32768
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
-[system.l1_cntrl1.prefetcher]
-type=Prefetcher
-cross_page=false
-nonunit_filter=8
-num_startup_pfs=1
-num_streams=4
-pf_per_stream=1
-train_misses=4
-unit_filter=8
-
-[system.l1_cntrl1.sequencer]
-type=RubySequencer
-access_phys_mem=true
-clock=1000
-dcache=system.l1_cntrl1.L1DcacheMemory
-deadlock_threshold=500000
-icache=system.l1_cntrl1.L1IcacheMemory
-max_outstanding_requests=16
-ruby_system=system.ruby
-support_data_reqs=true
-support_inst_reqs=true
-system=system
-using_network_tester=false
-using_ruby_tester=false
-version=1
-pio_port=system.piobus.slave[3]
-slave=system.cpu1.icache_port system.cpu1.dcache_port system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
-
-[system.l2_cntrl0]
-type=L2Cache_Controller
-children=L2cacheMemory
-L2cacheMemory=system.l2_cntrl0.L2cacheMemory
-buffer_size=0
-cntrl_id=2
-l2_request_latency=2
-l2_response_latency=2
-number_of_TBEs=256
-recycle_latency=10
-ruby_system=system.ruby
-to_l1_latency=1
-transitions_per_cycle=32
-version=0
-
-[system.l2_cntrl0.L2cacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=false
-latency=15
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=4194304
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
 [system.pc]
 type=Pc
 children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist pciconfig south_bridge terminal
@@ -1279,11 +1034,11 @@ use_default_range=true
 width=8
 default=system.pc.pciconfig.pio
 master=system.physmem.port system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio system.pc.i_dont_exist.pio system.pc.behind_pci.pio system.pc.com_1.pio system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio system.pc.fake_floppy.pio system.cpu0.interrupts.pio system.cpu0.interrupts.int_slave system.cpu1.interrupts.pio system.cpu1.interrupts.int_slave
-slave=system.pc.south_bridge.ide.dma system.pc.south_bridge.io_apic.int_master system.l1_cntrl0.sequencer.pio_port system.l1_cntrl1.sequencer.pio_port system.cpu0.interrupts.int_master system.cpu1.interrupts.int_master
+slave=system.pc.south_bridge.ide.dma system.pc.south_bridge.io_apic.int_master system.ruby.l1_cntrl0.sequencer.pio_port system.ruby.l1_cntrl1.sequencer.pio_port system.cpu0.interrupts.int_master system.cpu1.interrupts.int_master
 
 [system.ruby]
 type=RubySystem
-children=network profiler
+children=dir_cntrl0 dma_cntrl0 l1_cntrl0 l1_cntrl1 l2_cntrl0 network profiler
 block_size_bytes=64
 clock=500
 mem_size=134217728
@@ -1292,11 +1047,271 @@ random_seed=1234
 randomization=false
 stats_filename=ruby.stats
 
+[system.ruby.dir_cntrl0]
+type=Directory_Controller
+children=directory memBuffer
+buffer_size=0
+clock=500
+cntrl_id=3
+directory=system.ruby.dir_cntrl0.directory
+directory_latency=6
+memBuffer=system.ruby.dir_cntrl0.memBuffer
+number_of_TBEs=256
+recycle_latency=10
+ruby_system=system.ruby
+to_mem_ctrl_latency=1
+transitions_per_cycle=32
+version=0
+
+[system.ruby.dir_cntrl0.directory]
+type=RubyDirectoryMemory
+map_levels=4
+numa_high_bit=5
+size=134217728
+use_map=false
+version=0
+
+[system.ruby.dir_cntrl0.memBuffer]
+type=RubyMemoryControl
+bank_bit_0=8
+bank_busy_time=11
+bank_queue_size=12
+banks_per_rank=8
+basic_bus_busy_time=2
+clock=2500
+dimm_bit_0=12
+dimms_per_channel=2
+mem_ctl_latency=12
+mem_fixed_delay=0
+mem_random_arbitrate=0
+rank_bit_0=11
+rank_rank_delay=1
+ranks_per_dimm=2
+read_write_delay=2
+refresh_period=1560
+ruby_system=system.ruby
+tFaw=0
+version=0
+
+[system.ruby.dma_cntrl0]
+type=DMA_Controller
+children=dma_sequencer
+buffer_size=0
+clock=500
+cntrl_id=4
+dma_sequencer=system.ruby.dma_cntrl0.dma_sequencer
+number_of_TBEs=256
+recycle_latency=10
+request_latency=6
+ruby_system=system.ruby
+transitions_per_cycle=32
+version=0
+
+[system.ruby.dma_cntrl0.dma_sequencer]
+type=DMASequencer
+access_phys_mem=true
+clock=500
+ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
+using_network_tester=false
+using_ruby_tester=false
+version=0
+slave=system.pc.south_bridge.ide.dma
+
+[system.ruby.l1_cntrl0]
+type=L1Cache_Controller
+children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
+L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory
+buffer_size=0
+clock=500
+cntrl_id=0
+enable_prefetch=false
+l1_request_latency=2
+l1_response_latency=2
+l2_select_num_bits=0
+number_of_TBEs=256
+prefetcher=system.ruby.l1_cntrl0.prefetcher
+recycle_latency=10
+ruby_system=system.ruby
+send_evictions=false
+sequencer=system.ruby.l1_cntrl0.sequencer
+to_l2_latency=1
+transitions_per_cycle=32
+version=0
+
+[system.ruby.l1_cntrl0.L1DcacheMemory]
+type=RubyCache
+assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
+is_icache=false
+latency=3
+replacement_policy=PSEUDO_LRU
+resourceStalls=false
+size=32768
+start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
+
+[system.ruby.l1_cntrl0.L1IcacheMemory]
+type=RubyCache
+assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
+is_icache=true
+latency=3
+replacement_policy=PSEUDO_LRU
+resourceStalls=false
+size=32768
+start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
+
+[system.ruby.l1_cntrl0.prefetcher]
+type=Prefetcher
+cross_page=false
+nonunit_filter=8
+num_startup_pfs=1
+num_streams=4
+pf_per_stream=1
+train_misses=4
+unit_filter=8
+
+[system.ruby.l1_cntrl0.sequencer]
+type=RubySequencer
+access_phys_mem=true
+clock=500
+dcache=system.ruby.l1_cntrl0.L1DcacheMemory
+deadlock_threshold=500000
+icache=system.ruby.l1_cntrl0.L1IcacheMemory
+max_outstanding_requests=16
+ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
+using_network_tester=false
+using_ruby_tester=false
+version=0
+pio_port=system.piobus.slave[2]
+slave=system.cpu0.icache_port system.cpu0.dcache_port system.cpu0.itb.walker.port system.cpu0.dtb.walker.port
+
+[system.ruby.l1_cntrl1]
+type=L1Cache_Controller
+children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
+L1DcacheMemory=system.ruby.l1_cntrl1.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl1.L1IcacheMemory
+buffer_size=0
+clock=500
+cntrl_id=1
+enable_prefetch=false
+l1_request_latency=2
+l1_response_latency=2
+l2_select_num_bits=0
+number_of_TBEs=256
+prefetcher=system.ruby.l1_cntrl1.prefetcher
+recycle_latency=10
+ruby_system=system.ruby
+send_evictions=false
+sequencer=system.ruby.l1_cntrl1.sequencer
+to_l2_latency=1
+transitions_per_cycle=32
+version=1
+
+[system.ruby.l1_cntrl1.L1DcacheMemory]
+type=RubyCache
+assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
+is_icache=false
+latency=3
+replacement_policy=PSEUDO_LRU
+resourceStalls=false
+size=32768
+start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
+
+[system.ruby.l1_cntrl1.L1IcacheMemory]
+type=RubyCache
+assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
+is_icache=true
+latency=3
+replacement_policy=PSEUDO_LRU
+resourceStalls=false
+size=32768
+start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
+
+[system.ruby.l1_cntrl1.prefetcher]
+type=Prefetcher
+cross_page=false
+nonunit_filter=8
+num_startup_pfs=1
+num_streams=4
+pf_per_stream=1
+train_misses=4
+unit_filter=8
+
+[system.ruby.l1_cntrl1.sequencer]
+type=RubySequencer
+access_phys_mem=true
+clock=500
+dcache=system.ruby.l1_cntrl1.L1DcacheMemory
+deadlock_threshold=500000
+icache=system.ruby.l1_cntrl1.L1IcacheMemory
+max_outstanding_requests=16
+ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
+system=system
+using_network_tester=false
+using_ruby_tester=false
+version=1
+pio_port=system.piobus.slave[3]
+slave=system.cpu1.icache_port system.cpu1.dcache_port system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
+
+[system.ruby.l2_cntrl0]
+type=L2Cache_Controller
+children=L2cacheMemory
+L2cacheMemory=system.ruby.l2_cntrl0.L2cacheMemory
+buffer_size=0
+clock=500
+cntrl_id=2
+l2_request_latency=2
+l2_response_latency=2
+number_of_TBEs=256
+recycle_latency=10
+ruby_system=system.ruby
+to_l1_latency=1
+transitions_per_cycle=32
+version=0
+
+[system.ruby.l2_cntrl0.L2cacheMemory]
+type=RubyCache
+assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
+is_icache=false
+latency=15
+replacement_policy=PSEUDO_LRU
+resourceStalls=false
+size=4194304
+start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
+
 [system.ruby.network]
 type=SimpleNetwork
 children=topology
 adaptive_routing=false
 buffer_size=0
+clock=500
 control_msg_size=8
 endpoint_bandwidth=1000
 number_of_virtual_networks=10
@@ -1316,7 +1331,7 @@ routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.top
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl0
+ext_node=system.ruby.l1_cntrl0
 int_node=system.ruby.network.topology.ext_links0.int_node
 latency=1
 link_id=0
@@ -1324,6 +1339,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=500
 router_id=0
 virt_nets=10
 
@@ -1331,7 +1347,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l1_cntrl1
+ext_node=system.ruby.l1_cntrl1
 int_node=system.ruby.network.topology.ext_links1.int_node
 latency=1
 link_id=1
@@ -1339,6 +1355,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=500
 router_id=1
 virt_nets=10
 
@@ -1346,7 +1363,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.l2_cntrl0
+ext_node=system.ruby.l2_cntrl0
 int_node=system.ruby.network.topology.ext_links2.int_node
 latency=1
 link_id=2
@@ -1354,6 +1371,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=500
 router_id=2
 virt_nets=10
 
@@ -1361,7 +1379,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.dir_cntrl0
+ext_node=system.ruby.dir_cntrl0
 int_node=system.ruby.network.topology.ext_links3.int_node
 latency=1
 link_id=3
@@ -1369,6 +1387,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links3.int_node]
 type=Switch
+clock=500
 router_id=3
 virt_nets=10
 
@@ -1376,7 +1395,7 @@ virt_nets=10
 type=SimpleExtLink
 children=int_node
 bandwidth_factor=16
-ext_node=system.dma_cntrl0
+ext_node=system.ruby.dma_cntrl0
 int_node=system.ruby.network.topology.ext_links4.int_node
 latency=1
 link_id=4
@@ -1384,6 +1403,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links4.int_node]
 type=Switch
+clock=500
 router_id=4
 virt_nets=10
 
@@ -1399,6 +1419,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=500
 router_id=5
 virt_nets=10