ARM: Update stats for CBNZ fix.

2 files changed, 14 insertions, 13 deletions

diff --git a/tests/long/se/30.eon/ref/arm/linux/simple-atomic/config.ini b/tests/long/se/30.eon/ref/arm/linux/simple-atomic/config.ini
index 2d58b9952..a60b9f94a 100644
--- a/tests/long/se/30.eon/ref/arm/linux/simple-atomic/config.ini
+++ b/tests/long/se/30.eon/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/long/se/30.eon/ref/arm/linux/simple-atomic/stats.txt b/tests/long/se/30.eon/ref/arm/linux/simple-atomic/stats.txt
index 24bfa1f56..cbd6c2617 100644
--- a/tests/long/se/30.eon/ref/arm/linux/simple-atomic/stats.txt
+++ b/tests/long/se/30.eon/ref/arm/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.212344                       # Nu
 sim_ticks                                212344048000                       # Number of ticks simulated
 final_tick                               212344048000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                2097833                       # Simulator instruction rate (inst/s)
-host_op_rate                                  2681977                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             1631504750                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 220728                       # Number of bytes of host memory used
-host_seconds                                   130.15                       # Real time elapsed on the host
+host_inst_rate                                2182036                       # Simulator instruction rate (inst/s)
+host_op_rate                                  2789626                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1696989772                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 224464                       # Number of bytes of host memory used
+host_seconds                                   125.13                       # Real time elapsed on the host
 sim_insts                                   273037671                       # Number of instructions simulated
 sim_ops                                     349065408                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read                  1875350709                       # Number of bytes read from this memory
@@ -72,7 +72,7 @@ system.cpu.committedOps                     349065408                       # Nu
 system.cpu.num_int_alu_accesses             279584926                       # Number of integer alu accesses
 system.cpu.num_fp_alu_accesses              114216705                       # Number of float alu accesses
 system.cpu.num_func_calls                    12433363                       # number of times a function call or return occured
-system.cpu.num_conditional_control_insts     16271154                       # number of instructions that are conditional controls
+system.cpu.num_conditional_control_insts     18102314                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    279584926                       # number of integer instructions
 system.cpu.num_fp_insts                     114216705                       # number of float instructions
 system.cpu.num_int_register_reads          1887652191                       # number of times the integer registers were read