summaryrefslogtreecommitdiff
path: root/tests/long/se
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2012-06-04 10:43:11 -0700
committerGabe Black <gblack@eecs.umich.edu>2012-06-04 10:43:11 -0700
commit6437f3f4ee5275f59a4472d95e0abac1a8b82e22 (patch)
treed713965271b0329bca3d4496e491e1d456946dc2 /tests/long/se
parent35fa5074aa256880f70591eb656dceeb1a7feae0 (diff)
downloadgem5-6437f3f4ee5275f59a4472d95e0abac1a8b82e22.tar.xz
X86: Update stats for the CPUID change.
Diffstat (limited to 'tests/long/se')
-rw-r--r--tests/long/se/00.gzip/ref/x86/linux/o3-timing/config.ini8
-rwxr-xr-xtests/long/se/00.gzip/ref/x86/linux/o3-timing/simout8
-rw-r--r--tests/long/se/00.gzip/ref/x86/linux/o3-timing/stats.txt26
-rw-r--r--tests/long/se/00.gzip/ref/x86/linux/simple-atomic/config.ini5
-rwxr-xr-xtests/long/se/00.gzip/ref/x86/linux/simple-atomic/simout8
-rw-r--r--tests/long/se/00.gzip/ref/x86/linux/simple-atomic/stats.txt12
-rw-r--r--tests/long/se/00.gzip/ref/x86/linux/simple-timing/config.ini8
-rwxr-xr-xtests/long/se/00.gzip/ref/x86/linux/simple-timing/simout8
-rw-r--r--tests/long/se/00.gzip/ref/x86/linux/simple-timing/stats.txt12
-rw-r--r--tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini10
-rwxr-xr-xtests/long/se/10.mcf/ref/x86/linux/o3-timing/simout8
-rw-r--r--tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt16
-rw-r--r--tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini7
-rwxr-xr-xtests/long/se/10.mcf/ref/x86/linux/simple-atomic/simout8
-rw-r--r--tests/long/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt12
-rw-r--r--tests/long/se/10.mcf/ref/x86/linux/simple-timing/config.ini10
-rwxr-xr-xtests/long/se/10.mcf/ref/x86/linux/simple-timing/simout8
-rw-r--r--tests/long/se/10.mcf/ref/x86/linux/simple-timing/stats.txt12
-rw-r--r--tests/long/se/20.parser/ref/x86/linux/o3-timing/config.ini10
-rwxr-xr-xtests/long/se/20.parser/ref/x86/linux/o3-timing/simout8
-rw-r--r--tests/long/se/20.parser/ref/x86/linux/o3-timing/stats.txt26
-rw-r--r--tests/long/se/20.parser/ref/x86/linux/simple-atomic/config.ini7
-rwxr-xr-xtests/long/se/20.parser/ref/x86/linux/simple-atomic/simout8
-rw-r--r--tests/long/se/20.parser/ref/x86/linux/simple-atomic/stats.txt12
-rw-r--r--tests/long/se/20.parser/ref/x86/linux/simple-timing/config.ini10
-rwxr-xr-xtests/long/se/20.parser/ref/x86/linux/simple-timing/simout8
-rw-r--r--tests/long/se/20.parser/ref/x86/linux/simple-timing/stats.txt12
-rw-r--r--tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/config.ini5
-rwxr-xr-xtests/long/se/60.bzip2/ref/x86/linux/simple-atomic/simout8
-rw-r--r--tests/long/se/60.bzip2/ref/x86/linux/simple-atomic/stats.txt12
-rw-r--r--tests/long/se/60.bzip2/ref/x86/linux/simple-timing/config.ini8
-rwxr-xr-xtests/long/se/60.bzip2/ref/x86/linux/simple-timing/simout8
-rw-r--r--tests/long/se/60.bzip2/ref/x86/linux/simple-timing/stats.txt12
-rw-r--r--tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini8
-rwxr-xr-xtests/long/se/70.twolf/ref/x86/linux/o3-timing/simout10
-rw-r--r--tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt26
-rw-r--r--tests/long/se/70.twolf/ref/x86/linux/simple-atomic/config.ini5
-rwxr-xr-xtests/long/se/70.twolf/ref/x86/linux/simple-atomic/simout10
-rw-r--r--tests/long/se/70.twolf/ref/x86/linux/simple-atomic/stats.txt12
-rw-r--r--tests/long/se/70.twolf/ref/x86/linux/simple-timing/config.ini8
-rwxr-xr-xtests/long/se/70.twolf/ref/x86/linux/simple-timing/simout10
-rw-r--r--tests/long/se/70.twolf/ref/x86/linux/simple-timing/stats.txt12
42 files changed, 192 insertions, 249 deletions
diff --git a/tests/long/se/00.gzip/ref/x86/linux/o3-timing/config.ini b/tests/long/se/00.gzip/ref/x86/linux/o3-timing/config.ini
index c9c059053..54d39141c 100644
--- a/tests/long/se/00.gzip/ref/x86/linux/o3-timing/config.ini
+++ b/tests/long/se/00.gzip/ref/x86/linux/o3-timing/config.ini
@@ -495,9 +495,8 @@ cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
[system.cpu.toL2Bus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
@@ -516,7 +515,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/gzip
+executable=/dist/m5/cpu2000/binaries/x86/linux/gzip
gid=100
input=cin
max_stack_size=67108864
@@ -528,9 +527,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/00.gzip/ref/x86/linux/o3-timing/simout b/tests/long/se/00.gzip/ref/x86/linux/o3-timing/simout
index c90f0d12f..7b2a9ad59 100755
--- a/tests/long/se/00.gzip/ref/x86/linux/o3-timing/simout
+++ b/tests/long/se/00.gzip/ref/x86/linux/o3-timing/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/00.gzip/x86/linux/o3-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/00.gzip/x86/linux/o3-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:00:58
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:59
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/00.gzip/x86/linux/o3-timing -re tests/run.py build/X86/tests/opt/long/se/00.gzip/x86/linux/o3-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/se/00.gzip/ref/x86/linux/o3-timing/stats.txt b/tests/long/se/00.gzip/ref/x86/linux/o3-timing/stats.txt
index cda4c39ac..639bcc189 100644
--- a/tests/long/se/00.gzip/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/long/se/00.gzip/ref/x86/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.636988 # Nu
sim_ticks 636988382500 # Number of ticks simulated
final_tick 636988382500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 47331 # Simulator instruction rate (inst/s)
-host_op_rate 87209 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 34259348 # Simulator tick rate (ticks/s)
-host_mem_usage 276376 # Number of bytes of host memory used
-host_seconds 18593.13 # Real time elapsed on the host
+host_inst_rate 71818 # Simulator instruction rate (inst/s)
+host_op_rate 132329 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 51984066 # Simulator tick rate (ticks/s)
+host_mem_usage 250428 # Number of bytes of host memory used
+host_seconds 12253.53 # Real time elapsed on the host
sim_insts 880025312 # Number of instructions simulated
sim_ops 1621493982 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 5834048 # Number of bytes read from this memory
@@ -81,8 +81,8 @@ system.cpu.rename.IQFullEvents 293326885 # Nu
system.cpu.rename.LSQFullEvents 103161675 # Number of times rename has blocked due to LSQ full
system.cpu.rename.FullRegisterEvents 640 # Number of times there has been no free registers
system.cpu.rename.RenamedOperands 3463149697 # Number of destination operands rename has renamed
-system.cpu.rename.RenameLookups 7120628186 # Number of register rename lookups that rename has made
-system.cpu.rename.int_rename_lookups 7120621006 # Number of integer rename lookups
+system.cpu.rename.RenameLookups 7120628194 # Number of register rename lookups that rename has made
+system.cpu.rename.int_rename_lookups 7120621014 # Number of integer rename lookups
system.cpu.rename.fp_rename_lookups 7180 # Number of floating rename lookups
system.cpu.rename.CommittedMaps 2493860970 # Number of HB maps that are committed
system.cpu.rename.UndoneMaps 969288727 # Number of HB maps that are undone due to squashing
@@ -104,10 +104,10 @@ system.cpu.iq.issued_per_cycle::samples 1273914012 # Nu
system.cpu.iq.issued_per_cycle::mean 1.401645 # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::stdev 1.311838 # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::underflows 0 0.00% 0.00% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::0 347011243 27.24% 27.24% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::1 447440187 35.12% 62.36% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::2 243114047 19.08% 81.45% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::3 151317630 11.88% 93.33% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::0 347011244 27.24% 27.24% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::1 447440186 35.12% 62.36% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::2 243114046 19.08% 81.45% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::3 151317631 11.88% 93.33% # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::4 40944695 3.21% 96.54% # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::5 32410749 2.54% 99.08% # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::6 9957171 0.78% 99.87% # Number of insts issued each cycle
@@ -234,7 +234,7 @@ system.cpu.iew.exec_rate 1.387458 # In
system.cpu.iew.wb_sent 1728148485 # cumulative count of insts sent to commit
system.cpu.iew.wb_count 1726806355 # cumulative count of insts written-back
system.cpu.iew.wb_producers 1262041827 # num instructions producing a value
-system.cpu.iew.wb_consumers 2984894242 # num instructions consuming a value
+system.cpu.iew.wb_consumers 2984894243 # num instructions consuming a value
system.cpu.iew.wb_penalized 0 # number of instrctions required to write to 'other' IQ
system.cpu.iew.wb_rate 1.355446 # insts written-back per cycle
system.cpu.iew.wb_fanout 0.422810 # average fanout of values written-back
@@ -284,7 +284,7 @@ system.cpu.cpi 1.447659 # CP
system.cpu.cpi_total 1.447659 # CPI: Total CPI of All Threads
system.cpu.ipc 0.690770 # IPC: Instructions Per Cycle
system.cpu.ipc_total 0.690770 # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads 4473469244 # number of integer regfile reads
+system.cpu.int_regfile_reads 4473469252 # number of integer regfile reads
system.cpu.int_regfile_writes 2589680881 # number of integer regfile writes
system.cpu.fp_regfile_reads 84 # number of floating regfile reads
system.cpu.misc_regfile_reads 911429698 # number of misc regfile reads
diff --git a/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/config.ini b/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/config.ini
index d68307ad3..6c78f711c 100644
--- a/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/config.ini
@@ -103,7 +103,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/gzip
+executable=/dist/m5/cpu2000/binaries/x86/linux/gzip
gid=100
input=cin
max_stack_size=67108864
@@ -115,9 +115,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/simout b/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/simout
index dc2715495..87bcc8171 100755
--- a/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/simout
+++ b/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/00.gzip/x86/linux/simple-atomic/simout
-Redirecting stderr to build/X86/tests/opt/long/se/00.gzip/x86/linux/simple-atomic/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:03:31
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:58
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/00.gzip/x86/linux/simple-atomic -re tests/run.py build/X86/tests/opt/long/se/00.gzip/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/00.gzip/ref/x86/linux/simple-atomic/stats.txt b/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/stats.txt
index 8ef9855df..14740711a 100644
--- a/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/long/se/00.gzip/ref/x86/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.963993 # Nu
sim_ticks 963992704000 # Number of ticks simulated
final_tick 963992704000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 650115 # Simulator instruction rate (inst/s)
-host_op_rate 1197871 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 712145069 # Simulator tick rate (ticks/s)
-host_mem_usage 265536 # Number of bytes of host memory used
-host_seconds 1353.65 # Real time elapsed on the host
+host_inst_rate 688761 # Simulator instruction rate (inst/s)
+host_op_rate 1269079 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 754478822 # Simulator tick rate (ticks/s)
+host_mem_usage 239576 # Number of bytes of host memory used
+host_seconds 1277.69 # Real time elapsed on the host
sim_insts 880025313 # Number of instructions simulated
sim_ops 1621493983 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 11334586825 # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu
system.cpu.num_conditional_control_insts 99478861 # number of instructions that are conditional controls
system.cpu.num_int_insts 1621354493 # number of integer instructions
system.cpu.num_fp_insts 0 # number of float instructions
-system.cpu.num_int_register_reads 5129484084 # number of times the integer registers were read
+system.cpu.num_int_register_reads 5129484088 # number of times the integer registers were read
system.cpu.num_int_register_writes 2493860970 # 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
diff --git a/tests/long/se/00.gzip/ref/x86/linux/simple-timing/config.ini b/tests/long/se/00.gzip/ref/x86/linux/simple-timing/config.ini
index 041723c3f..30e9071fd 100644
--- a/tests/long/se/00.gzip/ref/x86/linux/simple-timing/config.ini
+++ b/tests/long/se/00.gzip/ref/x86/linux/simple-timing/config.ini
@@ -164,9 +164,8 @@ cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
[system.cpu.toL2Bus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
@@ -185,7 +184,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/gzip
+executable=/dist/m5/cpu2000/binaries/x86/linux/gzip
gid=100
input=cin
max_stack_size=67108864
@@ -197,9 +196,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/00.gzip/ref/x86/linux/simple-timing/simout b/tests/long/se/00.gzip/ref/x86/linux/simple-timing/simout
index 0fb9c1553..9ebad8844 100755
--- a/tests/long/se/00.gzip/ref/x86/linux/simple-timing/simout
+++ b/tests/long/se/00.gzip/ref/x86/linux/simple-timing/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/00.gzip/x86/linux/simple-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/00.gzip/x86/linux/simple-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:00:59
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:59
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/00.gzip/x86/linux/simple-timing -re tests/run.py build/X86/tests/opt/long/se/00.gzip/x86/linux/simple-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/se/00.gzip/ref/x86/linux/simple-timing/stats.txt b/tests/long/se/00.gzip/ref/x86/linux/simple-timing/stats.txt
index a3fe13db1..4294088ef 100644
--- a/tests/long/se/00.gzip/ref/x86/linux/simple-timing/stats.txt
+++ b/tests/long/se/00.gzip/ref/x86/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 1.803259 # Nu
sim_ticks 1803258587000 # Number of ticks simulated
final_tick 1803258587000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 373686 # Simulator instruction rate (inst/s)
-host_op_rate 688537 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 765720435 # Simulator tick rate (ticks/s)
-host_mem_usage 274452 # Number of bytes of host memory used
-host_seconds 2354.98 # Real time elapsed on the host
+host_inst_rate 617600 # Simulator instruction rate (inst/s)
+host_op_rate 1137962 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1265523884 # Simulator tick rate (ticks/s)
+host_mem_usage 248496 # Number of bytes of host memory used
+host_seconds 1424.91 # Real time elapsed on the host
sim_insts 880025313 # Number of instructions simulated
sim_ops 1621493983 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 5725952 # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu
system.cpu.num_conditional_control_insts 99478861 # number of instructions that are conditional controls
system.cpu.num_int_insts 1621354493 # number of integer instructions
system.cpu.num_fp_insts 0 # number of float instructions
-system.cpu.num_int_register_reads 5129484084 # number of times the integer registers were read
+system.cpu.num_int_register_reads 5129484088 # number of times the integer registers were read
system.cpu.num_int_register_writes 2493860970 # 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
diff --git a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini
index cb0a90f11..084c1a30a 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini
+++ b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini
@@ -495,9 +495,8 @@ cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
[system.cpu.toL2Bus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
@@ -516,9 +515,9 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/mcf
+executable=/dist/m5/cpu2000/binaries/x86/linux/mcf
gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
+input=/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
max_stack_size=67108864
output=cout
pid=100
@@ -528,9 +527,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout
index d6b0619bd..7dd036543 100755
--- a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout
+++ b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:10:14
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:59
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing -re tests/run.py build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt
index a58d7758c..2d4c91c54 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.067388 # Nu
sim_ticks 67388458000 # Number of ticks simulated
final_tick 67388458000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 49866 # Simulator instruction rate (inst/s)
-host_op_rate 87805 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 21269638 # Simulator tick rate (ticks/s)
-host_mem_usage 411868 # Number of bytes of host memory used
-host_seconds 3168.29 # Real time elapsed on the host
+host_inst_rate 74550 # Simulator instruction rate (inst/s)
+host_op_rate 131270 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 31798513 # Simulator tick rate (ticks/s)
+host_mem_usage 385908 # Number of bytes of host memory used
+host_seconds 2119.23 # Real time elapsed on the host
sim_insts 157988582 # Number of instructions simulated
sim_ops 278192519 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 3907520 # Number of bytes read from this memory
@@ -81,8 +81,8 @@ system.cpu.rename.IQFullEvents 3712 # Nu
system.cpu.rename.LSQFullEvents 23187560 # Number of times rename has blocked due to LSQ full
system.cpu.rename.FullRegisterEvents 79157 # Number of times there has been no free registers
system.cpu.rename.RenamedOperands 414755881 # Number of destination operands rename has renamed
-system.cpu.rename.RenameLookups 1009935088 # Number of register rename lookups that rename has made
-system.cpu.rename.int_rename_lookups 1009932388 # Number of integer rename lookups
+system.cpu.rename.RenameLookups 1009935094 # Number of register rename lookups that rename has made
+system.cpu.rename.int_rename_lookups 1009932394 # Number of integer rename lookups
system.cpu.rename.fp_rename_lookups 2700 # Number of floating rename lookups
system.cpu.rename.CommittedMaps 341010940 # Number of HB maps that are committed
system.cpu.rename.UndoneMaps 73744941 # Number of HB maps that are undone due to squashing
@@ -284,7 +284,7 @@ system.cpu.cpi 0.853080 # CP
system.cpu.cpi_total 0.853080 # CPI: Total CPI of All Threads
system.cpu.ipc 1.172223 # IPC: Instructions Per Cycle
system.cpu.ipc_total 1.172223 # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads 705322543 # number of integer regfile reads
+system.cpu.int_regfile_reads 705322547 # number of integer regfile reads
system.cpu.int_regfile_writes 373244258 # number of integer regfile writes
system.cpu.fp_regfile_reads 361 # number of floating regfile reads
system.cpu.fp_regfile_writes 193 # number of floating regfile writes
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini
index 3db1877d2..3fd88efc2 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/config.ini
@@ -103,9 +103,9 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/mcf
+executable=/dist/m5/cpu2000/binaries/x86/linux/mcf
gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
+input=/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
max_stack_size=67108864
output=cout
pid=100
@@ -115,9 +115,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simout b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simout
index fce15c036..8772b21f0 100755
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simout
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-atomic/simout
-Redirecting stderr to build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-atomic/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:00:58
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:58
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-atomic -re tests/run.py build/X86/tests/opt/long/se/10.mcf/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/10.mcf/ref/x86/linux/simple-atomic/stats.txt b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt
index 6c9341510..09f40044d 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.168950 # Nu
sim_ticks 168950072000 # Number of ticks simulated
final_tick 168950072000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 714486 # Simulator instruction rate (inst/s)
-host_op_rate 1258095 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 764057931 # Simulator tick rate (ticks/s)
-host_mem_usage 400764 # Number of bytes of host memory used
-host_seconds 221.12 # Real time elapsed on the host
+host_inst_rate 563497 # Simulator instruction rate (inst/s)
+host_op_rate 992227 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 602592819 # Simulator tick rate (ticks/s)
+host_mem_usage 374808 # Number of bytes of host memory used
+host_seconds 280.37 # Real time elapsed on the host
sim_insts 157988583 # Number of instructions simulated
sim_ops 278192520 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 2458815679 # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu
system.cpu.num_conditional_control_insts 18628012 # number of instructions that are conditional controls
system.cpu.num_int_insts 278186228 # number of integer instructions
system.cpu.num_fp_insts 40 # number of float instructions
-system.cpu.num_int_register_reads 834011906 # number of times the integer registers were read
+system.cpu.num_int_register_reads 834011910 # number of times the integer registers were read
system.cpu.num_int_register_writes 341010914 # number of times the integer registers were written
system.cpu.num_fp_register_reads 40 # number of times the floating registers were read
system.cpu.num_fp_register_writes 26 # number of times the floating registers were written
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/config.ini b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/config.ini
index 8da90e4f8..96f41a3e2 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/config.ini
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/config.ini
@@ -164,9 +164,8 @@ cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
[system.cpu.toL2Bus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
@@ -185,9 +184,9 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/mcf
+executable=/dist/m5/cpu2000/binaries/x86/linux/mcf
gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
+input=/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
max_stack_size=67108864
output=cout
pid=100
@@ -197,9 +196,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/simout b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/simout
index 704c6b28f..3e731c17d 100755
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/simout
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:00:58
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:59
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-timing -re tests/run.py build/X86/tests/opt/long/se/10.mcf/x86/linux/simple-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/stats.txt b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/stats.txt
index 3b408b67c..093a41c03 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/simple-timing/stats.txt
+++ b/tests/long/se/10.mcf/ref/x86/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.370011 # Nu
sim_ticks 370010840000 # Number of ticks simulated
final_tick 370010840000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 298215 # Simulator instruction rate (inst/s)
-host_op_rate 525109 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 698422266 # Simulator tick rate (ticks/s)
-host_mem_usage 409692 # Number of bytes of host memory used
-host_seconds 529.78 # Real time elapsed on the host
+host_inst_rate 376379 # Simulator instruction rate (inst/s)
+host_op_rate 662743 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 881483751 # Simulator tick rate (ticks/s)
+host_mem_usage 383736 # Number of bytes of host memory used
+host_seconds 419.76 # Real time elapsed on the host
sim_insts 157988583 # Number of instructions simulated
sim_ops 278192520 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 4900800 # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu
system.cpu.num_conditional_control_insts 18628012 # number of instructions that are conditional controls
system.cpu.num_int_insts 278186228 # number of integer instructions
system.cpu.num_fp_insts 40 # number of float instructions
-system.cpu.num_int_register_reads 834011906 # number of times the integer registers were read
+system.cpu.num_int_register_reads 834011910 # number of times the integer registers were read
system.cpu.num_int_register_writes 341010914 # number of times the integer registers were written
system.cpu.num_fp_register_reads 40 # number of times the floating registers were read
system.cpu.num_fp_register_writes 26 # number of times the floating registers were written
diff --git a/tests/long/se/20.parser/ref/x86/linux/o3-timing/config.ini b/tests/long/se/20.parser/ref/x86/linux/o3-timing/config.ini
index d1e37fed4..5b8f0efef 100644
--- a/tests/long/se/20.parser/ref/x86/linux/o3-timing/config.ini
+++ b/tests/long/se/20.parser/ref/x86/linux/o3-timing/config.ini
@@ -495,9 +495,8 @@ cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
[system.cpu.toL2Bus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
@@ -516,9 +515,9 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/parser
+executable=/dist/m5/cpu2000/binaries/x86/linux/parser
gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/parser/mdred/input/parser.in
+input=/dist/m5/cpu2000/data/parser/mdred/input/parser.in
max_stack_size=67108864
output=cout
pid=100
@@ -528,9 +527,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/20.parser/ref/x86/linux/o3-timing/simout b/tests/long/se/20.parser/ref/x86/linux/o3-timing/simout
index b3e00ff1f..e360d8cc6 100755
--- a/tests/long/se/20.parser/ref/x86/linux/o3-timing/simout
+++ b/tests/long/se/20.parser/ref/x86/linux/o3-timing/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/20.parser/x86/linux/o3-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/20.parser/x86/linux/o3-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:00:58
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:59
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/20.parser/x86/linux/o3-timing -re tests/run.py build/X86/tests/opt/long/se/20.parser/x86/linux/o3-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/se/20.parser/ref/x86/linux/o3-timing/stats.txt b/tests/long/se/20.parser/ref/x86/linux/o3-timing/stats.txt
index 5c1bbec0f..1dc4deb54 100644
--- a/tests/long/se/20.parser/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/long/se/20.parser/ref/x86/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.459938 # Nu
sim_ticks 459937575500 # Number of ticks simulated
final_tick 459937575500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 49599 # Simulator instruction rate (inst/s)
-host_op_rate 91715 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 27588814 # Simulator tick rate (ticks/s)
-host_mem_usage 313336 # Number of bytes of host memory used
-host_seconds 16671.16 # Real time elapsed on the host
+host_inst_rate 75971 # Simulator instruction rate (inst/s)
+host_op_rate 140479 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 42257715 # Simulator tick rate (ticks/s)
+host_mem_usage 287264 # Number of bytes of host memory used
+host_seconds 10884.11 # Real time elapsed on the host
sim_insts 826877144 # Number of instructions simulated
sim_ops 1528988756 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 37483008 # Number of bytes read from this memory
@@ -82,8 +82,8 @@ system.cpu.rename.IQFullEvents 23409384 # Nu
system.cpu.rename.LSQFullEvents 104435988 # Number of times rename has blocked due to LSQ full
system.cpu.rename.FullRegisterEvents 12914 # Number of times there has been no free registers
system.cpu.rename.RenamedOperands 2886886923 # Number of destination operands rename has renamed
-system.cpu.rename.RenameLookups 6492696422 # Number of register rename lookups that rename has made
-system.cpu.rename.int_rename_lookups 6491823897 # Number of integer rename lookups
+system.cpu.rename.RenameLookups 6492696430 # Number of register rename lookups that rename has made
+system.cpu.rename.int_rename_lookups 6491823905 # Number of integer rename lookups
system.cpu.rename.fp_rename_lookups 872525 # Number of floating rename lookups
system.cpu.rename.CommittedMaps 1993077484 # Number of HB maps that are committed
system.cpu.rename.UndoneMaps 893809439 # Number of HB maps that are undone due to squashing
@@ -105,10 +105,10 @@ system.cpu.iq.issued_per_cycle::samples 901432928 # Nu
system.cpu.iq.issued_per_cycle::mean 2.048639 # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::stdev 1.805034 # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::underflows 0 0.00% 0.00% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::0 246353789 27.33% 27.33% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::1 156616036 17.37% 44.70% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::2 150729221 16.72% 61.42% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::3 147768172 16.39% 77.82% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::0 246353790 27.33% 27.33% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::1 156616035 17.37% 44.70% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::2 150729220 16.72% 61.42% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::3 147768173 16.39% 77.82% # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::4 103385508 11.47% 89.29% # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::5 58828894 6.53% 95.81% # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::6 27652970 3.07% 98.88% # Number of insts issued each cycle
@@ -235,7 +235,7 @@ system.cpu.iew.exec_rate 1.977147 # In
system.cpu.iew.wb_sent 1813502289 # cumulative count of insts sent to commit
system.cpu.iew.wb_count 1806214095 # cumulative count of insts written-back
system.cpu.iew.wb_producers 1379770015 # num instructions producing a value
-system.cpu.iew.wb_consumers 2939115294 # num instructions consuming a value
+system.cpu.iew.wb_consumers 2939115295 # num instructions consuming a value
system.cpu.iew.wb_penalized 0 # number of instrctions required to write to 'other' IQ
system.cpu.iew.wb_rate 1.963543 # insts written-back per cycle
system.cpu.iew.wb_fanout 0.469451 # average fanout of values written-back
@@ -285,7 +285,7 @@ system.cpu.cpi 1.112469 # CP
system.cpu.cpi_total 1.112469 # CPI: Total CPI of All Threads
system.cpu.ipc 0.898901 # IPC: Instructions Per Cycle
system.cpu.ipc_total 0.898901 # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads 4004380463 # number of integer regfile reads
+system.cpu.int_regfile_reads 4004380471 # number of integer regfile reads
system.cpu.int_regfile_writes 2286341091 # number of integer regfile writes
system.cpu.fp_regfile_reads 262 # number of floating regfile reads
system.cpu.misc_regfile_reads 1001920300 # number of misc regfile reads
diff --git a/tests/long/se/20.parser/ref/x86/linux/simple-atomic/config.ini b/tests/long/se/20.parser/ref/x86/linux/simple-atomic/config.ini
index f6abc7cbb..8e0e263be 100644
--- a/tests/long/se/20.parser/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/se/20.parser/ref/x86/linux/simple-atomic/config.ini
@@ -103,9 +103,9 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/parser
+executable=/dist/m5/cpu2000/binaries/x86/linux/parser
gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/parser/mdred/input/parser.in
+input=/dist/m5/cpu2000/data/parser/mdred/input/parser.in
max_stack_size=67108864
output=cout
pid=100
@@ -115,9 +115,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/20.parser/ref/x86/linux/simple-atomic/simout b/tests/long/se/20.parser/ref/x86/linux/simple-atomic/simout
index bd9171025..5153e8f50 100755
--- a/tests/long/se/20.parser/ref/x86/linux/simple-atomic/simout
+++ b/tests/long/se/20.parser/ref/x86/linux/simple-atomic/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/20.parser/x86/linux/simple-atomic/simout
-Redirecting stderr to build/X86/tests/opt/long/se/20.parser/x86/linux/simple-atomic/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:00:57
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:58
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/20.parser/x86/linux/simple-atomic -re tests/run.py build/X86/tests/opt/long/se/20.parser/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/20.parser/ref/x86/linux/simple-atomic/stats.txt b/tests/long/se/20.parser/ref/x86/linux/simple-atomic/stats.txt
index 90f786dd4..38deb4a58 100644
--- a/tests/long/se/20.parser/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/long/se/20.parser/ref/x86/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.885229 # Nu
sim_ticks 885229360000 # Number of ticks simulated
final_tick 885229360000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 552274 # Simulator instruction rate (inst/s)
-host_op_rate 1021217 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 591247536 # Simulator tick rate (ticks/s)
-host_mem_usage 269460 # Number of bytes of host memory used
-host_seconds 1497.22 # Real time elapsed on the host
+host_inst_rate 648787 # Simulator instruction rate (inst/s)
+host_op_rate 1199679 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 694571010 # Simulator tick rate (ticks/s)
+host_mem_usage 243520 # Number of bytes of host memory used
+host_seconds 1274.50 # Real time elapsed on the host
sim_insts 826877145 # Number of instructions simulated
sim_ops 1528988757 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 10832432532 # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu
system.cpu.num_conditional_control_insts 92658800 # number of instructions that are conditional controls
system.cpu.num_int_insts 1528317615 # number of integer instructions
system.cpu.num_fp_insts 0 # number of float instructions
-system.cpu.num_int_register_reads 4441632806 # number of times the integer registers were read
+system.cpu.num_int_register_reads 4441632810 # number of times the integer registers were read
system.cpu.num_int_register_writes 1993077484 # 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
diff --git a/tests/long/se/20.parser/ref/x86/linux/simple-timing/config.ini b/tests/long/se/20.parser/ref/x86/linux/simple-timing/config.ini
index 2697e7cd5..7ea92ba3c 100644
--- a/tests/long/se/20.parser/ref/x86/linux/simple-timing/config.ini
+++ b/tests/long/se/20.parser/ref/x86/linux/simple-timing/config.ini
@@ -164,9 +164,8 @@ cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
[system.cpu.toL2Bus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
@@ -185,9 +184,9 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/parser
+executable=/dist/m5/cpu2000/binaries/x86/linux/parser
gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/parser/mdred/input/parser.in
+input=/dist/m5/cpu2000/data/parser/mdred/input/parser.in
max_stack_size=67108864
output=cout
pid=100
@@ -197,9 +196,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/20.parser/ref/x86/linux/simple-timing/simout b/tests/long/se/20.parser/ref/x86/linux/simple-timing/simout
index a1341a25f..c9e0b30c1 100755
--- a/tests/long/se/20.parser/ref/x86/linux/simple-timing/simout
+++ b/tests/long/se/20.parser/ref/x86/linux/simple-timing/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/20.parser/x86/linux/simple-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/20.parser/x86/linux/simple-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:10:10
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:58
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/20.parser/x86/linux/simple-timing -re tests/run.py build/X86/tests/opt/long/se/20.parser/x86/linux/simple-timing
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/se/20.parser/ref/x86/linux/simple-timing/stats.txt b/tests/long/se/20.parser/ref/x86/linux/simple-timing/stats.txt
index b16b4826d..c48e15266 100644
--- a/tests/long/se/20.parser/ref/x86/linux/simple-timing/stats.txt
+++ b/tests/long/se/20.parser/ref/x86/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 1.658730 # Nu
sim_ticks 1658729604000 # Number of ticks simulated
final_tick 1658729604000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 376518 # Simulator instruction rate (inst/s)
-host_op_rate 696225 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 755302226 # Simulator tick rate (ticks/s)
-host_mem_usage 278396 # Number of bytes of host memory used
-host_seconds 2196.11 # Real time elapsed on the host
+host_inst_rate 478704 # Simulator instruction rate (inst/s)
+host_op_rate 885178 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 960288988 # Simulator tick rate (ticks/s)
+host_mem_usage 252496 # Number of bytes of host memory used
+host_seconds 1727.32 # Real time elapsed on the host
sim_insts 826877145 # Number of instructions simulated
sim_ops 1528988757 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 37094976 # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu
system.cpu.num_conditional_control_insts 92658800 # number of instructions that are conditional controls
system.cpu.num_int_insts 1528317615 # number of integer instructions
system.cpu.num_fp_insts 0 # number of float instructions
-system.cpu.num_int_register_reads 4441632806 # number of times the integer registers were read
+system.cpu.num_int_register_reads 4441632810 # number of times the integer registers were read
system.cpu.num_int_register_writes 1993077484 # 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
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 b16c136ab..4b0cea416 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
@@ -103,7 +103,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/bzip2
+executable=/dist/m5/cpu2000/binaries/x86/linux/bzip2
gid=100
input=cin
max_stack_size=67108864
@@ -115,9 +115,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
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 291a38eb7..9635789c5 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,11 +1,9 @@
-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 May 21 2012 19:00:49
-gem5 started May 21 2012 19:00:57
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:59
+gem5 executing on burrito
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 af3b62cfc..681bc52fe 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 2846007259500 # Number of ticks simulated
final_tick 2846007259500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 825244 # Simulator instruction rate (inst/s)
-host_op_rate 1285805 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 780780219 # Simulator tick rate (ticks/s)
-host_mem_usage 265452 # Number of bytes of host memory used
-host_seconds 3645.08 # Real time elapsed on the host
+host_inst_rate 1189657 # Simulator instruction rate (inst/s)
+host_op_rate 1853594 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1125559296 # Simulator tick rate (ticks/s)
+host_mem_usage 239492 # Number of bytes of host memory used
+host_seconds 2528.53 # Real time elapsed on the host
sim_insts 3008081057 # Number of instructions simulated
sim_ops 4686862651 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 37129731755 # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu
system.cpu.num_conditional_control_insts 182173305 # number of instructions that are conditional controls
system.cpu.num_int_insts 4686862580 # number of integer instructions
system.cpu.num_fp_insts 0 # number of float instructions
-system.cpu.num_int_register_reads 14165752762 # number of times the integer registers were read
+system.cpu.num_int_register_reads 14165752766 # number of times the integer registers were read
system.cpu.num_int_register_writes 6716691823 # 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
diff --git a/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/config.ini b/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/config.ini
index 5366c30ec..5c77a44a2 100644
--- a/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/config.ini
+++ b/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/config.ini
@@ -164,9 +164,8 @@ cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
[system.cpu.toL2Bus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
@@ -185,7 +184,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/bzip2
+executable=/dist/m5/cpu2000/binaries/x86/linux/bzip2
gid=100
input=cin
max_stack_size=67108864
@@ -197,9 +196,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/simout b/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/simout
index f085076c6..efac2f0f1 100755
--- a/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/simout
+++ b/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/simout
@@ -1,11 +1,9 @@
-Redirecting stdout to build/X86/tests/opt/long/se/60.bzip2/x86/linux/simple-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/60.bzip2/x86/linux/simple-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:07:40
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:58
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/60.bzip2/x86/linux/simple-timing -re tests/run.py build/X86/tests/opt/long/se/60.bzip2/x86/linux/simple-timing
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-timing/stats.txt b/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/stats.txt
index 1ff8843da..2bc91e6e3 100644
--- a/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/stats.txt
+++ b/tests/long/se/60.bzip2/ref/x86/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 5.923548 # Nu
sim_ticks 5923548078000 # Number of ticks simulated
final_tick 5923548078000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 557700 # Simulator instruction rate (inst/s)
-host_op_rate 868947 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 1098229805 # Simulator tick rate (ticks/s)
-host_mem_usage 274380 # Number of bytes of host memory used
-host_seconds 5393.72 # Real time elapsed on the host
+host_inst_rate 747861 # Simulator instruction rate (inst/s)
+host_op_rate 1165236 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1472697488 # Simulator tick rate (ticks/s)
+host_mem_usage 248420 # Number of bytes of host memory used
+host_seconds 4022.24 # Real time elapsed on the host
sim_insts 3008081057 # Number of instructions simulated
sim_ops 4686862651 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 173910080 # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu
system.cpu.num_conditional_control_insts 182173305 # number of instructions that are conditional controls
system.cpu.num_int_insts 4686862580 # number of integer instructions
system.cpu.num_fp_insts 0 # number of float instructions
-system.cpu.num_int_register_reads 14165752762 # number of times the integer registers were read
+system.cpu.num_int_register_reads 14165752766 # number of times the integer registers were read
system.cpu.num_int_register_writes 6716691823 # 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
diff --git a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini
index ae31ca40a..1b6b8f01a 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini
+++ b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini
@@ -495,9 +495,8 @@ cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
[system.cpu.toL2Bus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
@@ -516,7 +515,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/twolf
+executable=/dist/m5/cpu2000/binaries/x86/linux/twolf
gid=100
input=cin
max_stack_size=67108864
@@ -528,9 +527,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout
index dc48832a4..59b747474 100755
--- a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout
+++ b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout
@@ -1,14 +1,10 @@
-Redirecting stdout to build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:00:57
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:59
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing -re tests/run.py build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing
-Couldn't unlink build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing/smred.sav
-Couldn't unlink build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing/smred.sv2
Global frequency set at 1000000000000 ticks per second
info: Entering event queue @ 0. Starting simulation...
diff --git a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt
index 247b6d16f..1d5121a0a 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.087752 # Nu
sim_ticks 87751730000 # Number of ticks simulated
final_tick 87751730000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 34298 # Simulator instruction rate (inst/s)
-host_op_rate 57486 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 22788458 # Simulator tick rate (ticks/s)
-host_mem_usage 285268 # Number of bytes of host memory used
-host_seconds 3850.71 # Real time elapsed on the host
+host_inst_rate 56809 # Simulator instruction rate (inst/s)
+host_op_rate 95217 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 37745520 # Simulator tick rate (ticks/s)
+host_mem_usage 259224 # Number of bytes of host memory used
+host_seconds 2324.83 # Real time elapsed on the host
sim_insts 132071227 # Number of instructions simulated
sim_ops 221363017 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 345024 # Number of bytes read from this memory
@@ -80,8 +80,8 @@ system.cpu.rename.IQFullEvents 20636040 # Nu
system.cpu.rename.LSQFullEvents 22537767 # Number of times rename has blocked due to LSQ full
system.cpu.rename.FullRegisterEvents 2198 # Number of times there has been no free registers
system.cpu.rename.RenamedOperands 506554560 # Number of destination operands rename has renamed
-system.cpu.rename.RenameLookups 1130537576 # Number of register rename lookups that rename has made
-system.cpu.rename.int_rename_lookups 1120266829 # Number of integer rename lookups
+system.cpu.rename.RenameLookups 1130537584 # Number of register rename lookups that rename has made
+system.cpu.rename.int_rename_lookups 1120266837 # Number of integer rename lookups
system.cpu.rename.fp_rename_lookups 10270747 # Number of floating rename lookups
system.cpu.rename.CommittedMaps 320143989 # Number of HB maps that are committed
system.cpu.rename.UndoneMaps 186410571 # Number of HB maps that are undone due to squashing
@@ -103,10 +103,10 @@ system.cpu.iq.issued_per_cycle::samples 175426420 # Nu
system.cpu.iq.issued_per_cycle::mean 1.544061 # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::stdev 1.467197 # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::underflows 0 0.00% 0.00% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::0 49131918 28.01% 28.01% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::1 52597598 29.98% 57.99% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::2 34344441 19.58% 77.57% # Number of insts issued each cycle
-system.cpu.iq.issued_per_cycle::3 18981959 10.82% 88.39% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::0 49131919 28.01% 28.01% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::1 52597597 29.98% 57.99% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::2 34344440 19.58% 77.57% # Number of insts issued each cycle
+system.cpu.iq.issued_per_cycle::3 18981960 10.82% 88.39% # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::4 12711399 7.25% 95.63% # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::5 4926918 2.81% 98.44% # Number of insts issued each cycle
system.cpu.iq.issued_per_cycle::6 2079867 1.19% 99.63% # Number of insts issued each cycle
@@ -233,7 +233,7 @@ system.cpu.iew.exec_rate 1.525690 # In
system.cpu.iew.wb_sent 266689649 # cumulative count of insts sent to commit
system.cpu.iew.wb_count 265814614 # cumulative count of insts written-back
system.cpu.iew.wb_producers 214459238 # num instructions producing a value
-system.cpu.iew.wb_consumers 504388651 # num instructions consuming a value
+system.cpu.iew.wb_consumers 504388652 # num instructions consuming a value
system.cpu.iew.wb_penalized 0 # number of instrctions required to write to 'other' IQ
system.cpu.iew.wb_rate 1.514583 # insts written-back per cycle
system.cpu.iew.wb_fanout 0.425186 # average fanout of values written-back
@@ -283,7 +283,7 @@ system.cpu.cpi 1.328855 # CP
system.cpu.cpi_total 1.328855 # CPI: Total CPI of All Threads
system.cpu.ipc 0.752528 # IPC: Instructions Per Cycle
system.cpu.ipc_total 0.752528 # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads 657510090 # number of integer regfile reads
+system.cpu.int_regfile_reads 657510098 # number of integer regfile reads
system.cpu.int_regfile_writes 365370199 # number of integer regfile writes
system.cpu.fp_regfile_reads 3509073 # number of floating regfile reads
system.cpu.fp_regfile_writes 2221147 # number of floating regfile writes
diff --git a/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/config.ini b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/config.ini
index 774020e98..5b797a438 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/config.ini
@@ -103,7 +103,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/twolf
+executable=/dist/m5/cpu2000/binaries/x86/linux/twolf
gid=100
input=cin
max_stack_size=67108864
@@ -115,9 +115,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/simout b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/simout
index 776b4fadc..c6c7c62e1 100755
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/simout
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/simout
@@ -1,14 +1,10 @@
-Redirecting stdout to build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-atomic/simout
-Redirecting stderr to build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-atomic/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:08:43
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:59
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-atomic -re tests/run.py build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-atomic
-Couldn't unlink build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-atomic/smred.sav
-Couldn't unlink build/X86/tests/opt/long/se/70.twolf/x86/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/se/70.twolf/ref/x86/linux/simple-atomic/stats.txt b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/stats.txt
index be9f62e84..98c43bfba 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.131393 # Nu
sim_ticks 131393100000 # Number of ticks simulated
final_tick 131393100000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 449336 # Simulator instruction rate (inst/s)
-host_op_rate 753127 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 447028889 # Simulator tick rate (ticks/s)
-host_mem_usage 272700 # Number of bytes of host memory used
-host_seconds 293.93 # Real time elapsed on the host
+host_inst_rate 560372 # Simulator instruction rate (inst/s)
+host_op_rate 939232 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 557494351 # Simulator tick rate (ticks/s)
+host_mem_usage 246748 # Number of bytes of host memory used
+host_seconds 235.69 # Real time elapsed on the host
sim_insts 132071228 # Number of instructions simulated
sim_ops 221363018 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 1698379042 # Number of bytes read from this memory
@@ -33,7 +33,7 @@ system.cpu.num_func_calls 0 # nu
system.cpu.num_conditional_control_insts 8268471 # number of instructions that are conditional controls
system.cpu.num_int_insts 220339607 # number of integer instructions
system.cpu.num_fp_insts 2162459 # number of float instructions
-system.cpu.num_int_register_reads 705008819 # number of times the integer registers were read
+system.cpu.num_int_register_reads 705008823 # number of times the integer registers were read
system.cpu.num_int_register_writes 318312586 # number of times the integer registers were written
system.cpu.num_fp_register_reads 3037165 # number of times the floating registers were read
system.cpu.num_fp_register_writes 1831403 # number of times the floating registers were written
diff --git a/tests/long/se/70.twolf/ref/x86/linux/simple-timing/config.ini b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/config.ini
index 8ab20ef21..3d56f1a99 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-timing/config.ini
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/config.ini
@@ -164,9 +164,8 @@ cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[1]
[system.cpu.toL2Bus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
@@ -185,7 +184,7 @@ egid=100
env=
errout=cerr
euid=100
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/twolf
+executable=/dist/m5/cpu2000/binaries/x86/linux/twolf
gid=100
input=cin
max_stack_size=67108864
@@ -197,9 +196,8 @@ system=system
uid=100
[system.membus]
-type=Bus
+type=CoherentBus
block_size=64
-bus_id=0
clock=1000
header_cycles=1
use_default_range=false
diff --git a/tests/long/se/70.twolf/ref/x86/linux/simple-timing/simout b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/simout
index 483a9fc09..a97127599 100755
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-timing/simout
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/simout
@@ -1,14 +1,10 @@
-Redirecting stdout to build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-timing/simout
-Redirecting stderr to build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 21 2012 19:00:49
-gem5 started May 21 2012 19:00:58
-gem5 executing on ribera.cs.wisc.edu
+gem5 compiled Jun 3 2012 13:30:44
+gem5 started Jun 3 2012 13:30:59
+gem5 executing on burrito
command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-timing -re tests/run.py build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-timing
-Couldn't unlink build/X86/tests/opt/long/se/70.twolf/x86/linux/simple-timing/smred.sav
-Couldn't unlink build/X86/tests/opt/long/se/70.twolf/x86/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/se/70.twolf/ref/x86/linux/simple-timing/stats.txt b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/stats.txt
index 029c5536e..1165c8c9e 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/simple-timing/stats.txt
+++ b/tests/long/se/70.twolf/ref/x86/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 0.250961 # Nu
sim_ticks 250960631000 # Number of ticks simulated
final_tick 250960631000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 291052 # Simulator instruction rate (inst/s)
-host_op_rate 487829 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 553054781 # Simulator tick rate (ticks/s)
-host_mem_usage 281636 # Number of bytes of host memory used
-host_seconds 453.77 # Real time elapsed on the host
+host_inst_rate 361817 # Simulator instruction rate (inst/s)
+host_op_rate 606437 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 687521912 # Simulator tick rate (ticks/s)
+host_mem_usage 255672 # Number of bytes of host memory used
+host_seconds 365.02 # Real time elapsed on the host
sim_insts 132071228 # Number of instructions simulated
sim_ops 221363018 # Number of ops (including micro ops) simulated
system.physmem.bytes_read 303040 # Number of bytes read from this memory
@@ -32,7 +32,7 @@ system.cpu.num_func_calls 0 # nu
system.cpu.num_conditional_control_insts 8268471 # number of instructions that are conditional controls
system.cpu.num_int_insts 220339607 # number of integer instructions
system.cpu.num_fp_insts 2162459 # number of float instructions
-system.cpu.num_int_register_reads 705008819 # number of times the integer registers were read
+system.cpu.num_int_register_reads 705008823 # number of times the integer registers were read
system.cpu.num_int_register_writes 318312586 # number of times the integer registers were written
system.cpu.num_fp_register_reads 3037165 # number of times the floating registers were read
system.cpu.num_fp_register_writes 1831403 # number of times the floating registers were written