ARM: update stats for bp and squash fixes.

3 files changed, 29 insertions, 22 deletions

diff --git a/tests/long/se/30.eon/ref/arm/linux/simple-timing/config.ini b/tests/long/se/30.eon/ref/arm/linux/simple-timing/config.ini
index 0fa8c3883..d9e3f9f38 100644
--- a/tests/long/se/30.eon/ref/arm/linux/simple-timing/config.ini
+++ b/tests/long/se/30.eon/ref/arm/linux/simple-timing/config.ini
@@ -10,6 +10,7 @@ time_sync_spin_threshold=100000000
 type=System
 children=cpu membus physmem
 boot_osflags=a
+clock=1
 init_param=0
 kernel=
 load_addr_mask=1099511627775
@@ -47,7 +48,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
 system=system
@@ -61,16 +61,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 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=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=262144
 subblock_size=0
 system=system
@@ -89,8 +91,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.cpu.toL2Bus.slave[3]
 
@@ -99,16 +101,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 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=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=1000
 size=131072
 subblock_size=0
 system=system
@@ -130,8 +134,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.cpu.toL2Bus.slave[2]
 
@@ -140,16 +144,18 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=2
 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=10
 prefetch_on_access=false
 prefetcher=Null
 prioritizeRequests=false
 repl=Null
+response_latency=10000
 size=2097152
 subblock_size=0
 system=system
@@ -176,12 +182,12 @@ type=ExeTracer
 [system.cpu.workload]
 type=LiveProcess
 cmd=eon chair.control.cook chair.camera chair.surfaces chair.cook.ppm ppm pixels_out.cook
-cwd=build/ARM/tests/fast/long/se/30.eon/arm/linux/simple-timing
+cwd=build/ARM/tests/opt/long/se/30.eon/arm/linux/simple-timing
 egid=100
 env=
 errout=cerr
 euid=100
-executable=/dist/m5/cpu2000/binaries/arm/linux/eon
+executable=/projects/pd/randd/dist/cpu2000/binaries/arm/linux/eon
 gid=100
 input=cin
 max_stack_size=67108864
@@ -199,13 +205,14 @@ clock=1000
 header_cycles=1
 use_default_range=false
 width=8
-master=system.physmem.port[0]
+master=system.physmem.port
 slave=system.system_port system.cpu.l2cache.mem_side
 
 [system.physmem]
 type=SimpleMemory
+bandwidth=73.000000
+clock=1
 conf_table_reported=false
-file=
 in_addr_map=true
 latency=30000
 latency_var=0
diff --git a/tests/long/se/30.eon/ref/arm/linux/simple-timing/simout b/tests/long/se/30.eon/ref/arm/linux/simple-timing/simout
index 091d7545a..38cd602c6 100755
--- a/tests/long/se/30.eon/ref/arm/linux/simple-timing/simout
+++ b/tests/long/se/30.eon/ref/arm/linux/simple-timing/simout
@@ -1,10 +1,10 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jul  2 2012 09:08:16
-gem5 started Jul  2 2012 16:02:17
-gem5 executing on zizzer
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/long/se/30.eon/arm/linux/simple-timing -re tests/run.py build/ARM/tests/fast/long/se/30.eon/arm/linux/simple-timing
+gem5 compiled Sep 21 2012 11:19:00
+gem5 started Sep 21 2012 13:57:28
+gem5 executing on u200540-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/30.eon/arm/linux/simple-timing -re tests/run.py build/ARM/tests/opt/long/se/30.eon/arm/linux/simple-timing
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 info: Increasing stack size by one page.
diff --git a/tests/long/se/30.eon/ref/arm/linux/simple-timing/stats.txt b/tests/long/se/30.eon/ref/arm/linux/simple-timing/stats.txt
index 3487a1e4f..7b678cb0b 100644
--- a/tests/long/se/30.eon/ref/arm/linux/simple-timing/stats.txt
+++ b/tests/long/se/30.eon/ref/arm/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.525920                       # Nu
 sim_ticks                                525920061000                       # Number of ticks simulated
 final_tick                               525920061000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 966127                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1235157                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             1862970627                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 241076                       # Number of bytes of host memory used
-host_seconds                                   282.30                       # Real time elapsed on the host
+host_inst_rate                                 787177                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1006377                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1517904458                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 235608                       # Number of bytes of host memory used
+host_seconds                                   346.48                       # Real time elapsed on the host
 sim_insts                                   272739283                       # Number of instructions simulated
 sim_ops                                     348687122                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst            166976                       # Number of bytes read from this memory
@@ -78,7 +78,7 @@ system.cpu.committedOps                     348687122                       # Nu
 system.cpu.num_int_alu_accesses             279584917                       # Number of integer alu accesses
 system.cpu.num_fp_alu_accesses              114216705                       # Number of float alu accesses
 system.cpu.num_func_calls                    12448615                       # number of times a function call or return occured
-system.cpu.num_conditional_control_insts     18087060                       # number of instructions that are conditional controls
+system.cpu.num_conditional_control_insts     18105896                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    279584917                       # number of integer instructions
 system.cpu.num_fp_insts                     114216705                       # number of float instructions
 system.cpu.num_int_register_reads          2212913168                       # number of times the integer registers were read