summaryrefslogtreecommitdiff
path: root/tests/quick/10.linux-boot
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/10.linux-boot')
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini6
-rwxr-xr-xtests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/simout7
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt24
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini4
-rwxr-xr-xtests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/simout7
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt18
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini6
-rwxr-xr-xtests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/simout7
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats.txt26
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini4
-rwxr-xr-xtests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/simout7
-rw-r--r--tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats.txt18
-rw-r--r--tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini4
-rwxr-xr-xtests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout10
-rw-r--r--tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt16
-rw-r--r--tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/status2
-rw-r--r--tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini4
-rwxr-xr-xtests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/simout10
-rw-r--r--tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt16
-rw-r--r--tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/status2
-rw-r--r--tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini6
-rwxr-xr-xtests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout10
-rw-r--r--tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt22
-rw-r--r--tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini6
-rwxr-xr-xtests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout10
-rw-r--r--tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt22
26 files changed, 149 insertions, 125 deletions
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
index 1712ae4de..b9ee6d3dc 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.ini
@@ -81,6 +81,7 @@ assoc=4
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -116,6 +117,7 @@ assoc=1
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -188,6 +190,7 @@ assoc=4
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -223,6 +226,7 @@ assoc=1
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -319,6 +323,7 @@ assoc=8
block_size=64
forward_snoops=false
hash_delay=1
+is_top_level=true
latency=50000
max_miss_count=0
mshrs=20
@@ -350,6 +355,7 @@ assoc=8
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=false
latency=10000
max_miss_count=0
mshrs=92
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/simout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/simout
index dcb0b4c2e..9887f002f 100755
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/simout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/simout
@@ -5,10 +5,9 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Feb 7 2011 01:46:17
-M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
-M5 started Feb 7 2011 01:46:32
-M5 executing on burrito
+M5 compiled Apr 19 2011 12:17:36
+M5 started Apr 19 2011 12:18:19
+M5 executing on maize
command line: build/ALPHA_FS/m5.fast -d build/ALPHA_FS/tests/fast/quick/10.linux-boot/alpha/linux/tsunami-simple-atomic-dual -re tests/run.py build/ALPHA_FS/tests/fast/quick/10.linux-boot/alpha/linux/tsunami-simple-atomic-dual
Global frequency set at 1000000000000 ticks per second
info: kernel located at: /dist/m5/system/binaries/vmlinux
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt
index 55bb5b9bd..b94a40430 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 1669061 # Simulator instruction rate (inst/s)
-host_mem_usage 312244 # Number of bytes of host memory used
-host_seconds 37.84 # Real time elapsed on the host
-host_tick_rate 49429698361 # Simulator tick rate (ticks/s)
+host_inst_rate 4662508 # Simulator instruction rate (inst/s)
+host_mem_usage 292496 # Number of bytes of host memory used
+host_seconds 13.55 # Real time elapsed on the host
+host_tick_rate 138080405600 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 63154034 # Number of instructions simulated
sim_seconds 1.870336 # Number of seconds simulated
@@ -70,8 +70,8 @@ system.cpu0.dcache.demand_mshr_misses 0 # nu
system.cpu0.dcache.fast_writes 0 # number of fast writes performed
system.cpu0.dcache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu0.dcache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu0.dcache.occ_%::0 0.985990 # Average percentage of cache occupancy
system.cpu0.dcache.occ_blocks::0 504.827058 # Average occupied blocks per context
+system.cpu0.dcache.occ_percent::0 0.985990 # Average percentage of cache occupancy
system.cpu0.dcache.overall_accesses::0 14729930 # number of overall (read+write) accesses
system.cpu0.dcache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu0.dcache.overall_accesses::total 14729930 # number of overall (read+write) accesses
@@ -162,8 +162,8 @@ system.cpu0.icache.demand_mshr_misses 0 # nu
system.cpu0.icache.fast_writes 0 # number of fast writes performed
system.cpu0.icache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu0.icache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu0.icache.occ_%::0 0.998525 # Average percentage of cache occupancy
system.cpu0.icache.occ_blocks::0 511.244754 # Average occupied blocks per context
+system.cpu0.icache.occ_percent::0 0.998525 # Average percentage of cache occupancy
system.cpu0.icache.overall_accesses::0 57230132 # number of overall (read+write) accesses
system.cpu0.icache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu0.icache.overall_accesses::total 57230132 # number of overall (read+write) accesses
@@ -385,8 +385,8 @@ system.cpu1.dcache.demand_mshr_misses 0 # nu
system.cpu1.dcache.fast_writes 0 # number of fast writes performed
system.cpu1.dcache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu1.dcache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu1.dcache.occ_%::0 0.765530 # Average percentage of cache occupancy
system.cpu1.dcache.occ_blocks::0 391.951263 # Average occupied blocks per context
+system.cpu1.dcache.occ_percent::0 0.765530 # Average percentage of cache occupancy
system.cpu1.dcache.overall_accesses::0 1884270 # number of overall (read+write) accesses
system.cpu1.dcache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu1.dcache.overall_accesses::total 1884270 # number of overall (read+write) accesses
@@ -477,8 +477,8 @@ system.cpu1.icache.demand_mshr_misses 0 # nu
system.cpu1.icache.fast_writes 0 # number of fast writes performed
system.cpu1.icache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu1.icache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu1.icache.occ_%::0 0.834231 # Average percentage of cache occupancy
system.cpu1.icache.occ_blocks::0 427.126317 # Average occupied blocks per context
+system.cpu1.icache.occ_percent::0 0.834231 # Average percentage of cache occupancy
system.cpu1.icache.overall_accesses::0 5935766 # number of overall (read+write) accesses
system.cpu1.icache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu1.icache.overall_accesses::total 5935766 # number of overall (read+write) accesses
@@ -677,8 +677,8 @@ system.iocache.demand_mshr_misses 0 # nu
system.iocache.fast_writes 0 # number of fast writes performed
system.iocache.mshr_cap_events 0 # number of times MSHR cap was activated
system.iocache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.iocache.occ_%::1 0.027215 # Average percentage of cache occupancy
system.iocache.occ_blocks::1 0.435437 # Average occupied blocks per context
+system.iocache.occ_percent::1 0.027215 # Average percentage of cache occupancy
system.iocache.overall_accesses::0 0 # number of overall (read+write) accesses
system.iocache.overall_accesses::1 41727 # number of overall (read+write) accesses
system.iocache.overall_accesses::total 41727 # number of overall (read+write) accesses
@@ -800,12 +800,12 @@ system.l2c.demand_mshr_misses 0 # nu
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.mshr_cap_events 0 # number of times MSHR cap was activated
system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate
-system.l2c.occ_%::0 0.152888 # Average percentage of cache occupancy
-system.l2c.occ_%::1 0.004061 # Average percentage of cache occupancy
-system.l2c.occ_%::2 0.363646 # Average percentage of cache occupancy
system.l2c.occ_blocks::0 10019.673951 # Average occupied blocks per context
system.l2c.occ_blocks::1 266.115685 # Average occupied blocks per context
system.l2c.occ_blocks::2 23831.931773 # Average occupied blocks per context
+system.l2c.occ_percent::0 0.152888 # Average percentage of cache occupancy
+system.l2c.occ_percent::1 0.004061 # Average percentage of cache occupancy
+system.l2c.occ_percent::2 0.363646 # Average percentage of cache occupancy
system.l2c.overall_accesses::0 2859320 # number of overall (read+write) accesses
system.l2c.overall_accesses::1 165593 # number of overall (read+write) accesses
system.l2c.overall_accesses::2 0 # number of overall (read+write) accesses
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
index 6d9c221c4..ffa9d4df6 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.ini
@@ -81,6 +81,7 @@ assoc=4
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -116,6 +117,7 @@ assoc=1
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -212,6 +214,7 @@ assoc=8
block_size=64
forward_snoops=false
hash_delay=1
+is_top_level=true
latency=50000
max_miss_count=0
mshrs=20
@@ -243,6 +246,7 @@ assoc=8
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=false
latency=10000
max_miss_count=0
mshrs=92
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/simout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/simout
index 644d4ca07..01b553cc1 100755
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/simout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/simout
@@ -5,10 +5,9 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Feb 7 2011 01:46:17
-M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
-M5 started Feb 7 2011 01:46:32
-M5 executing on burrito
+M5 compiled Apr 19 2011 12:17:36
+M5 started Apr 19 2011 12:18:17
+M5 executing on maize
command line: build/ALPHA_FS/m5.fast -d build/ALPHA_FS/tests/fast/quick/10.linux-boot/alpha/linux/tsunami-simple-atomic -re tests/run.py build/ALPHA_FS/tests/fast/quick/10.linux-boot/alpha/linux/tsunami-simple-atomic
Global frequency set at 1000000000000 ticks per second
info: kernel located at: /dist/m5/system/binaries/vmlinux
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt
index 3b6776214..85848a462 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 1616180 # Simulator instruction rate (inst/s)
-host_mem_usage 311108 # Number of bytes of host memory used
-host_seconds 37.15 # Real time elapsed on the host
-host_tick_rate 49243802130 # Simulator tick rate (ticks/s)
+host_inst_rate 4724073 # Simulator instruction rate (inst/s)
+host_mem_usage 291084 # Number of bytes of host memory used
+host_seconds 12.71 # Real time elapsed on the host
+host_tick_rate 143937379014 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 60038305 # Number of instructions simulated
sim_seconds 1.829332 # Number of seconds simulated
@@ -67,8 +67,8 @@ system.cpu.dcache.demand_mshr_misses 0 # nu
system.cpu.dcache.fast_writes 0 # number of fast writes performed
system.cpu.dcache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.dcache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.dcache.occ_%::0 0.999996 # Average percentage of cache occupancy
system.cpu.dcache.occ_blocks::0 511.997802 # Average occupied blocks per context
+system.cpu.dcache.occ_percent::0 0.999996 # Average percentage of cache occupancy
system.cpu.dcache.overall_accesses::0 15682061 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::total 15682061 # number of overall (read+write) accesses
@@ -159,8 +159,8 @@ system.cpu.icache.demand_mshr_misses 0 # nu
system.cpu.icache.fast_writes 0 # number of fast writes performed
system.cpu.icache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.icache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.icache.occ_%::0 0.998467 # Average percentage of cache occupancy
system.cpu.icache.occ_blocks::0 511.215243 # Average occupied blocks per context
+system.cpu.icache.occ_percent::0 0.998467 # Average percentage of cache occupancy
system.cpu.icache.overall_accesses::0 60050143 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::total 60050143 # number of overall (read+write) accesses
@@ -371,8 +371,8 @@ system.iocache.demand_mshr_misses 0 # nu
system.iocache.fast_writes 0 # number of fast writes performed
system.iocache.mshr_cap_events 0 # number of times MSHR cap was activated
system.iocache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.iocache.occ_%::1 0.076598 # Average percentage of cache occupancy
system.iocache.occ_blocks::1 1.225570 # Average occupied blocks per context
+system.iocache.occ_percent::1 0.076598 # Average percentage of cache occupancy
system.iocache.overall_accesses::0 0 # number of overall (read+write) accesses
system.iocache.overall_accesses::1 41726 # number of overall (read+write) accesses
system.iocache.overall_accesses::total 41726 # number of overall (read+write) accesses
@@ -465,10 +465,10 @@ system.l2c.demand_mshr_misses 0 # nu
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.mshr_cap_events 0 # number of times MSHR cap was activated
system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate
-system.l2c.occ_%::0 0.155542 # Average percentage of cache occupancy
-system.l2c.occ_%::1 0.360312 # Average percentage of cache occupancy
system.l2c.occ_blocks::0 10193.605493 # Average occupied blocks per context
system.l2c.occ_blocks::1 23613.410409 # Average occupied blocks per context
+system.l2c.occ_percent::0 0.155542 # Average percentage of cache occupancy
+system.l2c.occ_percent::1 0.360312 # Average percentage of cache occupancy
system.l2c.overall_accesses::0 2963266 # number of overall (read+write) accesses
system.l2c.overall_accesses::1 0 # number of overall (read+write) accesses
system.l2c.overall_accesses::total 2963266 # number of overall (read+write) accesses
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
index 41a7379e1..8d055ed5f 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.ini
@@ -78,6 +78,7 @@ assoc=4
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -113,6 +114,7 @@ assoc=1
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -182,6 +184,7 @@ assoc=4
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -217,6 +220,7 @@ assoc=1
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -313,6 +317,7 @@ assoc=8
block_size=64
forward_snoops=false
hash_delay=1
+is_top_level=true
latency=50000
max_miss_count=0
mshrs=20
@@ -344,6 +349,7 @@ assoc=8
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=false
latency=10000
max_miss_count=0
mshrs=92
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/simout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/simout
index 8f8e92a25..a027f13fc 100755
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/simout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/simout
@@ -5,10 +5,9 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Feb 7 2011 01:46:17
-M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
-M5 started Feb 7 2011 01:46:32
-M5 executing on burrito
+M5 compiled Apr 19 2011 12:17:36
+M5 started Apr 19 2011 12:17:43
+M5 executing on maize
command line: build/ALPHA_FS/m5.fast -d build/ALPHA_FS/tests/fast/quick/10.linux-boot/alpha/linux/tsunami-simple-timing-dual -re tests/run.py build/ALPHA_FS/tests/fast/quick/10.linux-boot/alpha/linux/tsunami-simple-timing-dual
Global frequency set at 1000000000000 ticks per second
info: kernel located at: /dist/m5/system/binaries/vmlinux
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats.txt
index 6e0648c43..58de64347 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 901052 # Simulator instruction rate (inst/s)
-host_mem_usage 309020 # Number of bytes of host memory used
-host_seconds 65.87 # Real time elapsed on the host
-host_tick_rate 29733229075 # Simulator tick rate (ticks/s)
+host_inst_rate 2296983 # Simulator instruction rate (inst/s)
+host_mem_usage 289272 # Number of bytes of host memory used
+host_seconds 25.84 # Real time elapsed on the host
+host_tick_rate 75796433096 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 59355643 # Number of instructions simulated
sim_seconds 1.958647 # Number of seconds simulated
@@ -114,10 +114,10 @@ system.cpu0.dcache.demand_mshr_misses 1327637 # nu
system.cpu0.dcache.fast_writes 0 # number of fast writes performed
system.cpu0.dcache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu0.dcache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu0.dcache.occ_%::0 0.983447 # Average percentage of cache occupancy
-system.cpu0.dcache.occ_%::1 -0.001953 # Average percentage of cache occupancy
system.cpu0.dcache.occ_blocks::0 503.524900 # Average occupied blocks per context
system.cpu0.dcache.occ_blocks::1 -1.000000 # Average occupied blocks per context
+system.cpu0.dcache.occ_percent::0 0.983447 # Average percentage of cache occupancy
+system.cpu0.dcache.occ_percent::1 -0.001953 # Average percentage of cache occupancy
system.cpu0.dcache.overall_accesses::0 14308776 # number of overall (read+write) accesses
system.cpu0.dcache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu0.dcache.overall_accesses::total 14308776 # number of overall (read+write) accesses
@@ -218,8 +218,8 @@ system.cpu0.icache.demand_mshr_misses 915781 # nu
system.cpu0.icache.fast_writes 0 # number of fast writes performed
system.cpu0.icache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu0.icache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu0.icache.occ_%::0 0.993751 # Average percentage of cache occupancy
system.cpu0.icache.occ_blocks::0 508.800486 # Average occupied blocks per context
+system.cpu0.icache.occ_percent::0 0.993751 # Average percentage of cache occupancy
system.cpu0.icache.overall_accesses::0 54081252 # number of overall (read+write) accesses
system.cpu0.icache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu0.icache.overall_accesses::total 54081252 # number of overall (read+write) accesses
@@ -484,8 +484,8 @@ system.cpu1.dcache.demand_mshr_misses 57534 # nu
system.cpu1.dcache.fast_writes 0 # number of fast writes performed
system.cpu1.dcache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu1.dcache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu1.dcache.occ_%::0 0.760784 # Average percentage of cache occupancy
system.cpu1.dcache.occ_blocks::0 389.521271 # Average occupied blocks per context
+system.cpu1.dcache.occ_percent::0 0.760784 # Average percentage of cache occupancy
system.cpu1.dcache.overall_accesses::0 1677594 # number of overall (read+write) accesses
system.cpu1.dcache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu1.dcache.overall_accesses::total 1677594 # number of overall (read+write) accesses
@@ -586,8 +586,8 @@ system.cpu1.icache.demand_mshr_misses 87005 # nu
system.cpu1.icache.fast_writes 0 # number of fast writes performed
system.cpu1.icache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu1.icache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu1.icache.occ_%::0 0.819937 # Average percentage of cache occupancy
system.cpu1.icache.occ_blocks::0 419.807616 # Average occupied blocks per context
+system.cpu1.icache.occ_percent::0 0.819937 # Average percentage of cache occupancy
system.cpu1.icache.overall_accesses::0 5286354 # number of overall (read+write) accesses
system.cpu1.icache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu1.icache.overall_accesses::total 5286354 # number of overall (read+write) accesses
@@ -801,8 +801,8 @@ system.iocache.demand_mshr_misses 41726 # nu
system.iocache.fast_writes 0 # number of fast writes performed
system.iocache.mshr_cap_events 0 # number of times MSHR cap was activated
system.iocache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.iocache.occ_%::1 0.035233 # Average percentage of cache occupancy
system.iocache.occ_blocks::1 0.563721 # Average occupied blocks per context
+system.iocache.occ_percent::1 0.035233 # Average percentage of cache occupancy
system.iocache.overall_accesses::0 0 # number of overall (read+write) accesses
system.iocache.overall_accesses::1 41726 # number of overall (read+write) accesses
system.iocache.overall_accesses::total 41726 # number of overall (read+write) accesses
@@ -977,12 +977,12 @@ system.l2c.demand_mshr_misses 428511 # nu
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.mshr_cap_events 0 # number of times MSHR cap was activated
system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate
-system.l2c.occ_%::0 0.165831 # Average percentage of cache occupancy
-system.l2c.occ_%::1 0.003052 # Average percentage of cache occupancy
-system.l2c.occ_%::2 0.357359 # Average percentage of cache occupancy
system.l2c.occ_blocks::0 10867.929163 # Average occupied blocks per context
system.l2c.occ_blocks::1 199.983935 # Average occupied blocks per context
system.l2c.occ_blocks::2 23419.887612 # Average occupied blocks per context
+system.l2c.occ_percent::0 0.165831 # Average percentage of cache occupancy
+system.l2c.occ_percent::1 0.003052 # Average percentage of cache occupancy
+system.l2c.occ_percent::2 0.357359 # Average percentage of cache occupancy
system.l2c.overall_accesses::0 2250056 # number of overall (read+write) accesses
system.l2c.overall_accesses::1 139909 # number of overall (read+write) accesses
system.l2c.overall_accesses::2 0 # number of overall (read+write) accesses
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
index f28d4e037..80db30395 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.ini
@@ -78,6 +78,7 @@ assoc=4
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -113,6 +114,7 @@ assoc=1
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -209,6 +211,7 @@ assoc=8
block_size=64
forward_snoops=false
hash_delay=1
+is_top_level=true
latency=50000
max_miss_count=0
mshrs=20
@@ -240,6 +243,7 @@ assoc=8
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=false
latency=10000
max_miss_count=0
mshrs=92
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/simout b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/simout
index be2bcef8d..aee40b816 100755
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/simout
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/simout
@@ -5,10 +5,9 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Feb 7 2011 01:46:17
-M5 revision 4b4b02c5553c 7929 default qtip reupdatestats.patch tip
-M5 started Feb 7 2011 01:46:32
-M5 executing on burrito
+M5 compiled Apr 19 2011 12:17:36
+M5 started Apr 19 2011 12:17:43
+M5 executing on maize
command line: build/ALPHA_FS/m5.fast -d build/ALPHA_FS/tests/fast/quick/10.linux-boot/alpha/linux/tsunami-simple-timing -re tests/run.py build/ALPHA_FS/tests/fast/quick/10.linux-boot/alpha/linux/tsunami-simple-timing
Global frequency set at 1000000000000 ticks per second
info: kernel located at: /dist/m5/system/binaries/vmlinux
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats.txt b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats.txt
index 5f1750494..397168bed 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats.txt
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 1077887 # Simulator instruction rate (inst/s)
-host_mem_usage 307624 # Number of bytes of host memory used
-host_seconds 52.08 # Real time elapsed on the host
-host_tick_rate 36780244064 # Simulator tick rate (ticks/s)
+host_inst_rate 2410973 # Simulator instruction rate (inst/s)
+host_mem_usage 287860 # Number of bytes of host memory used
+host_seconds 23.28 # Real time elapsed on the host
+host_tick_rate 82268225536 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 56137087 # Number of instructions simulated
sim_seconds 1.915549 # Number of seconds simulated
@@ -101,8 +101,8 @@ system.cpu.dcache.demand_mshr_misses 1373445 # nu
system.cpu.dcache.fast_writes 0 # number of fast writes performed
system.cpu.dcache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.dcache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.dcache.occ_%::0 0.999969 # Average percentage of cache occupancy
system.cpu.dcache.occ_blocks::0 511.984023 # Average occupied blocks per context
+system.cpu.dcache.occ_percent::0 0.999969 # Average percentage of cache occupancy
system.cpu.dcache.overall_accesses::0 15029535 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::total 15029535 # number of overall (read+write) accesses
@@ -203,8 +203,8 @@ system.cpu.icache.demand_mshr_misses 928354 # nu
system.cpu.icache.fast_writes 0 # number of fast writes performed
system.cpu.icache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.icache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.icache.occ_%::0 0.993597 # Average percentage of cache occupancy
system.cpu.icache.occ_blocks::0 508.721464 # Average occupied blocks per context
+system.cpu.icache.occ_percent::0 0.993597 # Average percentage of cache occupancy
system.cpu.icache.overall_accesses::0 56148907 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::total 56148907 # number of overall (read+write) accesses
@@ -435,8 +435,8 @@ system.iocache.demand_mshr_misses 41725 # nu
system.iocache.fast_writes 0 # number of fast writes performed
system.iocache.mshr_cap_events 0 # number of times MSHR cap was activated
system.iocache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.iocache.occ_%::1 0.083770 # Average percentage of cache occupancy
system.iocache.occ_blocks::1 1.340325 # Average occupied blocks per context
+system.iocache.occ_percent::1 0.083770 # Average percentage of cache occupancy
system.iocache.overall_accesses::0 0 # number of overall (read+write) accesses
system.iocache.overall_accesses::1 41725 # number of overall (read+write) accesses
system.iocache.overall_accesses::total 41725 # number of overall (read+write) accesses
@@ -563,10 +563,10 @@ system.l2c.demand_mshr_misses 422432 # nu
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.mshr_cap_events 0 # number of times MSHR cap was activated
system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate
-system.l2c.occ_%::0 0.171530 # Average percentage of cache occupancy
-system.l2c.occ_%::1 0.352641 # Average percentage of cache occupancy
system.l2c.occ_blocks::0 11241.373247 # Average occupied blocks per context
system.l2c.occ_blocks::1 23110.665097 # Average occupied blocks per context
+system.l2c.occ_percent::0 0.171530 # Average percentage of cache occupancy
+system.l2c.occ_percent::1 0.352641 # Average percentage of cache occupancy
system.l2c.overall_accesses::0 2318771 # number of overall (read+write) accesses
system.l2c.overall_accesses::1 0 # number of overall (read+write) accesses
system.l2c.overall_accesses::total 2318771 # number of overall (read+write) accesses
diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
index 22389fff7..fa239be0f 100644
--- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
+++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
@@ -11,7 +11,7 @@ children=bridge cpu diskmem intrctrl iobus iocache l2c membus physmem realview t
boot_cpu_frequency=500
boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB slram=slram0,0x8000000,+0x8000000 mtdparts=slram0:- root=/dev/mtdblock0
init_param=0
-kernel=/chips/pd/randd/dist/binaries/vmlinux.arm
+kernel=/dist/m5/system/binaries/vmlinux.arm
load_addr_mask=268435455
machine_type=RealView_PBX
mem_mode=atomic
@@ -169,7 +169,7 @@ type=ExeTracer
[system.diskmem]
type=PhysicalMemory
-file=/chips/pd/randd/dist/disks/ael-arm.ext2
+file=/dist/m5/system/disks/ael-arm.ext2
latency=30000
latency_var=0
null=false
diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
index fcaeba8a4..b43a524ba 100755
--- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
+++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
@@ -5,11 +5,11 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Apr 4 2011 11:17:23
-M5 started Apr 4 2011 11:17:27
-M5 executing on u200439-lin.austin.arm.com
-command line: build/ARM_FS/m5.opt -d build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-atomic -re tests/run.py build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-atomic
+M5 compiled Apr 19 2011 13:41:05
+M5 started Apr 19 2011 13:41:08
+M5 executing on maize
+command line: build/ARM_FS/m5.fast -d build/ARM_FS/tests/fast/quick/10.linux-boot/arm/linux/realview-simple-atomic -re tests/run.py build/ARM_FS/tests/fast/quick/10.linux-boot/arm/linux/realview-simple-atomic
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /chips/pd/randd/dist/binaries/vmlinux.arm
+info: kernel located at: /dist/m5/system/binaries/vmlinux.arm
info: Entering event queue @ 0. Starting simulation...
Exiting @ tick 26405524500 because m5_exit instruction encountered
diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
index ef25e7d53..1d1cbe8c6 100644
--- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
+++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 1925695 # Simulator instruction rate (inst/s)
-host_mem_usage 381972 # Number of bytes of host memory used
-host_seconds 27.06 # Real time elapsed on the host
-host_tick_rate 975977117 # Simulator tick rate (ticks/s)
+host_inst_rate 3981428 # Simulator instruction rate (inst/s)
+host_mem_usage 333640 # Number of bytes of host memory used
+host_seconds 13.09 # Real time elapsed on the host
+host_tick_rate 2017840381 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 52100192 # Number of instructions simulated
sim_seconds 0.026406 # Number of seconds simulated
@@ -67,8 +67,8 @@ system.cpu.dcache.demand_mshr_misses 0 # nu
system.cpu.dcache.fast_writes 0 # number of fast writes performed
system.cpu.dcache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.dcache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.dcache.occ_%::0 0.999487 # Average percentage of cache occupancy
system.cpu.dcache.occ_blocks::0 511.737186 # Average occupied blocks per context
+system.cpu.dcache.occ_percent::0 0.999487 # Average percentage of cache occupancy
system.cpu.dcache.overall_accesses::0 14508425 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::total 14508425 # number of overall (read+write) accesses
@@ -164,8 +164,8 @@ system.cpu.icache.demand_mshr_misses 0 # nu
system.cpu.icache.fast_writes 0 # number of fast writes performed
system.cpu.icache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.icache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.icache.occ_%::0 0.930522 # Average percentage of cache occupancy
system.cpu.icache.occ_blocks::0 476.427204 # Average occupied blocks per context
+system.cpu.icache.occ_percent::0 0.930522 # Average percentage of cache occupancy
system.cpu.icache.overall_accesses::0 41566870 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::total 41566870 # number of overall (read+write) accesses
@@ -374,10 +374,10 @@ system.l2c.demand_mshr_misses 0 # nu
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.mshr_cap_events 0 # number of times MSHR cap was activated
system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate
-system.l2c.occ_%::0 0.076949 # Average percentage of cache occupancy
-system.l2c.occ_%::1 0.477056 # Average percentage of cache occupancy
system.l2c.occ_blocks::0 5042.918302 # Average occupied blocks per context
system.l2c.occ_blocks::1 31264.310783 # Average occupied blocks per context
+system.l2c.occ_percent::0 0.076949 # Average percentage of cache occupancy
+system.l2c.occ_percent::1 0.477056 # Average percentage of cache occupancy
system.l2c.overall_accesses::0 843462 # number of overall (read+write) accesses
system.l2c.overall_accesses::1 6142 # number of overall (read+write) accesses
system.l2c.overall_accesses::total 849604 # number of overall (read+write) accesses
diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/status b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/status
index 586cb6b73..53b01d583 100644
--- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/status
+++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/status
@@ -1 +1 @@
-build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-atomic FAILED!
+build/ARM_FS/tests/fast/quick/10.linux-boot/arm/linux/realview-simple-atomic FAILED!
diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini
index 5e47cea73..6cf3e5508 100644
--- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini
+++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini
@@ -11,7 +11,7 @@ children=bridge cpu diskmem intrctrl iobus iocache l2c membus physmem realview t
boot_cpu_frequency=500
boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB slram=slram0,0x8000000,+0x8000000 mtdparts=slram0:- root=/dev/mtdblock0
init_param=0
-kernel=/chips/pd/randd/dist/binaries/vmlinux.arm
+kernel=/dist/m5/system/binaries/vmlinux.arm
load_addr_mask=268435455
machine_type=RealView_PBX
mem_mode=timing
@@ -166,7 +166,7 @@ type=ExeTracer
[system.diskmem]
type=PhysicalMemory
-file=/chips/pd/randd/dist/disks/ael-arm.ext2
+file=/dist/m5/system/disks/ael-arm.ext2
latency=30000
latency_var=0
null=false
diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/simout b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/simout
index fee47a4d1..397e3f68f 100755
--- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/simout
+++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/simout
@@ -5,11 +5,11 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Apr 4 2011 11:17:23
-M5 started Apr 4 2011 11:17:27
-M5 executing on u200439-lin.austin.arm.com
-command line: build/ARM_FS/m5.opt -d build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-timing -re tests/run.py build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-timing
+M5 compiled Apr 19 2011 13:41:05
+M5 started Apr 19 2011 13:41:07
+M5 executing on maize
+command line: build/ARM_FS/m5.fast -d build/ARM_FS/tests/fast/quick/10.linux-boot/arm/linux/realview-simple-timing -re tests/run.py build/ARM_FS/tests/fast/quick/10.linux-boot/arm/linux/realview-simple-timing
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /chips/pd/randd/dist/binaries/vmlinux.arm
+info: kernel located at: /dist/m5/system/binaries/vmlinux.arm
info: Entering event queue @ 0. Starting simulation...
Exiting @ tick 114405702000 because m5_exit instruction encountered
diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
index 6471ce023..1213d5a93 100644
--- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
+++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 936835 # Simulator instruction rate (inst/s)
-host_mem_usage 382000 # Number of bytes of host memory used
-host_seconds 54.69 # Real time elapsed on the host
-host_tick_rate 2092010024 # Simulator tick rate (ticks/s)
+host_inst_rate 1969505 # Simulator instruction rate (inst/s)
+host_mem_usage 333648 # Number of bytes of host memory used
+host_seconds 26.01 # Real time elapsed on the host
+host_tick_rate 4398008175 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 51232482 # Number of instructions simulated
sim_seconds 0.114406 # Number of seconds simulated
@@ -101,8 +101,8 @@ system.cpu.dcache.demand_mshr_misses 410569 # nu
system.cpu.dcache.fast_writes 0 # number of fast writes performed
system.cpu.dcache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.dcache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.dcache.occ_%::0 0.994514 # Average percentage of cache occupancy
system.cpu.dcache.occ_blocks::0 509.191392 # Average occupied blocks per context
+system.cpu.dcache.occ_percent::0 0.994514 # Average percentage of cache occupancy
system.cpu.dcache.overall_accesses::0 14503977 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::total 14503977 # number of overall (read+write) accesses
@@ -210,8 +210,8 @@ system.cpu.icache.demand_mshr_misses 434434 # nu
system.cpu.icache.fast_writes 0 # number of fast writes performed
system.cpu.icache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.icache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.icache.occ_%::0 0.945963 # Average percentage of cache occupancy
system.cpu.icache.occ_blocks::0 484.333151 # Average occupied blocks per context
+system.cpu.icache.occ_percent::0 0.945963 # Average percentage of cache occupancy
system.cpu.icache.overall_accesses::0 41556337 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::total 41556337 # number of overall (read+write) accesses
@@ -454,10 +454,10 @@ system.l2c.demand_mshr_misses 125930 # nu
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.mshr_cap_events 0 # number of times MSHR cap was activated
system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate
-system.l2c.occ_%::0 0.081395 # Average percentage of cache occupancy
-system.l2c.occ_%::1 0.478089 # Average percentage of cache occupancy
system.l2c.occ_blocks::0 5334.310202 # Average occupied blocks per context
system.l2c.occ_blocks::1 31332.032709 # Average occupied blocks per context
+system.l2c.occ_percent::0 0.081395 # Average percentage of cache occupancy
+system.l2c.occ_percent::1 0.478089 # Average percentage of cache occupancy
system.l2c.overall_accesses::0 846263 # number of overall (read+write) accesses
system.l2c.overall_accesses::1 5729 # number of overall (read+write) accesses
system.l2c.overall_accesses::total 851992 # number of overall (read+write) accesses
diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/status b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/status
index 8953751c2..624e9a5f7 100644
--- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/status
+++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/status
@@ -1 +1 @@
-build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-timing FAILED!
+build/ARM_FS/tests/fast/quick/10.linux-boot/arm/linux/realview-simple-timing FAILED!
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini
index 46cc1ee8d..1f83b404b 100644
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini
@@ -99,6 +99,7 @@ assoc=4
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -141,6 +142,7 @@ assoc=2
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=10
@@ -172,6 +174,7 @@ assoc=1
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -224,6 +227,7 @@ assoc=2
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=10
@@ -632,6 +636,7 @@ assoc=8
block_size=64
forward_snoops=false
hash_delay=1
+is_top_level=true
latency=50000
max_miss_count=0
mshrs=20
@@ -663,6 +668,7 @@ assoc=8
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=false
latency=10000
max_miss_count=0
mshrs=92
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout
index 3d2440746..b12d01305 100755
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout
@@ -5,13 +5,11 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Feb 26 2011 16:13:31
-M5 revision 412ef0f728a5 8092 default qtip tip updatefsstats.patch
-M5 started Feb 26 2011 16:13:35
-M5 executing on burrito
-command line: build/X86_FS/m5.opt -d build/X86_FS/tests/opt/long/10.linux-boot/x86/linux/pc-simple-atomic -re tests/run.py build/X86_FS/tests/opt/long/10.linux-boot/x86/linux/pc-simple-atomic
+M5 compiled Apr 19 2011 12:44:38
+M5 started Apr 19 2011 12:44:44
+M5 executing on maize
+command line: build/X86_FS/m5.fast -d build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-atomic -re tests/run.py build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-atomic
Global frequency set at 1000000000000 ticks per second
info: kernel located at: /dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9
- 0: rtc: Real-time clock set to Sun Jan 1 00:00:00 2012
info: Entering event queue @ 0. Starting simulation...
Exiting @ tick 5112051446000 because m5_exit instruction encountered
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt
index 432acc1f0..d1e2ef704 100644
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 2446370 # Simulator instruction rate (inst/s)
-host_mem_usage 368136 # Number of bytes of host memory used
-host_seconds 166.22 # Real time elapsed on the host
-host_tick_rate 30755543746 # Simulator tick rate (ticks/s)
+host_inst_rate 3814417 # Simulator instruction rate (inst/s)
+host_mem_usage 349920 # Number of bytes of host memory used
+host_seconds 106.60 # Real time elapsed on the host
+host_tick_rate 47954478135 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 406624458 # Number of instructions simulated
sim_seconds 5.112051 # Number of seconds simulated
@@ -56,8 +56,8 @@ system.cpu.dcache.demand_mshr_misses 0 # nu
system.cpu.dcache.fast_writes 0 # number of fast writes performed
system.cpu.dcache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.dcache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.dcache.occ_%::0 0.999999 # Average percentage of cache occupancy
system.cpu.dcache.occ_blocks::0 511.999375 # Average occupied blocks per context
+system.cpu.dcache.occ_percent::0 0.999999 # Average percentage of cache occupancy
system.cpu.dcache.overall_accesses::0 21771105 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::total 21771105 # number of overall (read+write) accesses
@@ -132,8 +132,8 @@ system.cpu.dtb_walker_cache.demand_mshr_misses 0
system.cpu.dtb_walker_cache.fast_writes 0 # number of fast writes performed
system.cpu.dtb_walker_cache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.dtb_walker_cache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.dtb_walker_cache.occ_%::1 0.313148 # Average percentage of cache occupancy
system.cpu.dtb_walker_cache.occ_blocks::1 5.010366 # Average occupied blocks per context
+system.cpu.dtb_walker_cache.occ_percent::1 0.313148 # Average percentage of cache occupancy
system.cpu.dtb_walker_cache.overall_accesses::0 0 # number of overall (read+write) accesses
system.cpu.dtb_walker_cache.overall_accesses::1 21821 # number of overall (read+write) accesses
system.cpu.dtb_walker_cache.overall_accesses::total 21821 # number of overall (read+write) accesses
@@ -208,8 +208,8 @@ system.cpu.icache.demand_mshr_misses 0 # nu
system.cpu.icache.fast_writes 0 # number of fast writes performed
system.cpu.icache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.icache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.icache.occ_%::0 0.997320 # Average percentage of cache occupancy
system.cpu.icache.occ_blocks::0 510.627884 # Average occupied blocks per context
+system.cpu.icache.occ_percent::0 0.997320 # Average percentage of cache occupancy
system.cpu.icache.overall_accesses::0 254189385 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::total 254189385 # number of overall (read+write) accesses
@@ -289,8 +289,8 @@ system.cpu.itb_walker_cache.demand_mshr_misses 0
system.cpu.itb_walker_cache.fast_writes 0 # number of fast writes performed
system.cpu.itb_walker_cache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.itb_walker_cache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.itb_walker_cache.occ_%::1 0.188799 # Average percentage of cache occupancy
system.cpu.itb_walker_cache.occ_blocks::1 3.020778 # Average occupied blocks per context
+system.cpu.itb_walker_cache.occ_percent::1 0.188799 # Average percentage of cache occupancy
system.cpu.itb_walker_cache.overall_accesses::0 0 # number of overall (read+write) accesses
system.cpu.itb_walker_cache.overall_accesses::1 12219 # number of overall (read+write) accesses
system.cpu.itb_walker_cache.overall_accesses::total 12219 # number of overall (read+write) accesses
@@ -390,8 +390,8 @@ system.iocache.demand_mshr_misses 0 # nu
system.iocache.fast_writes 0 # number of fast writes performed
system.iocache.mshr_cap_events 0 # number of times MSHR cap was activated
system.iocache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.iocache.occ_%::1 0.002653 # Average percentage of cache occupancy
system.iocache.occ_blocks::1 0.042448 # Average occupied blocks per context
+system.iocache.occ_percent::1 0.002653 # Average percentage of cache occupancy
system.iocache.overall_accesses::0 0 # number of overall (read+write) accesses
system.iocache.overall_accesses::1 47629 # number of overall (read+write) accesses
system.iocache.overall_accesses::total 47629 # number of overall (read+write) accesses
@@ -489,10 +489,10 @@ system.l2c.demand_mshr_misses 0 # nu
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.mshr_cap_events 0 # number of times MSHR cap was activated
system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate
-system.l2c.occ_%::0 0.147971 # Average percentage of cache occupancy
-system.l2c.occ_%::1 0.414180 # Average percentage of cache occupancy
system.l2c.occ_blocks::0 9697.448079 # Average occupied blocks per context
system.l2c.occ_blocks::1 27143.733047 # Average occupied blocks per context
+system.l2c.occ_percent::0 0.147971 # Average percentage of cache occupancy
+system.l2c.occ_percent::1 0.414180 # Average percentage of cache occupancy
system.l2c.overall_accesses::0 2414301 # number of overall (read+write) accesses
system.l2c.overall_accesses::1 10262 # number of overall (read+write) accesses
system.l2c.overall_accesses::total 2424563 # number of overall (read+write) accesses
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini
index 0541c10f2..f05a137d3 100644
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini
@@ -96,6 +96,7 @@ assoc=4
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -138,6 +139,7 @@ assoc=2
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=false
latency=1000
max_miss_count=0
mshrs=10
@@ -169,6 +171,7 @@ assoc=1
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=true
latency=1000
max_miss_count=0
mshrs=4
@@ -221,6 +224,7 @@ assoc=2
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=false
latency=1000
max_miss_count=0
mshrs=10
@@ -629,6 +633,7 @@ assoc=8
block_size=64
forward_snoops=false
hash_delay=1
+is_top_level=false
latency=50000
max_miss_count=0
mshrs=20
@@ -660,6 +665,7 @@ assoc=8
block_size=64
forward_snoops=true
hash_delay=1
+is_top_level=false
latency=10000
max_miss_count=0
mshrs=92
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout
index 62b97bfb9..f1baa96ff 100755
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout
@@ -5,13 +5,11 @@ The Regents of The University of Michigan
All Rights Reserved
-M5 compiled Feb 26 2011 16:13:31
-M5 revision 412ef0f728a5 8092 default qtip tip updatefsstats.patch
-M5 started Feb 26 2011 16:13:35
-M5 executing on burrito
-command line: build/X86_FS/m5.opt -d build/X86_FS/tests/opt/long/10.linux-boot/x86/linux/pc-simple-timing -re tests/run.py build/X86_FS/tests/opt/long/10.linux-boot/x86/linux/pc-simple-timing
+M5 compiled Apr 19 2011 12:44:38
+M5 started Apr 19 2011 12:46:29
+M5 executing on maize
+command line: build/X86_FS/m5.fast -d build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-timing -re tests/run.py build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-timing
Global frequency set at 1000000000000 ticks per second
info: kernel located at: /dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9
- 0: rtc: Real-time clock set to Sun Jan 1 00:00:00 2012
info: Entering event queue @ 0. Starting simulation...
Exiting @ tick 5195470393000 because m5_exit instruction encountered
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt
index 8b571b3ea..5e1d5b2a8 100644
--- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt
+++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt
@@ -1,9 +1,9 @@
---------- Begin Simulation Statistics ----------
-host_inst_rate 1546136 # Simulator instruction rate (inst/s)
-host_mem_usage 364716 # Number of bytes of host memory used
-host_seconds 170.97 # Real time elapsed on the host
-host_tick_rate 30388572127 # Simulator tick rate (ticks/s)
+host_inst_rate 2432424 # Simulator instruction rate (inst/s)
+host_mem_usage 346476 # Number of bytes of host memory used
+host_seconds 108.67 # Real time elapsed on the host
+host_tick_rate 47808116930 # Simulator tick rate (ticks/s)
sim_freq 1000000000000 # Frequency of simulated ticks
sim_insts 264339287 # Number of instructions simulated
sim_seconds 5.195470 # Number of seconds simulated
@@ -80,8 +80,8 @@ system.cpu.dcache.demand_mshr_misses 1626168 # nu
system.cpu.dcache.fast_writes 0 # number of fast writes performed
system.cpu.dcache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.dcache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.dcache.occ_%::0 0.999995 # Average percentage of cache occupancy
system.cpu.dcache.occ_blocks::0 511.997312 # Average occupied blocks per context
+system.cpu.dcache.occ_percent::0 0.999995 # Average percentage of cache occupancy
system.cpu.dcache.overall_accesses::0 21635359 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.dcache.overall_accesses::total 21635359 # number of overall (read+write) accesses
@@ -166,8 +166,8 @@ system.cpu.dtb_walker_cache.demand_mshr_misses 8896
system.cpu.dtb_walker_cache.fast_writes 0 # number of fast writes performed
system.cpu.dtb_walker_cache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.dtb_walker_cache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.dtb_walker_cache.occ_%::1 0.315775 # Average percentage of cache occupancy
system.cpu.dtb_walker_cache.occ_blocks::1 5.052403 # Average occupied blocks per context
+system.cpu.dtb_walker_cache.occ_percent::1 0.315775 # Average percentage of cache occupancy
system.cpu.dtb_walker_cache.overall_accesses::0 0 # number of overall (read+write) accesses
system.cpu.dtb_walker_cache.overall_accesses::1 21947 # number of overall (read+write) accesses
system.cpu.dtb_walker_cache.overall_accesses::total 21947 # number of overall (read+write) accesses
@@ -252,8 +252,8 @@ system.cpu.icache.demand_mshr_misses 788658 # nu
system.cpu.icache.fast_writes 0 # number of fast writes performed
system.cpu.icache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.icache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.icache.occ_%::0 0.996799 # Average percentage of cache occupancy
system.cpu.icache.occ_blocks::0 510.361283 # Average occupied blocks per context
+system.cpu.icache.occ_percent::0 0.996799 # Average percentage of cache occupancy
system.cpu.icache.overall_accesses::0 159222590 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::1 0 # number of overall (read+write) accesses
system.cpu.icache.overall_accesses::total 159222590 # number of overall (read+write) accesses
@@ -343,8 +343,8 @@ system.cpu.itb_walker_cache.demand_mshr_misses 4602
system.cpu.itb_walker_cache.fast_writes 0 # number of fast writes performed
system.cpu.itb_walker_cache.mshr_cap_events 0 # number of times MSHR cap was activated
system.cpu.itb_walker_cache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.cpu.itb_walker_cache.occ_%::1 0.191913 # Average percentage of cache occupancy
system.cpu.itb_walker_cache.occ_blocks::1 3.070606 # Average occupied blocks per context
+system.cpu.itb_walker_cache.occ_percent::1 0.191913 # Average percentage of cache occupancy
system.cpu.itb_walker_cache.overall_accesses::0 0 # number of overall (read+write) accesses
system.cpu.itb_walker_cache.overall_accesses::1 12223 # number of overall (read+write) accesses
system.cpu.itb_walker_cache.overall_accesses::total 12223 # number of overall (read+write) accesses
@@ -464,8 +464,8 @@ system.iocache.demand_mshr_misses 47564 # nu
system.iocache.fast_writes 0 # number of fast writes performed
system.iocache.mshr_cap_events 0 # number of times MSHR cap was activated
system.iocache.no_allocate_misses 0 # Number of misses that were no-allocate
-system.iocache.occ_%::1 0.007537 # Average percentage of cache occupancy
system.iocache.occ_blocks::1 0.120586 # Average occupied blocks per context
+system.iocache.occ_percent::1 0.007537 # Average percentage of cache occupancy
system.iocache.overall_accesses::0 0 # number of overall (read+write) accesses
system.iocache.overall_accesses::1 47564 # number of overall (read+write) accesses
system.iocache.overall_accesses::total 47564 # number of overall (read+write) accesses
@@ -597,10 +597,10 @@ system.l2c.demand_mshr_misses 170998 # nu
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.mshr_cap_events 0 # number of times MSHR cap was activated
system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate
-system.l2c.occ_%::0 0.120711 # Average percentage of cache occupancy
-system.l2c.occ_%::1 0.358261 # Average percentage of cache occupancy
system.l2c.occ_blocks::0 7910.895776 # Average occupied blocks per context
system.l2c.occ_blocks::1 23478.999694 # Average occupied blocks per context
+system.l2c.occ_percent::0 0.120711 # Average percentage of cache occupancy
+system.l2c.occ_percent::1 0.358261 # Average percentage of cache occupancy
system.l2c.overall_accesses::0 2411815 # number of overall (read+write) accesses
system.l2c.overall_accesses::1 9584 # number of overall (read+write) accesses
system.l2c.overall_accesses::total 2421399 # number of overall (read+write) accesses