regressions: update stats due to branch predictor changes

The actual statistical values are being updated for only two tests belonging
to sparc architecture and inorder cpu: 00.hello and 02.insttest. For others
the patch updates config.ini and name changes to statistical variables.

3 files changed, 33 insertions, 29 deletions

diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
index e13d309d9..56a5a7d83 100644
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
@@ -4,16 +4,16 @@ children=bridge cpu disk0 disk2 intrctrl iobridge iobus membus physmem simple_di
 boot_cpu_frequency=250
 boot_osflags=root=/dev/hda1 console=ttyS0
 clock=1000
-console=/gem5/dist/binaries/console
+console=/scratch/nilay/GEM5/system/binaries/console
 init_param=0
-kernel=/gem5/dist/binaries/vmlinux
+kernel=/scratch/nilay/GEM5/system/binaries/vmlinux
 load_addr_mask=1099511627775
 mem_mode=atomic
 mem_ranges=0:134217727
 memories=drivesys.physmem
 num_work_ids=16
-pal=/gem5/dist/binaries/ts_osfpal
-readfile=/gem5/configs/boot/netperf-server.rcS
+pal=/scratch/nilay/GEM5/system/binaries/ts_osfpal
+readfile=/scratch/nilay/GEM5/gem5/configs/boot/netperf-server.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -39,6 +39,7 @@ slave=drivesys.membus.master[0]
 [drivesys.cpu]
 type=AtomicSimpleCPU
 children=dtb interrupts isa itb tracer
+branchPred=Null
 checker=Null
 clock=250
 cpu_id=0
@@ -103,7 +104,7 @@ table_size=65536
 
 [drivesys.disk0.image.child]
 type=RawDiskImage
-image_file=/gem5/dist/disks/linux-latest.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img
 read_only=true
 
 [drivesys.disk2]
@@ -123,7 +124,7 @@ table_size=65536
 
 [drivesys.disk2.image.child]
 type=RawDiskImage
-image_file=/gem5/dist/disks/linux-bigswap2.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
 read_only=true
 
 [drivesys.intrctrl]
@@ -214,7 +215,7 @@ system=drivesys
 
 [drivesys.simple_disk.disk]
 type=RawDiskImage
-image_file=/gem5/dist/disks/linux-latest.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img
 read_only=true
 
 [drivesys.terminal]
@@ -777,16 +778,16 @@ children=bridge cpu disk0 disk2 intrctrl iobridge iobus membus physmem simple_di
 boot_cpu_frequency=500
 boot_osflags=root=/dev/hda1 console=ttyS0
 clock=1000
-console=/gem5/dist/binaries/console
+console=/scratch/nilay/GEM5/system/binaries/console
 init_param=0
-kernel=/gem5/dist/binaries/vmlinux
+kernel=/scratch/nilay/GEM5/system/binaries/vmlinux
 load_addr_mask=1099511627775
 mem_mode=atomic
 mem_ranges=0:134217727
 memories=testsys.physmem
 num_work_ids=16
-pal=/gem5/dist/binaries/ts_osfpal
-readfile=/gem5/configs/boot/netperf-stream-client.rcS
+pal=/scratch/nilay/GEM5/system/binaries/ts_osfpal
+readfile=/scratch/nilay/GEM5/gem5/configs/boot/netperf-stream-client.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -812,6 +813,7 @@ slave=testsys.membus.master[0]
 [testsys.cpu]
 type=AtomicSimpleCPU
 children=dtb interrupts isa itb tracer
+branchPred=Null
 checker=Null
 clock=500
 cpu_id=0
@@ -876,7 +878,7 @@ table_size=65536
 
 [testsys.disk0.image.child]
 type=RawDiskImage
-image_file=/gem5/dist/disks/linux-latest.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img
 read_only=true
 
 [testsys.disk2]
@@ -896,7 +898,7 @@ table_size=65536
 
 [testsys.disk2.image.child]
 type=RawDiskImage
-image_file=/gem5/dist/disks/linux-bigswap2.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
 read_only=true
 
 [testsys.intrctrl]
@@ -987,7 +989,7 @@ system=testsys
 
 [testsys.simple_disk.disk]
 type=RawDiskImage
-image_file=/gem5/dist/disks/linux-latest.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-latest.img
 read_only=true
 
 [testsys.terminal]
diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
index 6ea7e55c1..4fa3d404b 100755
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
@@ -1,14 +1,16 @@
+Redirecting stdout to build/ALPHA/tests/opt/quick/fs/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic/simout
+Redirecting stderr to build/ALPHA/tests/opt/quick/fs/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jan  4 2013 21:09:21
-gem5 started Jan  4 2013 21:17:35
-gem5 executing on u200540
+gem5 compiled Jan 23 2013 13:29:14
+gem5 started Jan 23 2013 14:07:46
+gem5 executing on ribera.cs.wisc.edu
 command line: build/ALPHA/gem5.opt -d build/ALPHA/tests/opt/quick/fs/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic -re tests/run.py build/ALPHA/tests/opt/quick/fs/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /gem5/dist/binaries/vmlinux
+info: kernel located at: /scratch/nilay/GEM5/system/binaries/vmlinux
       0: testsys.tsunami.io.rtc: Real-time clock set to Thu Jan  1 00:00:00 2009
-info: kernel located at: /gem5/dist/binaries/vmlinux
+info: kernel located at: /scratch/nilay/GEM5/system/binaries/vmlinux
       0: drivesys.tsunami.io.rtc: Real-time clock set to Thu Jan  1 00:00:00 2009
 info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 4321612280500 because checkpoint
diff --git a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
index ae987c639..015bc1924 100644
--- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
+++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.200409                       # Nu
 sim_ticks                                200409284500                       # Number of ticks simulated
 final_tick                               4321205328500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                7091560                       # Simulator instruction rate (inst/s)
-host_op_rate                                  7091556                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             2715554324                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 465632                       # Number of bytes of host memory used
-host_seconds                                    73.80                       # Real time elapsed on the host
+host_inst_rate                               13697441                       # Simulator instruction rate (inst/s)
+host_op_rate                                 13697433                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             5245128514                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 514692                       # Number of bytes of host memory used
+host_seconds                                    38.21                       # Real time elapsed on the host
 sim_insts                                   523360203                       # Number of instructions simulated
 sim_ops                                     523360203                       # Number of ops (including micro ops) simulated
 testsys.physmem.bytes_read::cpu.inst         80888044                       # Number of bytes read from this memory
@@ -751,11 +751,11 @@ sim_seconds                                  0.000407                       # Nu
 sim_ticks                                   406952000                       # Number of ticks simulated
 final_tick                               4321612280500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                             3682675458                       # Simulator instruction rate (inst/s)
-host_op_rate                               3681807032                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             2861829739                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 465632                       # Number of bytes of host memory used
-host_seconds                                     0.14                       # Real time elapsed on the host
+host_inst_rate                             7058170696                       # Simulator instruction rate (inst/s)
+host_op_rate                               7056390513                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             5484794115                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 514692                       # Number of bytes of host memory used
+host_seconds                                     0.07                       # Real time elapsed on the host
 sim_insts                                   523432506                       # Number of instructions simulated
 sim_ops                                     523432506                       # Number of ops (including micro ops) simulated
 testsys.physmem.bytes_read::cpu.inst           144604                       # Number of bytes read from this memory