SPARC: update SE stats for FP fix

--HG--
extra : rebase_source : 954a009a9f8eef6cae6050ee99f264e0fb456f85

6 files changed, 26 insertions, 28 deletions

diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-atomic/config.ini b/tests/long/70.twolf/ref/sparc/linux/simple-atomic/config.ini
index ee5b3b672..b59640844 100644
--- a/tests/long/70.twolf/ref/sparc/linux/simple-atomic/config.ini
+++ b/tests/long/70.twolf/ref/sparc/linux/simple-atomic/config.ini
@@ -9,6 +9,7 @@ time_sync_spin_threshold=100000000
 type=System
 children=cpu membus physmem
 mem_mode=atomic
+memories=system.physmem
 physmem=system.physmem
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
@@ -61,7 +62,7 @@ type=ExeTracer
 [system.cpu.workload]
 type=LiveProcess
 cmd=twolf smred
-cwd=build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-atomic
+cwd=build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-atomic
 egid=100
 env=
 errout=cerr
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-atomic/simout b/tests/long/70.twolf/ref/sparc/linux/simple-atomic/simout
index 705894fd8..a36de6b20 100755
--- a/tests/long/70.twolf/ref/sparc/linux/simple-atomic/simout
+++ b/tests/long/70.twolf/ref/sparc/linux/simple-atomic/simout
@@ -1,14 +1,12 @@
-Redirecting stdout to build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-atomic/simout
-Redirecting stderr to build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-atomic/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jun 12 2011 07:14:44
-gem5 started Jun 12 2011 07:14:52
+gem5 compiled Nov 30 2011 17:14:16
+gem5 started Nov 30 2011 17:16:48
 gem5 executing on zizzer
-command line: build/SPARC_SE/gem5.opt -d build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-atomic -re tests/run.py build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-atomic
-Couldn't unlink  build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-atomic/smred.sav
-Couldn't unlink  build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-atomic/smred.sv2
+command line: build/SPARC_SE/gem5.fast -d build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-atomic -re tests/run.py build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-atomic
+Couldn't unlink  build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-atomic/smred.sav
+Couldn't unlink  build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-atomic/smred.sv2
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-atomic/stats.txt b/tests/long/70.twolf/ref/sparc/linux/simple-atomic/stats.txt
index c1047d2b2..9a564c8ae 100644
--- a/tests/long/70.twolf/ref/sparc/linux/simple-atomic/stats.txt
+++ b/tests/long/70.twolf/ref/sparc/linux/simple-atomic/stats.txt
@@ -3,10 +3,10 @@
 sim_seconds                                  0.096723                       # Number of seconds simulated
 sim_ticks                                 96722951500                       # Number of ticks simulated
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                2494224                       # Simulator instruction rate (inst/s)
-host_tick_rate                             1247118942                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 225000                       # Number of bytes of host memory used
-host_seconds                                    77.56                       # Real time elapsed on the host
+host_inst_rate                                3820563                       # Simulator instruction rate (inst/s)
+host_tick_rate                             1910292029                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 200496                       # Number of bytes of host memory used
+host_seconds                                    50.63                       # Real time elapsed on the host
 sim_insts                                   193444769                       # Number of instructions simulated
 system.cpu.workload.num_syscalls                  401                       # Number of system calls
 system.cpu.numCycles                        193445904                       # number of cpu cycles simulated
@@ -19,8 +19,8 @@ system.cpu.num_func_calls                     1957920                       # nu
 system.cpu.num_conditional_control_insts      8665107                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    167974818                       # number of integer instructions
 system.cpu.num_fp_insts                       1970372                       # number of float instructions
-system.cpu.num_int_register_reads           352386257                       # number of times the integer registers were read
-system.cpu.num_int_register_writes          163703467                       # number of times the integer registers were written
+system.cpu.num_int_register_reads           352617963                       # number of times the integer registers were read
+system.cpu.num_int_register_writes          163060137                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads              3181089                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes             2974850                       # number of times the floating registers were written
 system.cpu.num_mem_refs                      76733959                       # number of memory refs
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-timing/config.ini b/tests/long/70.twolf/ref/sparc/linux/simple-timing/config.ini
index 89315cddc..6069e1413 100644
--- a/tests/long/70.twolf/ref/sparc/linux/simple-timing/config.ini
+++ b/tests/long/70.twolf/ref/sparc/linux/simple-timing/config.ini
@@ -9,6 +9,7 @@ time_sync_spin_threshold=100000000
 type=System
 children=cpu membus physmem
 mem_mode=atomic
+memories=system.physmem
 physmem=system.physmem
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
@@ -164,7 +165,7 @@ type=ExeTracer
 [system.cpu.workload]
 type=LiveProcess
 cmd=twolf smred
-cwd=build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-timing
+cwd=build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-timing
 egid=100
 env=
 errout=cerr
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-timing/simout b/tests/long/70.twolf/ref/sparc/linux/simple-timing/simout
index d8ad09e2a..1a7df931f 100755
--- a/tests/long/70.twolf/ref/sparc/linux/simple-timing/simout
+++ b/tests/long/70.twolf/ref/sparc/linux/simple-timing/simout
@@ -1,14 +1,12 @@
-Redirecting stdout to build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-timing/simout
-Redirecting stderr to build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-timing/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jun 12 2011 07:14:44
-gem5 started Jun 12 2011 07:16:32
+gem5 compiled Nov 30 2011 17:14:16
+gem5 started Nov 30 2011 17:16:48
 gem5 executing on zizzer
-command line: build/SPARC_SE/gem5.opt -d build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-timing -re tests/run.py build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-timing
-Couldn't unlink  build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-timing/smred.sav
-Couldn't unlink  build/SPARC_SE/tests/opt/long/70.twolf/sparc/linux/simple-timing/smred.sv2
+command line: build/SPARC_SE/gem5.fast -d build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-timing -re tests/run.py build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-timing
+Couldn't unlink  build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-timing/smred.sav
+Couldn't unlink  build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-timing/smred.sv2
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-timing/stats.txt b/tests/long/70.twolf/ref/sparc/linux/simple-timing/stats.txt
index 03f17b992..106cfd4f6 100644
--- a/tests/long/70.twolf/ref/sparc/linux/simple-timing/stats.txt
+++ b/tests/long/70.twolf/ref/sparc/linux/simple-timing/stats.txt
@@ -3,10 +3,10 @@
 sim_seconds                                  0.270577                       # Number of seconds simulated
 sim_ticks                                270576960000                       # Number of ticks simulated
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1189238                       # Simulator instruction rate (inst/s)
-host_tick_rate                             1663421950                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 233652                       # Number of bytes of host memory used
-host_seconds                                   162.66                       # Real time elapsed on the host
+host_inst_rate                                2077025                       # Simulator instruction rate (inst/s)
+host_tick_rate                             2905196336                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 209472                       # Number of bytes of host memory used
+host_seconds                                    93.14                       # Real time elapsed on the host
 sim_insts                                   193444769                       # Number of instructions simulated
 system.cpu.workload.num_syscalls                  401                       # Number of system calls
 system.cpu.numCycles                        541153920                       # number of cpu cycles simulated
@@ -19,8 +19,8 @@ system.cpu.num_func_calls                     1957920                       # nu
 system.cpu.num_conditional_control_insts      8665107                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    167974818                       # number of integer instructions
 system.cpu.num_fp_insts                       1970372                       # number of float instructions
-system.cpu.num_int_register_reads           352386257                       # number of times the integer registers were read
-system.cpu.num_int_register_writes          163703466                       # number of times the integer registers were written
+system.cpu.num_int_register_reads           352617963                       # number of times the integer registers were read
+system.cpu.num_int_register_writes          163060136                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads              3181089                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes             2974850                       # number of times the floating registers were written
 system.cpu.num_mem_refs                      76733959                       # number of memory refs