ARM: Update stats for CBNZ fix.

19 files changed, 102 insertions, 97 deletions

diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
index a8278f7b9..f60d68e94 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.411694                       # Nu
 sim_ticks                                2411694099500                       # Number of ticks simulated
 final_tick                               2411694099500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1397437                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1806505                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            54757981393                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 382236                       # Number of bytes of host memory used
-host_seconds                                    44.04                       # Real time elapsed on the host
+host_inst_rate                                2022463                       # Simulator instruction rate (inst/s)
+host_op_rate                                  2614492                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            79249307765                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 379912                       # Number of bytes of host memory used
+host_seconds                                    30.43                       # Real time elapsed on the host
 sim_insts                                    61546998                       # Number of instructions simulated
 sim_ops                                      79563488                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                   68                       # Number of bytes read from this memory
@@ -264,7 +264,7 @@ system.cpu0.committedOps                     44975797                       # Nu
 system.cpu0.num_int_alu_accesses             39858123                       # Number of integer alu accesses
 system.cpu0.num_fp_alu_accesses                  4945                       # Number of float alu accesses
 system.cpu0.num_func_calls                    1311755                       # number of times a function call or return occured
-system.cpu0.num_conditional_control_insts      4494669                       # number of instructions that are conditional controls
+system.cpu0.num_conditional_control_insts      4652122                       # number of instructions that are conditional controls
 system.cpu0.num_int_insts                    39858123                       # number of integer instructions
 system.cpu0.num_fp_insts                         4945                       # number of float instructions
 system.cpu0.num_int_register_reads          202125744                       # number of times the integer registers were read
@@ -433,7 +433,7 @@ system.cpu1.committedOps                     34587691                       # Nu
 system.cpu1.num_int_alu_accesses             30998246                       # Number of integer alu accesses
 system.cpu1.num_fp_alu_accesses                  5772                       # Number of float alu accesses
 system.cpu1.num_func_calls                     758024                       # number of times a function call or return occured
-system.cpu1.num_conditional_control_insts      3375080                       # number of instructions that are conditional controls
+system.cpu1.num_conditional_control_insts      3438794                       # number of instructions that are conditional controls
 system.cpu1.num_int_insts                    30998246                       # number of integer instructions
 system.cpu1.num_fp_insts                         5772                       # number of float instructions
 system.cpu1.num_int_register_reads          156835040                       # number of times the integer registers were read
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
index 38cf5a959..86fb980a7 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.332317                       # Nu
 sim_ticks                                2332316587000                       # Number of ticks simulated
 final_tick                               2332316587000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1602803                       # Simulator instruction rate (inst/s)
-host_op_rate                                  2069882                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            63078962864                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 382192                       # Number of bytes of host memory used
-host_seconds                                    36.97                       # Real time elapsed on the host
+host_inst_rate                                1979884                       # Simulator instruction rate (inst/s)
+host_op_rate                                  2556849                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            77919104565                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 379864                       # Number of bytes of host memory used
+host_seconds                                    29.93                       # Real time elapsed on the host
 sim_insts                                    59262876                       # Number of instructions simulated
 sim_ops                                      76532931                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                   20                       # Number of bytes read from this memory
@@ -189,7 +189,7 @@ system.cpu.committedOps                      76532931                       # Nu
 system.cpu.num_int_alu_accesses              68161177                       # Number of integer alu accesses
 system.cpu.num_fp_alu_accesses                  10269                       # Number of float alu accesses
 system.cpu.num_func_calls                     1971944                       # number of times a function call or return occured
-system.cpu.num_conditional_control_insts      7572657                       # number of instructions that are conditional controls
+system.cpu.num_conditional_control_insts      7793824                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                     68161177                       # number of integer instructions
 system.cpu.num_fp_insts                         10269                       # number of float instructions
 system.cpu.num_int_register_reads           345365607                       # number of times the integer registers were read
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
index 415456c85..a94cfdfbd 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.669611                       # Nu
 sim_ticks                                2669611225000                       # Number of ticks simulated
 final_tick                               2669611225000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 656752                       # Simulator instruction rate (inst/s)
-host_op_rate                                   840171                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            28603719755                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 384032                       # Number of bytes of host memory used
-host_seconds                                    93.33                       # Real time elapsed on the host
+host_inst_rate                                 888599                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1136769                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            38701401221                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 381720                       # Number of bytes of host memory used
+host_seconds                                    68.98                       # Real time elapsed on the host
 sim_insts                                    61295262                       # Number of instructions simulated
 sim_ops                                      78413959                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                   68                       # Number of bytes read from this memory
@@ -494,7 +494,7 @@ system.cpu0.committedOps                     43969024                       # Nu
 system.cpu0.num_int_alu_accesses             39881498                       # Number of integer alu accesses
 system.cpu0.num_fp_alu_accesses                  4107                       # Number of float alu accesses
 system.cpu0.num_func_calls                     977479                       # number of times a function call or return occured
-system.cpu0.num_conditional_control_insts      4512711                       # number of instructions that are conditional controls
+system.cpu0.num_conditional_control_insts      4566516                       # number of instructions that are conditional controls
 system.cpu0.num_int_insts                    39881498                       # number of integer instructions
 system.cpu0.num_fp_insts                         4107                       # number of float instructions
 system.cpu0.num_int_register_reads          225043856                       # number of times the integer registers were read
@@ -762,7 +762,7 @@ system.cpu1.committedOps                     34444935                       # Nu
 system.cpu1.num_int_alu_accesses             31033253                       # Number of integer alu accesses
 system.cpu1.num_fp_alu_accesses                  5714                       # Number of float alu accesses
 system.cpu1.num_func_calls                    1093852                       # number of times a function call or return occured
-system.cpu1.num_conditional_control_insts      3362553                       # number of instructions that are conditional controls
+system.cpu1.num_conditional_control_insts      3529915                       # number of instructions that are conditional controls
 system.cpu1.num_int_insts                    31033253                       # number of integer instructions
 system.cpu1.num_fp_insts                         5714                       # number of float instructions
 system.cpu1.num_int_register_reads          181157193                       # number of times the integer registers were read
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
index be18b1f6a..e62e718fc 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.591442                       # Nu
 sim_ticks                                2591441692000                       # Number of ticks simulated
 final_tick                               2591441692000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 652104                       # Simulator instruction rate (inst/s)
-host_op_rate                                   833155                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            28605499848                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 382484                       # Number of bytes of host memory used
-host_seconds                                    90.59                       # Real time elapsed on the host
+host_inst_rate                                 886915                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1133159                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            38905818967                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 380156                       # Number of bytes of host memory used
+host_seconds                                    66.61                       # Real time elapsed on the host
 sim_insts                                    59075683                       # Number of instructions simulated
 sim_ops                                      75477515                       # Number of ops (including micro ops) simulated
 system.realview.nvmem.bytes_read                   20                       # Number of bytes read from this memory
@@ -301,7 +301,7 @@ system.cpu.committedOps                      75477515                       # Nu
 system.cpu.num_int_alu_accesses              68255270                       # Number of integer alu accesses
 system.cpu.num_fp_alu_accesses                  10269                       # Number of float alu accesses
 system.cpu.num_func_calls                     1975579                       # number of times a function call or return occured
-system.cpu.num_conditional_control_insts      7580611                       # number of instructions that are conditional controls
+system.cpu.num_conditional_control_insts      7801778                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                     68255270                       # number of integer instructions
 system.cpu.num_fp_insts                         10269                       # number of float instructions
 system.cpu.num_int_register_reads           390835391                       # number of times the integer registers were read
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status
index 52e0ca5f6..48ab2f520 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status
@@ -1 +1 @@
-build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing passed.
+build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-timing FAILED!
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/simout b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/simout
index 5166f789f..762733a64 100755
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/simout
@@ -1,8 +1,8 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Mar  7 2012 20:12:09
-gem5 started Mar  7 2012 20:12:14
+gem5 compiled Mar  9 2012 10:15:20
+gem5 started Mar  9 2012 10:17:15
 gem5 executing on zizzer
 command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/se/00.hello/arm/linux/o3-timing-checker -re tests/run.py build/ARM/tests/fast/quick/se/00.hello/arm/linux/o3-timing-checker
 Global frequency set at 1000000000000 ticks per second
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt
index 96a493c86..3a90ce183 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing-checker/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000010                       # Nu
 sim_ticks                                    10389500                       # Number of ticks simulated
 final_tick                                   10389500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                   3665                       # Simulator instruction rate (inst/s)
-host_op_rate                                     4572                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                8277068                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 225396                       # Number of bytes of host memory used
-host_seconds                                     1.26                       # Real time elapsed on the host
+host_inst_rate                                  29724                       # Simulator instruction rate (inst/s)
+host_op_rate                                    37079                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               67113828                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 225376                       # Number of bytes of host memory used
+host_seconds                                     0.16                       # Real time elapsed on the host
 sim_insts                                        4600                       # Number of instructions simulated
 sim_ops                                          5739                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                       25600                       # Number of bytes read from this memory
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini
index a46f1b25d..29d0ee1dd 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/config.ini
@@ -26,7 +26,7 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
-system_port=system.membus.port[0]
+system_port=system.membus.slave[0]
 
 [system.cpu]
 type=DerivO3CPU
@@ -127,7 +127,7 @@ icache_port=system.cpu.icache.cpu_side
 
 [system.cpu.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
 forward_snoops=true
@@ -148,7 +148,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.dcache_port
-mem_side=system.cpu.toL2Bus.port[1]
+mem_side=system.cpu.toL2Bus.slave[1]
 
 [system.cpu.dtb]
 type=ArmTLB
@@ -161,7 +161,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.cpu.toL2Bus.port[3]
+port=system.cpu.toL2Bus.slave[3]
 
 [system.cpu.fuPool]
 type=FUPool
@@ -428,7 +428,7 @@ opLat=3
 
 [system.cpu.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
 forward_snoops=true
@@ -449,7 +449,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.icache_port
-mem_side=system.cpu.toL2Bus.port[0]
+mem_side=system.cpu.toL2Bus.slave[0]
 
 [system.cpu.interrupts]
 type=ArmInterrupts
@@ -465,11 +465,11 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.cpu.toL2Bus.port[2]
+port=system.cpu.toL2Bus.slave[2]
 
 [system.cpu.l2cache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
 forward_snoops=true
@@ -489,8 +489,8 @@ tgts_per_mshr=5
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu.toL2Bus.port[4]
-mem_side=system.membus.port[2]
+cpu_side=system.cpu.toL2Bus.master[0]
+mem_side=system.membus.slave[1]
 
 [system.cpu.toL2Bus]
 type=Bus
@@ -500,7 +500,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.l2cache.cpu_side
+master=system.cpu.l2cache.cpu_side
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -532,7 +533,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.system_port system.physmem.port[0] system.cpu.l2cache.mem_side
+master=system.physmem.port[0]
+slave=system.system_port system.cpu.l2cache.mem_side
 
 [system.physmem]
 type=PhysicalMemory
@@ -542,5 +544,5 @@ latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=system.membus.port[1]
+port=system.membus.master[0]
 
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/simout b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/simout
index e7e46b503..cdeb6fd62 100755
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/simout
@@ -1,8 +1,8 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 12 2012 17:19:56
-gem5 started Feb 12 2012 19:57:12
+gem5 compiled Mar  9 2012 10:15:20
+gem5 started Mar  9 2012 10:17:15
 gem5 executing on zizzer
 command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/se/00.hello/arm/linux/o3-timing -re tests/run.py build/ARM/tests/fast/quick/se/00.hello/arm/linux/o3-timing
 Global frequency set at 1000000000000 ticks per second
diff --git a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt
index 6eeb02481..b762714e2 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000010                       # Nu
 sim_ticks                                    10389500                       # Number of ticks simulated
 final_tick                                   10389500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  66059                       # Simulator instruction rate (inst/s)
-host_op_rate                                    82394                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              149123755                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 221320                       # Number of bytes of host memory used
-host_seconds                                     0.07                       # Real time elapsed on the host
+host_inst_rate                                  31505                       # Simulator instruction rate (inst/s)
+host_op_rate                                    39300                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               71135954                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 225060                       # Number of bytes of host memory used
+host_seconds                                     0.15                       # Real time elapsed on the host
 sim_insts                                        4600                       # Number of instructions simulated
 sim_ops                                          5739                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                       25600                       # Number of bytes read from this memory
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini
index 305feda00..1bb97fb57 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/config.ini
@@ -154,7 +154,7 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/projects/pd/randd/dist/test-progs/hello/bin/arm/linux/hello
+executable=/dist/m5/regression/test-progs/hello/bin/arm/linux/hello
 gid=100
 input=cin
 max_stack_size=67108864
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/simout b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/simout
index ee81f724d..708e8b4cb 100755
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/simout
@@ -1,9 +1,9 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Mar  8 2012 09:03:12
-gem5 started Mar  8 2012 09:06:54
-gem5 executing on u200540-lin
+gem5 compiled Mar  9 2012 10:15:20
+gem5 started Mar  9 2012 10:17:15
+gem5 executing on zizzer
 command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/se/00.hello/arm/linux/simple-atomic-dummychecker -re tests/run.py build/ARM/tests/fast/quick/se/00.hello/arm/linux/simple-atomic-dummychecker
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/stats.txt
index f9b36225f..047a13c77 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic-dummychecker/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000003                       # Nu
 sim_ticks                                     2875500                       # Number of ticks simulated
 final_tick                                    2875500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  76819                       # Simulator instruction rate (inst/s)
-host_op_rate                                    95818                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               47998674                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 212240                       # Number of bytes of host memory used
-host_seconds                                     0.06                       # Real time elapsed on the host
+host_inst_rate                                  25080                       # Simulator instruction rate (inst/s)
+host_op_rate                                    31285                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               15673750                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 214860                       # Number of bytes of host memory used
+host_seconds                                     0.18                       # Real time elapsed on the host
 sim_insts                                        4600                       # Number of instructions simulated
 sim_ops                                          5739                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                       22944                       # Number of bytes read from this memory
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini
index a2c85dbcd..85d2a6f4f 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/config.ini
@@ -26,7 +26,7 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
-system_port=system.membus.port[0]
+system_port=system.membus.slave[0]
 
 [system.cpu]
 type=AtomicSimpleCPU
@@ -57,8 +57,8 @@ system=system
 tracer=system.cpu.tracer
 width=1
 workload=system.cpu.workload
-dcache_port=system.membus.port[3]
-icache_port=system.membus.port[2]
+dcache_port=system.membus.slave[2]
+icache_port=system.membus.slave[1]
 
 [system.cpu.dtb]
 type=ArmTLB
@@ -71,7 +71,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.membus.port[5]
+port=system.membus.slave[4]
 
 [system.cpu.interrupts]
 type=ArmInterrupts
@@ -87,7 +87,7 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.membus.port[4]
+port=system.membus.slave[3]
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -119,7 +119,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.system_port system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port
+master=system.physmem.port[0]
+slave=system.system_port system.cpu.icache_port system.cpu.dcache_port system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
 [system.physmem]
 type=PhysicalMemory
@@ -129,5 +130,5 @@ latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=system.membus.port[1]
+port=system.membus.master[0]
 
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/simout b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/simout
index ef47c4ce8..a7a548730 100755
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/simout
@@ -1,8 +1,8 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 11 2012 13:10:40
-gem5 started Feb 11 2012 15:36:01
+gem5 compiled Mar  9 2012 10:15:20
+gem5 started Mar  9 2012 10:17:15
 gem5 executing on zizzer
 command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/se/00.hello/arm/linux/simple-atomic -re tests/run.py build/ARM/tests/fast/quick/se/00.hello/arm/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/stats.txt
index 1e73e7e3d..b76299081 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000003                       # Nu
 sim_ticks                                     2875500                       # Number of ticks simulated
 final_tick                                    2875500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 866385                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1077395                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              538148768                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 211284                       # Number of bytes of host memory used
-host_seconds                                     0.01                       # Real time elapsed on the host
+host_inst_rate                                  24562                       # Simulator instruction rate (inst/s)
+host_op_rate                                    30640                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               15350765                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 214764                       # Number of bytes of host memory used
+host_seconds                                     0.19                       # Real time elapsed on the host
 sim_insts                                        4600                       # Number of instructions simulated
 sim_ops                                          5739                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                       22944                       # Number of bytes read from this memory
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini
index 1d87891a2..50ec8fd07 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/config.ini
@@ -26,7 +26,7 @@ work_cpus_ckpt_count=0
 work_end_ckpt_count=0
 work_end_exit_count=0
 work_item_id=-1
-system_port=system.membus.port[0]
+system_port=system.membus.slave[0]
 
 [system.cpu]
 type=TimingSimpleCPU
@@ -59,7 +59,7 @@ icache_port=system.cpu.icache.cpu_side
 
 [system.cpu.dcache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
 forward_snoops=true
@@ -80,7 +80,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.dcache_port
-mem_side=system.cpu.toL2Bus.port[1]
+mem_side=system.cpu.toL2Bus.slave[1]
 
 [system.cpu.dtb]
 type=ArmTLB
@@ -93,11 +93,11 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.cpu.toL2Bus.port[3]
+port=system.cpu.toL2Bus.slave[3]
 
 [system.cpu.icache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
 forward_snoops=true
@@ -118,7 +118,7 @@ trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.icache_port
-mem_side=system.cpu.toL2Bus.port[0]
+mem_side=system.cpu.toL2Bus.slave[0]
 
 [system.cpu.interrupts]
 type=ArmInterrupts
@@ -134,11 +134,11 @@ type=ArmTableWalker
 max_backoff=100000
 min_backoff=0
 sys=system
-port=system.cpu.toL2Bus.port[2]
+port=system.cpu.toL2Bus.slave[2]
 
 [system.cpu.l2cache]
 type=BaseCache
-addr_range=0:18446744073709551615
+addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
 forward_snoops=true
@@ -158,8 +158,8 @@ tgts_per_mshr=5
 trace_addr=0
 two_queue=false
 write_buffers=8
-cpu_side=system.cpu.toL2Bus.port[4]
-mem_side=system.membus.port[2]
+cpu_side=system.cpu.toL2Bus.master[0]
+mem_side=system.membus.slave[1]
 
 [system.cpu.toL2Bus]
 type=Bus
@@ -169,7 +169,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port system.cpu.l2cache.cpu_side
+master=system.cpu.l2cache.cpu_side
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -201,7 +202,8 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=64
-port=system.system_port system.physmem.port[0] system.cpu.l2cache.mem_side
+master=system.physmem.port[0]
+slave=system.system_port system.cpu.l2cache.mem_side
 
 [system.physmem]
 type=PhysicalMemory
@@ -211,5 +213,5 @@ latency_var=0
 null=false
 range=0:134217727
 zero=false
-port=system.membus.port[1]
+port=system.membus.master[0]
 
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/simout b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/simout
index 378a682d4..25b5aeda6 100755
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/simout
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/simout
@@ -1,8 +1,8 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Feb 11 2012 13:10:40
-gem5 started Feb 11 2012 15:36:11
+gem5 compiled Mar  9 2012 10:15:20
+gem5 started Mar  9 2012 10:17:15
 gem5 executing on zizzer
 command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/se/00.hello/arm/linux/simple-timing -re tests/run.py build/ARM/tests/fast/quick/se/00.hello/arm/linux/simple-timing
 Global frequency set at 1000000000000 ticks per second
diff --git a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/stats.txt b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/stats.txt
index a93efeca8..4b008ff5c 100644
--- a/tests/quick/se/00.hello/ref/arm/linux/simple-timing/stats.txt
+++ b/tests/quick/se/00.hello/ref/arm/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.000026                       # Nu
 sim_ticks                                    26361000                       # Number of ticks simulated
 final_tick                                   26361000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 456104                       # Simulator instruction rate (inst/s)
-host_op_rate                                   565540                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             2619225899                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 220184                       # Number of bytes of host memory used
-host_seconds                                     0.01                       # Real time elapsed on the host
+host_inst_rate                                  29458                       # Simulator instruction rate (inst/s)
+host_op_rate                                    36586                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              169706423                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 223936                       # Number of bytes of host memory used
+host_seconds                                     0.16                       # Real time elapsed on the host
 sim_insts                                        4574                       # Number of instructions simulated
 sim_ops                                          5682                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                       22400                       # Number of bytes read from this memory