regressions: update stats due to changes in ruby obj hierarchy

3 files changed, 121 insertions, 112 deletions

diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
index 748354cc7..cfaf3b4cc 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
@@ -8,13 +8,14 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=dir_cntrl0 l1_cntrl0 l2_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,14 +29,38 @@ 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 l2_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=2
-directory=system.dir_cntrl0.directory
+directory=system.ruby.dir_cntrl0.directory
 directory_latency=6
-memBuffer=system.dir_cntrl0.memBuffer
+memBuffer=system.ruby.dir_cntrl0.memBuffer
 number_of_TBEs=256
 recycle_latency=10
 ruby_system=system.ruby
@@ -43,7 +68,7 @@ to_mem_ctrl_latency=1
 transitions_per_cycle=32
 version=0
 
-[system.dir_cntrl0.directory]
+[system.ruby.dir_cntrl0.directory]
 type=RubyDirectoryMemory
 map_levels=4
 numa_high_bit=5
@@ -51,7 +76,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
@@ -73,28 +98,29 @@ ruby_system=system.ruby
 tFaw=0
 version=0
 
-[system.l1_cntrl0]
+[system.ruby.l1_cntrl0]
 type=L1Cache_Controller
 children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
-L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory
-L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory
+L1DcacheMemory=system.ruby.l1_cntrl0.L1DcacheMemory
+L1IcacheMemory=system.ruby.l1_cntrl0.L1IcacheMemory
 buffer_size=0
+clock=1
 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
+prefetcher=system.ruby.l1_cntrl0.prefetcher
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
-sequencer=system.l1_cntrl0.sequencer
+sequencer=system.ruby.l1_cntrl0.sequencer
 to_l2_latency=1
 transitions_per_cycle=32
 version=0
 
-[system.l1_cntrl0.L1DcacheMemory]
+[system.ruby.l1_cntrl0.L1DcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -108,7 +134,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -122,7 +148,7 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.prefetcher]
+[system.ruby.l1_cntrl0.prefetcher]
 type=Prefetcher
 cross_page=false
 nonunit_filter=8
@@ -132,13 +158,13 @@ pf_per_stream=1
 train_misses=4
 unit_filter=8
 
-[system.l1_cntrl0.sequencer]
+[system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=false
 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
@@ -149,11 +175,12 @@ using_ruby_tester=true
 version=0
 slave=system.tester.cpuDataPort[0] system.tester.cpuInstPort[0]
 
-[system.l2_cntrl0]
+[system.ruby.l2_cntrl0]
 type=L2Cache_Controller
 children=L2cacheMemory
-L2cacheMemory=system.l2_cntrl0.L2cacheMemory
+L2cacheMemory=system.ruby.l2_cntrl0.L2cacheMemory
 buffer_size=0
+clock=1
 cntrl_id=1
 l2_request_latency=2
 l2_response_latency=2
@@ -164,7 +191,7 @@ to_l1_latency=1
 transitions_per_cycle=32
 version=0
 
-[system.l2_cntrl0.L2cacheMemory]
+[system.ruby.l2_cntrl0.L2cacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
@@ -178,34 +205,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=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
@@ -225,7 +230,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
@@ -233,6 +238,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -240,7 +246,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
@@ -248,6 +254,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -255,7 +262,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
@@ -263,6 +270,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -278,6 +286,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 
@@ -328,6 +337,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]
 
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
index 708a70aaa..aec2b1b3a 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Dec/11/2012 09:10:20
+Real time: Jan/14/2013 08:20:11
 
 Profiler Stats
 --------------
@@ -16,9 +16,9 @@ Ruby_current_time: 318321
 Ruby_start_time: 0
 Ruby_cycles: 318321
 
-mbytes_resident: 49.5391
-mbytes_total: 264.797
-resident_ratio: 0.187128
+mbytes_resident: 50.0117
+mbytes_total: 270.859
+resident_ratio: 0.184684
 
 ruby_cycles_executed: [ 318322 ]
 
@@ -83,11 +83,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 9268
+page_reclaims: 10464
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 88
+block_outputs: 80
 
 Network Stats
 -------------
@@ -161,28 +161,28 @@ links_utilized_percent_switch_3: 2.05746
   outgoing_messages_switch_3_link_2_Response_Data: 786 56592 [ 0 786 0 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Response_Control: 84 672 [ 0 84 0 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.L1IcacheMemory
-  system.l1_cntrl0.L1IcacheMemory_total_misses: 56
-  system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 56
-  system.l1_cntrl0.L1IcacheMemory_total_prefetches: 0
-  system.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl0.L1IcacheMemory
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_misses: 56
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 56
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
+  system.ruby.l1_cntrl0.L1IcacheMemory_request_type_IFETCH:   100%
 
-  system.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   56    100%
+  system.ruby.l1_cntrl0.L1IcacheMemory_access_mode_type_Supervisor:   56    100%
 
-Cache Stats: system.l1_cntrl0.L1DcacheMemory
-  system.l1_cntrl0.L1DcacheMemory_total_misses: 861
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 861
-  system.l1_cntrl0.L1DcacheMemory_total_prefetches: 0
-  system.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0
-  system.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l1_cntrl0.L1DcacheMemory
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_misses: 861
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 861
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_prefetches: 0
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_sw_prefetches: 0
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_hw_prefetches: 0
 
-  system.l1_cntrl0.L1DcacheMemory_request_type_LD:   4.87805%
-  system.l1_cntrl0.L1DcacheMemory_request_type_ST:   95.122%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_LD:   4.87805%
+  system.ruby.l1_cntrl0.L1DcacheMemory_request_type_ST:   95.122%
 
-  system.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   861    100%
+  system.ruby.l1_cntrl0.L1DcacheMemory_access_mode_type_Supervisor:   861    100%
 
  --- L1Cache ---
  - Event Counts -
@@ -356,18 +356,18 @@ PF_IS_I  Data_Exclusive [0 ] 0
 PF_IS_I  DataS_fromL1 [0 ] 0
 PF_IS_I  Data_all_Acks [0 ] 0
 
-Cache Stats: system.l2_cntrl0.L2cacheMemory
-  system.l2_cntrl0.L2cacheMemory_total_misses: 874
-  system.l2_cntrl0.L2cacheMemory_total_demand_misses: 874
-  system.l2_cntrl0.L2cacheMemory_total_prefetches: 0
-  system.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0
-  system.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0
+Cache Stats: system.ruby.l2_cntrl0.L2cacheMemory
+  system.ruby.l2_cntrl0.L2cacheMemory_total_misses: 874
+  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 874
+  system.ruby.l2_cntrl0.L2cacheMemory_total_prefetches: 0
+  system.ruby.l2_cntrl0.L2cacheMemory_total_sw_prefetches: 0
+  system.ruby.l2_cntrl0.L2cacheMemory_total_hw_prefetches: 0
 
-  system.l2_cntrl0.L2cacheMemory_request_type_GETS:   4.69108%
-  system.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   5.26316%
-  system.l2_cntrl0.L2cacheMemory_request_type_GETX:   90.0458%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETS:   4.69108%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GET_INSTR:   5.26316%
+  system.ruby.l2_cntrl0.L2cacheMemory_request_type_GETX:   90.0458%
 
-  system.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   874    100%
+  system.ruby.l2_cntrl0.L2cacheMemory_access_mode_type_Supervisor:   874    100%
 
  --- L2Cache ---
  - Event Counts -
@@ -579,7 +579,7 @@ MT_SB  L2_Replacement_clean [0 ] 0
 MT_SB  Unblock [0 ] 0
 MT_SB  MEM_Inv [0 ] 0
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 1660
   memory_reads: 874
   memory_writes: 786
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
index 4ea61ad84..6206d371a 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
@@ -4,35 +4,35 @@ sim_seconds                                  0.000318                       # Nu
 sim_ticks                                      318321                       # Number of ticks simulated
 final_tick                                     318321                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                1374742                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 271156                       # Number of bytes of host memory used
-host_seconds                                     0.23                       # Real time elapsed on the host
-system.l1_cntrl0.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl0.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl0.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl0.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl0.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l1_cntrl0.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
-system.l1_cntrl0.prefetcher.miss_observed            0                       # number of misses observed
-system.l1_cntrl0.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
-system.l1_cntrl0.prefetcher.prefetches_requested            0                       # number of prefetch requests made
-system.l1_cntrl0.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
-system.l1_cntrl0.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
-system.l1_cntrl0.prefetcher.hits                    0                       # number of prefetched blocks accessed
-system.l1_cntrl0.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
-system.l1_cntrl0.prefetcher.pages_crossed            0                       # number of prefetches across pages
-system.l1_cntrl0.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
-system.l2_cntrl0.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
-system.l2_cntrl0.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
-system.l2_cntrl0.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
-system.l2_cntrl0.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
-system.l2_cntrl0.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
-system.l2_cntrl0.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+host_tick_rate                                1534160                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 277364                       # Number of bytes of host memory used
+host_seconds                                     0.21                       # Real time elapsed on the host
+system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l2_cntrl0.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l2_cntrl0.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl0.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl0.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.ruby.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.ruby.l1_cntrl0.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.ruby.l1_cntrl0.prefetcher.miss_observed            0                       # number of misses observed
+system.ruby.l1_cntrl0.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
+system.ruby.l1_cntrl0.prefetcher.prefetches_requested            0                       # number of prefetch requests made
+system.ruby.l1_cntrl0.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
+system.ruby.l1_cntrl0.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
+system.ruby.l1_cntrl0.prefetcher.hits               0                       # number of prefetched blocks accessed
+system.ruby.l1_cntrl0.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
+system.ruby.l1_cntrl0.prefetcher.pages_crossed            0                       # number of prefetches across pages
+system.ruby.l1_cntrl0.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
 
 ---------- End Simulation Statistics   ----------