regressions: update stats due to changes in ruby obj hierarchy

1 files changed, 62 insertions, 49 deletions

diff --git a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
index 1f7e18219..704324832 100644
--- a/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_cntrl0 l2_cntrl0 physmem ruby sys_port_proxy
+children=cpu physmem ruby sys_port_proxy
 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=
@@ -30,11 +31,10 @@ system_port=system.sys_port_proxy.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
-children=dtb interrupts itb tracer workload
+children=dtb interrupts isa itb tracer workload
 checker=Null
 clock=1
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -42,6 +42,7 @@ dtb=system.cpu.dtb
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -50,11 +51,12 @@ max_loads_any_thread=0
 numThreads=1
 profile=0
 progress_interval=0
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 workload=system.cpu.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.cpu.dtb]
 type=AlphaTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=AlphaInterrupts
 
+[system.cpu.isa]
+type=AlphaISA
+
 [system.cpu.itb]
 type=AlphaTLB
 size=48
@@ -89,32 +94,56 @@ simpoint=0
 system=system
 uid=100
 
-[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 l2_cntrl0 network profiler
+block_size_bytes=64
+clock=1
+mem_size=134217728
+no_mem_vec=false
+random_seed=1234
+randomization=false
+stats_filename=ruby.stats
+
+[system.ruby.dir_cntrl0]
 type=Directory_Controller
 children=directory memBuffer
 buffer_size=0
+clock=1
 cntrl_id=2
-directory=system.dir_cntrl0.directory
+directory=system.ruby.dir_cntrl0.directory
 directory_latency=5
 distributed_persistent=true
 fixed_timeout_latency=100
 l2_select_num_bits=0
-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
@@ -136,13 +165,14 @@ ruby_system=system.ruby
 tFaw=0
 version=0
 
-[system.l1_cntrl0]
+[system.ruby.l1_cntrl0]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory sequencer
-L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory
 N_tokens=2
 buffer_size=0
+clock=1
 cntrl_id=0
 dynamic_timeout_enabled=true
 fixed_timeout_latency=300
@@ -155,11 +185,11 @@ recycle_latency=10
 retry_threshold=1
 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.L1DcacheMemory]
+[system.ruby.l1_cntrl0.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -173,7 +203,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -187,13 +217,13 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
 clock=1
-dcache=system.l1_cntrl0.L1DcacheMemory
+dcache=system.ruby.l1_cntrl0.L1DcacheMemory
 deadlock_threshold=500000
-icache=system.l1_cntrl0.L1IcacheMemory
+icache=system.ruby.l1_cntrl0.L1IcacheMemory
 max_outstanding_requests=16
 ruby_system=system.ruby
 support_data_reqs=true
@@ -204,12 +234,13 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[system.l2_cntrl0]
+[system.ruby.l2_cntrl0]
 type=L2Cache_Controller
 children=L2cacheMemory
-L2cacheMemory=system.l2_cntrl0.L2cacheMemory
+L2cacheMemory=system.ruby.l2_cntrl0.L2cacheMemory
 N_tokens=2
 buffer_size=0
+clock=1
 cntrl_id=1
 filtering_enabled=true
 l2_request_latency=5
@@ -220,7 +251,7 @@ ruby_system=system.ruby
 transitions_per_cycle=32
 version=0
 
-[system.l2_cntrl0.L2cacheMemory]
+[system.ruby.l2_cntrl0.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -234,34 +265,12 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[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=false
-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
@@ -281,7 +290,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
@@ -289,6 +298,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -296,7 +306,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_links1.int_node
 latency=1
 link_id=1
@@ -304,6 +314,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -311,7 +322,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_links2.int_node
 latency=1
 link_id=2
@@ -319,6 +330,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -334,6 +346,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10