stats: fix some miss-committed changes from the icache change

3 files changed, 379 insertions, 84 deletions

diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
index 34695a208..c353a8a4d 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
@@ -8,7 +8,7 @@ time_sync_spin_threshold=100000
 
 [system]
 type=System
-children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 physmem ruby sys_port_proxy
+children=cpu0 cpu1 cpu2 cpu3 cpu4 cpu5 cpu6 cpu7 dir_cntrl0 funcbus funcmem l1_cntrl0 l1_cntrl1 l1_cntrl2 l1_cntrl3 l1_cntrl4 l1_cntrl5 l1_cntrl6 l1_cntrl7 physmem ruby sys_port_proxy
 boot_osflags=a
 init_param=0
 kernel=
@@ -42,7 +42,7 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[0]
+functional=system.funcbus.slave[0]
 test=system.l1_cntrl0.sequencer.slave[0]
 
 [system.cpu1]
@@ -60,7 +60,7 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[1]
+functional=system.funcbus.slave[1]
 test=system.l1_cntrl1.sequencer.slave[0]
 
 [system.cpu2]
@@ -78,7 +78,7 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[2]
+functional=system.funcbus.slave[2]
 test=system.l1_cntrl2.sequencer.slave[0]
 
 [system.cpu3]
@@ -96,7 +96,7 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[3]
+functional=system.funcbus.slave[3]
 test=system.l1_cntrl3.sequencer.slave[0]
 
 [system.cpu4]
@@ -114,7 +114,7 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[4]
+functional=system.funcbus.slave[4]
 test=system.l1_cntrl4.sequencer.slave[0]
 
 [system.cpu5]
@@ -132,7 +132,7 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[5]
+functional=system.funcbus.slave[5]
 test=system.l1_cntrl5.sequencer.slave[0]
 
 [system.cpu6]
@@ -150,7 +150,7 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[6]
+functional=system.funcbus.slave[6]
 test=system.l1_cntrl6.sequencer.slave[0]
 
 [system.cpu7]
@@ -168,7 +168,7 @@ progress_interval=10000
 suppress_func_warnings=true
 sys=system
 trace_addr=0
-functional=system.funcmem.port[7]
+functional=system.funcbus.slave[7]
 test=system.l1_cntrl7.sequencer.slave[0]
 
 [system.dir_cntrl0]
@@ -220,11 +220,26 @@ 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.funcbus]
+type=NoncoherentBus
+block_size=64
+clock=1
+header_cycles=1
+use_default_range=false
+width=8
+master=system.funcmem.port
+slave=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
 
 [system.funcmem]
 type=SimpleMemory
@@ -236,7 +251,7 @@ latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=system.cpu0.functional system.cpu1.functional system.cpu2.functional system.cpu3.functional system.cpu4.functional system.cpu5.functional system.cpu6.functional system.cpu7.functional
+port=system.funcbus.master[0]
 
 [system.l1_cntrl0]
 type=L1Cache_Controller
@@ -261,29 +276,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
@@ -324,29 +354,44 @@ version=1
 [system.l1_cntrl1.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_cntrl1.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_cntrl1.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_cntrl1.sequencer]
 type=RubySequencer
@@ -387,29 +432,44 @@ version=2
 [system.l1_cntrl2.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_cntrl2.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_cntrl2.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_cntrl2.sequencer]
 type=RubySequencer
@@ -450,29 +510,44 @@ version=3
 [system.l1_cntrl3.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_cntrl3.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_cntrl3.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_cntrl3.sequencer]
 type=RubySequencer
@@ -513,29 +588,44 @@ version=4
 [system.l1_cntrl4.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_cntrl4.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_cntrl4.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_cntrl4.sequencer]
 type=RubySequencer
@@ -576,29 +666,44 @@ version=5
 [system.l1_cntrl5.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_cntrl5.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_cntrl5.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_cntrl5.sequencer]
 type=RubySequencer
@@ -639,29 +744,44 @@ version=6
 [system.l1_cntrl6.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_cntrl6.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_cntrl6.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_cntrl6.sequencer]
 type=RubySequencer
@@ -702,29 +822,44 @@ version=7
 [system.l1_cntrl7.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_cntrl7.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_cntrl7.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_cntrl7.sequencer]
 type=RubySequencer
@@ -777,110 +912,160 @@ topology=system.ruby.network.topology
 
 [system.ruby.network.topology]
 type=Topology
-children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8 routers0 routers1 routers2 routers3 routers4 routers5 routers6 routers7 routers8 routers9
+children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 ext_links5 ext_links6 ext_links7 ext_links8 int_links0 int_links1 int_links2 int_links3 int_links4 int_links5 int_links6 int_links7 int_links8
 description=Crossbar
 ext_links=system.ruby.network.topology.ext_links0 system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2 system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4 system.ruby.network.topology.ext_links5 system.ruby.network.topology.ext_links6 system.ruby.network.topology.ext_links7 system.ruby.network.topology.ext_links8
 int_links=system.ruby.network.topology.int_links0 system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2 system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4 system.ruby.network.topology.int_links5 system.ruby.network.topology.int_links6 system.ruby.network.topology.int_links7 system.ruby.network.topology.int_links8
 print_config=false
-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.routers4 system.ruby.network.topology.routers5 system.ruby.network.topology.routers6 system.ruby.network.topology.routers7 system.ruby.network.topology.routers8 system.ruby.network.topology.routers9
+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.ext_links3.int_node system.ruby.network.topology.ext_links4.int_node system.ruby.network.topology.ext_links5.int_node system.ruby.network.topology.ext_links6.int_node system.ruby.network.topology.ext_links7.int_node system.ruby.network.topology.ext_links8.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.l1_cntrl1
-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.ext_links2]
 type=SimpleExtLink
+children=int_node
 bandwidth_factor=16
 ext_node=system.l1_cntrl2
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
 latency=1
 link_id=2
 weight=1
 
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
 [system.ruby.network.topology.ext_links3]
 type=SimpleExtLink
+children=int_node
 bandwidth_factor=16
 ext_node=system.l1_cntrl3
-int_node=system.ruby.network.topology.routers3
+int_node=system.ruby.network.topology.ext_links3.int_node
 latency=1
 link_id=3
 weight=1
 
+[system.ruby.network.topology.ext_links3.int_node]
+type=BasicRouter
+router_id=3
+
 [system.ruby.network.topology.ext_links4]
 type=SimpleExtLink
+children=int_node
 bandwidth_factor=16
 ext_node=system.l1_cntrl4
-int_node=system.ruby.network.topology.routers4
+int_node=system.ruby.network.topology.ext_links4.int_node
 latency=1
 link_id=4
 weight=1
 
+[system.ruby.network.topology.ext_links4.int_node]
+type=BasicRouter
+router_id=4
+
 [system.ruby.network.topology.ext_links5]
 type=SimpleExtLink
+children=int_node
 bandwidth_factor=16
 ext_node=system.l1_cntrl5
-int_node=system.ruby.network.topology.routers5
+int_node=system.ruby.network.topology.ext_links5.int_node
 latency=1
 link_id=5
 weight=1
 
+[system.ruby.network.topology.ext_links5.int_node]
+type=BasicRouter
+router_id=5
+
 [system.ruby.network.topology.ext_links6]
 type=SimpleExtLink
+children=int_node
 bandwidth_factor=16
 ext_node=system.l1_cntrl6
-int_node=system.ruby.network.topology.routers6
+int_node=system.ruby.network.topology.ext_links6.int_node
 latency=1
 link_id=6
 weight=1
 
+[system.ruby.network.topology.ext_links6.int_node]
+type=BasicRouter
+router_id=6
+
 [system.ruby.network.topology.ext_links7]
 type=SimpleExtLink
+children=int_node
 bandwidth_factor=16
 ext_node=system.l1_cntrl7
-int_node=system.ruby.network.topology.routers7
+int_node=system.ruby.network.topology.ext_links7.int_node
 latency=1
 link_id=7
 weight=1
 
+[system.ruby.network.topology.ext_links7.int_node]
+type=BasicRouter
+router_id=7
+
 [system.ruby.network.topology.ext_links8]
 type=SimpleExtLink
+children=int_node
 bandwidth_factor=16
 ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers8
+int_node=system.ruby.network.topology.ext_links8.int_node
 latency=1
 link_id=8
 weight=1
 
+[system.ruby.network.topology.ext_links8.int_node]
+type=BasicRouter
+router_id=8
+
 [system.ruby.network.topology.int_links0]
 type=SimpleIntLink
+children=node_b
 bandwidth_factor=16
 latency=1
 link_id=9
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers9
+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=9
+
 [system.ruby.network.topology.int_links1]
 type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=10
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers9
+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.int_links2]
@@ -888,8 +1073,8 @@ type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=11
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links3]
@@ -897,8 +1082,8 @@ type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=12
-node_a=system.ruby.network.topology.routers3
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links3.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links4]
@@ -906,8 +1091,8 @@ type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=13
-node_a=system.ruby.network.topology.routers4
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links4.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links5]
@@ -915,8 +1100,8 @@ type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=14
-node_a=system.ruby.network.topology.routers5
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links5.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links6]
@@ -924,8 +1109,8 @@ type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=15
-node_a=system.ruby.network.topology.routers6
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links6.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links7]
@@ -933,8 +1118,8 @@ type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=16
-node_a=system.ruby.network.topology.routers7
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links7.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
 weight=1
 
 [system.ruby.network.topology.int_links8]
@@ -942,50 +1127,10 @@ type=SimpleIntLink
 bandwidth_factor=16
 latency=1
 link_id=17
-node_a=system.ruby.network.topology.routers8
-node_b=system.ruby.network.topology.routers9
+node_a=system.ruby.network.topology.ext_links8.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.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
-[system.ruby.network.topology.routers4]
-type=BasicRouter
-router_id=4
-
-[system.ruby.network.topology.routers5]
-type=BasicRouter
-router_id=5
-
-[system.ruby.network.topology.routers6]
-type=BasicRouter
-router_id=6
-
-[system.ruby.network.topology.routers7]
-type=BasicRouter
-router_id=7
-
-[system.ruby.network.topology.routers8]
-type=BasicRouter
-router_id=8
-
-[system.ruby.network.topology.routers9]
-type=BasicRouter
-router_id=9
-
 [system.ruby.profiler]
 type=RubyProfiler
 all_instructions=false
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
index bc60d72d3..f73f14411 100755
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
@@ -1,8 +1,8 @@
 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 compiled Jul 28 2012 11:27:37
+gem5 started Jul 28 2012 11:35:39
 gem5 executing on zizzer
 command line: build/ALPHA_MOESI_hammer/gem5.opt -d build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer -re tests/run.py build/ALPHA_MOESI_hammer/tests/opt/quick/se/50.memtest/alpha/linux/memtest-ruby-MOESI_hammer
 Global frequency set at 1000000000 ticks per second
diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
index 7c588684e..18deaff5a 100644
--- a/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
+++ b/tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
@@ -4,9 +4,159 @@ sim_seconds                                  0.019129                       # Nu
 sim_ticks                                    19129199                       # Number of ticks simulated
 final_tick                                   19129199                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                 171697                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 369968                       # Number of bytes of host memory used
-host_seconds                                   111.41                       # Real time elapsed on the host
+host_tick_rate                                 190724                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 378788                       # Number of bytes of host memory used
+host_seconds                                   100.30                       # Real time elapsed on the host
+system.l1_cntrl4.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl4.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl4.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl4.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl4.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl4.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl4.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl4.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl4.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl4.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl4.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl4.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl4.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl4.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl5.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl5.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl5.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl5.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl5.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl5.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl5.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl5.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl5.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl5.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl5.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl5.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl5.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl5.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl6.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl6.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl6.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl6.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl6.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl6.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl6.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl6.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl6.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl6.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl6.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl6.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl6.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl6.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl7.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl7.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl7.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl7.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl7.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl7.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl7.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl7.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl7.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl7.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl7.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl7.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl7.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl7.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+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.l1_cntrl1.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl1.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl1.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl1.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl1.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl1.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl1.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl1.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl1.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl1.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl1.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl1.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl1.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl1.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl2.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl2.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl2.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl2.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl2.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl2.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl2.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl2.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl2.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl2.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl2.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl2.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl2.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl2.L2cacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl3.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl3.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl3.L1DcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl3.L1DcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl3.L1IcacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl3.L1IcacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl3.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl3.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl3.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
+system.l1_cntrl3.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
+system.l1_cntrl3.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads
+system.l1_cntrl3.L2cacheMemory.num_tag_array_writes            0                       # number of tag array writes
+system.l1_cntrl3.L2cacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
+system.l1_cntrl3.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
 system.cpu0.num_reads                          100000                       # number of read accesses completed
 system.cpu0.num_writes                          53893                       # number of write accesses completed
 system.cpu0.num_copies                              0                       # number of copy accesses completed