x86 Regressions: Update stats due to register predication

3 files changed, 19 insertions, 13 deletions

diff --git a/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/config.ini b/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/config.ini
index d332c41fc..66b4a9e4a 100644
--- a/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/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
@@ -48,7 +49,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
@@ -68,14 +68,16 @@ walker=system.cpu.dtb.walker
 
 [system.cpu.dtb.walker]
 type=X86PagetableWalker
+clock=1
 system=system
 port=system.membus.slave[4]
 
 [system.cpu.interrupts]
 type=X86LocalApic
+clock=1
 int_latency=1000
 pio_addr=2305843009213693952
-pio_latency=1000
+pio_latency=100000
 system=system
 int_master=system.membus.slave[5]
 int_slave=system.membus.master[2]
@@ -89,6 +91,7 @@ walker=system.cpu.itb.walker
 
 [system.cpu.itb.walker]
 type=X86PagetableWalker
+clock=1
 system=system
 port=system.membus.slave[3]
 
@@ -103,7 +106,7 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/dist/m5/cpu2000/binaries/x86/linux/bzip2
+executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/bzip2
 gid=100
 input=cin
 max_stack_size=67108864
@@ -126,6 +129,7 @@ slave=system.system_port system.cpu.icache_port system.cpu.dcache_port system.cp
 
 [system.physmem]
 type=SimpleMemory
+clock=1
 conf_table_reported=false
 file=
 in_addr_map=true
diff --git a/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/simout b/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/simout
index 3c6a6098c..7e9cf379d 100755
--- a/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/simout
+++ b/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/simout
@@ -1,9 +1,11 @@
+Redirecting stdout to build/X86/tests/opt/long/se/60.bzip2/x86/linux/simple-atomic/simout
+Redirecting stderr to build/X86/tests/opt/long/se/60.bzip2/x86/linux/simple-atomic/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Aug 13 2012 17:08:22
-gem5 started Aug 13 2012 19:04:29
-gem5 executing on zizzer
+gem5 compiled Sep 10 2012 22:29:00
+gem5 started Sep 10 2012 22:29:07
+gem5 executing on ribera.cs.wisc.edu
 command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/60.bzip2/x86/linux/simple-atomic -re tests/run.py build/X86/tests/opt/long/se/60.bzip2/x86/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
diff --git a/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/stats.txt b/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/stats.txt
index f428cd228..292417104 100644
--- a/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.846007                       # Nu
 sim_ticks                                2846007226500                       # Number of ticks simulated
 final_tick                               2846007226500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1386030                       # Simulator instruction rate (inst/s)
-host_op_rate                                  2159560                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             1311351119                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 224788                       # Number of bytes of host memory used
-host_seconds                                  2170.29                       # Real time elapsed on the host
+host_inst_rate                                1027178                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1600436                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              971834142                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 265228                       # Number of bytes of host memory used
+host_seconds                                  2928.49                       # Real time elapsed on the host
 sim_insts                                  3008081022                       # Number of instructions simulated
 sim_ops                                    4686862594                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::cpu.inst       32105863056                       # Number of bytes read from this memory
@@ -45,8 +45,8 @@ system.cpu.num_func_calls                           0                       # nu
 system.cpu.num_conditional_control_insts    182173300                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                   4686862523                       # number of integer instructions
 system.cpu.num_fp_insts                             0                       # number of float instructions
-system.cpu.num_int_register_reads         14165752588                       # number of times the integer registers were read
-system.cpu.num_int_register_writes         6716691731                       # number of times the integer registers were written
+system.cpu.num_int_register_reads         11915474418                       # number of times the integer registers were read
+system.cpu.num_int_register_writes         5355771935                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads                    0                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes                   0                       # number of times the floating registers were written
 system.cpu.num_mem_refs                    1677713082                       # number of memory refs