1 files changed, 48 insertions, 41 deletions
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 2634ecc5e..e897d9566 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
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=dir_cntrl0 l1_cntrl0 physmem ruby sys_port_proxy tester
+children=physmem ruby sys_port_proxy tester
 boot_osflags=a
 clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
 mem_mode=timing
+mem_ranges=
 memories=system.physmem
 num_work_ids=16
 readfile=
@@ -28,29 +29,53 @@ work_end_exit_count=0
 work_item_id=-1
 system_port=system.sys_port_proxy.slave[0]
 
-[system.dir_cntrl0]
+[system.physmem]
+type=SimpleMemory
+bandwidth=0.000000
+clock=1
+conf_table_reported=false
+in_addr_map=true
+latency=30
+latency_var=0
+null=false
+range=0:134217727
+zero=false
+
+[system.ruby]
+type=RubySystem
+children=dir_cntrl0 l1_cntrl0 network profiler
+block_size_bytes=64
+clock=1
+mem_size=134217728
+no_mem_vec=false
+random_seed=1234
+randomization=true
+stats_filename=ruby.stats
+
+[system.ruby.dir_cntrl0]
 type=Directory_Controller
 children=directory memBuffer
 buffer_size=0
+clock=1
 cntrl_id=1
-directory=system.dir_cntrl0.directory
+directory=system.ruby.dir_cntrl0.directory
 directory_latency=12
-memBuffer=system.dir_cntrl0.memBuffer
+memBuffer=system.ruby.dir_cntrl0.memBuffer
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 transitions_per_cycle=32
 version=0
 
-[system.dir_cntrl0.directory]
+[system.ruby.dir_cntrl0.directory]
 type=RubyDirectoryMemory
 map_levels=4
-numa_high_bit=6
+numa_high_bit=5
 size=134217728
 use_map=false
 version=0
 
-[system.dir_cntrl0.memBuffer]
+[system.ruby.dir_cntrl0.memBuffer]
 type=RubyMemoryControl
 bank_bit_0=8
 bank_busy_time=11
@@ -72,23 +97,24 @@ ruby_system=system.ruby
 tFaw=0
 version=0
 
-[system.l1_cntrl0]
+[system.ruby.l1_cntrl0]
 type=L1Cache_Controller
 children=cacheMemory sequencer
 buffer_size=0
-cacheMemory=system.l1_cntrl0.cacheMemory
+cacheMemory=system.ruby.l1_cntrl0.cacheMemory
 cache_response_latency=12
+clock=1
 cntrl_id=0
 issue_latency=2
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl0.sequencer
+sequencer=system.ruby.l1_cntrl0.sequencer
 transitions_per_cycle=32
 version=0
 
-[system.l1_cntrl0.cacheMemory]
+[system.ruby.l1_cntrl0.cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -102,13 +128,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=false
 clock=1
-dcache=system.l1_cntrl0.cacheMemory
+dcache=system.ruby.l1_cntrl0.cacheMemory
 deadlock_threshold=500000
-icache=system.l1_cntrl0.cacheMemory
+icache=system.ruby.l1_cntrl0.cacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -119,34 +145,12 @@ using_ruby_tester=true
 version=0
 slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0]
 
-[system.physmem]
-type=SimpleMemory
-bandwidth=0.000000
-clock=1
-conf_table_reported=false
-in_addr_map=true
-latency=30
-latency_var=0
-null=false
-range=0:134217727
-zero=false
-
-[system.ruby]
-type=RubySystem
-children=network profiler
-block_size_bytes=64
-clock=1
-mem_size=134217728
-no_mem_vec=false
-random_seed=1234
-randomization=true
-stats_filename=ruby.stats
-
 [system.ruby.network]
 type=SimpleNetwork
 children=topology
 adaptive_routing=false
 buffer_size=0
+clock=1
 control_msg_size=8
 endpoint_bandwidth=1000
 number_of_virtual_networks=10
@@ -166,7 +170,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
@@ -174,6 +178,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -181,7 +186,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_links1.int_node
 latency=1
 link_id=1
@@ -189,6 +194,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -204,6 +210,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -245,6 +252,6 @@ deadlock_threshold=50000
 num_cpus=1
 system=system
 wakeup_frequency=10
-cpuDataPort=system.l1_cntrl0.sequencer.slave[0]
-cpuInstPort=system.l1_cntrl0.sequencer.slave[1]
+cpuDataPort=system.ruby.l1_cntrl0.sequencer.slave[0]
+cpuInstPort=system.ruby.l1_cntrl0.sequencer.slave[1]