summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/long/00.gzip/ref/sparc/linux/o3-timing/config.ini2
-rwxr-xr-xtests/long/00.gzip/ref/sparc/linux/o3-timing/simout8
-rw-r--r--tests/long/00.gzip/ref/sparc/linux/o3-timing/stats.txt10
-rw-r--r--tests/long/00.gzip/ref/sparc/linux/simple-atomic/config.ini3
-rwxr-xr-xtests/long/00.gzip/ref/sparc/linux/simple-atomic/simout8
-rw-r--r--tests/long/00.gzip/ref/sparc/linux/simple-atomic/stats.txt10
-rw-r--r--tests/long/00.gzip/ref/sparc/linux/simple-timing/config.ini3
-rwxr-xr-xtests/long/00.gzip/ref/sparc/linux/simple-timing/simout8
-rw-r--r--tests/long/00.gzip/ref/sparc/linux/simple-timing/stats.txt10
-rw-r--r--tests/long/10.mcf/ref/sparc/linux/simple-atomic/config.ini3
-rwxr-xr-xtests/long/10.mcf/ref/sparc/linux/simple-atomic/simout8
-rw-r--r--tests/long/10.mcf/ref/sparc/linux/simple-atomic/stats.txt10
-rw-r--r--tests/long/10.mcf/ref/sparc/linux/simple-timing/config.ini3
-rwxr-xr-xtests/long/10.mcf/ref/sparc/linux/simple-timing/simout8
-rw-r--r--tests/long/10.mcf/ref/sparc/linux/simple-timing/stats.txt10
-rw-r--r--tests/long/50.vortex/ref/sparc/linux/simple-atomic/config.ini3
-rwxr-xr-xtests/long/50.vortex/ref/sparc/linux/simple-atomic/simout8
-rw-r--r--tests/long/50.vortex/ref/sparc/linux/simple-atomic/stats.txt10
-rw-r--r--tests/long/50.vortex/ref/sparc/linux/simple-timing/config.ini3
-rwxr-xr-xtests/long/50.vortex/ref/sparc/linux/simple-timing/simout8
-rw-r--r--tests/long/50.vortex/ref/sparc/linux/simple-timing/stats.txt10
-rw-r--r--tests/long/70.twolf/ref/sparc/linux/simple-atomic/config.ini3
-rwxr-xr-xtests/long/70.twolf/ref/sparc/linux/simple-atomic/simout12
-rw-r--r--tests/long/70.twolf/ref/sparc/linux/simple-atomic/stats.txt12
-rw-r--r--tests/long/70.twolf/ref/sparc/linux/simple-timing/config.ini3
-rwxr-xr-xtests/long/70.twolf/ref/sparc/linux/simple-timing/simout12
-rw-r--r--tests/long/70.twolf/ref/sparc/linux/simple-timing/stats.txt12
27 files changed, 95 insertions, 105 deletions
diff --git a/tests/long/00.gzip/ref/sparc/linux/o3-timing/config.ini b/tests/long/00.gzip/ref/sparc/linux/o3-timing/config.ini
index 80ace0dc5..f1874f64f 100644
--- a/tests/long/00.gzip/ref/sparc/linux/o3-timing/config.ini
+++ b/tests/long/00.gzip/ref/sparc/linux/o3-timing/config.ini
@@ -495,7 +495,7 @@ type=ExeTracer
[system.cpu.workload]
type=LiveProcess
cmd=gzip input.log 1
-cwd=build/SPARC_SE/tests/opt/long/00.gzip/sparc/linux/o3-timing
+cwd=build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/o3-timing
egid=100
env=
errout=cerr
diff --git a/tests/long/00.gzip/ref/sparc/linux/o3-timing/simout b/tests/long/00.gzip/ref/sparc/linux/o3-timing/simout
index cea2acb5a..df0fa130a 100755
--- a/tests/long/00.gzip/ref/sparc/linux/o3-timing/simout
+++ b/tests/long/00.gzip/ref/sparc/linux/o3-timing/simout
@@ -1,12 +1,10 @@
-Redirecting stdout to build/SPARC_SE/tests/opt/long/00.gzip/sparc/linux/o3-timing/simout
-Redirecting stderr to build/SPARC_SE/tests/opt/long/00.gzip/sparc/linux/o3-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Aug 20 2011 13:07:22
-gem5 started Aug 20 2011 13:07:33
+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/00.gzip/sparc/linux/o3-timing -re tests/run.py build/SPARC_SE/tests/opt/long/00.gzip/sparc/linux/o3-timing
+command line: build/SPARC_SE/gem5.fast -d build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/o3-timing -re tests/run.py build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/o3-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
spec_init
diff --git a/tests/long/00.gzip/ref/sparc/linux/o3-timing/stats.txt b/tests/long/00.gzip/ref/sparc/linux/o3-timing/stats.txt
index 58e0bfc8f..8c5bfcb3c 100644
--- a/tests/long/00.gzip/ref/sparc/linux/o3-timing/stats.txt
+++ b/tests/long/00.gzip/ref/sparc/linux/o3-timing/stats.txt
@@ -3,10 +3,10 @@
sim_seconds 0.408816 # Number of seconds simulated
sim_ticks 408816360000 # Number of ticks simulated
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 166907 # Simulator instruction rate (inst/s)
-host_tick_rate 48544601 # Simulator tick rate (ticks/s)
-host_mem_usage 212296 # Number of bytes of host memory used
-host_seconds 8421.46 # Real time elapsed on the host
+host_inst_rate 252046 # Simulator instruction rate (inst/s)
+host_tick_rate 73306837 # Simulator tick rate (ticks/s)
+host_mem_usage 206388 # Number of bytes of host memory used
+host_seconds 5576.78 # Real time elapsed on the host
sim_insts 1405604152 # Number of instructions simulated
system.cpu.workload.num_syscalls 49 # Number of system calls
system.cpu.numCycles 817632721 # number of cpu cycles simulated
@@ -273,7 +273,7 @@ system.cpu.int_regfile_writes 1303867666 # nu
system.cpu.fp_regfile_reads 16986540 # number of floating regfile reads
system.cpu.fp_regfile_writes 10452290 # number of floating regfile writes
system.cpu.misc_regfile_reads 605383822 # number of misc regfile reads
-system.cpu.misc_regfile_writes 2258933 # number of misc regfile writes
+system.cpu.misc_regfile_writes 2190883 # number of misc regfile writes
system.cpu.icache.replacements 166 # number of replacements
system.cpu.icache.tagsinuse 1031.400456 # Cycle average of tags in use
system.cpu.icache.total_refs 170772098 # Total number of references to valid blocks.
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-atomic/config.ini b/tests/long/00.gzip/ref/sparc/linux/simple-atomic/config.ini
index 215751210..864c2771b 100644
--- a/tests/long/00.gzip/ref/sparc/linux/simple-atomic/config.ini
+++ b/tests/long/00.gzip/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=gzip input.log 1
-cwd=build/SPARC_SE/tests/opt/long/00.gzip/sparc/linux/simple-atomic
+cwd=build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/simple-atomic
egid=100
env=
errout=cerr
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-atomic/simout b/tests/long/00.gzip/ref/sparc/linux/simple-atomic/simout
index 98d918157..3eb09159b 100755
--- a/tests/long/00.gzip/ref/sparc/linux/simple-atomic/simout
+++ b/tests/long/00.gzip/ref/sparc/linux/simple-atomic/simout
@@ -1,12 +1,10 @@
-Redirecting stdout to build/SPARC_SE/tests/opt/long/00.gzip/sparc/linux/simple-atomic/simout
-Redirecting stderr to build/SPARC_SE/tests/opt/long/00.gzip/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:15:22
+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/00.gzip/sparc/linux/simple-atomic -re tests/run.py build/SPARC_SE/tests/opt/long/00.gzip/sparc/linux/simple-atomic
+command line: build/SPARC_SE/gem5.fast -d build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/simple-atomic -re tests/run.py build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/simple-atomic
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
spec_init
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-atomic/stats.txt b/tests/long/00.gzip/ref/sparc/linux/simple-atomic/stats.txt
index 920d55128..ae12e23e4 100644
--- a/tests/long/00.gzip/ref/sparc/linux/simple-atomic/stats.txt
+++ b/tests/long/00.gzip/ref/sparc/linux/simple-atomic/stats.txt
@@ -3,10 +3,10 @@
sim_seconds 0.744764 # Number of seconds simulated
sim_ticks 744764119000 # Number of ticks simulated
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 2563815 # Simulator instruction rate (inst/s)
-host_tick_rate 1281911834 # Simulator tick rate (ticks/s)
-host_mem_usage 220472 # Number of bytes of host memory used
-host_seconds 580.98 # Real time elapsed on the host
+host_inst_rate 4241689 # Simulator instruction rate (inst/s)
+host_tick_rate 2120851440 # Simulator tick rate (ticks/s)
+host_mem_usage 196528 # Number of bytes of host memory used
+host_seconds 351.16 # Real time elapsed on the host
sim_insts 1489523295 # Number of instructions simulated
system.cpu.workload.num_syscalls 49 # Number of system calls
system.cpu.numCycles 1489528239 # number of cpu cycles simulated
@@ -20,7 +20,7 @@ system.cpu.num_conditional_control_insts 78161763 # nu
system.cpu.num_int_insts 1319481298 # number of integer instructions
system.cpu.num_fp_insts 8454127 # number of float instructions
system.cpu.num_int_register_reads 2499743582 # number of times the integer registers were read
-system.cpu.num_int_register_writes 1234411208 # number of times the integer registers were written
+system.cpu.num_int_register_writes 1234343158 # number of times the integer registers were written
system.cpu.num_fp_register_reads 16769332 # number of times the floating registers were read
system.cpu.num_fp_register_writes 10359244 # number of times the floating registers were written
system.cpu.num_mem_refs 569365767 # number of memory refs
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-timing/config.ini b/tests/long/00.gzip/ref/sparc/linux/simple-timing/config.ini
index f78fdda37..6dbddf888 100644
--- a/tests/long/00.gzip/ref/sparc/linux/simple-timing/config.ini
+++ b/tests/long/00.gzip/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=gzip input.log 1
-cwd=build/SPARC_SE/tests/opt/long/00.gzip/sparc/linux/simple-timing
+cwd=build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/simple-timing
egid=100
env=
errout=cerr
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-timing/simout b/tests/long/00.gzip/ref/sparc/linux/simple-timing/simout
index e85428b5b..4a77ef60d 100755
--- a/tests/long/00.gzip/ref/sparc/linux/simple-timing/simout
+++ b/tests/long/00.gzip/ref/sparc/linux/simple-timing/simout
@@ -1,12 +1,10 @@
-Redirecting stdout to build/SPARC_SE/tests/opt/long/00.gzip/sparc/linux/simple-timing/simout
-Redirecting stderr to build/SPARC_SE/tests/opt/long/00.gzip/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:19:37
+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/00.gzip/sparc/linux/simple-timing -re tests/run.py build/SPARC_SE/tests/opt/long/00.gzip/sparc/linux/simple-timing
+command line: build/SPARC_SE/gem5.fast -d build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/simple-timing -re tests/run.py build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/simple-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
spec_init
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-timing/stats.txt b/tests/long/00.gzip/ref/sparc/linux/simple-timing/stats.txt
index 1c38bff95..d75fccee8 100644
--- a/tests/long/00.gzip/ref/sparc/linux/simple-timing/stats.txt
+++ b/tests/long/00.gzip/ref/sparc/linux/simple-timing/stats.txt
@@ -3,10 +3,10 @@
sim_seconds 2.064259 # Number of seconds simulated
sim_ticks 2064258667000 # Number of ticks simulated
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1125008 # Simulator instruction rate (inst/s)
-host_tick_rate 1559093873 # Simulator tick rate (ticks/s)
-host_mem_usage 229120 # Number of bytes of host memory used
-host_seconds 1324.01 # Real time elapsed on the host
+host_inst_rate 2284016 # Simulator instruction rate (inst/s)
+host_tick_rate 3165307188 # Simulator tick rate (ticks/s)
+host_mem_usage 205232 # Number of bytes of host memory used
+host_seconds 652.15 # Real time elapsed on the host
sim_insts 1489523295 # Number of instructions simulated
system.cpu.workload.num_syscalls 49 # Number of system calls
system.cpu.numCycles 4128517334 # number of cpu cycles simulated
@@ -20,7 +20,7 @@ system.cpu.num_conditional_control_insts 78161763 # nu
system.cpu.num_int_insts 1319481298 # number of integer instructions
system.cpu.num_fp_insts 8454127 # number of float instructions
system.cpu.num_int_register_reads 2499743582 # number of times the integer registers were read
-system.cpu.num_int_register_writes 1234411207 # number of times the integer registers were written
+system.cpu.num_int_register_writes 1234343157 # number of times the integer registers were written
system.cpu.num_fp_register_reads 16769332 # number of times the floating registers were read
system.cpu.num_fp_register_writes 10359244 # number of times the floating registers were written
system.cpu.num_mem_refs 569365767 # number of memory refs
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-atomic/config.ini b/tests/long/10.mcf/ref/sparc/linux/simple-atomic/config.ini
index 904c0b6e2..7b0140e7c 100644
--- a/tests/long/10.mcf/ref/sparc/linux/simple-atomic/config.ini
+++ b/tests/long/10.mcf/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=mcf mcf.in
-cwd=build/SPARC_SE/tests/opt/long/10.mcf/sparc/linux/simple-atomic
+cwd=build/SPARC_SE/tests/fast/long/10.mcf/sparc/linux/simple-atomic
egid=100
env=
errout=cerr
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-atomic/simout b/tests/long/10.mcf/ref/sparc/linux/simple-atomic/simout
index 697635a50..ef22c481f 100755
--- a/tests/long/10.mcf/ref/sparc/linux/simple-atomic/simout
+++ b/tests/long/10.mcf/ref/sparc/linux/simple-atomic/simout
@@ -1,12 +1,10 @@
-Redirecting stdout to build/SPARC_SE/tests/opt/long/10.mcf/sparc/linux/simple-atomic/simout
-Redirecting stderr to build/SPARC_SE/tests/opt/long/10.mcf/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:20:15
+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/10.mcf/sparc/linux/simple-atomic -re tests/run.py build/SPARC_SE/tests/opt/long/10.mcf/sparc/linux/simple-atomic
+command line: build/SPARC_SE/gem5.fast -d build/SPARC_SE/tests/fast/long/10.mcf/sparc/linux/simple-atomic -re tests/run.py build/SPARC_SE/tests/fast/long/10.mcf/sparc/linux/simple-atomic
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-atomic/stats.txt b/tests/long/10.mcf/ref/sparc/linux/simple-atomic/stats.txt
index b13ced2e7..a31e20e25 100644
--- a/tests/long/10.mcf/ref/sparc/linux/simple-atomic/stats.txt
+++ b/tests/long/10.mcf/ref/sparc/linux/simple-atomic/stats.txt
@@ -3,10 +3,10 @@
sim_seconds 0.122216 # Number of seconds simulated
sim_ticks 122215830000 # Number of ticks simulated
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 2350642 # Simulator instruction rate (inst/s)
-host_tick_rate 1178195565 # Simulator tick rate (ticks/s)
-host_mem_usage 352660 # Number of bytes of host memory used
-host_seconds 103.73 # Real time elapsed on the host
+host_inst_rate 3705610 # Simulator instruction rate (inst/s)
+host_tick_rate 1857336235 # Simulator tick rate (ticks/s)
+host_mem_usage 328592 # Number of bytes of host memory used
+host_seconds 65.80 # Real time elapsed on the host
sim_insts 243835278 # Number of instructions simulated
system.cpu.workload.num_syscalls 443 # Number of system calls
system.cpu.numCycles 244431661 # number of cpu cycles simulated
@@ -20,7 +20,7 @@ system.cpu.num_conditional_control_insts 18619960 # nu
system.cpu.num_int_insts 194726506 # number of integer instructions
system.cpu.num_fp_insts 11630 # number of float instructions
system.cpu.num_int_register_reads 456819010 # number of times the integer registers were read
-system.cpu.num_int_register_writes 215451609 # number of times the integer registers were written
+system.cpu.num_int_register_writes 215451567 # number of times the integer registers were written
system.cpu.num_fp_register_reads 23256 # number of times the floating registers were read
system.cpu.num_fp_register_writes 90 # number of times the floating registers were written
system.cpu.num_mem_refs 105711442 # number of memory refs
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-timing/config.ini b/tests/long/10.mcf/ref/sparc/linux/simple-timing/config.ini
index 75e17228b..f14a1754a 100644
--- a/tests/long/10.mcf/ref/sparc/linux/simple-timing/config.ini
+++ b/tests/long/10.mcf/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=mcf mcf.in
-cwd=build/SPARC_SE/tests/opt/long/10.mcf/sparc/linux/simple-timing
+cwd=build/SPARC_SE/tests/fast/long/10.mcf/sparc/linux/simple-timing
egid=100
env=
errout=cerr
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-timing/simout b/tests/long/10.mcf/ref/sparc/linux/simple-timing/simout
index b7d0f3ac1..5a81ca9dc 100755
--- a/tests/long/10.mcf/ref/sparc/linux/simple-timing/simout
+++ b/tests/long/10.mcf/ref/sparc/linux/simple-timing/simout
@@ -1,12 +1,10 @@
-Redirecting stdout to build/SPARC_SE/tests/opt/long/10.mcf/sparc/linux/simple-timing/simout
-Redirecting stderr to build/SPARC_SE/tests/opt/long/10.mcf/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:15:16
+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/10.mcf/sparc/linux/simple-timing -re tests/run.py build/SPARC_SE/tests/opt/long/10.mcf/sparc/linux/simple-timing
+command line: build/SPARC_SE/gem5.fast -d build/SPARC_SE/tests/fast/long/10.mcf/sparc/linux/simple-timing -re tests/run.py build/SPARC_SE/tests/fast/long/10.mcf/sparc/linux/simple-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-timing/stats.txt b/tests/long/10.mcf/ref/sparc/linux/simple-timing/stats.txt
index 4bbbd4713..cec6d8979 100644
--- a/tests/long/10.mcf/ref/sparc/linux/simple-timing/stats.txt
+++ b/tests/long/10.mcf/ref/sparc/linux/simple-timing/stats.txt
@@ -3,10 +3,10 @@
sim_seconds 0.362431 # Number of seconds simulated
sim_ticks 362430887000 # Number of ticks simulated
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1087927 # Simulator instruction rate (inst/s)
-host_tick_rate 1617068836 # Simulator tick rate (ticks/s)
-host_mem_usage 361308 # Number of bytes of host memory used
-host_seconds 224.13 # Real time elapsed on the host
+host_inst_rate 1940887 # Simulator instruction rate (inst/s)
+host_tick_rate 2884887520 # Simulator tick rate (ticks/s)
+host_mem_usage 337564 # Number of bytes of host memory used
+host_seconds 125.63 # Real time elapsed on the host
sim_insts 243835278 # Number of instructions simulated
system.cpu.workload.num_syscalls 443 # Number of system calls
system.cpu.numCycles 724861774 # number of cpu cycles simulated
@@ -20,7 +20,7 @@ system.cpu.num_conditional_control_insts 18619960 # nu
system.cpu.num_int_insts 194726506 # number of integer instructions
system.cpu.num_fp_insts 11630 # number of float instructions
system.cpu.num_int_register_reads 456819010 # number of times the integer registers were read
-system.cpu.num_int_register_writes 215451608 # number of times the integer registers were written
+system.cpu.num_int_register_writes 215451566 # number of times the integer registers were written
system.cpu.num_fp_register_reads 23256 # number of times the floating registers were read
system.cpu.num_fp_register_writes 90 # number of times the floating registers were written
system.cpu.num_mem_refs 105711442 # number of memory refs
diff --git a/tests/long/50.vortex/ref/sparc/linux/simple-atomic/config.ini b/tests/long/50.vortex/ref/sparc/linux/simple-atomic/config.ini
index f40a3547d..dcd4bf473 100644
--- a/tests/long/50.vortex/ref/sparc/linux/simple-atomic/config.ini
+++ b/tests/long/50.vortex/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=vortex bendian.raw
-cwd=build/SPARC_SE/tests/opt/long/50.vortex/sparc/linux/simple-atomic
+cwd=build/SPARC_SE/tests/fast/long/50.vortex/sparc/linux/simple-atomic
egid=100
env=
errout=cerr
diff --git a/tests/long/50.vortex/ref/sparc/linux/simple-atomic/simout b/tests/long/50.vortex/ref/sparc/linux/simple-atomic/simout
index c5450c656..746f2d87f 100755
--- a/tests/long/50.vortex/ref/sparc/linux/simple-atomic/simout
+++ b/tests/long/50.vortex/ref/sparc/linux/simple-atomic/simout
@@ -1,12 +1,10 @@
-Redirecting stdout to build/SPARC_SE/tests/opt/long/50.vortex/sparc/linux/simple-atomic/simout
-Redirecting stderr to build/SPARC_SE/tests/opt/long/50.vortex/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:19:11
+gem5 compiled Nov 30 2011 17:14:16
+gem5 started Nov 30 2011 17:17:49
gem5 executing on zizzer
-command line: build/SPARC_SE/gem5.opt -d build/SPARC_SE/tests/opt/long/50.vortex/sparc/linux/simple-atomic -re tests/run.py build/SPARC_SE/tests/opt/long/50.vortex/sparc/linux/simple-atomic
+command line: build/SPARC_SE/gem5.fast -d build/SPARC_SE/tests/fast/long/50.vortex/sparc/linux/simple-atomic -re tests/run.py build/SPARC_SE/tests/fast/long/50.vortex/sparc/linux/simple-atomic
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/50.vortex/ref/sparc/linux/simple-atomic/stats.txt b/tests/long/50.vortex/ref/sparc/linux/simple-atomic/stats.txt
index be6b34c01..2fa280f51 100644
--- a/tests/long/50.vortex/ref/sparc/linux/simple-atomic/stats.txt
+++ b/tests/long/50.vortex/ref/sparc/linux/simple-atomic/stats.txt
@@ -3,10 +3,10 @@
sim_seconds 0.068149 # Number of seconds simulated
sim_ticks 68148678500 # Number of ticks simulated
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 2568565 # Simulator instruction rate (inst/s)
-host_tick_rate 1285774138 # Simulator tick rate (ticks/s)
-host_mem_usage 229364 # Number of bytes of host memory used
-host_seconds 53.00 # Real time elapsed on the host
+host_inst_rate 3860753 # Simulator instruction rate (inst/s)
+host_tick_rate 1932617843 # Simulator tick rate (ticks/s)
+host_mem_usage 204428 # Number of bytes of host memory used
+host_seconds 35.26 # Real time elapsed on the host
sim_insts 136139203 # Number of instructions simulated
system.cpu.workload.num_syscalls 1946 # Number of system calls
system.cpu.numCycles 136297358 # number of cpu cycles simulated
@@ -20,7 +20,7 @@ system.cpu.num_conditional_control_insts 8898970 # nu
system.cpu.num_int_insts 115187758 # number of integer instructions
system.cpu.num_fp_insts 2326977 # number of float instructions
system.cpu.num_int_register_reads 263032383 # number of times the integer registers were read
-system.cpu.num_int_register_writes 113225733 # number of times the integer registers were written
+system.cpu.num_int_register_writes 113147747 # number of times the integer registers were written
system.cpu.num_fp_register_reads 4725607 # number of times the floating registers were read
system.cpu.num_fp_register_writes 1150968 # number of times the floating registers were written
system.cpu.num_mem_refs 58160249 # number of memory refs
diff --git a/tests/long/50.vortex/ref/sparc/linux/simple-timing/config.ini b/tests/long/50.vortex/ref/sparc/linux/simple-timing/config.ini
index ef97a0705..51f71312a 100644
--- a/tests/long/50.vortex/ref/sparc/linux/simple-timing/config.ini
+++ b/tests/long/50.vortex/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=vortex bendian.raw
-cwd=build/SPARC_SE/tests/opt/long/50.vortex/sparc/linux/simple-timing
+cwd=build/SPARC_SE/tests/fast/long/50.vortex/sparc/linux/simple-timing
egid=100
env=
errout=cerr
diff --git a/tests/long/50.vortex/ref/sparc/linux/simple-timing/simout b/tests/long/50.vortex/ref/sparc/linux/simple-timing/simout
index 81a020192..7c4300466 100755
--- a/tests/long/50.vortex/ref/sparc/linux/simple-timing/simout
+++ b/tests/long/50.vortex/ref/sparc/linux/simple-timing/simout
@@ -1,12 +1,10 @@
-Redirecting stdout to build/SPARC_SE/tests/opt/long/50.vortex/sparc/linux/simple-timing/simout
-Redirecting stderr to build/SPARC_SE/tests/opt/long/50.vortex/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:15:05
+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/50.vortex/sparc/linux/simple-timing -re tests/run.py build/SPARC_SE/tests/opt/long/50.vortex/sparc/linux/simple-timing
+command line: build/SPARC_SE/gem5.fast -d build/SPARC_SE/tests/fast/long/50.vortex/sparc/linux/simple-timing -re tests/run.py build/SPARC_SE/tests/fast/long/50.vortex/sparc/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/50.vortex/ref/sparc/linux/simple-timing/stats.txt b/tests/long/50.vortex/ref/sparc/linux/simple-timing/stats.txt
index 5c7b8642c..15f83a274 100644
--- a/tests/long/50.vortex/ref/sparc/linux/simple-timing/stats.txt
+++ b/tests/long/50.vortex/ref/sparc/linux/simple-timing/stats.txt
@@ -3,10 +3,10 @@
sim_seconds 0.202942 # Number of seconds simulated
sim_ticks 202941992000 # Number of ticks simulated
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 927071 # Simulator instruction rate (inst/s)
-host_tick_rate 1381979289 # Simulator tick rate (ticks/s)
-host_mem_usage 238016 # Number of bytes of host memory used
-host_seconds 146.85 # Real time elapsed on the host
+host_inst_rate 2092270 # Simulator instruction rate (inst/s)
+host_tick_rate 3118935472 # Simulator tick rate (ticks/s)
+host_mem_usage 213400 # Number of bytes of host memory used
+host_seconds 65.07 # Real time elapsed on the host
sim_insts 136139203 # Number of instructions simulated
system.cpu.workload.num_syscalls 1946 # Number of system calls
system.cpu.numCycles 405883984 # number of cpu cycles simulated
@@ -20,7 +20,7 @@ system.cpu.num_conditional_control_insts 8898970 # nu
system.cpu.num_int_insts 115187758 # number of integer instructions
system.cpu.num_fp_insts 2326977 # number of float instructions
system.cpu.num_int_register_reads 263032383 # number of times the integer registers were read
-system.cpu.num_int_register_writes 113225732 # number of times the integer registers were written
+system.cpu.num_int_register_writes 113147746 # number of times the integer registers were written
system.cpu.num_fp_register_reads 4725607 # number of times the floating registers were read
system.cpu.num_fp_register_writes 1150968 # number of times the floating registers were written
system.cpu.num_mem_refs 58160249 # number of memory refs
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