regress: ruby stat additions and config changes

4 files changed, 83 insertions, 36 deletions

diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
index c79554200..22a3e7356 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
@@ -76,11 +76,16 @@ version=0
 [system.dir_cntrl0.probeFilter]
 type=RubyCache
 assoc=4
+dataAccessLatency=1
+dataArrayBanks=1
 is_icache=false
 latency=1
 replacement_policy=PSEUDO_LRU
+resourceStalls=false
 size=1024
 start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
 
 [system.l1_cntrl0]
 type=L1Cache_Controller
@@ -105,29 +110,44 @@ version=0
 [system.l1_cntrl0.L1DcacheMemory]
 type=RubyCache
 assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
 is_icache=false
 latency=2
 replacement_policy=PSEUDO_LRU
+resourceStalls=false
 size=256
 start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
 
 [system.l1_cntrl0.L1IcacheMemory]
 type=RubyCache
 assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
 is_icache=true
 latency=2
 replacement_policy=PSEUDO_LRU
+resourceStalls=false
 size=256
 start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
 
 [system.l1_cntrl0.L2cacheMemory]
 type=RubyCache
 assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
 is_icache=false
 latency=10
 replacement_policy=PSEUDO_LRU
+resourceStalls=false
 size=512
 start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
 
 [system.l1_cntrl0.sequencer]
 type=RubySequencer
@@ -180,61 +200,64 @@ topology=system.ruby.network.topology
 
 [system.ruby.network.topology]
 type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
+children=ext_links0 ext_links1 int_links0 int_links1
 description=Crossbar
 ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1
 int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1
 print_config=false
-routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
+routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
 
 [system.ruby.network.topology.ext_links0]
 type=SimpleExtLink
+children=int_node
 bandwidth_factor=16
 ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
 latency=1
 link_id=0
 weight=1
 
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
 [system.ruby.network.topology.ext_links1]
 type=SimpleExtLink
+children=int_node
 bandwidth_factor=16
 ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
 latency=1
 link_id=1
 weight=1
 
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
+children=node_b
 bandwidth_factor=16
 latency=1
 link_id=2
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=2
+
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=3
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers2
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
 [system.ruby.profiler]
 type=RubyProfiler
 all_instructions=false
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
index 8e58b5f4d..e08b6ba17 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
@@ -34,7 +34,7 @@ periodic_stats_period: 1000000
 ================ End RubySystem Configuration Print ================
 
 
-Real time: Jun/04/2012 13:42:34
+Real time: Jul/10/2012 17:54:42
 
 Profiler Stats
 --------------
@@ -43,18 +43,18 @@ Elapsed_time_in_minutes: 0
 Elapsed_time_in_hours: 0
 Elapsed_time_in_days: 0
 
-Virtual_time_in_seconds: 0.32
-Virtual_time_in_minutes: 0.00533333
-Virtual_time_in_hours:   8.88889e-05
-Virtual_time_in_days:    3.7037e-06
+Virtual_time_in_seconds: 0.48
+Virtual_time_in_minutes: 0.008
+Virtual_time_in_hours:   0.000133333
+Virtual_time_in_days:    5.55556e-06
 
 Ruby_current_time: 205611
 Ruby_start_time: 0
 Ruby_cycles: 205611
 
-mbytes_resident: 43.1602
-mbytes_total: 215.941
-resident_ratio: 0.19987
+mbytes_resident: 41.625
+mbytes_total: 225.387
+resident_ratio: 0.184717
 
 ruby_cycles_executed: [ 205612 ]
 
@@ -127,11 +127,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 11479
+page_reclaims: 11775
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 80
+block_outputs: 0
 
 Network Stats
 -------------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
index 4f76e711e..4942a327e 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
@@ -1,9 +1,9 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jun  4 2012 11:51:44
-gem5 started Jun  4 2012 13:42:34
-gem5 executing on zizzer
+gem5 compiled Jul 10 2012 15:16:15
+gem5 started Jul 10 2012 17:54:42
+gem5 executing on sc2b0605
 command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer -re tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_hammer
 Global frequency set at 1000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
index 863fa07d3..e6a46ea4d 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
@@ -4,8 +4,32 @@ sim_seconds                                  0.000206                       # Nu
 sim_ticks                                      205611                       # Number of ticks simulated
 final_tick                                     205611                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                2093129                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 221128                       # Number of bytes of host memory used
-host_seconds                                     0.10                       # Real time elapsed on the host
+host_tick_rate                                1499366                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 230800                       # Number of bytes of host memory used
+host_seconds                                     0.14                       # 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.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl0.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl0.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl0.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl0.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl0.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.dir_cntrl0.probeFilter.num_data_array_reads            0                       # number of data array reads
+system.dir_cntrl0.probeFilter.num_data_array_writes            0                       # number of data array writes
+system.dir_cntrl0.probeFilter.num_tag_array_reads            0                       # number of tag array reads
+system.dir_cntrl0.probeFilter.num_tag_array_writes            0                       # number of tag array writes
+system.dir_cntrl0.probeFilter.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.dir_cntrl0.probeFilter.num_data_array_stalls            0                       # number of stalls caused by data array
 
 ---------- End Simulation Statistics   ----------