regressions: update stats due to changes in ruby obj hierarchy

3 files changed, 110 insertions, 101 deletions

diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
index 8a3bceec2..c6d6fc44e 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_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,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 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
 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,12 +97,13 @@ 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
 buffer_size=0
+clock=1
 cntrl_id=0
 l2_select_num_bits=0
 number_of_TBEs=256
@@ -85,11 +111,11 @@ recycle_latency=10
 request_latency=2
 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
@@ -103,12 +129,12 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
-[system.l1_cntrl0.L1IcacheMemory]
+[system.ruby.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
 dataAccessLatency=1
 dataArrayBanks=1
-is_icache=false
+is_icache=true
 latency=3
 replacement_policy=PSEUDO_LRU
 resourceStalls=false
@@ -117,13 +143,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.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
@@ -134,11 +160,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
 number_of_TBEs=256
 recycle_latency=10
@@ -148,7 +175,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
@@ -162,34 +189,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
@@ -209,7 +214,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
@@ -217,6 +222,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links0.int_node]
 type=Switch
+clock=1
 router_id=0
 virt_nets=10
 
@@ -224,7 +230,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
@@ -232,6 +238,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links1.int_node]
 type=Switch
+clock=1
 router_id=1
 virt_nets=10
 
@@ -239,7 +246,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
@@ -247,6 +254,7 @@ weight=1
 
 [system.ruby.network.topology.ext_links2.int_node]
 type=Switch
+clock=1
 router_id=2
 virt_nets=10
 
@@ -262,6 +270,7 @@ weight=1
 
 [system.ruby.network.topology.int_links0.node_b]
 type=Switch
+clock=1
 router_id=3
 virt_nets=10
 
@@ -312,6 +321,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-MOESI_CMP_directory/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
index 19907d578..9d03fe01e 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
@@ -1,24 +1,24 @@
-Real time: Sep/01/2012 14:14:50
+Real time: Jan/14/2013 08:23:28
 
 Profiler Stats
 --------------
-Elapsed_time_in_seconds: 1
-Elapsed_time_in_minutes: 0.0166667
-Elapsed_time_in_hours: 0.000277778
-Elapsed_time_in_days: 1.15741e-05
+Elapsed_time_in_seconds: 0
+Elapsed_time_in_minutes: 0
+Elapsed_time_in_hours: 0
+Elapsed_time_in_days: 0
 
-Virtual_time_in_seconds: 0.83
-Virtual_time_in_minutes: 0.0138333
-Virtual_time_in_hours:   0.000230556
-Virtual_time_in_days:    9.60648e-06
+Virtual_time_in_seconds: 0.91
+Virtual_time_in_minutes: 0.0151667
+Virtual_time_in_hours:   0.000252778
+Virtual_time_in_days:    1.05324e-05
 
 Ruby_current_time: 316521
 Ruby_start_time: 0
 Ruby_cycles: 316521
 
-mbytes_resident: 44.0977
-mbytes_total: 254.852
-resident_ratio: 0.173094
+mbytes_resident: 50.1406
+mbytes_total: 271.051
+resident_ratio: 0.185029
 
 ruby_cycles_executed: [ 316522 ]
 
@@ -83,7 +83,7 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 8272
+page_reclaims: 9989
 page_faults: 0
 swaps: 0
 block_inputs: 0
@@ -165,20 +165,20 @@ links_utilized_percent_switch_3: 1.93331
   outgoing_messages_switch_3_link_2_Writeback_Control: 899 7192 [ 0 823 76 0 0 0 0 0 0 0 ] base_latency: 1
   outgoing_messages_switch_3_link_2_Unblock_Control: 831 6648 [ 0 0 831 0 0 0 0 0 0 0 ] base_latency: 1
 
-Cache Stats: system.l1_cntrl0.L1IcacheMemory
-  system.l1_cntrl0.L1IcacheMemory_total_misses: 0
-  system.l1_cntrl0.L1IcacheMemory_total_demand_misses: 0
-  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: 0
+  system.ruby.l1_cntrl0.L1IcacheMemory_total_demand_misses: 0
+  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
 
 
-Cache Stats: system.l1_cntrl0.L1DcacheMemory
-  system.l1_cntrl0.L1DcacheMemory_total_misses: 0
-  system.l1_cntrl0.L1DcacheMemory_total_demand_misses: 0
-  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: 0
+  system.ruby.l1_cntrl0.L1DcacheMemory_total_demand_misses: 0
+  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
 
 
  --- L1Cache ---
@@ -343,12 +343,12 @@ II  Writeback_Ack [0 ] 0
 II  Writeback_Ack_Data [0 ] 0
 II  Writeback_Nack [0 ] 0
 
-Cache Stats: system.l2_cntrl0.L2cacheMemory
-  system.l2_cntrl0.L2cacheMemory_total_misses: 0
-  system.l2_cntrl0.L2cacheMemory_total_demand_misses: 0
-  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: 0
+  system.ruby.l2_cntrl0.L2cacheMemory_total_demand_misses: 0
+  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
 
 
  --- L2Cache ---
@@ -1195,7 +1195,7 @@ ILOXD  Inv [0 ] 0
 ILOXD  DmaAck [0 ] 0
 ILOXD  L2_Replacement [0 ] 0
 
-Memory controller: system.dir_cntrl0.memBuffer:
+Memory controller: system.ruby.dir_cntrl0.memBuffer:
   memory_total_requests: 1578
   memory_reads: 832
   memory_writes: 746
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
index 150be1ab5..fec1bbb41 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
@@ -4,26 +4,26 @@ sim_seconds                                  0.000317                       # Nu
 sim_ticks                                      316521                       # Number of ticks simulated
 final_tick                                     316521                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                 596457                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 260972                       # Number of bytes of host memory used
-host_seconds                                     0.53                       # 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.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                                 577725                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 277560                       # Number of bytes of host memory used
+host_seconds                                     0.55                       # 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
 
 ---------- End Simulation Statistics   ----------