summaryrefslogtreecommitdiff
path: root/tests/quick/fs/10.linux-boot/ref/arm
diff options
context:
space:
mode:
Diffstat (limited to 'tests/quick/fs/10.linux-boot/ref/arm')
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini18
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout10
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt54
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/status2
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini17
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout10
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt46
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/status2
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini16
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout10
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt54
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/status2
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini16
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout10
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt46
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status2
16 files changed, 163 insertions, 152 deletions
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
index 78c29faa1..b18e2b725 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
@@ -10,20 +10,18 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
atags_addr=256
-boot_loader=/projects/pd/randd/dist/binaries/boot.arm
-boot_loader_mem=system.realview.nvmem
+boot_loader=/dist/m5/system/binaries/boot.arm
boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
flags_addr=268435504
gic_cpu_addr=520093952
init_param=0
-kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
load_addr_mask=268435455
machine_type=RealView_PBX
mem_mode=atomic
memories=system.physmem system.realview.nvmem
midr_regval=890224640
num_work_ids=16
-physmem=system.physmem
readfile=tests/halt.sh
symbolfile=
work_begin_ckpt_count=0
@@ -63,7 +61,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
-image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
+image_file=/dist/m5/system/disks/linux-arm-ael.img
read_only=true
[system.cpu0]
@@ -77,6 +75,7 @@ do_checkpoint_insts=true
do_quiesce=true
do_statistics_insts=true
dtb=system.cpu0.dtb
+fastmem=false
function_trace=false
function_trace_start=0
interrupts=system.cpu0.interrupts
@@ -191,6 +190,7 @@ do_checkpoint_insts=true
do_quiesce=true
do_statistics_insts=true
dtb=system.cpu1.dtb
+fastmem=false
function_trace=false
function_trace_start=0
interrupts=system.cpu1.interrupts
@@ -389,8 +389,10 @@ warn_access=warn
pio=system.membus.default
[system.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=true
file=
+in_addr_map=true
latency=30000
latency_var=0
null=false
@@ -621,8 +623,10 @@ system=system
pio=system.iobus.master[22]
[system.realview.nvmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
file=
+in_addr_map=true
latency=30000
latency_var=0
null=false
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
index 8b688fa3a..e36b1902c 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
@@ -1,12 +1,12 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Mar 17 2012 11:46:05
-gem5 started Mar 17 2012 16:34:57
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re tests/run.py build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual
+gem5 compiled May 8 2012 15:17:37
+gem5 started May 8 2012 16:20:57
+gem5 executing on piton
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
info: Using bootloader at address 0x80000000
info: Entering event queue @ 0. Starting simulation...
Exiting @ tick 2411694099500 because m5_exit instruction encountered
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
index f44938962..505cf865e 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
@@ -4,22 +4,13 @@ sim_seconds 2.411694 # Nu
sim_ticks 2411694099500 # Number of ticks simulated
final_tick 2411694099500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 2019241 # Simulator instruction rate (inst/s)
-host_op_rate 2610327 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 79123006525 # Simulator tick rate (ticks/s)
-host_mem_usage 377328 # Number of bytes of host memory used
-host_seconds 30.48 # Real time elapsed on the host
+host_inst_rate 781676 # Simulator instruction rate (inst/s)
+host_op_rate 1010494 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 30629621173 # Simulator tick rate (ticks/s)
+host_mem_usage 383944 # Number of bytes of host memory used
+host_seconds 78.74 # Real time elapsed on the host
sim_insts 61547057 # Number of instructions simulated
sim_ops 79563547 # Number of ops (including micro ops) simulated
-system.realview.nvmem.bytes_read 68 # Number of bytes read from this memory
-system.realview.nvmem.bytes_inst_read 68 # Number of instructions bytes read from this memory
-system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory
-system.realview.nvmem.num_reads 17 # Number of read requests responded to by this memory
-system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory
-system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory
-system.realview.nvmem.bw_read 28 # Total read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_inst_read 28 # Instruction read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_total 28 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bytes_read 123270308 # Number of bytes read from this memory
system.physmem.bytes_inst_read 1011392 # Number of instructions bytes read from this memory
system.physmem.bytes_written 10185232 # Number of bytes written to this memory
@@ -30,6 +21,15 @@ system.physmem.bw_read 51113575 # To
system.physmem.bw_inst_read 419370 # Instruction read bandwidth from this memory (bytes/s)
system.physmem.bw_write 4223269 # Write bandwidth from this memory (bytes/s)
system.physmem.bw_total 55336844 # Total bandwidth to/from this memory (bytes/s)
+system.realview.nvmem.bytes_read 68 # Number of bytes read from this memory
+system.realview.nvmem.bytes_inst_read 68 # Number of instructions bytes read from this memory
+system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory
+system.realview.nvmem.num_reads 17 # Number of read requests responded to by this memory
+system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory
+system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory
+system.realview.nvmem.bw_read 28 # Total read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_inst_read 28 # Instruction read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_total 28 # Total bandwidth to/from this memory (bytes/s)
system.l2c.replacements 127720 # number of replacements
system.l2c.tagsinuse 25547.920882 # Cycle average of tags in use
system.l2c.total_refs 1498993 # Total number of references to valid blocks.
@@ -201,8 +201,8 @@ system.l2c.blocked_cycles::no_mshrs 0 # nu
system.l2c.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.l2c.blocked::no_mshrs 0 # number of cycles access was blocked
system.l2c.blocked::no_targets 0 # number of cycles access was blocked
-system.l2c.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.l2c.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.l2c.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.l2c.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.cache_copies 0 # number of cache copies performed
system.l2c.writebacks::writebacks 111818 # number of writebacks
@@ -314,8 +314,8 @@ system.cpu0.icache.blocked_cycles::no_mshrs 0 #
system.cpu0.icache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu0.icache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu0.icache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu0.icache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu0.icache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu0.icache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu0.icache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu0.icache.fast_writes 0 # number of fast writes performed
system.cpu0.icache.cache_copies 0 # number of cache copies performed
system.cpu0.icache.writebacks::writebacks 24728 # number of writebacks
@@ -376,8 +376,8 @@ system.cpu0.dcache.blocked_cycles::no_mshrs 0 #
system.cpu0.dcache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu0.dcache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu0.dcache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu0.dcache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu0.dcache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu0.dcache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu0.dcache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu0.dcache.fast_writes 0 # number of fast writes performed
system.cpu0.dcache.cache_copies 0 # number of cache copies performed
system.cpu0.dcache.writebacks::writebacks 339627 # number of writebacks
@@ -483,8 +483,8 @@ system.cpu1.icache.blocked_cycles::no_mshrs 0 #
system.cpu1.icache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu1.icache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu1.icache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu1.icache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu1.icache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu1.icache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu1.icache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu1.icache.fast_writes 0 # number of fast writes performed
system.cpu1.icache.cache_copies 0 # number of cache copies performed
system.cpu1.icache.writebacks::writebacks 13905 # number of writebacks
@@ -545,8 +545,8 @@ system.cpu1.dcache.blocked_cycles::no_mshrs 0 #
system.cpu1.dcache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu1.dcache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu1.dcache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu1.dcache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu1.dcache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu1.dcache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu1.dcache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu1.dcache.fast_writes 0 # number of fast writes performed
system.cpu1.dcache.cache_copies 0 # number of cache copies performed
system.cpu1.dcache.writebacks::writebacks 202202 # number of writebacks
@@ -556,14 +556,14 @@ system.iocache.replacements 0 # nu
system.iocache.tagsinuse 0 # Cycle average of tags in use
system.iocache.total_refs 0 # Total number of references to valid blocks.
system.iocache.sampled_refs 0 # Sample count of references to valid blocks.
-system.iocache.avg_refs no_value # Average number of references to valid blocks.
+system.iocache.avg_refs nan # Average number of references to valid blocks.
system.iocache.warmup_cycle 0 # Cycle when the warmup percentage was hit.
system.iocache.blocked_cycles::no_mshrs 0 # number of cycles access was blocked
system.iocache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.iocache.blocked::no_mshrs 0 # number of cycles access was blocked
system.iocache.blocked::no_targets 0 # number of cycles access was blocked
-system.iocache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.iocache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.iocache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.iocache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.iocache.fast_writes 0 # number of fast writes performed
system.iocache.cache_copies 0 # number of cache copies performed
system.iocache.no_allocate_misses 0 # Number of misses that were no-allocate
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/status b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/status
index 877c03770..7edf5b1c7 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/status
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/status
@@ -1 +1 @@
-build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual passed.
+build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual FAILED!
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
index 81760af9f..720edf3cb 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini
@@ -10,20 +10,18 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
atags_addr=256
-boot_loader=/projects/pd/randd/dist/binaries/boot.arm
-boot_loader_mem=system.realview.nvmem
+boot_loader=/dist/m5/system/binaries/boot.arm
boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
flags_addr=268435504
gic_cpu_addr=520093952
init_param=0
-kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
load_addr_mask=268435455
machine_type=RealView_PBX
mem_mode=atomic
memories=system.physmem system.realview.nvmem
midr_regval=890224640
num_work_ids=16
-physmem=system.physmem
readfile=tests/halt.sh
symbolfile=
work_begin_ckpt_count=0
@@ -63,7 +61,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
-image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
+image_file=/dist/m5/system/disks/linux-arm-ael.img
read_only=true
[system.cpu]
@@ -77,6 +75,7 @@ do_checkpoint_insts=true
do_quiesce=true
do_statistics_insts=true
dtb=system.cpu.dtb
+fastmem=false
function_trace=false
function_trace_start=0
interrupts=system.cpu.interrupts
@@ -275,8 +274,10 @@ warn_access=warn
pio=system.membus.default
[system.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=true
file=
+in_addr_map=true
latency=30000
latency_var=0
null=false
@@ -507,8 +508,10 @@ system=system
pio=system.iobus.master[22]
[system.realview.nvmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
file=
+in_addr_map=true
latency=30000
latency_var=0
null=false
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
index 60dab884c..d76ea9eaa 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout
@@ -1,12 +1,12 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Mar 17 2012 11:46:05
-gem5 started Mar 17 2012 16:34:16
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re tests/run.py build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic
+gem5 compiled May 8 2012 15:17:37
+gem5 started May 8 2012 16:20:57
+gem5 executing on piton
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
info: Using bootloader at address 0x80000000
info: Entering event queue @ 0. Starting simulation...
Exiting @ tick 2332316587000 because m5_exit instruction encountered
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
index c2b68c5b8..75b897a18 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt
@@ -4,22 +4,13 @@ sim_seconds 2.332317 # Nu
sim_ticks 2332316587000 # Number of ticks simulated
final_tick 2332316587000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1994377 # Simulator instruction rate (inst/s)
-host_op_rate 2575566 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 78489486028 # Simulator tick rate (ticks/s)
-host_mem_usage 377288 # Number of bytes of host memory used
-host_seconds 29.72 # Real time elapsed on the host
+host_inst_rate 864582 # Simulator instruction rate (inst/s)
+host_op_rate 1116533 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 34025972839 # Simulator tick rate (ticks/s)
+host_mem_usage 383900 # Number of bytes of host memory used
+host_seconds 68.55 # Real time elapsed on the host
sim_insts 59262896 # Number of instructions simulated
sim_ops 76532951 # Number of ops (including micro ops) simulated
-system.realview.nvmem.bytes_read 20 # Number of bytes read from this memory
-system.realview.nvmem.bytes_inst_read 20 # Number of instructions bytes read from this memory
-system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory
-system.realview.nvmem.num_reads 5 # Number of read requests responded to by this memory
-system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory
-system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory
-system.realview.nvmem.bw_read 9 # Total read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_inst_read 9 # Instruction read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_total 9 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bytes_read 122663536 # Number of bytes read from this memory
system.physmem.bytes_inst_read 941280 # Number of instructions bytes read from this memory
system.physmem.bytes_written 9577800 # Number of bytes written to this memory
@@ -30,6 +21,15 @@ system.physmem.bw_read 52593004 # To
system.physmem.bw_inst_read 403582 # Instruction read bandwidth from this memory (bytes/s)
system.physmem.bw_write 4106561 # Write bandwidth from this memory (bytes/s)
system.physmem.bw_total 56699565 # Total bandwidth to/from this memory (bytes/s)
+system.realview.nvmem.bytes_read 20 # Number of bytes read from this memory
+system.realview.nvmem.bytes_inst_read 20 # Number of instructions bytes read from this memory
+system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory
+system.realview.nvmem.num_reads 5 # Number of read requests responded to by this memory
+system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory
+system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory
+system.realview.nvmem.bw_read 9 # Total read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_inst_read 9 # Instruction read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_total 9 # Total bandwidth to/from this memory (bytes/s)
system.l2c.replacements 116822 # number of replacements
system.l2c.tagsinuse 24240.388395 # Cycle average of tags in use
system.l2c.total_refs 1520830 # Total number of references to valid blocks.
@@ -126,8 +126,8 @@ system.l2c.blocked_cycles::no_mshrs 0 # nu
system.l2c.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.l2c.blocked::no_mshrs 0 # number of cycles access was blocked
system.l2c.blocked::no_targets 0 # number of cycles access was blocked
-system.l2c.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.l2c.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.l2c.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.l2c.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.cache_copies 0 # number of cache copies performed
system.l2c.writebacks::writebacks 102531 # number of writebacks
@@ -239,8 +239,8 @@ system.cpu.icache.blocked_cycles::no_mshrs 0 #
system.cpu.icache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu.icache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu.icache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu.icache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu.icache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu.icache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu.icache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu.icache.fast_writes 0 # number of fast writes performed
system.cpu.icache.cache_copies 0 # number of cache copies performed
system.cpu.icache.writebacks::writebacks 44721 # number of writebacks
@@ -298,8 +298,8 @@ system.cpu.dcache.blocked_cycles::no_mshrs 0 #
system.cpu.dcache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu.dcache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu.dcache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu.dcache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu.dcache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu.dcache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu.dcache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu.dcache.fast_writes 0 # number of fast writes performed
system.cpu.dcache.cache_copies 0 # number of cache copies performed
system.cpu.dcache.writebacks::writebacks 559892 # number of writebacks
@@ -309,14 +309,14 @@ system.iocache.replacements 0 # nu
system.iocache.tagsinuse 0 # Cycle average of tags in use
system.iocache.total_refs 0 # Total number of references to valid blocks.
system.iocache.sampled_refs 0 # Sample count of references to valid blocks.
-system.iocache.avg_refs no_value # Average number of references to valid blocks.
+system.iocache.avg_refs nan # Average number of references to valid blocks.
system.iocache.warmup_cycle 0 # Cycle when the warmup percentage was hit.
system.iocache.blocked_cycles::no_mshrs 0 # number of cycles access was blocked
system.iocache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.iocache.blocked::no_mshrs 0 # number of cycles access was blocked
system.iocache.blocked::no_targets 0 # number of cycles access was blocked
-system.iocache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.iocache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.iocache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.iocache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.iocache.fast_writes 0 # number of fast writes performed
system.iocache.cache_copies 0 # number of cache copies performed
system.iocache.no_allocate_misses 0 # Number of misses that were no-allocate
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/status b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/status
index 3643c334f..5d3e81846 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/status
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/status
@@ -1 +1 @@
-build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic passed.
+build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic FAILED!
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
index d4b7d32fd..e58e54e5c 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
@@ -10,20 +10,18 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
atags_addr=256
-boot_loader=/projects/pd/randd/dist/binaries/boot.arm
-boot_loader_mem=system.realview.nvmem
+boot_loader=/dist/m5/system/binaries/boot.arm
boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
flags_addr=268435504
gic_cpu_addr=520093952
init_param=0
-kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
load_addr_mask=268435455
machine_type=RealView_PBX
mem_mode=timing
memories=system.physmem system.realview.nvmem
midr_regval=890224640
num_work_ids=16
-physmem=system.physmem
readfile=tests/halt.sh
symbolfile=
work_begin_ckpt_count=0
@@ -63,7 +61,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
-image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
+image_file=/dist/m5/system/disks/linux-arm-ael.img
read_only=true
[system.cpu0]
@@ -383,8 +381,10 @@ warn_access=warn
pio=system.membus.default
[system.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=true
file=
+in_addr_map=true
latency=30000
latency_var=0
null=false
@@ -615,8 +615,10 @@ system=system
pio=system.iobus.master[22]
[system.realview.nvmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
file=
+in_addr_map=true
latency=30000
latency_var=0
null=false
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout
index 79a5c7d79..ae01846e4 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout
@@ -1,12 +1,12 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Mar 17 2012 11:46:05
-gem5 started Mar 17 2012 16:36:56
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual -re tests/run.py build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual
+gem5 compiled May 8 2012 15:17:37
+gem5 started May 8 2012 16:20:58
+gem5 executing on piton
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual -re tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
info: Using bootloader at address 0x80000000
info: Entering event queue @ 0. Starting simulation...
Exiting @ tick 2669611225000 because m5_exit instruction encountered
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
index ed51beca1..0ac70eccc 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt
@@ -4,22 +4,13 @@ sim_seconds 2.669611 # Nu
sim_ticks 2669611225000 # Number of ticks simulated
final_tick 2669611225000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 887100 # Simulator instruction rate (inst/s)
-host_op_rate 1134851 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 38636092154 # Simulator tick rate (ticks/s)
-host_mem_usage 379132 # Number of bytes of host memory used
-host_seconds 69.10 # Real time elapsed on the host
+host_inst_rate 280373 # Simulator instruction rate (inst/s)
+host_op_rate 358676 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 12211141498 # Simulator tick rate (ticks/s)
+host_mem_usage 385748 # Number of bytes of host memory used
+host_seconds 218.62 # Real time elapsed on the host
sim_insts 61295282 # Number of instructions simulated
sim_ops 78413979 # Number of ops (including micro ops) simulated
-system.realview.nvmem.bytes_read 68 # Number of bytes read from this memory
-system.realview.nvmem.bytes_inst_read 68 # Number of instructions bytes read from this memory
-system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory
-system.realview.nvmem.num_reads 17 # Number of read requests responded to by this memory
-system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory
-system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory
-system.realview.nvmem.bw_read 25 # Total read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_inst_read 25 # Instruction read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_total 25 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bytes_read 134334820 # Number of bytes read from this memory
system.physmem.bytes_inst_read 1003520 # Number of instructions bytes read from this memory
system.physmem.bytes_written 10194256 # Number of bytes written to this memory
@@ -30,6 +21,15 @@ system.physmem.bw_read 50319994 # To
system.physmem.bw_inst_read 375905 # Instruction read bandwidth from this memory (bytes/s)
system.physmem.bw_write 3818629 # Write bandwidth from this memory (bytes/s)
system.physmem.bw_total 54138623 # Total bandwidth to/from this memory (bytes/s)
+system.realview.nvmem.bytes_read 68 # Number of bytes read from this memory
+system.realview.nvmem.bytes_inst_read 68 # Number of instructions bytes read from this memory
+system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory
+system.realview.nvmem.num_reads 17 # Number of read requests responded to by this memory
+system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory
+system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory
+system.realview.nvmem.bw_read 25 # Total read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_inst_read 25 # Instruction read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_total 25 # Total bandwidth to/from this memory (bytes/s)
system.l2c.replacements 127749 # number of replacements
system.l2c.tagsinuse 26172.513447 # Cycle average of tags in use
system.l2c.total_refs 1540413 # Total number of references to valid blocks.
@@ -267,8 +267,8 @@ system.l2c.blocked_cycles::no_mshrs 0 # nu
system.l2c.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.l2c.blocked::no_mshrs 0 # number of cycles access was blocked
system.l2c.blocked::no_targets 0 # number of cycles access was blocked
-system.l2c.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.l2c.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.l2c.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.l2c.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.cache_copies 0 # number of cache copies performed
system.l2c.writebacks::writebacks 111955 # number of writebacks
@@ -553,8 +553,8 @@ system.cpu0.icache.blocked_cycles::no_mshrs 0 #
system.cpu0.icache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu0.icache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu0.icache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu0.icache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu0.icache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu0.icache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu0.icache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu0.icache.fast_writes 0 # number of fast writes performed
system.cpu0.icache.cache_copies 0 # number of cache copies performed
system.cpu0.icache.writebacks::writebacks 12960 # number of writebacks
@@ -657,8 +657,8 @@ system.cpu0.dcache.blocked_cycles::no_mshrs 0 #
system.cpu0.dcache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu0.dcache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu0.dcache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu0.dcache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu0.dcache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu0.dcache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu0.dcache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu0.dcache.fast_writes 0 # number of fast writes performed
system.cpu0.dcache.cache_copies 0 # number of cache copies performed
system.cpu0.dcache.writebacks::writebacks 294891 # number of writebacks
@@ -821,8 +821,8 @@ system.cpu1.icache.blocked_cycles::no_mshrs 0 #
system.cpu1.icache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu1.icache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu1.icache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu1.icache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu1.icache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu1.icache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu1.icache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu1.icache.fast_writes 0 # number of fast writes performed
system.cpu1.icache.cache_copies 0 # number of cache copies performed
system.cpu1.icache.writebacks::writebacks 27998 # number of writebacks
@@ -925,8 +925,8 @@ system.cpu1.dcache.blocked_cycles::no_mshrs 0 #
system.cpu1.dcache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu1.dcache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu1.dcache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu1.dcache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu1.dcache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu1.dcache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu1.dcache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu1.dcache.fast_writes 0 # number of fast writes performed
system.cpu1.dcache.cache_copies 0 # number of cache copies performed
system.cpu1.dcache.writebacks::writebacks 253551 # number of writebacks
@@ -981,14 +981,14 @@ system.iocache.replacements 0 # nu
system.iocache.tagsinuse 0 # Cycle average of tags in use
system.iocache.total_refs 0 # Total number of references to valid blocks.
system.iocache.sampled_refs 0 # Sample count of references to valid blocks.
-system.iocache.avg_refs no_value # Average number of references to valid blocks.
+system.iocache.avg_refs nan # Average number of references to valid blocks.
system.iocache.warmup_cycle 0 # Cycle when the warmup percentage was hit.
system.iocache.blocked_cycles::no_mshrs 0 # number of cycles access was blocked
system.iocache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.iocache.blocked::no_mshrs 0 # number of cycles access was blocked
system.iocache.blocked::no_targets 0 # number of cycles access was blocked
-system.iocache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.iocache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.iocache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.iocache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.iocache.fast_writes 0 # number of fast writes performed
system.iocache.cache_copies 0 # number of cache copies performed
system.iocache.ReadReq_mshr_uncacheable_latency::realview.clcd 1342252853622 # number of ReadReq MSHR uncacheable cycles
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/status b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/status
index d529dbd88..8ae0da5a8 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/status
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/status
@@ -1 +1 @@
-build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual passed.
+build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual FAILED!
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini
index cb6ee4aa9..bdfa88421 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini
@@ -10,20 +10,18 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
atags_addr=256
-boot_loader=/projects/pd/randd/dist/binaries/boot.arm
-boot_loader_mem=system.realview.nvmem
+boot_loader=/dist/m5/system/binaries/boot.arm
boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
flags_addr=268435504
gic_cpu_addr=520093952
init_param=0
-kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
load_addr_mask=268435455
machine_type=RealView_PBX
mem_mode=timing
memories=system.physmem system.realview.nvmem
midr_regval=890224640
num_work_ids=16
-physmem=system.physmem
readfile=tests/halt.sh
symbolfile=
work_begin_ckpt_count=0
@@ -63,7 +61,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
-image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
+image_file=/dist/m5/system/disks/linux-arm-ael.img
read_only=true
[system.cpu]
@@ -272,8 +270,10 @@ warn_access=warn
pio=system.membus.default
[system.physmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=true
file=
+in_addr_map=true
latency=30000
latency_var=0
null=false
@@ -504,8 +504,10 @@ system=system
pio=system.iobus.master[22]
[system.realview.nvmem]
-type=PhysicalMemory
+type=SimpleMemory
+conf_table_reported=false
file=
+in_addr_map=true
latency=30000
latency_var=0
null=false
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout
index 1758a0df6..480141f03 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout
@@ -1,12 +1,12 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Mar 17 2012 11:46:05
-gem5 started Mar 17 2012 16:35:38
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.fast -d build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-timing -re tests/run.py build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-timing
+gem5 compiled May 8 2012 15:17:37
+gem5 started May 8 2012 16:20:58
+gem5 executing on piton
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing -re tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8
+info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
info: Using bootloader at address 0x80000000
info: Entering event queue @ 0. Starting simulation...
Exiting @ tick 2591441692000 because m5_exit instruction encountered
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
index 2c94df23b..4b750a42d 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt
@@ -4,22 +4,13 @@ sim_seconds 2.591442 # Nu
sim_ticks 2591441692000 # Number of ticks simulated
final_tick 2591441692000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 879685 # Simulator instruction rate (inst/s)
-host_op_rate 1123921 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 38588641896 # Simulator tick rate (ticks/s)
-host_mem_usage 377580 # Number of bytes of host memory used
-host_seconds 67.16 # Real time elapsed on the host
+host_inst_rate 302887 # Simulator instruction rate (inst/s)
+host_op_rate 386981 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 13286578938 # Simulator tick rate (ticks/s)
+host_mem_usage 384192 # Number of bytes of host memory used
+host_seconds 195.04 # Real time elapsed on the host
sim_insts 59075703 # Number of instructions simulated
sim_ops 75477535 # Number of ops (including micro ops) simulated
-system.realview.nvmem.bytes_read 20 # Number of bytes read from this memory
-system.realview.nvmem.bytes_inst_read 20 # Number of instructions bytes read from this memory
-system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory
-system.realview.nvmem.num_reads 5 # Number of read requests responded to by this memory
-system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory
-system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory
-system.realview.nvmem.bw_read 8 # Total read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_inst_read 8 # Instruction read bandwidth from this memory (bytes/s)
-system.realview.nvmem.bw_total 8 # Total bandwidth to/from this memory (bytes/s)
system.physmem.bytes_read 133655408 # Number of bytes read from this memory
system.physmem.bytes_inst_read 949920 # Number of instructions bytes read from this memory
system.physmem.bytes_written 9634312 # Number of bytes written to this memory
@@ -30,6 +21,15 @@ system.physmem.bw_read 51575696 # To
system.physmem.bw_inst_read 366560 # Instruction read bandwidth from this memory (bytes/s)
system.physmem.bw_write 3717742 # Write bandwidth from this memory (bytes/s)
system.physmem.bw_total 55293438 # Total bandwidth to/from this memory (bytes/s)
+system.realview.nvmem.bytes_read 20 # Number of bytes read from this memory
+system.realview.nvmem.bytes_inst_read 20 # Number of instructions bytes read from this memory
+system.realview.nvmem.bytes_written 0 # Number of bytes written to this memory
+system.realview.nvmem.num_reads 5 # Number of read requests responded to by this memory
+system.realview.nvmem.num_writes 0 # Number of write requests responded to by this memory
+system.realview.nvmem.num_other 0 # Number of other requests responded to by this memory
+system.realview.nvmem.bw_read 8 # Total read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_inst_read 8 # Instruction read bandwidth from this memory (bytes/s)
+system.realview.nvmem.bw_total 8 # Total bandwidth to/from this memory (bytes/s)
system.l2c.replacements 117809 # number of replacements
system.l2c.tagsinuse 24929.234619 # Cycle average of tags in use
system.l2c.total_refs 1535239 # Total number of references to valid blocks.
@@ -159,8 +159,8 @@ system.l2c.blocked_cycles::no_mshrs 0 # nu
system.l2c.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.l2c.blocked::no_mshrs 0 # number of cycles access was blocked
system.l2c.blocked::no_targets 0 # number of cycles access was blocked
-system.l2c.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.l2c.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.l2c.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.l2c.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.l2c.fast_writes 0 # number of fast writes performed
system.l2c.cache_copies 0 # number of cache copies performed
system.l2c.writebacks::writebacks 103410 # number of writebacks
@@ -360,8 +360,8 @@ system.cpu.icache.blocked_cycles::no_mshrs 0 #
system.cpu.icache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu.icache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu.icache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu.icache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu.icache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu.icache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu.icache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu.icache.fast_writes 0 # number of fast writes performed
system.cpu.icache.cache_copies 0 # number of cache copies performed
system.cpu.icache.writebacks::writebacks 45661 # number of writebacks
@@ -458,8 +458,8 @@ system.cpu.dcache.blocked_cycles::no_mshrs 0 #
system.cpu.dcache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.cpu.dcache.blocked::no_mshrs 0 # number of cycles access was blocked
system.cpu.dcache.blocked::no_targets 0 # number of cycles access was blocked
-system.cpu.dcache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.cpu.dcache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.cpu.dcache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.cpu.dcache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.cpu.dcache.fast_writes 0 # number of fast writes performed
system.cpu.dcache.cache_copies 0 # number of cache copies performed
system.cpu.dcache.writebacks::writebacks 564388 # number of writebacks
@@ -508,14 +508,14 @@ system.iocache.replacements 0 # nu
system.iocache.tagsinuse 0 # Cycle average of tags in use
system.iocache.total_refs 0 # Total number of references to valid blocks.
system.iocache.sampled_refs 0 # Sample count of references to valid blocks.
-system.iocache.avg_refs no_value # Average number of references to valid blocks.
+system.iocache.avg_refs nan # Average number of references to valid blocks.
system.iocache.warmup_cycle 0 # Cycle when the warmup percentage was hit.
system.iocache.blocked_cycles::no_mshrs 0 # number of cycles access was blocked
system.iocache.blocked_cycles::no_targets 0 # number of cycles access was blocked
system.iocache.blocked::no_mshrs 0 # number of cycles access was blocked
system.iocache.blocked::no_targets 0 # number of cycles access was blocked
-system.iocache.avg_blocked_cycles::no_mshrs no_value # average number of cycles each access was blocked
-system.iocache.avg_blocked_cycles::no_targets no_value # average number of cycles each access was blocked
+system.iocache.avg_blocked_cycles::no_mshrs nan # average number of cycles each access was blocked
+system.iocache.avg_blocked_cycles::no_targets nan # average number of cycles each access was blocked
system.iocache.fast_writes 0 # number of fast writes performed
system.iocache.cache_copies 0 # number of cache copies performed
system.iocache.ReadReq_mshr_uncacheable_latency::realview.clcd 1341941439938 # number of ReadReq MSHR uncacheable cycles
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status
index 48ab2f520..4523c3c36 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status
@@ -1 +1 @@
-build/ARM/tests/fast/quick/fs/10.linux-boot/arm/linux/realview-simple-timing FAILED!
+build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing FAILED!