bp: fix up stats for changes to branch predictor

1 files changed, 16 insertions, 82 deletions

diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
index 84e5e8c3f..499c6a74e 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
@@ -1,6 +1,7 @@
 [root]
 type=Root
 children=system
+full_system=true
 time_sync_enable=false
 time_sync_period=100000000000
 time_sync_spin_threshold=100000000
@@ -8,7 +9,6 @@ time_sync_spin_threshold=100000000
 [system]
 type=LinuxArmSystem
 children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver
-boot_cpu_frequency=500
 boot_loader=/dist/m5/system/binaries/boot.arm
 boot_loader_mem=system.nvmem
 boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
@@ -19,7 +19,7 @@ kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=atomic
-memories=system.physmem system.nvmem
+memories=system.nvmem system.physmem
 midr_regval=890224640
 num_work_ids=16
 physmem=system.physmem
@@ -93,6 +93,7 @@ simulate_inst_stalls=false
 system=system
 tracer=system.cpu0.tracer
 width=1
+workload=
 dcache_port=system.cpu0.dcache.cpu_side
 icache_port=system.cpu0.icache.cpu_side
 
@@ -107,20 +108,13 @@ is_top_level=true
 latency=1000
 max_miss_count=0
 mshrs=4
-num_cpus=1
-prefetch_data_accesses_only=false
-prefetch_degree=1
-prefetch_latency=10000
 prefetch_on_access=false
-prefetch_past_page=false
-prefetch_policy=none
-prefetch_serial_squash=false
-prefetch_use_cpu_id=true
-prefetcher_size=100
+prefetcher=Null
 prioritizeRequests=false
 repl=Null
 size=32768
 subblock_size=0
+system=system
 tgts_per_mshr=8
 trace_addr=0
 two_queue=false
@@ -152,20 +146,13 @@ is_top_level=true
 latency=1000
 max_miss_count=0
 mshrs=4
-num_cpus=1
-prefetch_data_accesses_only=false
-prefetch_degree=1
-prefetch_latency=10000
 prefetch_on_access=false
-prefetch_past_page=false
-prefetch_policy=none
-prefetch_serial_squash=false
-prefetch_use_cpu_id=true
-prefetcher_size=100
+prefetcher=Null
 prioritizeRequests=false
 repl=Null
 size=32768
 subblock_size=0
+system=system
 tgts_per_mshr=8
 trace_addr=0
 two_queue=false
@@ -220,6 +207,7 @@ simulate_inst_stalls=false
 system=system
 tracer=system.cpu1.tracer
 width=1
+workload=
 dcache_port=system.cpu1.dcache.cpu_side
 icache_port=system.cpu1.icache.cpu_side
 
@@ -234,20 +222,13 @@ is_top_level=true
 latency=1000
 max_miss_count=0
 mshrs=4
-num_cpus=1
-prefetch_data_accesses_only=false
-prefetch_degree=1
-prefetch_latency=10000
 prefetch_on_access=false
-prefetch_past_page=false
-prefetch_policy=none
-prefetch_serial_squash=false
-prefetch_use_cpu_id=true
-prefetcher_size=100
+prefetcher=Null
 prioritizeRequests=false
 repl=Null
 size=32768
 subblock_size=0
+system=system
 tgts_per_mshr=8
 trace_addr=0
 two_queue=false
@@ -279,20 +260,13 @@ is_top_level=true
 latency=1000
 max_miss_count=0
 mshrs=4
-num_cpus=1
-prefetch_data_accesses_only=false
-prefetch_degree=1
-prefetch_latency=10000
 prefetch_on_access=false
-prefetch_past_page=false
-prefetch_policy=none
-prefetch_serial_squash=false
-prefetch_use_cpu_id=true
-prefetcher_size=100
+prefetcher=Null
 prioritizeRequests=false
 repl=Null
 size=32768
 subblock_size=0
+system=system
 tgts_per_mshr=8
 trace_addr=0
 two_queue=false
@@ -344,20 +318,13 @@ is_top_level=false
 latency=50000
 max_miss_count=0
 mshrs=20
-num_cpus=1
-prefetch_data_accesses_only=false
-prefetch_degree=1
-prefetch_latency=500000
 prefetch_on_access=false
-prefetch_past_page=false
-prefetch_policy=none
-prefetch_serial_squash=false
-prefetch_use_cpu_id=true
-prefetcher_size=100
+prefetcher=Null
 prioritizeRequests=false
 repl=Null
 size=1024
 subblock_size=0
+system=system
 tgts_per_mshr=12
 trace_addr=0
 two_queue=false
@@ -376,20 +343,13 @@ is_top_level=false
 latency=10000
 max_miss_count=0
 mshrs=92
-num_cpus=2
-prefetch_data_accesses_only=false
-prefetch_degree=1
-prefetch_latency=100000
 prefetch_on_access=false
-prefetch_past_page=false
-prefetch_policy=none
-prefetch_serial_squash=false
-prefetch_use_cpu_id=true
-prefetcher_size=100
+prefetcher=Null
 prioritizeRequests=false
 repl=Null
 size=4194304
 subblock_size=0
+system=system
 tgts_per_mshr=16
 trace_addr=0
 two_queue=false
@@ -415,7 +375,6 @@ fake_mem=false
 pio_addr=0
 pio_latency=1000
 pio_size=8
-platform=system.realview
 ret_bad_addr=true
 ret_data16=65535
 ret_data32=4294967295
@@ -457,7 +416,6 @@ system=system
 type=A9SCU
 pio_addr=520093696
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.membus.port[5]
 
@@ -467,7 +425,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268451840
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[24]
 
@@ -537,7 +494,6 @@ max_backoff_delay=10000000
 min_backoff_delay=4000
 pio_addr=268566528
 pio_latency=10000
-platform=system.realview
 system=system
 vnc=system.vncserver
 dma=system.iobus.port[6]
@@ -549,7 +505,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268632064
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[12]
 
@@ -559,7 +514,6 @@ fake_mem=true
 pio_addr=1073741824
 pio_latency=1000
 pio_size=536870912
-platform=system.realview
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -588,7 +542,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268513280
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[19]
 
@@ -598,7 +551,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268517376
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[20]
 
@@ -608,7 +560,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268521472
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[21]
 
@@ -621,7 +572,6 @@ int_num=52
 is_mouse=false
 pio_addr=268460032
 pio_latency=1000
-platform=system.realview
 system=system
 vnc=system.vncserver
 pio=system.iobus.port[7]
@@ -635,7 +585,6 @@ int_num=53
 is_mouse=true
 pio_addr=268464128
 pio_latency=1000
-platform=system.realview
 system=system
 vnc=system.vncserver
 pio=system.iobus.port[8]
@@ -646,7 +595,6 @@ fake_mem=false
 pio_addr=520101888
 pio_latency=1000
 pio_size=4095
-platform=system.realview
 ret_bad_addr=false
 ret_data16=65535
 ret_data32=4294967295
@@ -665,7 +613,6 @@ int_num_timer=29
 int_num_watchdog=30
 pio_addr=520095232
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.membus.port[6]
 
@@ -675,7 +622,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268455936
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[25]
 
@@ -684,7 +630,6 @@ type=RealViewCtrl
 idreg=0
 pio_addr=268435456
 pio_latency=1000
-platform=system.realview
 proc_id0=201326592
 proc_id1=201327138
 system=system
@@ -696,7 +641,6 @@ amba_id=266289
 ignore_access=false
 pio_addr=268529664
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[26]
 
@@ -706,7 +650,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268492800
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[23]
 
@@ -716,7 +659,6 @@ amba_id=0
 ignore_access=false
 pio_addr=269357056
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[16]
 
@@ -726,7 +668,6 @@ amba_id=0
 ignore_access=true
 pio_addr=268439552
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[17]
 
@@ -736,7 +677,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268488704
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[22]
 
@@ -750,7 +690,6 @@ int_num0=36
 int_num1=36
 pio_addr=268505088
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[3]
 
@@ -764,7 +703,6 @@ int_num0=37
 int_num1=37
 pio_addr=268509184
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[4]
 
@@ -787,7 +725,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268476416
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[13]
 
@@ -797,7 +734,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268480512
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[14]
 
@@ -807,7 +743,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268484608
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[15]
 
@@ -817,7 +752,6 @@ amba_id=0
 ignore_access=false
 pio_addr=268500992
 pio_latency=1000
-platform=system.realview
 system=system
 pio=system.iobus.port[18]