ARM: update stats for bp and squash fixes.

3 files changed, 90 insertions, 57 deletions

diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
index 59476048e..20da648f5 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
@@ -10,13 +10,15 @@ time_sync_spin_threshold=100000000
 type=LinuxArmSystem
 children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
 atags_addr=256
-boot_loader=/dist/m5/system/binaries/boot.arm
+boot_loader=/projects/pd/randd/dist/binaries/boot.arm
 boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
+clock=1
+dtb_filename=
 early_kernel_symbols=false
 flags_addr=268435504
 gic_cpu_addr=520093952
 init_param=0
-kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=atomic
@@ -37,12 +39,11 @@ system_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
+clock=1
 delay=50000
-nack_delay=4000
 ranges=268435456:520093695 1073741824:1610612735
 req_size=16
 resp_size=16
-write_ack=false
 master=system.iobus.slave[0]
 slave=system.membus.master[0]
 
@@ -63,7 +64,7 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-arm-ael.img
+image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu]
@@ -87,7 +88,6 @@ max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
 numThreads=1
-phase=0
 profile=0
 progress_interval=0
 simulate_data_stalls=false
@@ -104,16 +104,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=4
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=32768
 subblock_size=0
 system=system
@@ -132,8 +134,8 @@ walker=system.cpu.dtb.walker
 
 [system.cpu.dtb.walker]
 type=ArmTableWalker
-max_backoff=100000
-min_backoff=0
+clock=1
+num_squash_per_cycle=2
 sys=system
 port=system.toL2Bus.slave[3]
 
@@ -142,16 +144,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=1000
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=4
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=32768
 subblock_size=0
 system=system
@@ -173,8 +177,8 @@ walker=system.cpu.itb.walker
 
 [system.cpu.itb.walker]
 type=ArmTableWalker
-max_backoff=100000
-min_backoff=0
+clock=1
+num_squash_per_cycle=2
 sys=system
 port=system.toL2Bus.slave[2]
 
@@ -200,16 +204,18 @@ type=BaseCache
 addr_ranges=0:268435455
 assoc=8
 block_size=64
+clock=1
 forward_snoops=false
 hash_delay=1
+hit_latency=50000
 is_top_level=false
-latency=50000
 max_miss_count=0
 mshrs=20
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=50000
 size=1024
 subblock_size=0
 system=system
@@ -225,16 +231,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=8
 block_size=64
+clock=1
 forward_snoops=true
 hash_delay=1
+hit_latency=10000
 is_top_level=false
-latency=10000
 max_miss_count=0
 mshrs=92
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=10000
 size=4194304
 subblock_size=0
 system=system
@@ -259,9 +267,10 @@ slave=system.system_port system.iocache.mem_side system.l2c.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
+clock=1
 fake_mem=false
 pio_addr=0
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=true
 ret_data16=65535
@@ -275,8 +284,9 @@ pio=system.membus.default
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=73.000000
+clock=1
 conf_table_reported=true
-file=
 in_addr_map=true
 latency=30000
 latency_var=0
@@ -296,17 +306,19 @@ system=system
 
 [system.realview.a9scu]
 type=A9SCU
+clock=1
 pio_addr=520093696
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.membus.master[5]
 
 [system.realview.aaci_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268451840
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[21]
 
@@ -350,16 +362,15 @@ SubClassCode=1
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=32902
+clock=1
 config_latency=20000
 ctrl_offset=2
 disks=system.cf0
 io_shift=1
-max_backoff_delay=10000000
-min_backoff_delay=4000
 pci_bus=2
 pci_dev=7
 pci_func=0
-pio_latency=1000
+pio_latency=30000
 platform=system.realview
 system=system
 config=system.iobus.master[8]
@@ -372,8 +383,6 @@ amba_id=1315089
 clock=41667
 gic=system.realview.gic
 int_num=55
-max_backoff_delay=10000000
-min_backoff_delay=4000
 pio_addr=268566528
 pio_latency=10000
 system=system
@@ -384,17 +393,19 @@ pio=system.iobus.master[4]
 [system.realview.dmac_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268632064
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[9]
 
 [system.realview.flash_fake]
 type=IsaFake
+clock=1
 fake_mem=true
 pio_addr=1073741824
-pio_latency=1000
+pio_latency=100000
 pio_size=536870912
 ret_bad_addr=false
 ret_data16=65535
@@ -408,6 +419,7 @@ pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Gic
+clock=1
 cpu_addr=520093952
 cpu_pio_delay=10000
 dist_addr=520097792
@@ -421,39 +433,43 @@ pio=system.membus.master[3]
 [system.realview.gpio0_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268513280
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[16]
 
 [system.realview.gpio1_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268517376
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[17]
 
 [system.realview.gpio2_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268521472
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[18]
 
 [system.realview.kmi0]
 type=Pl050
 amba_id=1314896
+clock=1
 gic=system.realview.gic
 int_delay=1000000
 int_num=52
 is_mouse=false
 pio_addr=268460032
-pio_latency=1000
+pio_latency=100000
 system=system
 vnc=system.vncserver
 pio=system.iobus.master[5]
@@ -461,21 +477,23 @@ pio=system.iobus.master[5]
 [system.realview.kmi1]
 type=Pl050
 amba_id=1314896
+clock=1
 gic=system.realview.gic
 int_delay=1000000
 int_num=53
 is_mouse=true
 pio_addr=268464128
-pio_latency=1000
+pio_latency=100000
 system=system
 vnc=system.vncserver
 pio=system.iobus.master[6]
 
 [system.realview.l2x0_fake]
 type=IsaFake
+clock=1
 fake_mem=false
 pio_addr=520101888
-pio_latency=1000
+pio_latency=100000
 pio_size=4095
 ret_bad_addr=false
 ret_data16=65535
@@ -494,23 +512,25 @@ gic=system.realview.gic
 int_num_timer=29
 int_num_watchdog=30
 pio_addr=520095232
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.membus.master[6]
 
 [system.realview.mmc_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268455936
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[22]
 
 [system.realview.nvmem]
 type=SimpleMemory
+bandwidth=73.000000
+clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30000
 latency_var=0
@@ -521,9 +541,10 @@ port=system.membus.master[1]
 
 [system.realview.realview_io]
 type=RealViewCtrl
+clock=1
 idreg=0
 pio_addr=268435456
-pio_latency=1000
+pio_latency=100000
 proc_id0=201326592
 proc_id1=201327138
 system=system
@@ -532,11 +553,12 @@ pio=system.iobus.master[1]
 [system.realview.rtc]
 type=PL031
 amba_id=3412017
+clock=1
 gic=system.realview.gic
 int_delay=100000
 int_num=42
 pio_addr=268529664
-pio_latency=1000
+pio_latency=100000
 system=system
 time=Thu Jan  1 00:00:00 2009
 pio=system.iobus.master[23]
@@ -544,73 +566,80 @@ pio=system.iobus.master[23]
 [system.realview.sci_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268492800
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[20]
 
 [system.realview.smc_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=269357056
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[13]
 
 [system.realview.sp810_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=true
 pio_addr=268439552
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[14]
 
 [system.realview.ssp_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268488704
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[19]
 
 [system.realview.timer0]
 type=Sp804
 amba_id=1316868
+clock=1
 clock0=1000000
 clock1=1000000
 gic=system.realview.gic
 int_num0=36
 int_num1=36
 pio_addr=268505088
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[2]
 
 [system.realview.timer1]
 type=Sp804
 amba_id=1316868
+clock=1
 clock0=1000000
 clock1=1000000
 gic=system.realview.gic
 int_num0=37
 int_num1=37
 pio_addr=268509184
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[3]
 
 [system.realview.uart]
 type=Pl011
+clock=1
 end_on_eot=false
 gic=system.realview.gic
 int_delay=100000
 int_num=44
 pio_addr=268472320
-pio_latency=1000
+pio_latency=100000
 platform=system.realview
 system=system
 terminal=system.terminal
@@ -619,36 +648,40 @@ pio=system.iobus.master[0]
 [system.realview.uart1_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268476416
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[10]
 
 [system.realview.uart2_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268480512
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[11]
 
 [system.realview.uart3_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268484608
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[12]
 
 [system.realview.watchdog_fake]
 type=AmbaFake
 amba_id=0
+clock=1
 ignore_access=false
 pio_addr=268500992
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[15]
 
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
index 5f92f06af..2d2abdc83 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
@@ -1,12 +1,12 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jul 26 2012 21:40:00
-gem5 started Jul 27 2012 00:54:29
-gem5 executing on zizzer
+gem5 compiled Sep 21 2012 11:19:00
+gem5 started Sep 21 2012 11:19:18
+gem5 executing on u200540-lin
 command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
 info: Using bootloader at address 0x80000000
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 2332810264000 because m5_exit instruction encountered
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 e8bc29aac..ae8484f6d 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.332810                       # Nu
 sim_ticks                                2332810264000                       # Number of ticks simulated
 final_tick                               2332810264000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1498673                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1927201                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            57874436068                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 388524                       # Number of bytes of host memory used
-host_seconds                                    40.31                       # Real time elapsed on the host
+host_inst_rate                                1681370                       # Simulator instruction rate (inst/s)
+host_op_rate                                  2162138                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            64929680145                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 380112                       # Number of bytes of host memory used
+host_seconds                                    35.93                       # Real time elapsed on the host
 sim_insts                                    60408639                       # Number of instructions simulated
 sim_ops                                      77681819                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::realview.clcd    111673344                       # Number of bytes read from this memory
@@ -225,7 +225,7 @@ system.cpu.committedOps                      77681819                       # Nu
 system.cpu.num_int_alu_accesses              68795605                       # Number of integer alu accesses
 system.cpu.num_fp_alu_accesses                  10269                       # Number of float alu accesses
 system.cpu.num_func_calls                     2136008                       # number of times a function call or return occured
-system.cpu.num_conditional_control_insts      7904929                       # number of instructions that are conditional controls
+system.cpu.num_conditional_control_insts      7942113                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                     68795605                       # number of integer instructions
 system.cpu.num_fp_insts                         10269                       # number of float instructions
 system.cpu.num_int_register_reads           349324274                       # number of times the integer registers were read