regressions: update stats due to changes in ruby obj hierarchy

3 files changed, 86 insertions, 75 deletions

diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
index ab18e451d..f73262840 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/sparc/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=SparcTLB
@@ -63,6 +65,9 @@ size=64
 [system.cpu.interrupts]
 type=SparcInterrupts
 
+[system.cpu.isa]
+type=SparcISA
+
 [system.cpu.itb]
 type=SparcTLB
 size=64
@@ -78,7 +83,7 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/projects/pd/randd/dist/test-progs/hello/bin/sparc/linux/hello
+executable=tests/test-progs/hello/bin/sparc/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
@@ -89,21 +94,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
@@ -111,7 +140,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
@@ -133,23 +162,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
@@ -163,13 +193,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
@@ -180,34 +210,12 @@ using_ruby_tester=false
 version=0
 slave=system.cpu.icache_port system.cpu.dcache_port
 
-[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
@@ -227,7 +235,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
@@ -235,6 +243,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -242,7 +251,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
@@ -250,6 +259,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -265,6 +275,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/sparc/linux/simple-timing-ruby/ruby.stats b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
index b9367ba4b..c5c22fe69 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Sep/09/2012 13:47:33
+Real time: Jan/14/2013 08:36:36
 
 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.42
-Virtual_time_in_minutes: 0.007
-Virtual_time_in_hours:   0.000116667
-Virtual_time_in_days:    4.86111e-06
+Virtual_time_in_seconds: 0.57
+Virtual_time_in_minutes: 0.0095
+Virtual_time_in_hours:   0.000158333
+Virtual_time_in_days:    6.59722e-06
 
 Ruby_current_time: 107952
 Ruby_start_time: 0
 Ruby_cycles: 107952
 
-mbytes_resident: 54.2266
-mbytes_total: 273.301
-resident_ratio: 0.198428
+mbytes_resident: 55.6602
+mbytes_total: 282.727
+resident_ratio: 0.196911
 
 ruby_cycles_executed: [ 107953 ]
 
@@ -86,11 +86,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 10992
+page_reclaims: 11405
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 80
+block_outputs: 88
 
 Network Stats
 -------------
@@ -134,18 +134,18 @@ links_utilized_percent_switch_2: 5.96098
   outgoing_messages_switch_2_link_1_Control: 1289 10312 [ 0 0 1289 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_2_link_1_Data: 1285 92520 [ 0 0 1285 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.cacheMemory
-  system.l1_cntrl0.cacheMemory_total_misses: 1289
-  system.l1_cntrl0.cacheMemory_total_demand_misses: 1289
-  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: 1289
+  system.ruby.l1_cntrl0.cacheMemory_total_demand_misses: 1289
+  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:   30.6439%
-  system.l1_cntrl0.cacheMemory_request_type_ST:   13.8867%
-  system.l1_cntrl0.cacheMemory_request_type_IFETCH:   55.4694%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_LD:   30.6439%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_ST:   13.8867%
+  system.ruby.l1_cntrl0.cacheMemory_request_type_IFETCH:   55.4694%
 
-  system.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1289    100%
+  system.ruby.l1_cntrl0.cacheMemory_access_mode_type_Supervisor:   1289    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -186,7 +186,7 @@ IS  Data [1110 ] 1110
 
 IM  Data [179 ] 179
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 2574
   memory_reads: 1289
   memory_writes: 1285
diff --git a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
index 0ee67c488..78e09ef17 100644
--- a/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000108                       # Nu
 sim_ticks                                      107952                       # Number of ticks simulated
 final_tick                                     107952                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  33106                       # Simulator instruction rate (inst/s)
-host_op_rate                                    33103                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 670773                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 232832                       # Number of bytes of host memory used
-host_seconds                                     0.16                       # Real time elapsed on the host
+host_inst_rate                                  20687                       # Simulator instruction rate (inst/s)
+host_op_rate                                    20685                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 419155                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 289516                       # Number of bytes of host memory used
+host_seconds                                     0.26                       # Real time elapsed on the host
 sim_insts                                        5327                       # Number of instructions simulated
 sim_ops                                          5327                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst             21480                       # Number of bytes read from this memory
@@ -33,12 +33,12 @@ system.physmem.bw_write::total               46919001                       # Wr
 system.physmem.bw_total::cpu.inst           198977323                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::cpu.data            89549059                       # Total bandwidth to/from this memory (bytes/s)
 system.physmem.bw_total::total              288526382                       # 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                           107952                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started