stats: update stats for icache change not allowing dirty data

12 files changed, 125 insertions, 283 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 f8c719b99..993287fd9 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
@@ -93,30 +93,20 @@ version=0
 [system.l1_cntrl0.L1DcacheMemory]
 type=RubyCache
 assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
 is_icache=false
 latency=3
 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=false
 latency=3
 replacement_policy=PSEUDO_LRU
-resourceStalls=false
 size=256
 start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
 
 [system.l1_cntrl0.sequencer]
 type=RubySequencer
@@ -152,16 +142,11 @@ version=0
 [system.l2_cntrl0.L2cacheMemory]
 type=RubyCache
 assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
 is_icache=false
 latency=15
 replacement_policy=PSEUDO_LRU
-resourceStalls=false
 size=512
 start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
 
 [system.physmem]
 type=SimpleMemory
@@ -198,76 +183,56 @@ topology=system.ruby.network.topology
 
 [system.ruby.network.topology]
 type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
 description=Crossbar
 ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
 int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
 print_config=false
-routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
 
 [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.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
 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.l2_cntrl0
-int_node=system.ruby.network.topology.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
 latency=1
 link_id=1
 weight=1
 
-[system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
-router_id=1
-
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
-children=int_node
 bandwidth_factor=16
 ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.ext_links2.int_node
+int_node=system.ruby.network.topology.routers2
 latency=1
 link_id=2
 weight=1
 
-[system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
-router_id=2
-
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
-children=node_b
 bandwidth_factor=16
 latency=1
 link_id=3
-node_a=system.ruby.network.topology.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers3
 weight=1
 
-[system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
-router_id=3
-
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=4
-node_a=system.ruby.network.topology.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers3
 weight=1
 
 [system.ruby.network.topology.int_links2]
@@ -275,10 +240,26 @@ type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=5
-node_a=system.ruby.network.topology.ext_links2.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers2
+node_b=system.ruby.network.topology.routers3
 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.network.topology.routers3]
+type=BasicRouter
+router_id=3
+
 [system.ruby.profiler]
 type=RubyProfiler
 all_instructions=false
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout
index a5b5eb0e5..bfa4f7e73 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout
@@ -1,9 +1,9 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jul 10 2012 17:30:17
-gem5 started Jul 10 2012 17:34:42
-gem5 executing on sc2b0605
+gem5 compiled Jun  4 2012 11:53:20
+gem5 started Jun  4 2012 14:40:53
+gem5 executing on zizzer
 command line: build/ALPHA_MESI_CMP_directory/gem5.opt -d build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MESI_CMP_directory -re tests/run.py build/ALPHA_MESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MESI_CMP_directory
 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-MESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
index 3aa96ab1f..f6f4e6847 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,26 +4,8 @@ sim_seconds                                  0.000350                       # Nu
 sim_ticks                                      349711                       # Number of ticks simulated
 final_tick                                     349711                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                1546655                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 230968                       # 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.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                                2288501                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 221264                       # Number of bytes of host memory used
+host_seconds                                     0.15                       # Real time elapsed on the host
 
 ---------- End Simulation Statistics   ----------
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 dc2ecd66a..a92426643 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
@@ -90,30 +90,20 @@ version=0
 [system.l1_cntrl0.L1DcacheMemory]
 type=RubyCache
 assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
 is_icache=false
 latency=3
 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=false
 latency=3
 replacement_policy=PSEUDO_LRU
-resourceStalls=false
 size=256
 start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
 
 [system.l1_cntrl0.sequencer]
 type=RubySequencer
@@ -148,16 +138,11 @@ version=0
 [system.l2_cntrl0.L2cacheMemory]
 type=RubyCache
 assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
 is_icache=false
 latency=15
 replacement_policy=PSEUDO_LRU
-resourceStalls=false
 size=512
 start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
 
 [system.physmem]
 type=SimpleMemory
@@ -194,76 +179,56 @@ topology=system.ruby.network.topology
 
 [system.ruby.network.topology]
 type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
 description=Crossbar
 ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
 int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
 print_config=false
-routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
 
 [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.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
 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.l2_cntrl0
-int_node=system.ruby.network.topology.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
 latency=1
 link_id=1
 weight=1
 
-[system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
-router_id=1
-
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
-children=int_node
 bandwidth_factor=16
 ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.ext_links2.int_node
+int_node=system.ruby.network.topology.routers2
 latency=1
 link_id=2
 weight=1
 
-[system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
-router_id=2
-
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
-children=node_b
 bandwidth_factor=16
 latency=1
 link_id=3
-node_a=system.ruby.network.topology.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers3
 weight=1
 
-[system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
-router_id=3
-
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=4
-node_a=system.ruby.network.topology.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers3
 weight=1
 
 [system.ruby.network.topology.int_links2]
@@ -271,10 +236,26 @@ type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=5
-node_a=system.ruby.network.topology.ext_links2.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers2
+node_b=system.ruby.network.topology.routers3
 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.network.topology.routers3]
+type=BasicRouter
+router_id=3
+
 [system.ruby.profiler]
 type=RubyProfiler
 all_instructions=false
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
index 3eb17b7ab..473ebc3b9 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
@@ -1,9 +1,9 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jul 10 2012 17:36:02
-gem5 started Jul 10 2012 17:44:41
-gem5 executing on sc2b0605
+gem5 compiled Jun  4 2012 11:54:55
+gem5 started Jun  4 2012 14:42:00
+gem5 executing on zizzer
 command line: build/ALPHA_MOESI_CMP_directory/gem5.opt -d build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory -re tests/run.py build/ALPHA_MOESI_CMP_directory/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_directory
 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_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
index da0ebfcc7..22e36183d 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,8 @@ sim_seconds                                  0.000358                       # Nu
 sim_ticks                                      357561                       # Number of ticks simulated
 final_tick                                     357561                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                 486616                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 231064                       # Number of bytes of host memory used
-host_seconds                                     0.73                       # 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                                 776030                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 221440                       # Number of bytes of host memory used
+host_seconds                                     0.46                       # Real time elapsed on the host
 
 ---------- End Simulation Statistics   ----------
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
index ee2d6f075..529933d46 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
@@ -99,30 +99,20 @@ 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=false
 latency=2
 replacement_policy=PSEUDO_LRU
-resourceStalls=false
 size=256
 start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
 
 [system.l1_cntrl0.sequencer]
 type=RubySequencer
@@ -159,16 +149,11 @@ version=0
 [system.l2_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.physmem]
 type=SimpleMemory
@@ -205,76 +190,56 @@ topology=system.ruby.network.topology
 
 [system.ruby.network.topology]
 type=Topology
-children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2
+children=ext_links0 ext_links1 ext_links2 int_links0 int_links1 int_links2 routers0 routers1 routers2 routers3
 description=Crossbar
 ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
 int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
 print_config=false
-routers=system.ruby.network.topology.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.ext_links2.int_node system.ruby.network.topology.int_links0.node_b
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2 system.ruby.network.topology.routers3
 
 [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.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
 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.l2_cntrl0
-int_node=system.ruby.network.topology.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
 latency=1
 link_id=1
 weight=1
 
-[system.ruby.network.topology.ext_links1.int_node]
-type=BasicRouter
-router_id=1
-
 [system.ruby.network.topology.ext_links2]
 type=SimpleExtLink
-children=int_node
 bandwidth_factor=16
 ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.ext_links2.int_node
+int_node=system.ruby.network.topology.routers2
 latency=1
 link_id=2
 weight=1
 
-[system.ruby.network.topology.ext_links2.int_node]
-type=BasicRouter
-router_id=2
-
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
-children=node_b
 bandwidth_factor=16
 latency=1
 link_id=3
-node_a=system.ruby.network.topology.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers3
 weight=1
 
-[system.ruby.network.topology.int_links0.node_b]
-type=BasicRouter
-router_id=3
-
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=4
-node_a=system.ruby.network.topology.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers3
 weight=1
 
 [system.ruby.network.topology.int_links2]
@@ -282,10 +247,26 @@ type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=5
-node_a=system.ruby.network.topology.ext_links2.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers2
+node_b=system.ruby.network.topology.routers3
 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.network.topology.routers3]
+type=BasicRouter
+router_id=3
+
 [system.ruby.profiler]
 type=RubyProfiler
 all_instructions=false
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
index f70cf8f6c..a79f03bf6 100755
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
@@ -1,9 +1,9 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jul 10 2012 15:34:13
-gem5 started Jul 10 2012 17:49:52
-gem5 executing on sc2b0605
+gem5 compiled Jun  4 2012 11:56:32
+gem5 started Jun  4 2012 14:43:05
+gem5 executing on zizzer
 command line: build/ALPHA_MOESI_CMP_token/gem5.opt -d build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token -re tests/run.py build/ALPHA_MOESI_CMP_token/tests/opt/quick/se/60.rubytest/alpha/linux/rubytest-ruby-MOESI_CMP_token
 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_CMP_token/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
index de9b59632..b667f4459 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
@@ -4,26 +4,8 @@ sim_seconds                                  0.000259                       # Nu
 sim_ticks                                      259241                       # Number of ticks simulated
 final_tick                                     259241                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                1392990                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 230820                       # Number of bytes of host memory used
-host_seconds                                     0.19                       # 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                                2053459                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 221360                       # Number of bytes of host memory used
+host_seconds                                     0.13                       # Real time elapsed on the host
 
 ---------- End Simulation Statistics   ----------
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 22a3e7356..c79554200 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,16 +76,11 @@ 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
@@ -110,44 +105,29 @@ 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
@@ -200,64 +180,61 @@ topology=system.ruby.network.topology
 
 [system.ruby.network.topology]
 type=Topology
-children=ext_links0 ext_links1 int_links0 int_links1
+children=ext_links0 ext_links1 int_links0 int_links1 routers0 routers1 routers2
 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.ext_links0.int_node system.ruby.network.topology.ext_links1.int_node system.ruby.network.topology.int_links0.node_b
+routers=system.ruby.network.topology.routers0 system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
 
 [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.ext_links0.int_node
+int_node=system.ruby.network.topology.routers0
 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.ext_links1.int_node
+int_node=system.ruby.network.topology.routers1
 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.ext_links0.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers0
+node_b=system.ruby.network.topology.routers2
 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.ext_links1.int_node
-node_b=system.ruby.network.topology.int_links0.node_b
+node_a=system.ruby.network.topology.routers1
+node_b=system.ruby.network.topology.routers2
 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/simout b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
index 4942a327e..4f76e711e 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 Jul 10 2012 15:16:15
-gem5 started Jul 10 2012 17:54:42
-gem5 executing on sc2b0605
+gem5 compiled Jun  4 2012 11:51:44
+gem5 started Jun  4 2012 13:42:34
+gem5 executing on zizzer
 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 e6a46ea4d..863fa07d3 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,32 +4,8 @@ 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                                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
+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
 
 ---------- End Simulation Statistics   ----------