regressions: update stats due to changes in ruby obj hierarchy

3 files changed, 92 insertions, 81 deletions

diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
index 33bd11300..f8bb08914 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu dir_cntrl0 l1_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=X86TLB
@@ -66,7 +68,7 @@ walker=system.cpu.dtb.walker
 type=X86PagetableWalker
 clock=1
 system=system
-port=system.l1_cntrl0.sequencer.slave[3]
+port=system.ruby.l1_cntrl0.sequencer.slave[3]
 
 [system.cpu.interrupts]
 type=X86LocalApic
@@ -75,9 +77,12 @@ int_latency=1
 pio_addr=2305843009213693952
 pio_latency=100
 system=system
-int_master=system.l1_cntrl0.sequencer.slave[4]
-int_slave=system.l1_cntrl0.sequencer.master[1]
-pio=system.l1_cntrl0.sequencer.master[0]
+int_master=system.ruby.l1_cntrl0.sequencer.slave[4]
+int_slave=system.ruby.l1_cntrl0.sequencer.master[1]
+pio=system.ruby.l1_cntrl0.sequencer.master[0]
+
+[system.cpu.isa]
+type=X86ISA
 
 [system.cpu.itb]
 type=X86TLB
@@ -89,7 +94,7 @@ walker=system.cpu.itb.walker
 type=X86PagetableWalker
 clock=1
 system=system
-port=system.l1_cntrl0.sequencer.slave[2]
+port=system.ruby.l1_cntrl0.sequencer.slave[2]
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -113,21 +118,45 @@ 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 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=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=5
@@ -135,7 +164,7 @@ 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
@@ -157,23 +186,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
@@ -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.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
@@ -205,34 +235,12 @@ version=0
 master=system.cpu.interrupts.pio system.cpu.interrupts.int_slave
 slave=system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.interrupts.int_master
 
-[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
@@ -252,7 +260,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
@@ -260,6 +268,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -267,7 +276,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
@@ -275,6 +284,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -290,6 +300,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
index 87c404fd6..48dddeab7 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Dec/30/2012 01:12:43
+Real time: Jan/14/2013 08:41:48
 
 Profiler Stats
 --------------
@@ -7,18 +7,18 @@ Elapsed_time_in_minutes: 0
 Elapsed_time_in_hours: 0
 Elapsed_time_in_days: 0
 
-Virtual_time_in_seconds: 0.51
-Virtual_time_in_minutes: 0.0085
-Virtual_time_in_hours:   0.000141667
-Virtual_time_in_days:    5.90278e-06
+Virtual_time_in_seconds: 0.61
+Virtual_time_in_minutes: 0.0101667
+Virtual_time_in_hours:   0.000169444
+Virtual_time_in_days:    7.06019e-06
 
 Ruby_current_time: 121759
 Ruby_start_time: 0
 Ruby_cycles: 121759
 
-mbytes_resident: 60.1836
-mbytes_total: 277.391
-resident_ratio: 0.217006
+mbytes_resident: 66.375
+mbytes_total: 290.48
+resident_ratio: 0.228541
 
 ruby_cycles_executed: [ 121760 ]
 
@@ -89,11 +89,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 12527
-page_faults: 3
+page_reclaims: 13678
+page_faults: 0
 swaps: 0
-block_inputs: 1360
-block_outputs: 88
+block_inputs: 240
+block_outputs: 152
 
 Network Stats
 -------------
@@ -137,18 +137,18 @@ links_utilized_percent_switch_2: 5.6464
   outgoing_messages_switch_2_link_1_Control: 1377 11016 [ 0 0 1377 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 1373 98856 [ 0 0 1373 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.cacheMemory
-  system.l1_cntrl0.cacheMemory_total_misses: 1377
-  system.l1_cntrl0.cacheMemory_total_demand_misses: 1377
-  system.l1_cntrl0.cacheMemory_total_prefetches: 0
-  system.l1_cntrl0.cacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl0.cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl0.cacheMemory
+  system.ruby.l1_cntrl0.cacheMemory_total_misses: 1377
+  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 1377
+  system.ruby.l1_cntrl0.cacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl0.cacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl0.cacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl0.cacheMemory_request_type_LD:   36.2382%
-  system.l1_cntrl0.cacheMemory_request_type_ST:   18.5185%
-  system.l1_cntrl0.cacheMemory_request_type_IFETCH:   45.2433%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_LD:   36.2382%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   18.5185%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   45.2433%
 
-  system.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1377    100%
+  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1377    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -189,7 +189,7 @@ IS  Data [1122 ] 1122
 
 IM  Data [255 ] 255
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 2750
   memory_reads: 1377
   memory_writes: 1373
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
index 36958969e..538b5b79e 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000122                       # Nu
 sim_ticks                                      121759                       # Number of ticks simulated
 final_tick                                     121759                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  28531                       # Simulator instruction rate (inst/s)
-host_op_rate                                    51675                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 645460                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 284052                       # Number of bytes of host memory used
-host_seconds                                     0.19                       # Real time elapsed on the host
+host_inst_rate                                  22533                       # Simulator instruction rate (inst/s)
+host_op_rate                                    40812                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 509771                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 297456                       # Number of bytes of host memory used
+host_seconds                                     0.24                       # Real time elapsed on the host
 sim_insts                                        5381                       # Number of instructions simulated
 sim_ops                                          9747                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             54912                       # Number of bytes read from this memory
@@ -33,12 +33,12 @@ system.physmem.bw_write::total               58410467                       # Wr
 system.physmem.bw_total::cpu.inst           450989249                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data           116426712                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              567415961                       # Total bandwidth to/from this memory (bytes/s)
-system.l1_cntrl0.cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl0.cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl0.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl0.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl0.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl0.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl0.cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl0.cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl0.cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl0.cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl0.cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl0.cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
 system.cpu.workload.num_syscalls                   11                       # Number of system calls
 system.cpu.numCycles                           121759                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started