summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2015-08-07 15:39:17 +0100
committerAndreas Sandberg <andreas.sandberg@arm.com>2015-08-07 15:39:17 +0100
commit023f6eb0f2093ea8ccd706353db6c3afa34c3a4d (patch)
treed9f4f8d660d6d9fafa730222ab66d01ff625f7cb /tests
parentbbb3abc16711e14858094b64a2eb1eb53204dded (diff)
downloadgem5-023f6eb0f2093ea8ccd706353db6c3afa34c3a4d.tar.xz
stats: Update ARM stats to include programmable oscillators
Diffstat (limited to 'tests')
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini121
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout8
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/config.ini121
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/simout7
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini121
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr8
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout17
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini111
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr1
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout8
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal2
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini123
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout16
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini113
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout6
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini121
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simout6
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/config.ini123
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simerr2
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simout17
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/system.terminal237
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/config.ini123
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simerr2
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simout16
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/system.terminal252
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/config.ini123
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simerr2
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simout16
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/system.terminal236
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/config.ini123
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr5
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout16
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/system.terminal238
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/config.ini121
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simerr2
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simout15
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/system.terminal236
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.ini114
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json211
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/config.ini121
-rwxr-xr-x[-rw-r--r--]tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simerr2
-rwxr-xr-x[-rw-r--r--]tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simout17
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/system.terminal6
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/config.ini121
-rwxr-xr-x[-rw-r--r--]tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simerr2
-rwxr-xr-x[-rw-r--r--]tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simout16
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/system.terminal4
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/config.ini121
-rwxr-xr-x[-rw-r--r--]tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simerr2
-rwxr-xr-x[-rw-r--r--]tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simout17
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/system.terminal257
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/config.ini121
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simerr2
-rwxr-xr-x[-rw-r--r--]tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simout16
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/system.terminal242
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/config.ini121
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simerr2
-rwxr-xr-x[-rw-r--r--]tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simout11
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/system.terminal4
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/config.ini113
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simerr2
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simout6
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/config.ini123
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simerr2
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simout10
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/system.terminal244
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/config.ini121
-rwxr-xr-xtests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simerr2
-rwxr-xr-x[-rw-r--r--]tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simout11
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/stats.txt20
-rw-r--r--tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/system.terminal254
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini128
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json211
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt20
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini162
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout18
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt20
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/system.terminal6
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini146
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout17
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt20
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal6
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini162
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout18
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt20
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal8
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini146
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout17
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt20
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/system.terminal6
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini146
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout11
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt20
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/system.terminal6
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini183
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr12
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout11
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt20
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal6
119 files changed, 5410 insertions, 1809 deletions
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini
index 4e40ecf7a..1ce6d2d3e 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -2254,6 +2254,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -2264,6 +2265,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout
index 6375e36ce..7ec39e811 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout
@@ -1,15 +1,13 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 6 2015 17:58:20
-gem5 started May 6 2015 20:43:49
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:47:25
gem5 executing on e104799-lin
command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-minor-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-minor-dual
Global frequency set at 1000000000000 ticks per second
info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
- 0: system.cpu0.isa: ISA system set to: 0x50ed000 0x50ed000
- 0: system.cpu1.isa: ISA system set to: 0x50ed000 0x50ed000
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80008000
info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000
@@ -29,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2846106511000 because m5_exit instruction encountered
+Exiting @ tick 2846057099000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt
index 5b4459bdf..934713496 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 2.846057 # Nu
sim_ticks 2846057099000 # Number of ticks simulated
final_tick 2846057099000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 155095 # Simulator instruction rate (inst/s)
-host_op_rate 187821 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 3461671389 # Simulator tick rate (ticks/s)
-host_mem_usage 654788 # Number of bytes of host memory used
-host_seconds 822.16 # Real time elapsed on the host
+host_inst_rate 157157 # Simulator instruction rate (inst/s)
+host_op_rate 190318 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 3507683540 # Simulator tick rate (ticks/s)
+host_mem_usage 605024 # Number of bytes of host memory used
+host_seconds 811.38 # Real time elapsed on the host
sim_insts 127513349 # Number of instructions simulated
sim_ops 154419501 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -2933,6 +2933,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 38668 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 519865 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 31161 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/config.ini
index ec83c8fb6..46b536a54 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -1464,6 +1464,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1474,6 +1475,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/simout
index a77dec169..174785dd4 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/simout
@@ -1,14 +1,13 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 6 2015 17:58:20
-gem5 started May 6 2015 19:26:45
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:47:25
gem5 executing on e104799-lin
command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-minor -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-minor
Global frequency set at 1000000000000 ticks per second
info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
- 0: system.cpu.isa: ISA system set to: 0x3b57000 0x3b57000
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80008000
info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000
@@ -28,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2852795541500 because m5_exit instruction encountered
+Exiting @ tick 2852648357500 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/stats.txt
index 4d6593456..b263a31ec 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 2.852648 # Nu
sim_ticks 2852648357500 # Number of ticks simulated
final_tick 2852648357500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 166579 # Simulator instruction rate (inst/s)
-host_op_rate 201414 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 4236074446 # Simulator tick rate (ticks/s)
-host_mem_usage 625784 # Number of bytes of host memory used
-host_seconds 673.42 # Real time elapsed on the host
+host_inst_rate 154527 # Simulator instruction rate (inst/s)
+host_op_rate 186842 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 3929586318 # Simulator tick rate (ticks/s)
+host_mem_usage 575824 # Number of bytes of host memory used
+host_seconds 725.94 # Real time elapsed on the host
sim_insts 112177181 # Number of instructions simulated
sim_ops 135636113 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1439,5 +1439,15 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
---------- End Simulation Statistics ----------
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini
index 6227da137..4a6c72a8e 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -1519,6 +1519,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1529,6 +1530,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr
index 07835b11a..92eb66ef7 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simerr
@@ -10,13 +10,15 @@ warn: Not doing anything for write of miscreg ACTLR
warn: The clidr register always reports 0 caches.
warn: clidr LoUIS field of 0b001 to match current ARM implementations.
warn: The csselr register isn't implemented.
+warn: CP14 unimplemented crn[0], opc1[6], crm[0], opc2[0]
+warn: CP14 unimplemented crn[0], opc1[6], crm[0], opc2[0]
warn: instruction 'mcr dccmvau' unimplemented
warn: instruction 'mcr icimvau' unimplemented
warn: instruction 'mcr bpiallis' unimplemented
warn: instruction 'mcr icialluis' unimplemented
warn: instruction 'mcr dccimvac' unimplemented
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
-warn: 8779058000: Instruction results do not match! (Values may not actually be integers) Inst: 0xa, checker: 0
+warn: 8753536000: Instruction results do not match! (Values may not actually be integers) Inst: 0xa, checker: 0
warn: Tried to write RVIO at offset 0xa8 (data 0) that doesn't exist
warn: Tried to write RVIO at offset 0xa8 (data 0) that doesn't exist
warn: Tried to write RVIO at offset 0xa8 (data 0) that doesn't exist
@@ -32,7 +34,7 @@ warn: CP14 unimplemented crn[1], opc1[0], crm[0], opc2[4]
warn: CP14 unimplemented crn[0], opc1[0], crm[7], opc2[0]
warn: CP14 unimplemented crn[1], opc1[0], crm[5], opc2[4]
warn: CP14 unimplemented crn[5], opc1[4], crm[0], opc2[0]
-warn: 82000113500: Instruction results do not match! (Values may not actually be integers) Inst: 0x80000001, checker: 0x80000000
+warn: 81958779500: Instruction results do not match! (Values may not actually be integers) Inst: 0x80000001, checker: 0x80000000
warn: Returning zero for read from miscreg pmcr
warn: Returning zero for read from miscreg pmcr
warn: Ignoring write to miscreg pmcntenclr
@@ -43,6 +45,6 @@ warn: Ignoring write to miscreg pmovsr
warn: Ignoring write to miscreg pmovsr
warn: Ignoring write to miscreg pmcr
warn: Ignoring write to miscreg pmcr
-warn: 405408467500: Instruction results do not match! (Values may not actually be integers) Inst: 0x80000001, checker: 0x80000000
+warn: 405391096500: Instruction results do not match! (Values may not actually be integers) Inst: 0x80000001, checker: 0x80000000
warn: instruction 'mcr dcisw' unimplemented
warn: instruction 'mcr bpiall' unimplemented
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout
index 5625a74d8..1b657eb46 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout
@@ -1,20 +1,17 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 10:59:45
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-checker -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-checker
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:47:25
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-checker -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-checker
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch32.ll_20131205.0-gem5
- 0: system.cpu.checker.isa: ISA system set to: 0x2d2a120 0x2d2a120
- 0: system.cpu.isa: ISA system set to: 0x2d2a120 0x2d2a120
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80008000
-info: Loading DTB file: /home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-info: Read CNTFREQ_EL0 frequency
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
@@ -45,4 +42,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2827616186000 because m5_exit instruction encountered
+Exiting @ tick 2827546300000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
index d2ddd8522..7bba59de9 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 2.827546 # Nu
sim_ticks 2827546300000 # Number of ticks simulated
final_tick 2827546300000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 69908 # Simulator instruction rate (inst/s)
-host_op_rate 84797 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 1747497470 # Simulator tick rate (ticks/s)
-host_mem_usage 626724 # Number of bytes of host memory used
-host_seconds 1618.05 # Real time elapsed on the host
+host_inst_rate 77731 # Simulator instruction rate (inst/s)
+host_op_rate 94287 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 1943054038 # Simulator tick rate (ticks/s)
+host_mem_usage 577104 # Number of bytes of host memory used
+host_seconds 1455.21 # Real time elapsed on the host
sim_insts 113115023 # Number of instructions simulated
sim_ops 137206411 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1915,6 +1915,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.cpu.kern.inst.arm 0 # number of arm instructions executed
system.cpu.kern.inst.quiesce 3038 # number of quiesce instructions executed
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
index 06829ebfc..ec3f91aac 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
@@ -2062,6 +2062,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -2072,6 +2073,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr
index b6712dc14..579777365 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr
@@ -43,3 +43,4 @@ warn: Ignoring write to miscreg pmintenclr
warn: Ignoring write to miscreg pmovsr
warn: Ignoring write to miscreg pmcr
warn: instruction 'mcr dcisw' unimplemented
+warn: CP14 unimplemented crn[9], opc1[1], crm[0], opc2[2]
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
index 3ad068601..e8a4671f3 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
@@ -1,15 +1,13 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 6 2015 17:58:20
-gem5 started May 6 2015 18:01:09
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:47:25
gem5 executing on e104799-lin
command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual
Global frequency set at 1000000000000 ticks per second
info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
- 0: system.cpu0.isa: ISA system set to: 0x4207000 0x4207000
- 0: system.cpu1.isa: ISA system set to: 0x4207000 0x4207000
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80008000
info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000
@@ -29,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2625394935000 because m5_exit instruction encountered
+Exiting @ tick 2825405893500 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
index 409c3a759..6e37ea292 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 2.825406 # Nu
sim_ticks 2825405893500 # Number of ticks simulated
final_tick 2825405893500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 89977 # Simulator instruction rate (inst/s)
-host_op_rate 109159 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 2115602490 # Simulator tick rate (ticks/s)
-host_mem_usage 657340 # Number of bytes of host memory used
-host_seconds 1335.51 # Real time elapsed on the host
+host_inst_rate 99518 # Simulator instruction rate (inst/s)
+host_op_rate 120734 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 2339943688 # Simulator tick rate (ticks/s)
+host_mem_usage 607076 # Number of bytes of host memory used
+host_seconds 1207.47 # Real time elapsed on the host
sim_insts 120165205 # Number of instructions simulated
sim_ops 145782922 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -3629,6 +3629,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 37978 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 489550 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 30901 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal
index d38aec98b..03b467a01 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal
@@ -158,10 +158,10 @@ ata1.00: 1048320 sectors, multi 0: LBA
ata1.00: configured for UDMA/33
scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
sd 0:0:0:0: [sda] 1048320 512-byte logical blocks: (536 MB/511 MiB)
+sd 0:0:0:0: Attached scsi generic sg0 type 0
sd 0:0:0:0: [sda] Write Protect is off
sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
-sd 0:0:0:0: Attached scsi generic sg0 type 0
sda: sda1
sd 0:0:0:0: [sda] Attached SCSI disk
e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini
index 367b2246b..d2adfc64d 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
atags_addr=134217728
-boot_loader=/home/stever/m5/aarch-system-2014-10/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/home/stever/hg/m5sim.org/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/home/stever/m5/aarch-system-2014-10/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -1370,6 +1368,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1380,6 +1379,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout
index 5250b0867..124b0c524 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout
@@ -1,19 +1,17 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 11:53:00
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3 -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:47:25
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3 -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch32.ll_20131205.0-gem5
- 0: system.cpu.isa: ISA system set to: 0x317f940 0x317f940
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80008000
-info: Loading DTB file: /home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-info: Read CNTFREQ_EL0 frequency
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
@@ -29,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2827616186000 because m5_exit instruction encountered
+Exiting @ tick 2827546300000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
index a1c5aab40..0a443d2f1 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 2.827546 # Nu
sim_ticks 2827546300000 # Number of ticks simulated
final_tick 2827546300000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 98439 # Simulator instruction rate (inst/s)
-host_op_rate 119404 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 2460684463 # Simulator tick rate (ticks/s)
-host_mem_usage 625192 # Number of bytes of host memory used
-host_seconds 1149.09 # Real time elapsed on the host
+host_inst_rate 101558 # Simulator instruction rate (inst/s)
+host_op_rate 123188 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 2538650252 # Simulator tick rate (ticks/s)
+host_mem_usage 576848 # Number of bytes of host memory used
+host_seconds 1113.80 # Real time elapsed on the host
sim_insts 113115023 # Number of instructions simulated
sim_ops 137206411 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1776,6 +1776,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.cpu.kern.inst.arm 0 # number of arm instructions executed
system.cpu.kern.inst.quiesce 3038 # number of quiesce instructions executed
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini
index e73de7c57..fa71746e2 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/work/gem5/outgoing/gem5_3/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -2273,6 +2273,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -2283,6 +2284,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout
index 6d0661457..5454319fd 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout
@@ -1,9 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jul 31 2015 14:34:49
-gem5 started Jul 31 2015 14:34:58
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:47:25
gem5 executing on e104799-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-full -re /work/gem5/outgoing/gem5_3/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-full
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-full -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-full
Global frequency set at 1000000000000 ticks per second
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
index c5b3bbc72..19db0f3e8 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 2.823474 # Nu
sim_ticks 2823473696000 # Number of ticks simulated
final_tick 2823473696000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 536168 # Simulator instruction rate (inst/s)
-host_op_rate 650376 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 12315198448 # Simulator tick rate (ticks/s)
-host_mem_usage 577764 # Number of bytes of host memory used
-host_seconds 229.27 # Real time elapsed on the host
+host_inst_rate 253388 # Simulator instruction rate (inst/s)
+host_op_rate 307362 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 5820051646 # Simulator tick rate (ticks/s)
+host_mem_usage 579664 # Number of bytes of host memory used
+host_seconds 485.13 # Real time elapsed on the host
sim_insts 122925898 # Number of instructions simulated
sim_ops 149109939 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -2922,6 +2922,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 112246 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 2626935 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 27565 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini
index df306f02a..07cc062ab 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -1924,6 +1924,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1934,6 +1935,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simout
index 8e9e85e8f..b8874e580 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/simout
@@ -1,11 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled May 6 2015 17:58:20
-gem5 started May 6 2015 20:51:07
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:47:25
gem5 executing on e104799-lin
command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-o3 -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-o3
Global frequency set at 1000000000000 ticks per second
- 0: system.cpu0.isa: ISA system set to: 0x4a64c00 0x4a64c00
- 0: system.cpu1.isa: ISA system set to: 0x4a64c00 0x4a64c00
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt
index 3557587c2..b9bed144d 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 2.804297 # Nu
sim_ticks 2804296829000 # Number of ticks simulated
final_tick 2804296829000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 103542 # Simulator instruction rate (inst/s)
-host_op_rate 125673 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 2482681694 # Simulator tick rate (ticks/s)
-host_mem_usage 631560 # Number of bytes of host memory used
-host_seconds 1129.54 # Real time elapsed on the host
+host_inst_rate 111219 # Simulator instruction rate (inst/s)
+host_op_rate 134991 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 2666745991 # Simulator tick rate (ticks/s)
+host_mem_usage 581460 # Number of bytes of host memory used
+host_seconds 1051.58 # Real time elapsed on the host
sim_insts 116955586 # Number of instructions simulated
sim_ops 141953418 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -2573,6 +2573,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 154492 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 2656868 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 27584 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/config.ini
index 66f5e8613..04d020f53 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/config.ini
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/dist/m5/system/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/dist/m5/system/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/dist/m5/system/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/z/stever/hg/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/dist/m5/system/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -2256,6 +2254,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -2266,6 +2265,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simerr
index 744db2c76..3c2cf37c0 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simerr
@@ -4,7 +4,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simout
index bc06c34c6..501ee633b 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/simout
@@ -1,17 +1,16 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Mar 15 2015 20:30:55
-gem5 started Mar 15 2015 20:31:14
-gem5 executing on zizzer2
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-minor-dual -re /z/stever/hg/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-minor-dual
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:55:42
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-minor-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-minor-dual
+
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/m5/system/binaries/vmlinux.aarch64.20140821
- 0: system.cpu0.isa: ISA system set to: 0x3d33a20 0x3d33a20
- 0: system.cpu1.isa: ISA system set to: 0x3d33a20 0x3d33a20
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch64.20140821
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80080000
-info: Loading DTB file: /dist/m5/system/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 47397610926500 because m5_exit instruction encountered
+Exiting @ tick 47411962285000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/stats.txt
index 0c25a081b..d121e108e 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 47.411962 # Nu
sim_ticks 47411962285000 # Number of ticks simulated
final_tick 47411962285000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 170497 # Simulator instruction rate (inst/s)
-host_op_rate 200546 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 9509503550 # Simulator tick rate (ticks/s)
-host_mem_usage 769500 # Number of bytes of host memory used
-host_seconds 4985.75 # Real time elapsed on the host
+host_inst_rate 167928 # Simulator instruction rate (inst/s)
+host_op_rate 197524 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 9366197696 # Simulator tick rate (ticks/s)
+host_mem_usage 719564 # Number of bytes of host memory used
+host_seconds 5062.03 # Real time elapsed on the host
sim_insts 850056300 # Number of instructions simulated
sim_ops 999871495 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -3151,6 +3151,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 13 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 90801 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 4609563 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 38305 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/system.terminal
index 04cd08c82..f58d9fefa 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor-dual/system.terminal
@@ -37,130 +37,130 @@
[ 0.000028] pid_max: default: 32768 minimum: 301
[ 0.000040] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
[ 0.000041] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000162] hw perfevents: no hardware support available
-[ 0.060041] CPU1: Booted secondary processor
+[ 0.000175] hw perfevents: no hardware support available
+[ 0.060045] CPU1: Booted secondary processor
[ 1.080077] CPU2: failed to come online
[ 2.100147] CPU3: failed to come online
[ 2.100150] Brought up 2 CPUs
[ 2.100151] SMP: Total of 2 processors activated.
-[ 2.100222] devtmpfs: initialized
-[ 2.100720] atomic64_test: passed
-[ 2.100765] regulator-dummy: no parameters
-[ 2.101110] NET: Registered protocol family 16
-[ 2.101240] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
-[ 2.101248] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
-[ 2.101774] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
-[ 2.101778] Serial: AMBA PL011 UART driver
-[ 2.101977] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
-[ 2.102014] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
-[ 2.102559] console [ttyAMA0] enabled
-[ 2.102714] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
-[ 2.102776] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
-[ 2.102840] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
-[ 2.102896] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
-[ 2.140326] 3V3: 3300 mV
-[ 2.140386] vgaarb: loaded
-[ 2.140451] SCSI subsystem initialized
-[ 2.140500] libata version 3.00 loaded.
-[ 2.140582] usbcore: registered new interface driver usbfs
-[ 2.140606] usbcore: registered new interface driver hub
-[ 2.140634] usbcore: registered new device driver usb
-[ 2.140679] pps_core: LinuxPPS API ver. 1 registered
-[ 2.140690] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
-[ 2.140713] PTP clock support registered
-[ 2.140890] Switched to clocksource arch_sys_counter
-[ 2.142410] NET: Registered protocol family 2
-[ 2.142497] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
-[ 2.142513] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
-[ 2.142530] TCP: Hash tables configured (established 2048 bind 2048)
-[ 2.142553] TCP: reno registered
-[ 2.142559] UDP hash table entries: 256 (order: 1, 8192 bytes)
-[ 2.142571] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
-[ 2.142606] NET: Registered protocol family 1
-[ 2.142648] RPC: Registered named UNIX socket transport module.
-[ 2.142658] RPC: Registered udp transport module.
-[ 2.142666] RPC: Registered tcp transport module.
-[ 2.142674] RPC: Registered tcp NFSv4.1 backchannel transport module.
-[ 2.142686] PCI: CLS 0 bytes, default 64
-[ 2.142917] futex hash table entries: 1024 (order: 4, 65536 bytes)
-[ 2.143025] HugeTLB registered 2 MB page size, pre-allocated 0 pages
-[ 2.145169] fuse init (API version 7.23)
-[ 2.145284] msgmni has been set to 469
-[ 2.145389] io scheduler noop registered
-[ 2.145440] io scheduler cfq registered (default)
-[ 2.145841] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
-[ 2.145854] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
-[ 2.145865] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
-[ 2.145877] pci_bus 0000:00: root bus resource [bus 00-ff]
-[ 2.145887] pci_bus 0000:00: scanning bus
-[ 2.145897] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
-[ 2.145910] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
-[ 2.145924] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 2.145958] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
-[ 2.145969] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
-[ 2.145980] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
-[ 2.145990] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
-[ 2.146000] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
-[ 2.146011] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
-[ 2.146022] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 2.146056] pci_bus 0000:00: fixups for bus
-[ 2.146064] pci_bus 0000:00: bus scan returning with max=00
-[ 2.146076] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
-[ 2.146095] pci 0000:00:00.0: fixup irq: got 33
-[ 2.146103] pci 0000:00:00.0: assigning IRQ 33
-[ 2.146113] pci 0000:00:01.0: fixup irq: got 34
-[ 2.146121] pci 0000:00:01.0: assigning IRQ 34
-[ 2.146133] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
-[ 2.146145] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
-[ 2.146158] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
-[ 2.146170] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
-[ 2.146181] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
-[ 2.146192] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
-[ 2.146203] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
-[ 2.146214] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
-[ 2.146861] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
-[ 2.147132] ata_piix 0000:00:01.0: version 2.13
-[ 2.147142] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
-[ 2.147165] ata_piix 0000:00:01.0: enabling bus mastering
-[ 2.147427] scsi0 : ata_piix
-[ 2.147508] scsi1 : ata_piix
-[ 2.147536] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
-[ 2.147548] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
-[ 2.147650] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
-[ 2.147662] e1000: Copyright (c) 1999-2006 Intel Corporation.
-[ 2.147676] e1000 0000:00:00.0: enabling device (0000 -> 0002)
-[ 2.147687] e1000 0000:00:00.0: enabling bus mastering
-[ 2.290931] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
-[ 2.290941] ata1.00: 2096640 sectors, multi 0: LBA
-[ 2.290968] ata1.00: configured for UDMA/33
-[ 2.291021] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
-[ 2.291157] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
-[ 2.291201] sd 0:0:0:0: [sda] Write Protect is off
-[ 2.291210] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
-[ 2.291229] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
-[ 2.291303] sd 0:0:0:0: Attached scsi generic sg0 type 0
-[ 2.291385] sda: sda1
-[ 2.291511] sd 0:0:0:0: [sda] Attached SCSI disk
-[ 2.411191] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
-[ 2.411204] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
-[ 2.411225] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
-[ 2.411235] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
-[ 2.411255] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
-[ 2.411267] igb: Copyright (c) 2007-2014 Intel Corporation.
-[ 2.411336] usbcore: registered new interface driver usb-storage
-[ 2.411399] mousedev: PS/2 mouse device common for all mice
-[ 2.411553] usbcore: registered new interface driver usbhid
-[ 2.411563] usbhid: USB HID core driver
-[ 2.411592] TCP: cubic registered
-[ 2.411599] NET: Registered protocol family 17
-
-[ 2.411989] devtmpfs: mounted
-[ 2.412026] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
+[ 2.100223] devtmpfs: initialized
+[ 2.100724] atomic64_test: passed
+[ 2.100770] regulator-dummy: no parameters
+[ 2.101122] NET: Registered protocol family 16
+[ 2.101258] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
+[ 2.101266] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
+[ 2.102220] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
+[ 2.102224] Serial: AMBA PL011 UART driver
+[ 2.102423] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
+[ 2.102463] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
+[ 2.103011] console [ttyAMA0] enabled
+[ 2.103164] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
+[ 2.103228] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
+[ 2.103292] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
+[ 2.103348] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
+[ 2.140302] 3V3: 3300 mV
+[ 2.140352] vgaarb: loaded
+[ 2.140397] SCSI subsystem initialized
+[ 2.140431] libata version 3.00 loaded.
+[ 2.140480] usbcore: registered new interface driver usbfs
+[ 2.140498] usbcore: registered new interface driver hub
+[ 2.140524] usbcore: registered new device driver usb
+[ 2.140552] pps_core: LinuxPPS API ver. 1 registered
+[ 2.140560] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[ 2.140580] PTP clock support registered
+[ 2.140713] Switched to clocksource arch_sys_counter
+[ 2.142154] NET: Registered protocol family 2
+[ 2.142231] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
+[ 2.142248] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
+[ 2.142265] TCP: Hash tables configured (established 2048 bind 2048)
+[ 2.142293] TCP: reno registered
+[ 2.142300] UDP hash table entries: 256 (order: 1, 8192 bytes)
+[ 2.142311] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
+[ 2.142346] NET: Registered protocol family 1
+[ 2.142411] RPC: Registered named UNIX socket transport module.
+[ 2.142421] RPC: Registered udp transport module.
+[ 2.142429] RPC: Registered tcp transport module.
+[ 2.142437] RPC: Registered tcp NFSv4.1 backchannel transport module.
+[ 2.142449] PCI: CLS 0 bytes, default 64
+[ 2.142611] futex hash table entries: 1024 (order: 4, 65536 bytes)
+[ 2.142705] HugeTLB registered 2 MB page size, pre-allocated 0 pages
+[ 2.144323] fuse init (API version 7.23)
+[ 2.144408] msgmni has been set to 469
+[ 2.144748] io scheduler noop registered
+[ 2.144801] io scheduler cfq registered (default)
+[ 2.145278] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
+[ 2.145291] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
+[ 2.145302] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
+[ 2.145314] pci_bus 0000:00: root bus resource [bus 00-ff]
+[ 2.145324] pci_bus 0000:00: scanning bus
+[ 2.145335] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
+[ 2.145348] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
+[ 2.145362] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 2.145397] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
+[ 2.145408] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
+[ 2.145419] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
+[ 2.145429] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
+[ 2.145440] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
+[ 2.145450] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
+[ 2.145461] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 2.145494] pci_bus 0000:00: fixups for bus
+[ 2.145502] pci_bus 0000:00: bus scan returning with max=00
+[ 2.145513] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
+[ 2.145533] pci 0000:00:00.0: fixup irq: got 33
+[ 2.145541] pci 0000:00:00.0: assigning IRQ 33
+[ 2.145551] pci 0000:00:01.0: fixup irq: got 34
+[ 2.145559] pci 0000:00:01.0: assigning IRQ 34
+[ 2.145571] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
+[ 2.145583] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
+[ 2.145596] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
+[ 2.145608] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
+[ 2.145619] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
+[ 2.145631] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
+[ 2.145642] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
+[ 2.145653] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
+[ 2.146115] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+[ 2.146366] ata_piix 0000:00:01.0: version 2.13
+[ 2.146376] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
+[ 2.146403] ata_piix 0000:00:01.0: enabling bus mastering
+[ 2.146653] scsi0 : ata_piix
+[ 2.146726] scsi1 : ata_piix
+[ 2.146757] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
+[ 2.146769] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
+[ 2.146877] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
+[ 2.146889] e1000: Copyright (c) 1999-2006 Intel Corporation.
+[ 2.146903] e1000 0000:00:00.0: enabling device (0000 -> 0002)
+[ 2.146914] e1000 0000:00:00.0: enabling bus mastering
+[ 2.300739] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
+[ 2.300748] ata1.00: 2096640 sectors, multi 0: LBA
+[ 2.300776] ata1.00: configured for UDMA/33
+[ 2.300832] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
+[ 2.300940] sd 0:0:0:0: Attached scsi generic sg0 type 0
+[ 2.300943] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
+[ 2.300970] sd 0:0:0:0: [sda] Write Protect is off
+[ 2.300979] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
+[ 2.301004] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+[ 2.301128] sda: sda1
+[ 2.301242] sd 0:0:0:0: [sda] Attached SCSI disk
+[ 2.421010] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
+[ 2.421023] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
+[ 2.421045] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
+[ 2.421055] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
+[ 2.421075] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
+[ 2.421087] igb: Copyright (c) 2007-2014 Intel Corporation.
+[ 2.421158] usbcore: registered new interface driver usb-storage
+[ 2.421211] mousedev: PS/2 mouse device common for all mice
+[ 2.421360] usbcore: registered new interface driver usbhid
+[ 2.421370] usbhid: USB HID core driver
+[ 2.421405] TCP: cubic registered
+[ 2.421412] NET: Registered protocol family 17
+
+[ 2.421788] devtmpfs: mounted
+[ 2.421844] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 2.450394] udevd[609]: starting version 182
+[ 2.460208] udevd[609]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 2.513589] random: dd urandom read with 17 bits of entropy available
+[ 2.523360] random: dd urandom read with 17 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
@@ -169,7 +169,7 @@ Mon Jan 27 08:00:00 UTC 2014
hwclock: can't open '/dev/misc/rtc': No such file or directory
INIT: Entering runlevel: 5
Configuring network interfaces... udhcpc (v1.21.1) started
-[ 2.641120] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+[ 2.650938] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
Sending discover...
Sending discover...
Sending discover...
@@ -181,3 +181,4 @@ done.
rpcbind: cannot get uid of '': Success
creating NFS state directory: done
starting statd: done
+Starting auto-serial-console: done
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/config.ini
index 7ef33a7a5..ecd472250 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/config.ini
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
atags_addr=134217728
-boot_loader=/dist/m5/system/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/dist/m5/system/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/dist/m5/system/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/z/stever/hg/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/dist/m5/system/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -1466,6 +1464,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1476,6 +1475,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simerr
index 744db2c76..3c2cf37c0 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simerr
@@ -4,7 +4,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simout
index e83ff881b..067811cf5 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/simout
@@ -1,16 +1,16 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Mar 15 2015 20:30:55
-gem5 started Mar 15 2015 20:31:14
-gem5 executing on zizzer2
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-minor -re /z/stever/hg/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-minor
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:47:25
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-minor -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-minor
+
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/m5/system/binaries/vmlinux.aarch64.20140821
- 0: system.cpu.isa: ISA system set to: 0x404afc0 0x404afc0
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch64.20140821
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80080000
-info: Loading DTB file: /dist/m5/system/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 51609998980000 because m5_exit instruction encountered
+Exiting @ tick 51694136923000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/stats.txt
index df26aa07d..8fffe3d01 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 51.694137 # Nu
sim_ticks 51694136923000 # Number of ticks simulated
final_tick 51694136923000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 185117 # Simulator instruction rate (inst/s)
-host_op_rate 217521 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 10090931944 # Simulator tick rate (ticks/s)
-host_mem_usage 725160 # Number of bytes of host memory used
-host_seconds 5122.83 # Real time elapsed on the host
+host_inst_rate 173196 # Simulator instruction rate (inst/s)
+host_op_rate 203514 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 9441127725 # Simulator tick rate (ticks/s)
+host_mem_usage 675004 # Number of bytes of host memory used
+host_seconds 5475.42 # Real time elapsed on the host
sim_insts 948323287 # Number of instructions simulated
sim_ops 1114322939 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1551,5 +1551,15 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 13 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
---------- End Simulation Statistics ----------
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/system.terminal
index 2bb89eb2c..0399621ef 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-minor/system.terminal
@@ -31,136 +31,136 @@
[ 0.000000] RCU: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=4
[ 0.000000] NR_IRQS:64 nr_irqs:64 0
[ 0.000000] Architected cp15 timer(s) running at 100.00MHz (phys).
-[ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 2748779069440ns
-[ 0.000026] Console: colour dummy device 80x25
-[ 0.000029] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
-[ 0.000031] pid_max: default: 32768 minimum: 301
-[ 0.000045] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000047] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000180] hw perfevents: no hardware support available
-[ 1.060095] CPU1: failed to come online
-[ 2.080185] CPU2: failed to come online
-[ 3.100275] CPU3: failed to come online
+[ 0.000001] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 2748779069440ns
+[ 0.000027] Console: colour dummy device 80x25
+[ 0.000030] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
+[ 0.000032] pid_max: default: 32768 minimum: 301
+[ 0.000046] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000048] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000194] hw perfevents: no hardware support available
+[ 1.060094] CPU1: failed to come online
+[ 2.080184] CPU2: failed to come online
+[ 3.100274] CPU3: failed to come online
[ 3.100278] Brought up 1 CPUs
-[ 3.100280] SMP: Total of 1 processors activated.
-[ 3.100349] devtmpfs: initialized
-[ 3.100980] atomic64_test: passed
-[ 3.101035] regulator-dummy: no parameters
-[ 3.101538] NET: Registered protocol family 16
-[ 3.101703] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
-[ 3.101713] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
-[ 3.102141] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
-[ 3.102147] Serial: AMBA PL011 UART driver
-[ 3.102394] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
-[ 3.102440] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
-[ 3.102971] console [ttyAMA0] enabled
-[ 3.103068] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
-[ 3.103104] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
-[ 3.103141] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
-[ 3.103175] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
+[ 3.100279] SMP: Total of 1 processors activated.
+[ 3.100351] devtmpfs: initialized
+[ 3.100988] atomic64_test: passed
+[ 3.101045] regulator-dummy: no parameters
+[ 3.101555] NET: Registered protocol family 16
+[ 3.101725] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
+[ 3.101735] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
+[ 3.102530] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
+[ 3.102535] Serial: AMBA PL011 UART driver
+[ 3.102787] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
+[ 3.102834] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
+[ 3.103371] console [ttyAMA0] enabled
+[ 3.103467] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
+[ 3.103504] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
+[ 3.103541] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
+[ 3.103575] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
[ 3.130690] 3V3: 3300 mV
-[ 3.130742] vgaarb: loaded
-[ 3.130800] SCSI subsystem initialized
-[ 3.130851] libata version 3.00 loaded.
-[ 3.130907] usbcore: registered new interface driver usbfs
-[ 3.130928] usbcore: registered new interface driver hub
-[ 3.130968] usbcore: registered new device driver usb
-[ 3.130999] pps_core: LinuxPPS API ver. 1 registered
-[ 3.131008] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
-[ 3.131027] PTP clock support registered
-[ 3.131174] Switched to clocksource arch_sys_counter
-[ 3.132602] NET: Registered protocol family 2
-[ 3.132697] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
-[ 3.132719] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
-[ 3.132744] TCP: Hash tables configured (established 2048 bind 2048)
-[ 3.132760] TCP: reno registered
-[ 3.132768] UDP hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.132782] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.132828] NET: Registered protocol family 1
-[ 3.132876] RPC: Registered named UNIX socket transport module.
-[ 3.132886] RPC: Registered udp transport module.
-[ 3.132894] RPC: Registered tcp transport module.
-[ 3.132902] RPC: Registered tcp NFSv4.1 backchannel transport module.
-[ 3.132914] PCI: CLS 0 bytes, default 64
-[ 3.133108] futex hash table entries: 1024 (order: 4, 65536 bytes)
-[ 3.133253] HugeTLB registered 2 MB page size, pre-allocated 0 pages
-[ 3.135428] fuse init (API version 7.23)
-[ 3.135535] msgmni has been set to 469
-[ 3.138600] io scheduler noop registered
-[ 3.138667] io scheduler cfq registered (default)
-[ 3.139158] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
-[ 3.139171] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
-[ 3.139182] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
-[ 3.139194] pci_bus 0000:00: root bus resource [bus 00-ff]
-[ 3.139204] pci_bus 0000:00: scanning bus
-[ 3.139215] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
-[ 3.139228] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
-[ 3.139243] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.139286] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
-[ 3.139299] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
-[ 3.139310] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
-[ 3.139320] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
-[ 3.139331] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
-[ 3.139342] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
-[ 3.139353] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.139394] pci_bus 0000:00: fixups for bus
-[ 3.139403] pci_bus 0000:00: bus scan returning with max=00
-[ 3.139414] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
-[ 3.139435] pci 0000:00:00.0: fixup irq: got 33
-[ 3.139444] pci 0000:00:00.0: assigning IRQ 33
-[ 3.139455] pci 0000:00:01.0: fixup irq: got 34
-[ 3.139463] pci 0000:00:01.0: assigning IRQ 34
-[ 3.139475] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
-[ 3.139488] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
-[ 3.139501] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
-[ 3.139514] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
-[ 3.139525] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
-[ 3.139537] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
-[ 3.139548] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
-[ 3.139559] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
-[ 3.140184] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
-[ 3.140520] ata_piix 0000:00:01.0: version 2.13
-[ 3.140531] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
-[ 3.140555] ata_piix 0000:00:01.0: enabling bus mastering
-[ 3.140911] scsi0 : ata_piix
-[ 3.141038] scsi1 : ata_piix
-[ 3.141075] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
-[ 3.141087] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
-[ 3.141242] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
-[ 3.141254] e1000: Copyright (c) 1999-2006 Intel Corporation.
-[ 3.141271] e1000 0000:00:00.0: enabling device (0000 -> 0002)
-[ 3.141283] e1000 0000:00:00.0: enabling bus mastering
-[ 3.301203] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
-[ 3.301213] ata1.00: 2096640 sectors, multi 0: LBA
-[ 3.301243] ata1.00: configured for UDMA/33
-[ 3.301299] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
-[ 3.301438] sd 0:0:0:0: Attached scsi generic sg0 type 0
-[ 3.301467] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
-[ 3.301514] sd 0:0:0:0: [sda] Write Protect is off
-[ 3.301523] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
-[ 3.301547] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
-[ 3.301695] sda: sda1
-[ 3.301842] sd 0:0:0:0: [sda] Attached SCSI disk
-[ 3.421490] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
-[ 3.421503] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
-[ 3.421526] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
-[ 3.421536] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
-[ 3.421559] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
-[ 3.421571] igb: Copyright (c) 2007-2014 Intel Corporation.
-[ 3.421656] usbcore: registered new interface driver usb-storage
-[ 3.421723] mousedev: PS/2 mouse device common for all mice
-[ 3.421911] usbcore: registered new interface driver usbhid
-[ 3.421921] usbhid: USB HID core driver
-[ 3.421955] TCP: cubic registered
-[ 3.421963] NET: Registered protocol family 17
-
-[ 3.422420] devtmpfs: mounted
-[ 3.422455] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
+[ 3.130745] vgaarb: loaded
+[ 3.130802] SCSI subsystem initialized
+[ 3.130853] libata version 3.00 loaded.
+[ 3.130911] usbcore: registered new interface driver usbfs
+[ 3.130932] usbcore: registered new interface driver hub
+[ 3.130973] usbcore: registered new device driver usb
+[ 3.131004] pps_core: LinuxPPS API ver. 1 registered
+[ 3.131013] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[ 3.131032] PTP clock support registered
+[ 3.131182] Switched to clocksource arch_sys_counter
+[ 3.132629] NET: Registered protocol family 2
+[ 3.132726] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
+[ 3.132747] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
+[ 3.132772] TCP: Hash tables configured (established 2048 bind 2048)
+[ 3.132789] TCP: reno registered
+[ 3.132796] UDP hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.132810] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.132857] NET: Registered protocol family 1
+[ 3.132907] RPC: Registered named UNIX socket transport module.
+[ 3.132917] RPC: Registered udp transport module.
+[ 3.132925] RPC: Registered tcp transport module.
+[ 3.132933] RPC: Registered tcp NFSv4.1 backchannel transport module.
+[ 3.132945] PCI: CLS 0 bytes, default 64
+[ 3.133143] futex hash table entries: 1024 (order: 4, 65536 bytes)
+[ 3.133288] HugeTLB registered 2 MB page size, pre-allocated 0 pages
+[ 3.135480] fuse init (API version 7.23)
+[ 3.135589] msgmni has been set to 469
+[ 3.138660] io scheduler noop registered
+[ 3.138727] io scheduler cfq registered (default)
+[ 3.139287] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
+[ 3.139300] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
+[ 3.139312] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
+[ 3.139324] pci_bus 0000:00: root bus resource [bus 00-ff]
+[ 3.139334] pci_bus 0000:00: scanning bus
+[ 3.139345] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
+[ 3.139358] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
+[ 3.139373] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.139417] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
+[ 3.139429] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
+[ 3.139440] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
+[ 3.139451] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
+[ 3.139461] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
+[ 3.139472] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
+[ 3.139484] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.139525] pci_bus 0000:00: fixups for bus
+[ 3.139534] pci_bus 0000:00: bus scan returning with max=00
+[ 3.139546] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
+[ 3.139566] pci 0000:00:00.0: fixup irq: got 33
+[ 3.139575] pci 0000:00:00.0: assigning IRQ 33
+[ 3.139586] pci 0000:00:01.0: fixup irq: got 34
+[ 3.139595] pci 0000:00:01.0: assigning IRQ 34
+[ 3.139607] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
+[ 3.139620] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
+[ 3.139633] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
+[ 3.139646] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
+[ 3.139657] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
+[ 3.139669] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
+[ 3.139680] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
+[ 3.139692] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
+[ 3.140333] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+[ 3.140661] ata_piix 0000:00:01.0: version 2.13
+[ 3.140672] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
+[ 3.140699] ata_piix 0000:00:01.0: enabling bus mastering
+[ 3.141055] scsi0 : ata_piix
+[ 3.141441] scsi1 : ata_piix
+[ 3.141477] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
+[ 3.141489] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
+[ 3.141617] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
+[ 3.141629] e1000: Copyright (c) 1999-2006 Intel Corporation.
+[ 3.141645] e1000 0000:00:00.0: enabling device (0000 -> 0002)
+[ 3.141657] e1000 0000:00:00.0: enabling bus mastering
+[ 3.301211] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
+[ 3.301221] ata1.00: 2096640 sectors, multi 0: LBA
+[ 3.301251] ata1.00: configured for UDMA/33
+[ 3.301307] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
+[ 3.301444] sd 0:0:0:0: Attached scsi generic sg0 type 0
+[ 3.301474] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
+[ 3.301521] sd 0:0:0:0: [sda] Write Protect is off
+[ 3.301530] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
+[ 3.301554] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+[ 3.301704] sda: sda1
+[ 3.301852] sd 0:0:0:0: [sda] Attached SCSI disk
+[ 3.421498] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
+[ 3.421511] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
+[ 3.421534] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
+[ 3.421544] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
+[ 3.421567] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
+[ 3.421579] igb: Copyright (c) 2007-2014 Intel Corporation.
+[ 3.421664] usbcore: registered new interface driver usb-storage
+[ 3.421730] mousedev: PS/2 mouse device common for all mice
+[ 3.421920] usbcore: registered new interface driver usbhid
+[ 3.421930] usbhid: USB HID core driver
+[ 3.421965] TCP: cubic registered
+[ 3.421973] NET: Registered protocol family 17
+
+[ 3.422431] devtmpfs: mounted
+[ 3.422482] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 3.464312] udevd[607]: starting version 182
+[ 3.464327] udevd[607]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 3.594630] random: dd urandom read with 20 bits of entropy available
+[ 3.614662] random: dd urandom read with 21 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
@@ -169,7 +169,7 @@ Mon Jan 27 08:00:00 UTC 2014
hwclock: can't open '/dev/misc/rtc': No such file or directory
INIT: Entering runlevel: 5
Configuring network interfaces... udhcpc (v1.21.1) started
-[ 3.751405] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+[ 3.771415] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
Sending discover...
Sending discover...
Sending discover...
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/config.ini
index b4c7e90f4..ef60c64b3 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/config.ini
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
atags_addr=134217728
-boot_loader=/home/stever/m5/aarch-system-2014-10/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/home/stever/hg/m5sim.org/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/home/stever/m5/aarch-system-2014-10/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -1521,6 +1519,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1531,6 +1530,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simerr
index d76e2074b..18ae58d7b 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simerr
@@ -4,7 +4,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: 12461855003000: Instruction results do not match! (Values may not actually be integers) Inst: 0xffffffc00d07d780, checker: 0
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simout
index 2ecb92535..703b25032 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/simout
@@ -1,18 +1,16 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 14:36:18
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-checker -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-checker
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 11:01:08
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-checker -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-checker
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch64.20140821
- 0: system.cpu.checker.isa: ISA system set to: 0x35ea180 0x35ea180
- 0: system.cpu.isa: ISA system set to: 0x35ea180 0x35ea180
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch64.20140821
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80080000
-info: Loading DTB file: /home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 51320468905000 because m5_exit instruction encountered
+Exiting @ tick 51323721423000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/stats.txt
index 2b80b1dcb..597734940 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 51.323721 # Nu
sim_ticks 51323721423000 # Number of ticks simulated
final_tick 51323721423000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 78661 # Simulator instruction rate (inst/s)
-host_op_rate 92428 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 4731079623 # Simulator tick rate (ticks/s)
-host_mem_usage 729012 # Number of bytes of host memory used
-host_seconds 10848.21 # Real time elapsed on the host
+host_inst_rate 88242 # Simulator instruction rate (inst/s)
+host_op_rate 103686 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 5307363437 # Simulator tick rate (ticks/s)
+host_mem_usage 679356 # Number of bytes of host memory used
+host_seconds 9670.29 # Real time elapsed on the host
sim_insts 853325819 # Number of instructions simulated
sim_ops 1002674190 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -2017,6 +2017,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 13 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.cpu.kern.inst.arm 0 # number of arm instructions executed
system.cpu.kern.inst.quiesce 16150 # number of quiesce instructions executed
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/system.terminal
index 671c12990..d0adccb37 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-checker/system.terminal
@@ -35,132 +35,132 @@
[ 0.000019] Console: colour dummy device 80x25
[ 0.000021] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
[ 0.000022] pid_max: default: 32768 minimum: 301
-[ 0.000031] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000032] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
[ 0.000033] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000120] hw perfevents: no hardware support available
+[ 0.000129] hw perfevents: no hardware support available
[ 1.060065] CPU1: failed to come online
[ 2.080127] CPU2: failed to come online
[ 3.100189] CPU3: failed to come online
[ 3.100192] Brought up 1 CPUs
[ 3.100193] SMP: Total of 1 processors activated.
-[ 3.100239] devtmpfs: initialized
-[ 3.100662] atomic64_test: passed
-[ 3.100699] regulator-dummy: no parameters
-[ 3.101056] NET: Registered protocol family 16
-[ 3.101171] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
-[ 3.101179] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
-[ 3.101397] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
-[ 3.101401] Serial: AMBA PL011 UART driver
-[ 3.101568] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
-[ 3.101599] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
-[ 3.102135] console [ttyAMA0] enabled
-[ 3.102203] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
-[ 3.102233] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
-[ 3.102264] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
-[ 3.102292] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
-[ 3.130476] 3V3: 3300 mV
-[ 3.130514] vgaarb: loaded
-[ 3.130556] SCSI subsystem initialized
-[ 3.130592] libata version 3.00 loaded.
-[ 3.130632] usbcore: registered new interface driver usbfs
-[ 3.130649] usbcore: registered new interface driver hub
-[ 3.130678] usbcore: registered new device driver usb
-[ 3.130702] pps_core: LinuxPPS API ver. 1 registered
-[ 3.130710] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
-[ 3.130727] PTP clock support registered
-[ 3.130832] Switched to clocksource arch_sys_counter
-[ 3.131787] NET: Registered protocol family 2
-[ 3.131853] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
-[ 3.131868] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
-[ 3.131886] TCP: Hash tables configured (established 2048 bind 2048)
-[ 3.131900] TCP: reno registered
-[ 3.131907] UDP hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.131920] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.131953] NET: Registered protocol family 1
-[ 3.131998] RPC: Registered named UNIX socket transport module.
-[ 3.132008] RPC: Registered udp transport module.
-[ 3.132015] RPC: Registered tcp transport module.
-[ 3.132023] RPC: Registered tcp NFSv4.1 backchannel transport module.
-[ 3.132035] PCI: CLS 0 bytes, default 64
-[ 3.132170] futex hash table entries: 1024 (order: 4, 65536 bytes)
-[ 3.132259] HugeTLB registered 2 MB page size, pre-allocated 0 pages
-[ 3.133755] fuse init (API version 7.23)
-[ 3.133830] msgmni has been set to 469
-[ 3.135876] io scheduler noop registered
-[ 3.135924] io scheduler cfq registered (default)
-[ 3.136253] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
-[ 3.136265] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
-[ 3.136276] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
-[ 3.136288] pci_bus 0000:00: root bus resource [bus 00-ff]
-[ 3.136297] pci_bus 0000:00: scanning bus
-[ 3.136307] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
-[ 3.136319] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
-[ 3.136332] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.136366] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
-[ 3.136377] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
-[ 3.136387] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
-[ 3.136397] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
-[ 3.136408] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
-[ 3.136418] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
-[ 3.136428] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.136460] pci_bus 0000:00: fixups for bus
-[ 3.136468] pci_bus 0000:00: bus scan returning with max=00
-[ 3.136479] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
-[ 3.136497] pci 0000:00:00.0: fixup irq: got 33
-[ 3.136505] pci 0000:00:00.0: assigning IRQ 33
-[ 3.136514] pci 0000:00:01.0: fixup irq: got 34
-[ 3.136522] pci 0000:00:01.0: assigning IRQ 34
-[ 3.136533] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
-[ 3.136545] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
-[ 3.136557] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
-[ 3.136570] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
-[ 3.136580] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
-[ 3.136591] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
-[ 3.136602] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
-[ 3.136613] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
-[ 3.137039] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
-[ 3.137263] ata_piix 0000:00:01.0: version 2.13
-[ 3.137273] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
-[ 3.137291] ata_piix 0000:00:01.0: enabling bus mastering
-[ 3.137539] scsi0 : ata_piix
-[ 3.137625] scsi1 : ata_piix
-[ 3.137652] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
-[ 3.137663] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
-[ 3.137754] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
-[ 3.137765] e1000: Copyright (c) 1999-2006 Intel Corporation.
-[ 3.137780] e1000 0000:00:00.0: enabling device (0000 -> 0002)
-[ 3.137791] e1000 0000:00:00.0: enabling bus mastering
-[ 3.290854] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
-[ 3.290863] ata1.00: 2096640 sectors, multi 0: LBA
-[ 3.290888] ata1.00: configured for UDMA/33
-[ 3.290928] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
-[ 3.291027] sd 0:0:0:0: Attached scsi generic sg0 type 0
-[ 3.291049] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
-[ 3.291085] sd 0:0:0:0: [sda] Write Protect is off
-[ 3.291094] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
-[ 3.291113] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
-[ 3.291218] sda: sda1
-[ 3.291320] sd 0:0:0:0: [sda] Attached SCSI disk
-[ 3.411119] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
-[ 3.411132] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
-[ 3.411151] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
-[ 3.411161] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
-[ 3.411179] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
-[ 3.411190] igb: Copyright (c) 2007-2014 Intel Corporation.
-[ 3.411252] usbcore: registered new interface driver usb-storage
-[ 3.411300] mousedev: PS/2 mouse device common for all mice
-[ 3.411434] usbcore: registered new interface driver usbhid
-[ 3.411443] usbhid: USB HID core driver
-[ 3.411470] TCP: cubic registered
-[ 3.411477] NET: Registered protocol family 17
-
-[ 3.411812] devtmpfs: mounted
-[ 3.411835] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
+[ 3.100240] devtmpfs: initialized
+[ 3.100669] atomic64_test: passed
+[ 3.100708] regulator-dummy: no parameters
+[ 3.101069] NET: Registered protocol family 16
+[ 3.101188] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
+[ 3.101196] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
+[ 3.101685] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
+[ 3.101689] Serial: AMBA PL011 UART driver
+[ 3.101859] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
+[ 3.101891] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
+[ 3.102431] console [ttyAMA0] enabled
+[ 3.102499] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
+[ 3.102529] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
+[ 3.102560] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
+[ 3.102589] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
+[ 3.130477] 3V3: 3300 mV
+[ 3.130516] vgaarb: loaded
+[ 3.130558] SCSI subsystem initialized
+[ 3.130594] libata version 3.00 loaded.
+[ 3.130636] usbcore: registered new interface driver usbfs
+[ 3.130652] usbcore: registered new interface driver hub
+[ 3.130683] usbcore: registered new device driver usb
+[ 3.130706] pps_core: LinuxPPS API ver. 1 registered
+[ 3.130715] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[ 3.130733] PTP clock support registered
+[ 3.130839] Switched to clocksource arch_sys_counter
+[ 3.131808] NET: Registered protocol family 2
+[ 3.131874] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
+[ 3.131890] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
+[ 3.131908] TCP: Hash tables configured (established 2048 bind 2048)
+[ 3.131922] TCP: reno registered
+[ 3.131928] UDP hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.131941] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.131975] NET: Registered protocol family 1
+[ 3.132021] RPC: Registered named UNIX socket transport module.
+[ 3.132031] RPC: Registered udp transport module.
+[ 3.132039] RPC: Registered tcp transport module.
+[ 3.132047] RPC: Registered tcp NFSv4.1 backchannel transport module.
+[ 3.132058] PCI: CLS 0 bytes, default 64
+[ 3.132196] futex hash table entries: 1024 (order: 4, 65536 bytes)
+[ 3.132285] HugeTLB registered 2 MB page size, pre-allocated 0 pages
+[ 3.133797] fuse init (API version 7.23)
+[ 3.133873] msgmni has been set to 469
+[ 3.135927] io scheduler noop registered
+[ 3.135975] io scheduler cfq registered (default)
+[ 3.136358] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
+[ 3.136370] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
+[ 3.136381] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
+[ 3.136393] pci_bus 0000:00: root bus resource [bus 00-ff]
+[ 3.136402] pci_bus 0000:00: scanning bus
+[ 3.136412] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
+[ 3.136424] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
+[ 3.136438] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.136471] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
+[ 3.136483] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
+[ 3.136493] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
+[ 3.136503] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
+[ 3.136513] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
+[ 3.136524] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
+[ 3.136534] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.136567] pci_bus 0000:00: fixups for bus
+[ 3.136574] pci_bus 0000:00: bus scan returning with max=00
+[ 3.136586] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
+[ 3.136603] pci 0000:00:00.0: fixup irq: got 33
+[ 3.136611] pci 0000:00:00.0: assigning IRQ 33
+[ 3.136621] pci 0000:00:01.0: fixup irq: got 34
+[ 3.136629] pci 0000:00:01.0: assigning IRQ 34
+[ 3.136639] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
+[ 3.136651] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
+[ 3.136664] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
+[ 3.136676] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
+[ 3.136687] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
+[ 3.136698] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
+[ 3.136709] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
+[ 3.136720] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
+[ 3.137151] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+[ 3.137378] ata_piix 0000:00:01.0: version 2.13
+[ 3.137387] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
+[ 3.137408] ata_piix 0000:00:01.0: enabling bus mastering
+[ 3.137658] scsi0 : ata_piix
+[ 3.137744] scsi1 : ata_piix
+[ 3.137771] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
+[ 3.137783] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
+[ 3.137876] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
+[ 3.137888] e1000: Copyright (c) 1999-2006 Intel Corporation.
+[ 3.137902] e1000 0000:00:00.0: enabling device (0000 -> 0002)
+[ 3.137913] e1000 0000:00:00.0: enabling bus mastering
+[ 3.290861] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
+[ 3.290871] ata1.00: 2096640 sectors, multi 0: LBA
+[ 3.290896] ata1.00: configured for UDMA/33
+[ 3.290937] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
+[ 3.291037] sd 0:0:0:0: Attached scsi generic sg0 type 0
+[ 3.291060] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
+[ 3.291095] sd 0:0:0:0: [sda] Write Protect is off
+[ 3.291104] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
+[ 3.291123] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+[ 3.291229] sda: sda1
+[ 3.291331] sd 0:0:0:0: [sda] Attached SCSI disk
+[ 3.411127] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
+[ 3.411139] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
+[ 3.411159] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
+[ 3.411168] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
+[ 3.411187] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
+[ 3.411198] igb: Copyright (c) 2007-2014 Intel Corporation.
+[ 3.411260] usbcore: registered new interface driver usb-storage
+[ 3.411309] mousedev: PS/2 mouse device common for all mice
+[ 3.411443] usbcore: registered new interface driver usbhid
+[ 3.411452] usbhid: USB HID core driver
+[ 3.411480] TCP: cubic registered
+[ 3.411487] NET: Registered protocol family 17
+
+[ 3.411823] devtmpfs: mounted
+[ 3.411860] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 3.450156] udevd[607]: starting version 182
+[ 3.450179] udevd[607]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 3.543301] random: dd urandom read with 19 bits of entropy available
+[ 3.543317] random: dd urandom read with 19 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
@@ -168,7 +168,7 @@ hwclock: can't open '/dev/misc/rtc': No such file or directory
Mon Jan 27 08:00:00 UTC 2014
hwclock: can't open '/dev/misc/rtc': No such file or directory
INIT: Entering runlevel: 5
-Configuring network interfaces... [ 3.671060] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+Configuring network interfaces... [ 3.671067] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
udhcpc (v1.21.1) started
Sending discover...
Sending discover...
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/config.ini
index d3e5a5093..def82d401 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/config.ini
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/home/stever/m5/aarch-system-2014-10/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/home/stever/hg/m5sim.org/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/home/stever/m5/aarch-system-2014-10/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -2064,6 +2062,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -2074,6 +2073,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr
index fa6d20798..4c70e8d66 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr
@@ -4,9 +4,10 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
+warn: allocating bonus target for snoop
+warn: allocating bonus target for snoop
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
-warn: allocating bonus target for snoop
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout
index 3913964ad..0fe5c8030 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout
@@ -1,18 +1,16 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 13:01:24
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-dual -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-dual
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 11:05:08
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-dual
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch64.20140821
- 0: system.cpu0.isa: ISA system set to: 0x305baa0 0x305baa0
- 0: system.cpu1.isa: ISA system set to: 0x305baa0 0x305baa0
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch64.20140821
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80080000
-info: Loading DTB file: /home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 47305566199500 because m5_exit instruction encountered
+Exiting @ tick 47309826639000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt
index 5e0f7ea36..6bf45e0f6 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 47.309827 # Nu
sim_ticks 47309826639000 # Number of ticks simulated
final_tick 47309826639000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 99581 # Simulator instruction rate (inst/s)
-host_op_rate 117105 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 4980017521 # Simulator tick rate (ticks/s)
-host_mem_usage 777716 # Number of bytes of host memory used
-host_seconds 9499.93 # Real time elapsed on the host
+host_inst_rate 115168 # Simulator instruction rate (inst/s)
+host_op_rate 135435 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 5759542779 # Simulator tick rate (ticks/s)
+host_mem_usage 728780 # Number of bytes of host memory used
+host_seconds 8214.16 # Real time elapsed on the host
sim_insts 946011818 # Number of instructions simulated
sim_ops 1112485532 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -3842,6 +3842,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 13 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 59648 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 5069827 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 38204 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/system.terminal
index 106828a6d..705a6445b 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/system.terminal
@@ -35,132 +35,132 @@
[ 0.000015] Console: colour dummy device 80x25
[ 0.000017] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
[ 0.000018] pid_max: default: 32768 minimum: 301
-[ 0.000025] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000026] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
[ 0.000026] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000102] hw perfevents: no hardware support available
-[ 0.060025] CPU1: Booted secondary processor
+[ 0.000111] hw perfevents: no hardware support available
+[ 0.060027] CPU1: Booted secondary processor
[ 1.080050] CPU2: failed to come online
[ 2.100095] CPU3: failed to come online
[ 2.100098] Brought up 2 CPUs
[ 2.100098] SMP: Total of 2 processors activated.
-[ 2.100138] devtmpfs: initialized
-[ 2.100444] atomic64_test: passed
-[ 2.100472] regulator-dummy: no parameters
-[ 2.100696] NET: Registered protocol family 16
-[ 2.100779] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
-[ 2.100786] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
-[ 2.100981] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
-[ 2.100984] Serial: AMBA PL011 UART driver
-[ 2.101110] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
-[ 2.101135] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
-[ 2.101687] console [ttyAMA0] enabled
-[ 2.101755] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
-[ 2.101783] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
-[ 2.101810] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
-[ 2.101836] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
-[ 2.140205] 3V3: 3300 mV
-[ 2.140237] vgaarb: loaded
-[ 2.140268] SCSI subsystem initialized
-[ 2.140296] libata version 3.00 loaded.
-[ 2.140328] usbcore: registered new interface driver usbfs
-[ 2.140342] usbcore: registered new interface driver hub
-[ 2.140362] usbcore: registered new device driver usb
-[ 2.140381] pps_core: LinuxPPS API ver. 1 registered
-[ 2.140390] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
-[ 2.140408] PTP clock support registered
-[ 2.140494] Switched to clocksource arch_sys_counter
-[ 2.141571] NET: Registered protocol family 2
-[ 2.141633] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
-[ 2.141647] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
-[ 2.141662] TCP: Hash tables configured (established 2048 bind 2048)
-[ 2.141678] TCP: reno registered
-[ 2.141685] UDP hash table entries: 256 (order: 1, 8192 bytes)
-[ 2.141696] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
-[ 2.141722] NET: Registered protocol family 1
-[ 2.141756] RPC: Registered named UNIX socket transport module.
-[ 2.141766] RPC: Registered udp transport module.
-[ 2.141774] RPC: Registered tcp transport module.
-[ 2.141782] RPC: Registered tcp NFSv4.1 backchannel transport module.
-[ 2.141794] PCI: CLS 0 bytes, default 64
-[ 2.141902] futex hash table entries: 1024 (order: 4, 65536 bytes)
-[ 2.141968] HugeTLB registered 2 MB page size, pre-allocated 0 pages
-[ 2.143005] fuse init (API version 7.23)
-[ 2.143061] msgmni has been set to 469
-[ 2.143642] io scheduler noop registered
-[ 2.143678] io scheduler cfq registered (default)
-[ 2.143908] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
-[ 2.143920] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
-[ 2.143930] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
-[ 2.143942] pci_bus 0000:00: root bus resource [bus 00-ff]
-[ 2.143952] pci_bus 0000:00: scanning bus
-[ 2.143961] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
-[ 2.143973] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
-[ 2.143986] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 2.144013] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
-[ 2.144024] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
-[ 2.144034] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
-[ 2.144044] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
-[ 2.144054] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
-[ 2.144064] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
-[ 2.144074] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 2.144101] pci_bus 0000:00: fixups for bus
-[ 2.144108] pci_bus 0000:00: bus scan returning with max=00
-[ 2.144119] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
-[ 2.144135] pci 0000:00:00.0: fixup irq: got 33
-[ 2.144143] pci 0000:00:00.0: assigning IRQ 33
-[ 2.144152] pci 0000:00:01.0: fixup irq: got 34
-[ 2.144160] pci 0000:00:01.0: assigning IRQ 34
-[ 2.144170] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
-[ 2.144182] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
-[ 2.144195] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
-[ 2.144207] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
-[ 2.144217] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
-[ 2.144228] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
-[ 2.144239] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
-[ 2.144249] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
-[ 2.144543] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
-[ 2.144706] ata_piix 0000:00:01.0: version 2.13
-[ 2.144715] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
-[ 2.144733] ata_piix 0000:00:01.0: enabling bus mastering
-[ 2.144903] scsi0 : ata_piix
-[ 2.144950] scsi1 : ata_piix
-[ 2.144971] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
-[ 2.144983] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
-[ 2.145053] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
-[ 2.145065] e1000: Copyright (c) 1999-2006 Intel Corporation.
-[ 2.145077] e1000 0000:00:00.0: enabling device (0000 -> 0002)
-[ 2.145088] e1000 0000:00:00.0: enabling bus mastering
-[ 2.290511] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
-[ 2.290521] ata1.00: 2096640 sectors, multi 0: LBA
-[ 2.290544] ata1.00: configured for UDMA/33
-[ 2.290580] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
-[ 2.290654] sd 0:0:0:0: Attached scsi generic sg0 type 0
-[ 2.290656] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
-[ 2.290672] sd 0:0:0:0: [sda] Write Protect is off
-[ 2.290673] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
-[ 2.290680] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
-[ 2.290769] sda: sda1
-[ 2.290844] sd 0:0:0:0: [sda] Attached SCSI disk
-[ 2.410782] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
-[ 2.410795] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
-[ 2.410817] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
-[ 2.410828] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
-[ 2.410848] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
-[ 2.410861] igb: Copyright (c) 2007-2014 Intel Corporation.
-[ 2.410941] usbcore: registered new interface driver usb-storage
-[ 2.410988] mousedev: PS/2 mouse device common for all mice
-[ 2.411093] usbcore: registered new interface driver usbhid
-[ 2.411103] usbhid: USB HID core driver
-[ 2.411126] TCP: cubic registered
-[ 2.411133] NET: Registered protocol family 17
-
-[ 2.411442] devtmpfs: mounted
-[ 2.411462] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
+[ 2.100137] devtmpfs: initialized
+[ 2.100450] atomic64_test: passed
+[ 2.100480] regulator-dummy: no parameters
+[ 2.100708] NET: Registered protocol family 16
+[ 2.100794] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
+[ 2.100801] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
+[ 2.101261] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
+[ 2.101264] Serial: AMBA PL011 UART driver
+[ 2.101390] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
+[ 2.101415] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
+[ 2.101971] console [ttyAMA0] enabled
+[ 2.102037] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
+[ 2.102065] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
+[ 2.102093] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
+[ 2.102119] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
+[ 2.130210] 3V3: 3300 mV
+[ 2.130252] vgaarb: loaded
+[ 2.130305] SCSI subsystem initialized
+[ 2.130337] libata version 3.00 loaded.
+[ 2.130399] usbcore: registered new interface driver usbfs
+[ 2.130418] usbcore: registered new interface driver hub
+[ 2.130440] usbcore: registered new device driver usb
+[ 2.130474] pps_core: LinuxPPS API ver. 1 registered
+[ 2.130483] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[ 2.130504] PTP clock support registered
+[ 2.130625] Switched to clocksource arch_sys_counter
+[ 2.131645] NET: Registered protocol family 2
+[ 2.131709] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
+[ 2.131723] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
+[ 2.131738] TCP: Hash tables configured (established 2048 bind 2048)
+[ 2.131760] TCP: reno registered
+[ 2.131766] UDP hash table entries: 256 (order: 1, 8192 bytes)
+[ 2.131777] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
+[ 2.131803] NET: Registered protocol family 1
+[ 2.131837] RPC: Registered named UNIX socket transport module.
+[ 2.131847] RPC: Registered udp transport module.
+[ 2.131855] RPC: Registered tcp transport module.
+[ 2.131863] RPC: Registered tcp NFSv4.1 backchannel transport module.
+[ 2.131875] PCI: CLS 0 bytes, default 64
+[ 2.132032] futex hash table entries: 1024 (order: 4, 65536 bytes)
+[ 2.132111] HugeTLB registered 2 MB page size, pre-allocated 0 pages
+[ 2.133524] fuse init (API version 7.23)
+[ 2.133604] msgmni has been set to 469
+[ 2.133679] io scheduler noop registered
+[ 2.133713] io scheduler cfq registered (default)
+[ 2.133988] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
+[ 2.134000] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
+[ 2.134011] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
+[ 2.134023] pci_bus 0000:00: root bus resource [bus 00-ff]
+[ 2.134032] pci_bus 0000:00: scanning bus
+[ 2.134042] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
+[ 2.134054] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
+[ 2.134067] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 2.134094] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
+[ 2.134105] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
+[ 2.134115] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
+[ 2.134125] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
+[ 2.134135] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
+[ 2.134145] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
+[ 2.134156] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 2.134182] pci_bus 0000:00: fixups for bus
+[ 2.134190] pci_bus 0000:00: bus scan returning with max=00
+[ 2.134201] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
+[ 2.134217] pci 0000:00:00.0: fixup irq: got 33
+[ 2.134225] pci 0000:00:00.0: assigning IRQ 33
+[ 2.134234] pci 0000:00:01.0: fixup irq: got 34
+[ 2.134242] pci 0000:00:01.0: assigning IRQ 34
+[ 2.134252] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
+[ 2.134264] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
+[ 2.134276] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
+[ 2.134289] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
+[ 2.134299] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
+[ 2.134310] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
+[ 2.134321] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
+[ 2.134331] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
+[ 2.134762] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+[ 2.134944] ata_piix 0000:00:01.0: version 2.13
+[ 2.134953] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
+[ 2.134973] ata_piix 0000:00:01.0: enabling bus mastering
+[ 2.135150] scsi0 : ata_piix
+[ 2.135206] scsi1 : ata_piix
+[ 2.135226] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
+[ 2.135238] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
+[ 2.135311] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
+[ 2.135322] e1000: Copyright (c) 1999-2006 Intel Corporation.
+[ 2.135335] e1000 0000:00:00.0: enabling device (0000 -> 0002)
+[ 2.135345] e1000 0000:00:00.0: enabling bus mastering
+[ 2.280657] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
+[ 2.280666] ata1.00: 2096640 sectors, multi 0: LBA
+[ 2.280690] ata1.00: configured for UDMA/33
+[ 2.280728] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
+[ 2.280821] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
+[ 2.280854] sd 0:0:0:0: [sda] Write Protect is off
+[ 2.280863] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
+[ 2.280878] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+[ 2.280929] sd 0:0:0:0: Attached scsi generic sg0 type 0
+[ 2.280990] sda: sda1
+[ 2.281073] sd 0:0:0:0: [sda] Attached SCSI disk
+[ 2.400906] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
+[ 2.400919] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
+[ 2.400938] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
+[ 2.400948] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
+[ 2.400966] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
+[ 2.400977] igb: Copyright (c) 2007-2014 Intel Corporation.
+[ 2.401027] usbcore: registered new interface driver usb-storage
+[ 2.401068] mousedev: PS/2 mouse device common for all mice
+[ 2.401175] usbcore: registered new interface driver usbhid
+[ 2.401185] usbhid: USB HID core driver
+[ 2.401212] TCP: cubic registered
+[ 2.401219] NET: Registered protocol family 17
+
+[ 2.401484] devtmpfs: mounted
+[ 2.401519] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 2.447379] udevd[609]: starting version 182
+[ 2.437521] udevd[609]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 2.532355] random: dd urandom read with 17 bits of entropy available
+[ 2.512528] random: dd urandom read with 18 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
@@ -169,7 +169,7 @@ Mon Jan 27 08:00:00 UTC 2014
hwclock: can't open '/dev/misc/rtc': No such file or directory
INIT: Entering runlevel: 5
Configuring network interfaces... udhcpc (v1.21.1) started
-[ 2.640722] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+[ 2.620850] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
Sending discover...
Sending discover...
Sending discover...
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/config.ini
index 2c9a47114..026d5a2a0 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -1368,6 +1368,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1378,6 +1379,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simerr
index 744db2c76..3c2cf37c0 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simerr
@@ -4,7 +4,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simout
index 11e1245f8..a2bc54e0f 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/simout
@@ -1,17 +1,16 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 12:58:50
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3 -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:59:42
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3 -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch64.20140821
- 0: system.cpu.isa: ISA system set to: 0x41ceb00 0x41ceb00
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch64.20140821
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80080000
-info: Loading DTB file: /home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 51320468905000 because m5_exit instruction encountered
+Exiting @ tick 51323721423000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/stats.txt
index ef8414f55..02e1510aa 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 51.323721 # Nu
sim_ticks 51323721423000 # Number of ticks simulated
final_tick 51323721423000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 113854 # Simulator instruction rate (inst/s)
-host_op_rate 133781 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 6847821533 # Simulator tick rate (ticks/s)
-host_mem_usage 727476 # Number of bytes of host memory used
-host_seconds 7494.90 # Real time elapsed on the host
+host_inst_rate 120356 # Simulator instruction rate (inst/s)
+host_op_rate 141420 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 7238849372 # Simulator tick rate (ticks/s)
+host_mem_usage 678076 # Number of bytes of host memory used
+host_seconds 7090.04 # Real time elapsed on the host
sim_insts 853325819 # Number of instructions simulated
sim_ops 1002674190 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1878,6 +1878,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 13 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.cpu.kern.inst.arm 0 # number of arm instructions executed
system.cpu.kern.inst.quiesce 16150 # number of quiesce instructions executed
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/system.terminal
index 671c12990..d0adccb37 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3/system.terminal
@@ -35,132 +35,132 @@
[ 0.000019] Console: colour dummy device 80x25
[ 0.000021] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
[ 0.000022] pid_max: default: 32768 minimum: 301
-[ 0.000031] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000032] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
[ 0.000033] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000120] hw perfevents: no hardware support available
+[ 0.000129] hw perfevents: no hardware support available
[ 1.060065] CPU1: failed to come online
[ 2.080127] CPU2: failed to come online
[ 3.100189] CPU3: failed to come online
[ 3.100192] Brought up 1 CPUs
[ 3.100193] SMP: Total of 1 processors activated.
-[ 3.100239] devtmpfs: initialized
-[ 3.100662] atomic64_test: passed
-[ 3.100699] regulator-dummy: no parameters
-[ 3.101056] NET: Registered protocol family 16
-[ 3.101171] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
-[ 3.101179] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
-[ 3.101397] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
-[ 3.101401] Serial: AMBA PL011 UART driver
-[ 3.101568] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
-[ 3.101599] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
-[ 3.102135] console [ttyAMA0] enabled
-[ 3.102203] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
-[ 3.102233] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
-[ 3.102264] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
-[ 3.102292] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
-[ 3.130476] 3V3: 3300 mV
-[ 3.130514] vgaarb: loaded
-[ 3.130556] SCSI subsystem initialized
-[ 3.130592] libata version 3.00 loaded.
-[ 3.130632] usbcore: registered new interface driver usbfs
-[ 3.130649] usbcore: registered new interface driver hub
-[ 3.130678] usbcore: registered new device driver usb
-[ 3.130702] pps_core: LinuxPPS API ver. 1 registered
-[ 3.130710] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
-[ 3.130727] PTP clock support registered
-[ 3.130832] Switched to clocksource arch_sys_counter
-[ 3.131787] NET: Registered protocol family 2
-[ 3.131853] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
-[ 3.131868] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
-[ 3.131886] TCP: Hash tables configured (established 2048 bind 2048)
-[ 3.131900] TCP: reno registered
-[ 3.131907] UDP hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.131920] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.131953] NET: Registered protocol family 1
-[ 3.131998] RPC: Registered named UNIX socket transport module.
-[ 3.132008] RPC: Registered udp transport module.
-[ 3.132015] RPC: Registered tcp transport module.
-[ 3.132023] RPC: Registered tcp NFSv4.1 backchannel transport module.
-[ 3.132035] PCI: CLS 0 bytes, default 64
-[ 3.132170] futex hash table entries: 1024 (order: 4, 65536 bytes)
-[ 3.132259] HugeTLB registered 2 MB page size, pre-allocated 0 pages
-[ 3.133755] fuse init (API version 7.23)
-[ 3.133830] msgmni has been set to 469
-[ 3.135876] io scheduler noop registered
-[ 3.135924] io scheduler cfq registered (default)
-[ 3.136253] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
-[ 3.136265] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
-[ 3.136276] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
-[ 3.136288] pci_bus 0000:00: root bus resource [bus 00-ff]
-[ 3.136297] pci_bus 0000:00: scanning bus
-[ 3.136307] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
-[ 3.136319] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
-[ 3.136332] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.136366] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
-[ 3.136377] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
-[ 3.136387] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
-[ 3.136397] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
-[ 3.136408] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
-[ 3.136418] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
-[ 3.136428] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.136460] pci_bus 0000:00: fixups for bus
-[ 3.136468] pci_bus 0000:00: bus scan returning with max=00
-[ 3.136479] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
-[ 3.136497] pci 0000:00:00.0: fixup irq: got 33
-[ 3.136505] pci 0000:00:00.0: assigning IRQ 33
-[ 3.136514] pci 0000:00:01.0: fixup irq: got 34
-[ 3.136522] pci 0000:00:01.0: assigning IRQ 34
-[ 3.136533] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
-[ 3.136545] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
-[ 3.136557] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
-[ 3.136570] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
-[ 3.136580] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
-[ 3.136591] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
-[ 3.136602] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
-[ 3.136613] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
-[ 3.137039] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
-[ 3.137263] ata_piix 0000:00:01.0: version 2.13
-[ 3.137273] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
-[ 3.137291] ata_piix 0000:00:01.0: enabling bus mastering
-[ 3.137539] scsi0 : ata_piix
-[ 3.137625] scsi1 : ata_piix
-[ 3.137652] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
-[ 3.137663] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
-[ 3.137754] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
-[ 3.137765] e1000: Copyright (c) 1999-2006 Intel Corporation.
-[ 3.137780] e1000 0000:00:00.0: enabling device (0000 -> 0002)
-[ 3.137791] e1000 0000:00:00.0: enabling bus mastering
-[ 3.290854] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
-[ 3.290863] ata1.00: 2096640 sectors, multi 0: LBA
-[ 3.290888] ata1.00: configured for UDMA/33
-[ 3.290928] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
-[ 3.291027] sd 0:0:0:0: Attached scsi generic sg0 type 0
-[ 3.291049] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
-[ 3.291085] sd 0:0:0:0: [sda] Write Protect is off
-[ 3.291094] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
-[ 3.291113] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
-[ 3.291218] sda: sda1
-[ 3.291320] sd 0:0:0:0: [sda] Attached SCSI disk
-[ 3.411119] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
-[ 3.411132] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
-[ 3.411151] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
-[ 3.411161] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
-[ 3.411179] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
-[ 3.411190] igb: Copyright (c) 2007-2014 Intel Corporation.
-[ 3.411252] usbcore: registered new interface driver usb-storage
-[ 3.411300] mousedev: PS/2 mouse device common for all mice
-[ 3.411434] usbcore: registered new interface driver usbhid
-[ 3.411443] usbhid: USB HID core driver
-[ 3.411470] TCP: cubic registered
-[ 3.411477] NET: Registered protocol family 17
-
-[ 3.411812] devtmpfs: mounted
-[ 3.411835] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
+[ 3.100240] devtmpfs: initialized
+[ 3.100669] atomic64_test: passed
+[ 3.100708] regulator-dummy: no parameters
+[ 3.101069] NET: Registered protocol family 16
+[ 3.101188] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
+[ 3.101196] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
+[ 3.101685] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
+[ 3.101689] Serial: AMBA PL011 UART driver
+[ 3.101859] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
+[ 3.101891] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
+[ 3.102431] console [ttyAMA0] enabled
+[ 3.102499] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
+[ 3.102529] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
+[ 3.102560] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
+[ 3.102589] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
+[ 3.130477] 3V3: 3300 mV
+[ 3.130516] vgaarb: loaded
+[ 3.130558] SCSI subsystem initialized
+[ 3.130594] libata version 3.00 loaded.
+[ 3.130636] usbcore: registered new interface driver usbfs
+[ 3.130652] usbcore: registered new interface driver hub
+[ 3.130683] usbcore: registered new device driver usb
+[ 3.130706] pps_core: LinuxPPS API ver. 1 registered
+[ 3.130715] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[ 3.130733] PTP clock support registered
+[ 3.130839] Switched to clocksource arch_sys_counter
+[ 3.131808] NET: Registered protocol family 2
+[ 3.131874] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
+[ 3.131890] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
+[ 3.131908] TCP: Hash tables configured (established 2048 bind 2048)
+[ 3.131922] TCP: reno registered
+[ 3.131928] UDP hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.131941] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.131975] NET: Registered protocol family 1
+[ 3.132021] RPC: Registered named UNIX socket transport module.
+[ 3.132031] RPC: Registered udp transport module.
+[ 3.132039] RPC: Registered tcp transport module.
+[ 3.132047] RPC: Registered tcp NFSv4.1 backchannel transport module.
+[ 3.132058] PCI: CLS 0 bytes, default 64
+[ 3.132196] futex hash table entries: 1024 (order: 4, 65536 bytes)
+[ 3.132285] HugeTLB registered 2 MB page size, pre-allocated 0 pages
+[ 3.133797] fuse init (API version 7.23)
+[ 3.133873] msgmni has been set to 469
+[ 3.135927] io scheduler noop registered
+[ 3.135975] io scheduler cfq registered (default)
+[ 3.136358] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
+[ 3.136370] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
+[ 3.136381] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
+[ 3.136393] pci_bus 0000:00: root bus resource [bus 00-ff]
+[ 3.136402] pci_bus 0000:00: scanning bus
+[ 3.136412] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
+[ 3.136424] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
+[ 3.136438] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.136471] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
+[ 3.136483] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
+[ 3.136493] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
+[ 3.136503] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
+[ 3.136513] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
+[ 3.136524] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
+[ 3.136534] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.136567] pci_bus 0000:00: fixups for bus
+[ 3.136574] pci_bus 0000:00: bus scan returning with max=00
+[ 3.136586] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
+[ 3.136603] pci 0000:00:00.0: fixup irq: got 33
+[ 3.136611] pci 0000:00:00.0: assigning IRQ 33
+[ 3.136621] pci 0000:00:01.0: fixup irq: got 34
+[ 3.136629] pci 0000:00:01.0: assigning IRQ 34
+[ 3.136639] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
+[ 3.136651] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
+[ 3.136664] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
+[ 3.136676] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
+[ 3.136687] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
+[ 3.136698] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
+[ 3.136709] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
+[ 3.136720] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
+[ 3.137151] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+[ 3.137378] ata_piix 0000:00:01.0: version 2.13
+[ 3.137387] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
+[ 3.137408] ata_piix 0000:00:01.0: enabling bus mastering
+[ 3.137658] scsi0 : ata_piix
+[ 3.137744] scsi1 : ata_piix
+[ 3.137771] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
+[ 3.137783] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
+[ 3.137876] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
+[ 3.137888] e1000: Copyright (c) 1999-2006 Intel Corporation.
+[ 3.137902] e1000 0000:00:00.0: enabling device (0000 -> 0002)
+[ 3.137913] e1000 0000:00:00.0: enabling bus mastering
+[ 3.290861] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
+[ 3.290871] ata1.00: 2096640 sectors, multi 0: LBA
+[ 3.290896] ata1.00: configured for UDMA/33
+[ 3.290937] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
+[ 3.291037] sd 0:0:0:0: Attached scsi generic sg0 type 0
+[ 3.291060] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
+[ 3.291095] sd 0:0:0:0: [sda] Write Protect is off
+[ 3.291104] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
+[ 3.291123] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+[ 3.291229] sda: sda1
+[ 3.291331] sd 0:0:0:0: [sda] Attached SCSI disk
+[ 3.411127] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
+[ 3.411139] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
+[ 3.411159] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
+[ 3.411168] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
+[ 3.411187] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
+[ 3.411198] igb: Copyright (c) 2007-2014 Intel Corporation.
+[ 3.411260] usbcore: registered new interface driver usb-storage
+[ 3.411309] mousedev: PS/2 mouse device common for all mice
+[ 3.411443] usbcore: registered new interface driver usbhid
+[ 3.411452] usbhid: USB HID core driver
+[ 3.411480] TCP: cubic registered
+[ 3.411487] NET: Registered protocol family 17
+
+[ 3.411823] devtmpfs: mounted
+[ 3.411860] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 3.450156] udevd[607]: starting version 182
+[ 3.450179] udevd[607]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 3.543301] random: dd urandom read with 19 bits of entropy available
+[ 3.543317] random: dd urandom read with 19 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
@@ -168,7 +168,7 @@ hwclock: can't open '/dev/misc/rtc': No such file or directory
Mon Jan 27 08:00:00 UTC 2014
hwclock: can't open '/dev/misc/rtc': No such file or directory
INIT: Entering runlevel: 5
-Configuring network interfaces... [ 3.671060] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+Configuring network interfaces... [ 3.671067] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
udhcpc (v1.21.1) started
Sending discover...
Sending discover...
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.ini
index c1a5b024a..cc1edf626 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.ini
@@ -14,7 +14,6 @@ children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus io
atags_addr=134217728
boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
@@ -43,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/work/gem5/scratch1/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -975,6 +974,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -985,6 +985,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json
index 593398c96..1d5cc7d19 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/config.json
@@ -68,9 +68,8 @@
"frontend_latency": 2
},
"symbolfile": "",
- "readfile": "/work/gem5/scratch1/gem5/tests/halt.sh",
+ "readfile": "/work/gem5/outgoing/gem5/tests/halt.sh",
"have_large_asid_64": false,
- "work_end_ckpt_count": 0,
"phys_addr_range_64": 40,
"have_lpae": false,
"cxx_class": "LinuxArmSystem",
@@ -80,7 +79,6 @@
"number": 0,
"frame_capture": false,
"eventq_index": 0,
- "capture_exit_frame": -1,
"cxx_class": "VncServer",
"path": "system.vncserver",
"type": "VncServer",
@@ -132,6 +130,7 @@
"enable_capture": true,
"path": "system.realview.hdlcd",
"pio_addr": 721420288,
+ "workaround_swap_rb": true,
"type": "HDLcd"
},
"mmc_fake": {
@@ -210,22 +209,162 @@
"type": "AmbaFake"
},
"realview_io": {
- "proc_id1": 335544320,
- "name": "realview_io",
"pio": {
"peer": "system.iobus.master[1]",
"role": "SLAVE"
},
+ "system": "system",
+ "cxx_class": "RealViewCtrl",
+ "pio_addr": 469827584,
"pio_latency": 100000,
"clk_domain": "system.clk_domain",
- "system": "system",
+ "osc_sys": {
+ "position": 0,
+ "name": "osc_sys",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 7,
+ "path": "system.realview.realview_io.osc_sys",
+ "freq": 16667,
+ "type": "RealViewOsc"
+ },
"eventq_index": 0,
- "cxx_class": "RealViewCtrl",
"proc_id0": 335544320,
+ "proc_id1": 335544320,
+ "osc_clcd": {
+ "position": 0,
+ "name": "osc_clcd",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 0,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 1,
+ "path": "system.realview.realview_io.osc_clcd",
+ "freq": 42105,
+ "type": "RealViewOsc"
+ },
+ "osc_peripheral": {
+ "position": 0,
+ "name": "osc_peripheral",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 0,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 2,
+ "path": "system.realview.realview_io.osc_peripheral",
+ "freq": 41667,
+ "type": "RealViewOsc"
+ },
+ "osc_hsbm": {
+ "position": 0,
+ "name": "osc_hsbm",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 4,
+ "path": "system.realview.realview_io.osc_hsbm",
+ "freq": 25000,
+ "type": "RealViewOsc"
+ },
+ "osc_mcc": {
+ "position": 0,
+ "name": "osc_mcc",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 0,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 0,
+ "path": "system.realview.realview_io.osc_mcc",
+ "freq": 20000,
+ "type": "RealViewOsc"
+ },
"path": "system.realview.realview_io",
"idreg": 35979264,
+ "osc_system_bus": {
+ "position": 0,
+ "name": "osc_system_bus",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 0,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 4,
+ "path": "system.realview.realview_io.osc_system_bus",
+ "freq": 41667,
+ "type": "RealViewOsc"
+ },
+ "osc_smb": {
+ "position": 0,
+ "name": "osc_smb",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 6,
+ "path": "system.realview.realview_io.osc_smb",
+ "freq": 20000,
+ "type": "RealViewOsc"
+ },
+ "name": "realview_io",
"type": "RealViewCtrl",
- "pio_addr": 469827584
+ "osc_ddr": {
+ "position": 0,
+ "name": "osc_ddr",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 8,
+ "path": "system.realview.realview_io.osc_ddr",
+ "freq": 25000,
+ "type": "RealViewOsc"
+ },
+ "osc_cpu": {
+ "position": 0,
+ "name": "osc_cpu",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 0,
+ "path": "system.realview.realview_io.osc_cpu",
+ "freq": 16667,
+ "type": "RealViewOsc"
+ },
+ "osc_pxl": {
+ "position": 0,
+ "name": "osc_pxl",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 5,
+ "path": "system.realview.realview_io.osc_pxl",
+ "freq": 42105,
+ "type": "RealViewOsc"
+ }
},
"l2x0_fake": {
"system": "system",
@@ -754,7 +893,7 @@
"MSIXCAPNextCapability": 0,
"PXCAPLinkCtrl": 0,
"Revision": 0,
- "hardware_address": "<m5.params.EthernetAddr object at 0x46abfd0>",
+ "hardware_address": "<m5.params.EthernetAddr object at 0x7fd02360a190>",
"LegacyIOBase": 0,
"pio_latency": 30000,
"platform": "system.realview",
@@ -1029,7 +1168,10 @@
"panic_on_panic": true,
"eventq_index": 0,
"iocache": {
- "is_top_level": true,
+ "cpu_side": {
+ "peer": "system.iobus.master[27]",
+ "role": "SLAVE"
+ },
"prefetcher": null,
"clk_domain": "system.clk_domain",
"write_buffers": 8,
@@ -1064,17 +1206,13 @@
"addr_ranges": [
"2147483648:2415919103"
],
- "assoc": 8,
+ "is_read_only": false,
"prefetch_on_access": false,
"path": "system.iocache",
"name": "iocache",
"type": "BaseCache",
"sequential_access": false,
- "cpu_side": {
- "peer": "system.iobus.master[27]",
- "role": "SLAVE"
- },
- "two_queue": false
+ "assoc": 8
},
"dvfs_handler": {
"enable": false,
@@ -1270,7 +1408,10 @@
"role": "MASTER"
},
"icache": {
- "is_top_level": true,
+ "cpu_side": {
+ "peer": "system.cpu.icache_port",
+ "role": "SLAVE"
+ },
"prefetcher": null,
"clk_domain": "system.cpu_clk_domain",
"write_buffers": 8,
@@ -1305,17 +1446,13 @@
"addr_ranges": [
"0:18446744073709551615"
],
- "assoc": 1,
+ "is_read_only": true,
"prefetch_on_access": false,
"path": "system.cpu.icache",
"name": "icache",
"type": "BaseCache",
"sequential_access": false,
- "cpu_side": {
- "peer": "system.cpu.icache_port",
- "role": "SLAVE"
- },
- "two_queue": false
+ "assoc": 1
},
"interrupts": {
"eventq_index": 0,
@@ -1360,7 +1497,10 @@
"type": "ArmStage2MMU"
},
"l2cache": {
- "is_top_level": false,
+ "cpu_side": {
+ "peer": "system.cpu.toL2Bus.master[0]",
+ "role": "SLAVE"
+ },
"prefetcher": null,
"clk_domain": "system.cpu_clk_domain",
"write_buffers": 8,
@@ -1395,17 +1535,13 @@
"addr_ranges": [
"0:18446744073709551615"
],
- "assoc": 8,
+ "is_read_only": false,
"prefetch_on_access": false,
"path": "system.cpu.l2cache",
"name": "l2cache",
"type": "BaseCache",
"sequential_access": false,
- "cpu_side": {
- "peer": "system.cpu.toL2Bus.master[0]",
- "role": "SLAVE"
- },
- "two_queue": false
+ "assoc": 8
},
"path": "system.cpu",
"max_loads_any_thread": 0,
@@ -1442,7 +1578,10 @@
"progress_interval": 0,
"branchPred": null,
"dcache": {
- "is_top_level": true,
+ "cpu_side": {
+ "peer": "system.cpu.dcache_port",
+ "role": "SLAVE"
+ },
"prefetcher": null,
"clk_domain": "system.cpu_clk_domain",
"write_buffers": 8,
@@ -1477,17 +1616,13 @@
"addr_ranges": [
"0:18446744073709551615"
],
- "assoc": 4,
+ "is_read_only": false,
"prefetch_on_access": false,
"path": "system.cpu.dcache",
"name": "dcache",
"type": "BaseCache",
"sequential_access": false,
- "cpu_side": {
- "peer": "system.cpu.dcache_port",
- "role": "SLAVE"
- },
- "two_queue": false
+ "assoc": 4
},
"isa": [
{
@@ -1580,7 +1715,7 @@
"path": "system.cf0",
"type": "IdeDisk"
},
- "boot_release_addr": 65528,
+ "work_end_ckpt_count": 0,
"mem_mode": "atomic",
"name": "system",
"init_param": 0,
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt
index b60b333d0..35e369985 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-checkpoint/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 51.111153 # Nu
sim_ticks 51111152682000 # Number of ticks simulated
final_tick 51111152682000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1400836 # Simulator instruction rate (inst/s)
-host_op_rate 1646212 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 72720385640 # Simulator tick rate (ticks/s)
-host_mem_usage 722712 # Number of bytes of host memory used
-host_seconds 702.85 # Real time elapsed on the host
+host_inst_rate 1040961 # Simulator instruction rate (inst/s)
+host_op_rate 1223300 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 54038486240 # Simulator tick rate (ticks/s)
+host_mem_usage 670940 # Number of bytes of host memory used
+host_seconds 945.83 # Real time elapsed on the host
sim_insts 984570519 # Number of instructions simulated
sim_ops 1157031967 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -787,5 +787,15 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 13 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
---------- End Simulation Statistics ----------
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/config.ini
index d35c4ce4c..0ef1481b3 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -1338,6 +1338,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1348,6 +1349,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simerr
index 0a1da41f0..a78b01f0e 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simerr
@@ -3,7 +3,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simout
index 03afdc9d6..30f75cd41 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/simout
@@ -1,17 +1,16 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 29 2014 15:46:15
-gem5 started Oct 29 2014 16:01:47
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview64-simple-atomic-dual -re /work/gem5.latest/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview64-simple-atomic-dual
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 11:11:51
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-simple-atomic-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-simple-atomic-dual
+
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.aarch64.20140821
- 0: system.cpu0.isa: ISA system set to: 0x52fab00 0x52fab00
- 0: system.cpu1.isa: ISA system set to: 0x52fab00 0x52fab00
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch64.20140821
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80080000
-info: Loading DTB file: /projects/pd/randd/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 47256535568000 because m5_exit instruction encountered
+Exiting @ tick 47216814145000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/stats.txt
index aba26f57d..34d0b7d0d 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 47.216814 # Nu
sim_ticks 47216814145000 # Number of ticks simulated
final_tick 47216814145000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1175010 # Simulator instruction rate (inst/s)
-host_op_rate 1382295 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 56876129335 # Simulator tick rate (ticks/s)
-host_mem_usage 728240 # Number of bytes of host memory used
-host_seconds 830.17 # Real time elapsed on the host
+host_inst_rate 990548 # Simulator instruction rate (inst/s)
+host_op_rate 1165292 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 47947296122 # Simulator tick rate (ticks/s)
+host_mem_usage 681164 # Number of bytes of host memory used
+host_seconds 984.77 # Real time elapsed on the host
sim_insts 975457230 # Number of instructions simulated
sim_ops 1147538415 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1551,6 +1551,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 13 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 82133 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 3716153 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 38802 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/system.terminal
index 4a0363ec3..251986706 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic-dual/system.terminal
@@ -158,9 +158,9 @@
[ 2.411057] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 2.446370] udevd[609]: starting version 182
+[ 2.446371] udevd[609]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 2.512067] random: dd urandom read with 17 bits of entropy available
+[ 2.521978] random: dd urandom read with 17 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
@@ -169,7 +169,7 @@ Mon Jan 27 08:00:00 UTC 2014
hwclock: can't open '/dev/misc/rtc': No such file or directory
INIT: Entering runlevel: 5
Configuring network interfaces... udhcpc (v1.21.1) started
-[ 2.610614] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+[ 2.620600] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
Sending discover...
Sending discover...
Sending discover...
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/config.ini
index b6cf1914a..cc1edf626 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -974,6 +974,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -984,6 +985,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simerr
index 0a1da41f0..a78b01f0e 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simerr
@@ -3,7 +3,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simout
index 0ec7f4b0f..343cfe408 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/simout
@@ -1,16 +1,16 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 29 2014 15:46:15
-gem5 started Oct 29 2014 16:00:57
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview64-simple-atomic -re /work/gem5.latest/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview64-simple-atomic
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 11:06:10
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-simple-atomic -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-simple-atomic
+
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.aarch64.20140821
- 0: system.cpu.isa: ISA system set to: 0x54cdb00 0x54cdb00
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch64.20140821
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80080000
-info: Loading DTB file: /projects/pd/randd/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 51111167186000 because m5_exit instruction encountered
+Exiting @ tick 51111152682000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/stats.txt
index 6f3d32b32..5d4303b7e 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 51.111153 # Nu
sim_ticks 51111152682000 # Number of ticks simulated
final_tick 51111152682000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1372139 # Simulator instruction rate (inst/s)
-host_op_rate 1612489 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 71230678319 # Simulator tick rate (ticks/s)
-host_mem_usage 718244 # Number of bytes of host memory used
-host_seconds 717.54 # Real time elapsed on the host
+host_inst_rate 1034678 # Simulator instruction rate (inst/s)
+host_op_rate 1215917 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 53712340974 # Simulator tick rate (ticks/s)
+host_mem_usage 668604 # Number of bytes of host memory used
+host_seconds 951.57 # Real time elapsed on the host
sim_insts 984570519 # Number of instructions simulated
sim_ops 1157031967 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -787,5 +787,15 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 13 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
---------- End Simulation Statistics ----------
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/system.terminal
index a8a62831d..7a2b5d086 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-atomic/system.terminal
@@ -158,9 +158,9 @@
[ 3.411222] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 3.446950] udevd[607]: starting version 182
+[ 3.446951] udevd[607]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 3.532262] random: dd urandom read with 19 bits of entropy available
+[ 3.532266] random: dd urandom read with 19 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/config.ini
index 314709801..11e85042f 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -1394,6 +1394,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1404,6 +1405,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simerr
index 744db2c76..3c2cf37c0 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simerr
@@ -4,7 +4,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simout
index 1e0022357..76a99086b 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/simout
@@ -1,17 +1,16 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 29 2014 15:46:15
-gem5 started Oct 29 2014 16:01:57
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview64-simple-timing-dual -re /work/gem5.latest/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview64-simple-timing-dual
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 11:24:22
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-simple-timing-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-simple-timing-dual
+
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.aarch64.20140821
- 0: system.cpu0.isa: ISA system set to: 0x5b5eb00 0x5b5eb00
- 0: system.cpu1.isa: ISA system set to: 0x5b5eb00 0x5b5eb00
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch64.20140821
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80080000
-info: Loading DTB file: /projects/pd/randd/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 47438274662000 because m5_exit instruction encountered
+Exiting @ tick 47456679626500 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/stats.txt
index ba04235c3..11d99eddf 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 47.456680 # Nu
sim_ticks 47456679626500 # Number of ticks simulated
final_tick 47456679626500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 659863 # Simulator instruction rate (inst/s)
-host_op_rate 776251 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 36196220555 # Simulator tick rate (ticks/s)
-host_mem_usage 759244 # Number of bytes of host memory used
-host_seconds 1311.10 # Real time elapsed on the host
+host_inst_rate 617984 # Simulator instruction rate (inst/s)
+host_op_rate 726985 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 33898978760 # Simulator tick rate (ticks/s)
+host_mem_usage 711884 # Number of bytes of host memory used
+host_seconds 1399.94 # Real time elapsed on the host
sim_insts 865142471 # Number of instructions simulated
sim_ops 1017738631 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -3222,6 +3222,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 13 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 81969 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 4074898 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 38603 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/system.terminal
index 2b30f017d..cbef2e56e 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing-dual/system.terminal
@@ -31,136 +31,136 @@
[ 0.000000] RCU: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=4
[ 0.000000] NR_IRQS:64 nr_irqs:64 0
[ 0.000000] Architected cp15 timer(s) running at 100.00MHz (phys).
-[ 0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 2748779069440ns
-[ 0.000024] Console: colour dummy device 80x25
-[ 0.000026] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
-[ 0.000028] pid_max: default: 32768 minimum: 301
-[ 0.000041] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000043] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000177] hw perfevents: no hardware support available
-[ 0.060047] CPU1: Booted secondary processor
-[ 1.080090] CPU2: failed to come online
-[ 2.100176] CPU3: failed to come online
-[ 2.100179] Brought up 2 CPUs
-[ 2.100180] SMP: Total of 2 processors activated.
-[ 2.100246] devtmpfs: initialized
-[ 2.101156] atomic64_test: passed
-[ 2.101216] regulator-dummy: no parameters
-[ 2.101757] NET: Registered protocol family 16
-[ 2.101938] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
-[ 2.101944] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
-[ 2.102749] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
-[ 2.102752] Serial: AMBA PL011 UART driver
-[ 2.102985] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
-[ 2.103030] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
-[ 2.103571] console [ttyAMA0] enabled
-[ 2.103651] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
-[ 2.103687] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
-[ 2.103724] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
-[ 2.103758] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
-[ 2.130471] 3V3: 3300 mV
-[ 2.130527] vgaarb: loaded
-[ 2.130588] SCSI subsystem initialized
-[ 2.130625] libata version 3.00 loaded.
-[ 2.130697] usbcore: registered new interface driver usbfs
-[ 2.130719] usbcore: registered new interface driver hub
-[ 2.130747] usbcore: registered new device driver usb
-[ 2.130780] pps_core: LinuxPPS API ver. 1 registered
-[ 2.130789] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
-[ 2.130808] PTP clock support registered
-[ 2.130983] Switched to clocksource arch_sys_counter
-[ 2.132484] NET: Registered protocol family 2
-[ 2.132575] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
-[ 2.132593] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
-[ 2.132613] TCP: Hash tables configured (established 2048 bind 2048)
-[ 2.132639] TCP: reno registered
-[ 2.132646] UDP hash table entries: 256 (order: 1, 8192 bytes)
-[ 2.132659] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
-[ 2.132700] NET: Registered protocol family 1
-[ 2.132760] RPC: Registered named UNIX socket transport module.
-[ 2.132769] RPC: Registered udp transport module.
-[ 2.132777] RPC: Registered tcp transport module.
-[ 2.132785] RPC: Registered tcp NFSv4.1 backchannel transport module.
-[ 2.132797] PCI: CLS 0 bytes, default 64
-[ 2.133009] futex hash table entries: 1024 (order: 4, 65536 bytes)
-[ 2.133115] HugeTLB registered 2 MB page size, pre-allocated 0 pages
-[ 2.136052] fuse init (API version 7.23)
-[ 2.136196] msgmni has been set to 469
-[ 2.136706] io scheduler noop registered
-[ 2.136791] io scheduler cfq registered (default)
-[ 2.137366] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
-[ 2.137378] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
-[ 2.137389] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
-[ 2.137401] pci_bus 0000:00: root bus resource [bus 00-ff]
-[ 2.137411] pci_bus 0000:00: scanning bus
-[ 2.137421] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
-[ 2.137433] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
-[ 2.137448] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 2.137496] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
-[ 2.137508] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
-[ 2.137518] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
-[ 2.137529] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
-[ 2.137540] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
-[ 2.137551] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
-[ 2.137562] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 2.137612] pci_bus 0000:00: fixups for bus
-[ 2.137620] pci_bus 0000:00: bus scan returning with max=00
-[ 2.137631] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
-[ 2.137651] pci 0000:00:00.0: fixup irq: got 33
-[ 2.137660] pci 0000:00:00.0: assigning IRQ 33
-[ 2.137670] pci 0000:00:01.0: fixup irq: got 34
-[ 2.137679] pci 0000:00:01.0: assigning IRQ 34
-[ 2.137690] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
-[ 2.137702] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
-[ 2.137715] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
-[ 2.137727] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
-[ 2.137739] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
-[ 2.137750] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
-[ 2.137761] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
-[ 2.137773] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
-[ 2.138657] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
-[ 2.139057] ata_piix 0000:00:01.0: version 2.13
-[ 2.139067] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
-[ 2.139093] ata_piix 0000:00:01.0: enabling bus mastering
-[ 2.139456] scsi0 : ata_piix
-[ 2.139567] scsi1 : ata_piix
-[ 2.139611] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
-[ 2.139623] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
-[ 2.139769] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
-[ 2.139781] e1000: Copyright (c) 1999-2006 Intel Corporation.
-[ 2.139797] e1000 0000:00:00.0: enabling device (0000 -> 0002)
-[ 2.139808] e1000 0000:00:00.0: enabling bus mastering
-[ 2.291018] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
-[ 2.291027] ata1.00: 2096640 sectors, multi 0: LBA
-[ 2.291054] ata1.00: configured for UDMA/33
-[ 2.291104] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
-[ 2.291261] sd 0:0:0:0: Attached scsi generic sg0 type 0
-[ 2.291294] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
-[ 2.291338] sd 0:0:0:0: [sda] Write Protect is off
-[ 2.291347] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
-[ 2.291369] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
-[ 2.291545] sda: sda1
-[ 2.291741] sd 0:0:0:0: [sda] Attached SCSI disk
-[ 2.411341] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
-[ 2.411354] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
-[ 2.411387] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
-[ 2.411399] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
-[ 2.411432] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
-[ 2.411446] igb: Copyright (c) 2007-2014 Intel Corporation.
-[ 2.411610] usbcore: registered new interface driver usb-storage
-[ 2.411699] mousedev: PS/2 mouse device common for all mice
-[ 2.412097] usbcore: registered new interface driver usbhid
-[ 2.412108] usbhid: USB HID core driver
-[ 2.412141] TCP: cubic registered
-[ 2.412149] NET: Registered protocol family 17
-
-[ 2.412601] devtmpfs: mounted
-[ 2.412656] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
+[ 0.000001] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 2748779069440ns
+[ 0.000029] Console: colour dummy device 80x25
+[ 0.000031] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
+[ 0.000033] pid_max: default: 32768 minimum: 301
+[ 0.000048] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000050] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000222] hw perfevents: no hardware support available
+[ 0.060058] CPU1: Booted secondary processor
+[ 1.080093] CPU2: failed to come online
+[ 2.100180] CPU3: failed to come online
+[ 2.100183] Brought up 2 CPUs
+[ 2.100185] SMP: Total of 2 processors activated.
+[ 2.100258] devtmpfs: initialized
+[ 2.100912] atomic64_test: passed
+[ 2.100971] regulator-dummy: no parameters
+[ 2.101423] NET: Registered protocol family 16
+[ 2.101601] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
+[ 2.101609] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
+[ 2.103309] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
+[ 2.103313] Serial: AMBA PL011 UART driver
+[ 2.103557] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
+[ 2.103606] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
+[ 2.104158] console [ttyAMA0] enabled
+[ 2.104242] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
+[ 2.104279] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
+[ 2.104316] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
+[ 2.104350] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
+[ 2.130486] 3V3: 3300 mV
+[ 2.130544] vgaarb: loaded
+[ 2.130608] SCSI subsystem initialized
+[ 2.130645] libata version 3.00 loaded.
+[ 2.130706] usbcore: registered new interface driver usbfs
+[ 2.130725] usbcore: registered new interface driver hub
+[ 2.130751] usbcore: registered new device driver usb
+[ 2.130779] pps_core: LinuxPPS API ver. 1 registered
+[ 2.130788] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[ 2.130807] PTP clock support registered
+[ 2.130959] Switched to clocksource arch_sys_counter
+[ 2.132580] NET: Registered protocol family 2
+[ 2.132678] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
+[ 2.132697] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
+[ 2.132716] TCP: Hash tables configured (established 2048 bind 2048)
+[ 2.132756] TCP: reno registered
+[ 2.132763] UDP hash table entries: 256 (order: 1, 8192 bytes)
+[ 2.132776] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
+[ 2.132818] NET: Registered protocol family 1
+[ 2.132885] RPC: Registered named UNIX socket transport module.
+[ 2.132895] RPC: Registered udp transport module.
+[ 2.132903] RPC: Registered tcp transport module.
+[ 2.132911] RPC: Registered tcp NFSv4.1 backchannel transport module.
+[ 2.132923] PCI: CLS 0 bytes, default 64
+[ 2.133119] futex hash table entries: 1024 (order: 4, 65536 bytes)
+[ 2.133227] HugeTLB registered 2 MB page size, pre-allocated 0 pages
+[ 2.135972] fuse init (API version 7.23)
+[ 2.136086] msgmni has been set to 469
+[ 2.136303] io scheduler noop registered
+[ 2.136365] io scheduler cfq registered (default)
+[ 2.137096] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
+[ 2.137109] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
+[ 2.137120] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
+[ 2.137132] pci_bus 0000:00: root bus resource [bus 00-ff]
+[ 2.137143] pci_bus 0000:00: scanning bus
+[ 2.137154] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
+[ 2.137167] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
+[ 2.137182] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 2.137222] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
+[ 2.137234] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
+[ 2.137245] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
+[ 2.137256] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
+[ 2.137267] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
+[ 2.137277] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
+[ 2.137289] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 2.137330] pci_bus 0000:00: fixups for bus
+[ 2.137339] pci_bus 0000:00: bus scan returning with max=00
+[ 2.137351] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
+[ 2.137371] pci 0000:00:00.0: fixup irq: got 33
+[ 2.137379] pci 0000:00:00.0: assigning IRQ 33
+[ 2.137390] pci 0000:00:01.0: fixup irq: got 34
+[ 2.137399] pci 0000:00:01.0: assigning IRQ 34
+[ 2.137410] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
+[ 2.137423] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
+[ 2.137436] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
+[ 2.137449] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
+[ 2.137461] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
+[ 2.137472] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
+[ 2.137484] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
+[ 2.137495] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
+[ 2.138294] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+[ 2.138626] ata_piix 0000:00:01.0: version 2.13
+[ 2.138636] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
+[ 2.138670] ata_piix 0000:00:01.0: enabling bus mastering
+[ 2.139006] scsi0 : ata_piix
+[ 2.139097] scsi1 : ata_piix
+[ 2.139131] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
+[ 2.139143] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
+[ 2.139268] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
+[ 2.139280] e1000: Copyright (c) 1999-2006 Intel Corporation.
+[ 2.139297] e1000 0000:00:00.0: enabling device (0000 -> 0002)
+[ 2.139308] e1000 0000:00:00.0: enabling bus mastering
+[ 2.291000] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
+[ 2.291010] ata1.00: 2096640 sectors, multi 0: LBA
+[ 2.291039] ata1.00: configured for UDMA/33
+[ 2.291099] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
+[ 2.291228] sd 0:0:0:0: Attached scsi generic sg0 type 0
+[ 2.291262] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
+[ 2.291303] sd 0:0:0:0: [sda] Write Protect is off
+[ 2.291313] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
+[ 2.291334] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+[ 2.291502] sda: sda1
+[ 2.291677] sd 0:0:0:0: [sda] Attached SCSI disk
+[ 2.411277] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
+[ 2.411290] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
+[ 2.411316] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
+[ 2.411326] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
+[ 2.411349] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
+[ 2.411361] igb: Copyright (c) 2007-2014 Intel Corporation.
+[ 2.411451] usbcore: registered new interface driver usb-storage
+[ 2.411518] mousedev: PS/2 mouse device common for all mice
+[ 2.411720] usbcore: registered new interface driver usbhid
+[ 2.411730] usbhid: USB HID core driver
+[ 2.411767] TCP: cubic registered
+[ 2.411774] NET: Registered protocol family 17
+
+[ 2.412254] devtmpfs: mounted
+[ 2.412348] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 2.452574] udevd[608]: starting version 182
+[ 2.452452] udevd[608]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 2.544108] random: dd urandom read with 18 bits of entropy available
+[ 2.534107] random: dd urandom read with 18 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
@@ -169,7 +169,7 @@ Mon Jan 27 08:00:00 UTC 2014
hwclock: can't open '/dev/misc/rtc': No such file or directory
INIT: Entering runlevel: 5
Configuring network interfaces... udhcpc (v1.21.1) started
-[ 2.681213] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+[ 2.661194] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
Sending discover...
Sending discover...
Sending discover...
@@ -181,4 +181,3 @@ rpcbind: cannot get uid of '': Success
done.
creating NFS state directory: done
starting statd: done
-Starting auto-serial-console: \ No newline at end of file
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/config.ini
index e55c12b7f..b1ceb0f38 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -1034,6 +1034,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1044,6 +1045,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simerr
index 744db2c76..3c2cf37c0 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simerr
@@ -4,7 +4,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simout
index 86944f7db..608cdb063 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/simout
@@ -1,16 +1,16 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 29 2014 15:46:15
-gem5 started Oct 29 2014 16:01:52
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview64-simple-timing -re /work/gem5.latest/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview64-simple-timing
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 11:22:13
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-simple-timing -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-simple-timing
+
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.aarch64.20140821
- 0: system.cpu.isa: ISA system set to: 0x500ab00 0x500ab00
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch64.20140821
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80080000
-info: Loading DTB file: /projects/pd/randd/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 51781056074000 because m5_exit instruction encountered
+Exiting @ tick 51832458543500 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/stats.txt
index 61b2291b6..829b00030 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 51.832459 # Nu
sim_ticks 51832458543500 # Number of ticks simulated
final_tick 51832458543500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 757890 # Simulator instruction rate (inst/s)
-host_op_rate 890582 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 44493723118 # Simulator tick rate (ticks/s)
-host_mem_usage 717728 # Number of bytes of host memory used
-host_seconds 1164.94 # Real time elapsed on the host
+host_inst_rate 643815 # Simulator instruction rate (inst/s)
+host_op_rate 756535 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 37796716864 # Simulator tick rate (ticks/s)
+host_mem_usage 668604 # Number of bytes of host memory used
+host_seconds 1371.35 # Real time elapsed on the host
sim_insts 882895003 # Number of instructions simulated
sim_ops 1037473525 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1588,5 +1588,15 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 13 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
---------- End Simulation Statistics ----------
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/system.terminal
index 5957040e9..9324c8985 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-simple-timing/system.terminal
@@ -32,135 +32,135 @@
[ 0.000000] NR_IRQS:64 nr_irqs:64 0
[ 0.000000] Architected cp15 timer(s) running at 100.00MHz (phys).
[ 0.000001] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 2748779069440ns
-[ 0.000039] Console: colour dummy device 80x25
-[ 0.000042] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
+[ 0.000040] Console: colour dummy device 80x25
+[ 0.000043] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
[ 0.000045] pid_max: default: 32768 minimum: 301
-[ 0.000065] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000068] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000254] hw perfevents: no hardware support available
+[ 0.000067] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000069] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000281] hw perfevents: no hardware support available
[ 1.060134] CPU1: failed to come online
[ 2.080264] CPU2: failed to come online
[ 3.100395] CPU3: failed to come online
[ 3.100400] Brought up 1 CPUs
[ 3.100402] SMP: Total of 1 processors activated.
-[ 3.100500] devtmpfs: initialized
-[ 3.101762] atomic64_test: passed
-[ 3.101843] regulator-dummy: no parameters
-[ 3.102644] NET: Registered protocol family 16
-[ 3.102917] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
-[ 3.102927] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
-[ 3.103581] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
-[ 3.103585] Serial: AMBA PL011 UART driver
-[ 3.103931] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
-[ 3.103997] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
-[ 3.104547] console [ttyAMA0] enabled
-[ 3.104647] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
-[ 3.104695] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
-[ 3.104744] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
-[ 3.104789] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
-[ 3.130966] 3V3: 3300 mV
-[ 3.131042] vgaarb: loaded
-[ 3.131134] SCSI subsystem initialized
-[ 3.131205] libata version 3.00 loaded.
-[ 3.131293] usbcore: registered new interface driver usbfs
-[ 3.131321] usbcore: registered new interface driver hub
-[ 3.131375] usbcore: registered new device driver usb
-[ 3.131420] pps_core: LinuxPPS API ver. 1 registered
-[ 3.131429] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
-[ 3.131451] PTP clock support registered
-[ 3.131688] Switched to clocksource arch_sys_counter
-[ 3.133862] NET: Registered protocol family 2
-[ 3.134013] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
-[ 3.134040] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
-[ 3.134072] TCP: Hash tables configured (established 2048 bind 2048)
-[ 3.134099] TCP: reno registered
-[ 3.134107] UDP hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.134124] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.134187] NET: Registered protocol family 1
-[ 3.134256] RPC: Registered named UNIX socket transport module.
-[ 3.134266] RPC: Registered udp transport module.
-[ 3.134274] RPC: Registered tcp transport module.
-[ 3.134283] RPC: Registered tcp NFSv4.1 backchannel transport module.
-[ 3.134296] PCI: CLS 0 bytes, default 64
-[ 3.134626] futex hash table entries: 1024 (order: 4, 65536 bytes)
-[ 3.134832] HugeTLB registered 2 MB page size, pre-allocated 0 pages
-[ 3.138917] fuse init (API version 7.23)
-[ 3.139097] msgmni has been set to 469
-[ 3.143447] io scheduler noop registered
-[ 3.143560] io scheduler cfq registered (default)
-[ 3.144375] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
-[ 3.144389] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
-[ 3.144401] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
-[ 3.144415] pci_bus 0000:00: root bus resource [bus 00-ff]
-[ 3.144425] pci_bus 0000:00: scanning bus
-[ 3.144438] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
-[ 3.144452] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
-[ 3.144469] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.144534] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
-[ 3.144547] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
-[ 3.144560] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
-[ 3.144572] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
-[ 3.144584] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
-[ 3.144596] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
-[ 3.144609] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.144672] pci_bus 0000:00: fixups for bus
-[ 3.144681] pci_bus 0000:00: bus scan returning with max=00
-[ 3.144694] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
-[ 3.144718] pci 0000:00:00.0: fixup irq: got 33
-[ 3.144728] pci 0000:00:00.0: assigning IRQ 33
-[ 3.144741] pci 0000:00:01.0: fixup irq: got 34
-[ 3.144750] pci 0000:00:01.0: assigning IRQ 34
-[ 3.144764] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
-[ 3.144778] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
-[ 3.144792] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
-[ 3.144806] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
-[ 3.144818] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
-[ 3.144831] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
-[ 3.144844] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
-[ 3.144856] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
-[ 3.145803] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
-[ 3.146345] ata_piix 0000:00:01.0: version 2.13
-[ 3.146356] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
-[ 3.146386] ata_piix 0000:00:01.0: enabling bus mastering
-[ 3.146981] scsi0 : ata_piix
-[ 3.147177] scsi1 : ata_piix
-[ 3.147237] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
-[ 3.147249] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
-[ 3.147450] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
-[ 3.147462] e1000: Copyright (c) 1999-2006 Intel Corporation.
-[ 3.147484] e1000 0000:00:00.0: enabling device (0000 -> 0002)
-[ 3.147496] e1000 0000:00:00.0: enabling bus mastering
-[ 3.301720] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
-[ 3.301730] ata1.00: 2096640 sectors, multi 0: LBA
-[ 3.301764] ata1.00: configured for UDMA/33
-[ 3.301835] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
-[ 3.302052] sd 0:0:0:0: Attached scsi generic sg0 type 0
-[ 3.302087] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
-[ 3.302146] sd 0:0:0:0: [sda] Write Protect is off
-[ 3.302156] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
-[ 3.302186] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
-[ 3.302399] sda: sda1
-[ 3.302620] sd 0:0:0:0: [sda] Attached SCSI disk
-[ 3.422060] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
-[ 3.422074] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
-[ 3.422105] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
-[ 3.422115] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
-[ 3.422148] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
-[ 3.422160] igb: Copyright (c) 2007-2014 Intel Corporation.
-[ 3.422304] usbcore: registered new interface driver usb-storage
-[ 3.422400] mousedev: PS/2 mouse device common for all mice
-[ 3.422718] usbcore: registered new interface driver usbhid
-[ 3.422728] usbhid: USB HID core driver
-[ 3.422776] TCP: cubic registered
-[ 3.422785] NET: Registered protocol family 17
-
-[ 3.423415] devtmpfs: mounted
-[ 3.423469] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
+[ 3.100503] devtmpfs: initialized
+[ 3.101580] atomic64_test: passed
+[ 3.101658] regulator-dummy: no parameters
+[ 3.102417] NET: Registered protocol family 16
+[ 3.102687] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
+[ 3.102698] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
+[ 3.104168] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
+[ 3.104175] Serial: AMBA PL011 UART driver
+[ 3.104541] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
+[ 3.104609] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
+[ 3.105167] console [ttyAMA0] enabled
+[ 3.105294] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
+[ 3.105343] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
+[ 3.105393] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
+[ 3.105437] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
+[ 3.130927] 3V3: 3300 mV
+[ 3.131005] vgaarb: loaded
+[ 3.131096] SCSI subsystem initialized
+[ 3.131165] libata version 3.00 loaded.
+[ 3.131250] usbcore: registered new interface driver usbfs
+[ 3.131276] usbcore: registered new interface driver hub
+[ 3.131330] usbcore: registered new device driver usb
+[ 3.131374] pps_core: LinuxPPS API ver. 1 registered
+[ 3.131383] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[ 3.131406] PTP clock support registered
+[ 3.131631] Switched to clocksource arch_sys_counter
+[ 3.133692] NET: Registered protocol family 2
+[ 3.133845] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
+[ 3.133872] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
+[ 3.133905] TCP: Hash tables configured (established 2048 bind 2048)
+[ 3.133943] TCP: reno registered
+[ 3.133951] UDP hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.133968] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.134032] NET: Registered protocol family 1
+[ 3.134102] RPC: Registered named UNIX socket transport module.
+[ 3.134112] RPC: Registered udp transport module.
+[ 3.134121] RPC: Registered tcp transport module.
+[ 3.134129] RPC: Registered tcp NFSv4.1 backchannel transport module.
+[ 3.134142] PCI: CLS 0 bytes, default 64
+[ 3.134458] futex hash table entries: 1024 (order: 4, 65536 bytes)
+[ 3.134657] HugeTLB registered 2 MB page size, pre-allocated 0 pages
+[ 3.138123] fuse init (API version 7.23)
+[ 3.138286] msgmni has been set to 469
+[ 3.142763] io scheduler noop registered
+[ 3.142858] io scheduler cfq registered (default)
+[ 3.143781] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
+[ 3.143795] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
+[ 3.143807] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
+[ 3.143821] pci_bus 0000:00: root bus resource [bus 00-ff]
+[ 3.143832] pci_bus 0000:00: scanning bus
+[ 3.143845] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
+[ 3.143859] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
+[ 3.143876] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.143936] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
+[ 3.143950] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
+[ 3.143962] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
+[ 3.143974] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
+[ 3.143986] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
+[ 3.143999] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
+[ 3.144012] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.144070] pci_bus 0000:00: fixups for bus
+[ 3.144079] pci_bus 0000:00: bus scan returning with max=00
+[ 3.144093] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
+[ 3.144117] pci 0000:00:00.0: fixup irq: got 33
+[ 3.144127] pci 0000:00:00.0: assigning IRQ 33
+[ 3.144140] pci 0000:00:01.0: fixup irq: got 34
+[ 3.144149] pci 0000:00:01.0: assigning IRQ 34
+[ 3.144164] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
+[ 3.144178] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
+[ 3.144193] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
+[ 3.144207] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
+[ 3.144220] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
+[ 3.144232] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
+[ 3.144245] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
+[ 3.144258] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
+[ 3.145146] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+[ 3.145648] ata_piix 0000:00:01.0: version 2.13
+[ 3.145659] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
+[ 3.145695] ata_piix 0000:00:01.0: enabling bus mastering
+[ 3.146265] scsi0 : ata_piix
+[ 3.146439] scsi1 : ata_piix
+[ 3.146491] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
+[ 3.146504] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
+[ 3.146696] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
+[ 3.146709] e1000: Copyright (c) 1999-2006 Intel Corporation.
+[ 3.146730] e1000 0000:00:00.0: enabling device (0000 -> 0002)
+[ 3.146742] e1000 0000:00:00.0: enabling bus mastering
+[ 3.301663] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
+[ 3.301673] ata1.00: 2096640 sectors, multi 0: LBA
+[ 3.301707] ata1.00: configured for UDMA/33
+[ 3.301781] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
+[ 3.301972] sd 0:0:0:0: Attached scsi generic sg0 type 0
+[ 3.302006] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
+[ 3.302063] sd 0:0:0:0: [sda] Write Protect is off
+[ 3.302073] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
+[ 3.302101] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+[ 3.302304] sda: sda1
+[ 3.302503] sd 0:0:0:0: [sda] Attached SCSI disk
+[ 3.421983] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
+[ 3.421997] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
+[ 3.422026] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
+[ 3.422037] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
+[ 3.422067] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
+[ 3.422079] igb: Copyright (c) 2007-2014 Intel Corporation.
+[ 3.422208] usbcore: registered new interface driver usb-storage
+[ 3.422298] mousedev: PS/2 mouse device common for all mice
+[ 3.422583] usbcore: registered new interface driver usbhid
+[ 3.422593] usbhid: USB HID core driver
+[ 3.422643] TCP: cubic registered
+[ 3.422652] NET: Registered protocol family 17
+
+[ 3.423282] devtmpfs: mounted
+[ 3.423373] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 3.470498] udevd[607]: starting version 182
+[ 3.470155] udevd[607]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 3.596627] random: dd urandom read with 22 bits of entropy available
+[ 3.606530] random: dd urandom read with 20 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
@@ -169,7 +169,7 @@ Mon Jan 27 08:00:00 UTC 2014
hwclock: can't open '/dev/misc/rtc': No such file or directory
INIT: Entering runlevel: 5
Configuring network interfaces... udhcpc (v1.21.1) started
-[ 3.801922] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+[ 3.801865] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
Sending discover...
Sending discover...
Sending discover...
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/config.ini
index a9d46c0d8..ab5c7b693 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -1110,6 +1110,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1120,6 +1121,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simerr
index e6c37927e..4c76ae25b 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simerr
@@ -3,7 +3,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simout
index 3cdd0b0b9..6c6535e7f 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/simout
@@ -1,11 +1,10 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 29 2014 15:46:15
-gem5 started Oct 29 2014 16:13:02
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview64-switcheroo-atomic -re /work/gem5.latest/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview64-switcheroo-atomic
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 11:28:27
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-atomic -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-atomic
+
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
- 0: system.cpu0.isa: ISA system set to: 0x5318b00 0x5318b00
- 0: system.cpu1.isa: ISA system set to: 0x5318b00 0x5318b00
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/stats.txt
index 0afb21efb..bd6e6276d 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 51.111153 # Nu
sim_ticks 51111152682000 # Number of ticks simulated
final_tick 51111152682000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1174774 # Simulator instruction rate (inst/s)
-host_op_rate 1380553 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 60985034894 # Simulator tick rate (ticks/s)
-host_mem_usage 718504 # Number of bytes of host memory used
-host_seconds 838.09 # Real time elapsed on the host
+host_inst_rate 1034928 # Simulator instruction rate (inst/s)
+host_op_rate 1216210 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 53725315382 # Simulator tick rate (ticks/s)
+host_mem_usage 668860 # Number of bytes of host memory used
+host_seconds 951.34 # Real time elapsed on the host
sim_insts 984570519 # Number of instructions simulated
sim_ops 1157031967 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1080,6 +1080,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 18 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 1320350 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 23464706 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 33606 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/system.terminal
index a8a62831d..7a2b5d086 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-atomic/system.terminal
@@ -158,9 +158,9 @@
[ 3.411222] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 3.446950] udevd[607]: starting version 182
+[ 3.446951] udevd[607]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 3.532262] random: dd urandom read with 19 bits of entropy available
+[ 3.532266] random: dd urandom read with 19 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/config.ini
index e978bf851..92fcc1d90 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/config.ini
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/work/gem5/outgoing/gem5_3/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -2273,6 +2273,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -2283,6 +2284,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simerr
index c7170625b..d502db8d0 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simerr
@@ -4,7 +4,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
WARNING: One or more banks are active! REF requires all banks to be precharged.
Command: 4, Timestamp: 12458, Bank: 0
WARNING: One or more banks are active! REF requires all banks to be precharged.
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simout
index df60a91c0..9c3e48547 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/simout
@@ -1,10 +1,10 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jul 31 2015 14:34:49
-gem5 started Jul 31 2015 14:34:58
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 11:44:30
gem5 executing on e104799-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-full -re /work/gem5/outgoing/gem5_3/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-full
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-full -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-full
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/stats.txt
index 4fe5ef0f9..5a4eed10a 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 51.316635 # Nu
sim_ticks 51316634750000 # Number of ticks simulated
final_tick 51316634750000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 555955 # Simulator instruction rate (inst/s)
-host_op_rate 653275 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 33346498264 # Simulator tick rate (ticks/s)
-host_mem_usage 678992 # Number of bytes of host memory used
-host_seconds 1538.89 # Real time elapsed on the host
+host_inst_rate 261197 # Simulator instruction rate (inst/s)
+host_op_rate 306920 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 15666770859 # Simulator tick rate (ticks/s)
+host_mem_usage 680896 # Number of bytes of host memory used
+host_seconds 3275.51 # Real time elapsed on the host
sim_insts 855554018 # Number of instructions simulated
sim_ops 1005318688 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -3186,6 +3186,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 18 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 1507075 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 23857599 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 33648 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/config.ini
index 2214964bc..5de46231b 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/config.ini
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/home/stever/m5/aarch-system-2014-10/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/home/stever/hg/m5sim.org/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/home/stever/m5/aarch-system-2014-10/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -1926,6 +1924,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1936,6 +1935,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simerr
index 4d4e040d3..27f3f6c98 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simerr
@@ -4,7 +4,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simout
index e7cd8038d..b5c5e8de5 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/simout
@@ -1,12 +1,10 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 15:04:42
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-o3 -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-o3
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 11:45:15
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-o3 -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-o3
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
- 0: system.cpu0.isa: ISA system set to: 0x40189d0 0x40189d0
- 0: system.cpu1.isa: ISA system set to: 0x40189d0 0x40189d0
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/stats.txt
index fa15729bd..b9292423f 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 51.321386 # Nu
sim_ticks 51321386217000 # Number of ticks simulated
final_tick 51321386217000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 131020 # Simulator instruction rate (inst/s)
-host_op_rate 153952 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 7451916901 # Simulator tick rate (ticks/s)
-host_mem_usage 738104 # Number of bytes of host memory used
-host_seconds 6887.00 # Real time elapsed on the host
+host_inst_rate 134164 # Simulator instruction rate (inst/s)
+host_op_rate 157647 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 7630777532 # Simulator tick rate (ticks/s)
+host_mem_usage 687808 # Number of bytes of host memory used
+host_seconds 6725.58 # Real time elapsed on the host
sim_insts 902332774 # Number of instructions simulated
sim_ops 1060266688 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -2754,6 +2754,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 18 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 2074158 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 25494018 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 33697 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/system.terminal
index c5c4d146b..60c0d2a5a 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-o3/system.terminal
@@ -35,132 +35,132 @@
[ 0.000011] Console: colour dummy device 80x25
[ 0.000013] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
[ 0.000014] pid_max: default: 32768 minimum: 301
-[ 0.000020] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000021] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000091] hw perfevents: no hardware support available
+[ 0.000021] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000022] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000100] hw perfevents: no hardware support available
[ 1.060050] CPU1: failed to come online
-[ 2.080096] CPU2: failed to come online
-[ 3.100142] CPU3: failed to come online
+[ 2.080097] CPU2: failed to come online
+[ 3.100143] CPU3: failed to come online
[ 3.100145] Brought up 1 CPUs
-[ 3.100145] SMP: Total of 1 processors activated.
-[ 3.100181] devtmpfs: initialized
-[ 3.100445] atomic64_test: passed
-[ 3.100472] regulator-dummy: no parameters
-[ 3.100688] NET: Registered protocol family 16
-[ 3.100765] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
-[ 3.100772] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
-[ 3.100985] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
-[ 3.100989] Serial: AMBA PL011 UART driver
-[ 3.101109] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
-[ 3.101131] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
-[ 3.101654] console [ttyAMA0] enabled
-[ 3.101707] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
-[ 3.101732] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
-[ 3.101757] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
-[ 3.101781] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
-[ 3.130360] 3V3: 3300 mV
-[ 3.130388] vgaarb: loaded
-[ 3.130419] SCSI subsystem initialized
-[ 3.130448] libata version 3.00 loaded.
-[ 3.130477] usbcore: registered new interface driver usbfs
-[ 3.130491] usbcore: registered new interface driver hub
-[ 3.130515] usbcore: registered new device driver usb
-[ 3.130533] pps_core: LinuxPPS API ver. 1 registered
-[ 3.130542] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
-[ 3.130558] PTP clock support registered
-[ 3.130631] Switched to clocksource arch_sys_counter
-[ 3.131314] NET: Registered protocol family 2
-[ 3.131359] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
-[ 3.131373] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
-[ 3.131388] TCP: Hash tables configured (established 2048 bind 2048)
-[ 3.131401] TCP: reno registered
-[ 3.131407] UDP hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.131418] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.131445] NET: Registered protocol family 1
-[ 3.131486] RPC: Registered named UNIX socket transport module.
-[ 3.131496] RPC: Registered udp transport module.
-[ 3.131503] RPC: Registered tcp transport module.
-[ 3.131511] RPC: Registered tcp NFSv4.1 backchannel transport module.
-[ 3.131522] PCI: CLS 0 bytes, default 64
-[ 3.131616] futex hash table entries: 1024 (order: 4, 65536 bytes)
-[ 3.131677] HugeTLB registered 2 MB page size, pre-allocated 0 pages
-[ 3.132690] fuse init (API version 7.23)
-[ 3.132744] msgmni has been set to 469
-[ 3.134228] io scheduler noop registered
-[ 3.134263] io scheduler cfq registered (default)
-[ 3.134485] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
-[ 3.134497] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
-[ 3.134507] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
-[ 3.134518] pci_bus 0000:00: root bus resource [bus 00-ff]
-[ 3.134527] pci_bus 0000:00: scanning bus
-[ 3.134536] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
-[ 3.134547] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
-[ 3.134559] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.134585] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
-[ 3.134596] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
-[ 3.134605] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
-[ 3.134615] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
-[ 3.134624] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
-[ 3.134634] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
-[ 3.134644] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.134669] pci_bus 0000:00: fixups for bus
-[ 3.134676] pci_bus 0000:00: bus scan returning with max=00
-[ 3.134687] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
-[ 3.134702] pci 0000:00:00.0: fixup irq: got 33
-[ 3.134710] pci 0000:00:00.0: assigning IRQ 33
-[ 3.134718] pci 0000:00:01.0: fixup irq: got 34
-[ 3.134726] pci 0000:00:01.0: assigning IRQ 34
-[ 3.134735] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
-[ 3.134747] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
-[ 3.134759] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
-[ 3.134770] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
-[ 3.134780] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
-[ 3.134790] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
-[ 3.134801] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
-[ 3.134811] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
-[ 3.135117] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
-[ 3.135275] ata_piix 0000:00:01.0: version 2.13
-[ 3.135284] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
-[ 3.135300] ata_piix 0000:00:01.0: enabling bus mastering
-[ 3.135469] scsi0 : ata_piix
-[ 3.135531] scsi1 : ata_piix
-[ 3.135551] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
-[ 3.135562] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
-[ 3.135629] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
-[ 3.135640] e1000: Copyright (c) 1999-2006 Intel Corporation.
-[ 3.135652] e1000 0000:00:00.0: enabling device (0000 -> 0002)
-[ 3.135662] e1000 0000:00:00.0: enabling bus mastering
-[ 3.290651] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
-[ 3.290659] ata1.00: 2096640 sectors, multi 0: LBA
-[ 3.290682] ata1.00: configured for UDMA/33
-[ 3.290714] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
-[ 3.290788] sd 0:0:0:0: Attached scsi generic sg0 type 0
-[ 3.290807] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
-[ 3.290836] sd 0:0:0:0: [sda] Write Protect is off
-[ 3.290845] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
-[ 3.290861] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
-[ 3.290945] sda: sda1
-[ 3.291020] sd 0:0:0:0: [sda] Attached SCSI disk
-[ 3.410902] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
-[ 3.410913] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
-[ 3.410930] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
-[ 3.410939] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
-[ 3.410954] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
-[ 3.410965] igb: Copyright (c) 2007-2014 Intel Corporation.
-[ 3.411010] usbcore: registered new interface driver usb-storage
-[ 3.411047] mousedev: PS/2 mouse device common for all mice
-[ 3.411142] usbcore: registered new interface driver usbhid
-[ 3.411151] usbhid: USB HID core driver
-[ 3.411173] TCP: cubic registered
-[ 3.411179] NET: Registered protocol family 17
-
-[ 3.411432] devtmpfs: mounted
-[ 3.411453] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
+[ 3.100146] SMP: Total of 1 processors activated.
+[ 3.100182] devtmpfs: initialized
+[ 3.100453] atomic64_test: passed
+[ 3.100481] regulator-dummy: no parameters
+[ 3.100703] NET: Registered protocol family 16
+[ 3.100783] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
+[ 3.100790] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
+[ 3.101275] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
+[ 3.101279] Serial: AMBA PL011 UART driver
+[ 3.101402] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
+[ 3.101425] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
+[ 3.101952] console [ttyAMA0] enabled
+[ 3.102005] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
+[ 3.102030] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
+[ 3.102055] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
+[ 3.102079] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
+[ 3.130361] 3V3: 3300 mV
+[ 3.130390] vgaarb: loaded
+[ 3.130421] SCSI subsystem initialized
+[ 3.130450] libata version 3.00 loaded.
+[ 3.130481] usbcore: registered new interface driver usbfs
+[ 3.130495] usbcore: registered new interface driver hub
+[ 3.130519] usbcore: registered new device driver usb
+[ 3.130538] pps_core: LinuxPPS API ver. 1 registered
+[ 3.130547] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[ 3.130563] PTP clock support registered
+[ 3.130638] Switched to clocksource arch_sys_counter
+[ 3.131336] NET: Registered protocol family 2
+[ 3.131382] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
+[ 3.131395] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
+[ 3.131411] TCP: Hash tables configured (established 2048 bind 2048)
+[ 3.131424] TCP: reno registered
+[ 3.131430] UDP hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.131441] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.131468] NET: Registered protocol family 1
+[ 3.131511] RPC: Registered named UNIX socket transport module.
+[ 3.131521] RPC: Registered udp transport module.
+[ 3.131528] RPC: Registered tcp transport module.
+[ 3.131536] RPC: Registered tcp NFSv4.1 backchannel transport module.
+[ 3.131547] PCI: CLS 0 bytes, default 64
+[ 3.131644] futex hash table entries: 1024 (order: 4, 65536 bytes)
+[ 3.131705] HugeTLB registered 2 MB page size, pre-allocated 0 pages
+[ 3.132732] fuse init (API version 7.23)
+[ 3.132787] msgmni has been set to 469
+[ 3.134276] io scheduler noop registered
+[ 3.134311] io scheduler cfq registered (default)
+[ 3.134587] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
+[ 3.134599] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
+[ 3.134609] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
+[ 3.134620] pci_bus 0000:00: root bus resource [bus 00-ff]
+[ 3.134629] pci_bus 0000:00: scanning bus
+[ 3.134638] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
+[ 3.134649] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
+[ 3.134662] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.134688] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
+[ 3.134699] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
+[ 3.134709] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
+[ 3.134718] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
+[ 3.134728] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
+[ 3.134737] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
+[ 3.134747] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.134773] pci_bus 0000:00: fixups for bus
+[ 3.134781] pci_bus 0000:00: bus scan returning with max=00
+[ 3.134791] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
+[ 3.134806] pci 0000:00:00.0: fixup irq: got 33
+[ 3.134814] pci 0000:00:00.0: assigning IRQ 33
+[ 3.134822] pci 0000:00:01.0: fixup irq: got 34
+[ 3.134830] pci 0000:00:01.0: assigning IRQ 34
+[ 3.134839] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
+[ 3.134851] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
+[ 3.134863] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
+[ 3.134874] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
+[ 3.134885] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
+[ 3.134895] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
+[ 3.134905] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
+[ 3.134915] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
+[ 3.135224] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+[ 3.135384] ata_piix 0000:00:01.0: version 2.13
+[ 3.135393] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
+[ 3.135411] ata_piix 0000:00:01.0: enabling bus mastering
+[ 3.135582] scsi0 : ata_piix
+[ 3.135646] scsi1 : ata_piix
+[ 3.135666] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
+[ 3.135677] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
+[ 3.135746] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
+[ 3.135757] e1000: Copyright (c) 1999-2006 Intel Corporation.
+[ 3.135770] e1000 0000:00:00.0: enabling device (0000 -> 0002)
+[ 3.135780] e1000 0000:00:00.0: enabling bus mastering
+[ 3.290658] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
+[ 3.290667] ata1.00: 2096640 sectors, multi 0: LBA
+[ 3.290689] ata1.00: configured for UDMA/33
+[ 3.290723] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
+[ 3.290797] sd 0:0:0:0: Attached scsi generic sg0 type 0
+[ 3.290816] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
+[ 3.290846] sd 0:0:0:0: [sda] Write Protect is off
+[ 3.290855] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
+[ 3.290871] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+[ 3.290955] sda: sda1
+[ 3.291031] sd 0:0:0:0: [sda] Attached SCSI disk
+[ 3.410909] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
+[ 3.410921] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
+[ 3.410937] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
+[ 3.410947] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
+[ 3.410962] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
+[ 3.410973] igb: Copyright (c) 2007-2014 Intel Corporation.
+[ 3.411018] usbcore: registered new interface driver usb-storage
+[ 3.411056] mousedev: PS/2 mouse device common for all mice
+[ 3.411152] usbcore: registered new interface driver usbhid
+[ 3.411161] usbhid: USB HID core driver
+[ 3.411184] TCP: cubic registered
+[ 3.411190] NET: Registered protocol family 17
+
+[ 3.411445] devtmpfs: mounted
+[ 3.411480] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 3.447823] udevd[607]: starting version 182
+[ 3.447850] udevd[607]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 3.542531] random: dd urandom read with 19 bits of entropy available
+[ 3.542546] random: dd urandom read with 19 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
@@ -169,7 +169,7 @@ Mon Jan 27 08:00:00 UTC 2014
hwclock: can't open '/dev/misc/rtc': No such file or directory
INIT: Entering runlevel: 5
Configuring network interfaces... udhcpc (v1.21.1) started
-[ 3.660859] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+[ 3.660867] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
Sending discover...
Sending discover...
Sending discover...
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/config.ini
index 5a83a4136..edfc7ccb5 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm64
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm64
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch64.20140821.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch64.20140821
+kernel=/work/gem5/dist/binaries/vmlinux.aarch64.20140821
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -42,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -85,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linaro-minimal-aarch64.img
+image_file=/work/gem5/dist/disks/linaro-minimal-aarch64.img
read_only=true
[system.clk_domain]
@@ -1166,6 +1166,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1176,6 +1177,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simerr
index bc8b17326..e29b1630b 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simerr
@@ -4,7 +4,7 @@ warn: Sockets disabled, not accepting vnc client connections
warn: Sockets disabled, not accepting terminal connections
warn: Sockets disabled, not accepting gdb connections
warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
-warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
+warn: SCReg: Access to unknown device dcc0:site0:pos0:fn7:dev0
warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simout
index 7aed49fb9..977e84594 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/simout
@@ -1,11 +1,10 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 29 2014 09:18:22
-gem5 started Oct 29 2014 13:24:01
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-timing -re /work/gem5.latest/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-timing
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 11:47:53
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-timing -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-switcheroo-timing
+
Selected 64-bit ARM architecture, updating default disk image...
Global frequency set at 1000000000000 ticks per second
- 0: system.cpu0.isa: ISA system set to: 0x5b6db00 0x5b6db00
- 0: system.cpu1.isa: ISA system set to: 0x5b6db00 0x5b6db00
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/stats.txt
index 4ce945989..8ea842e52 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 51.832615 # Nu
sim_ticks 51832614542500 # Number of ticks simulated
final_tick 51832614542500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 677235 # Simulator instruction rate (inst/s)
-host_op_rate 795801 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 39828045805 # Simulator tick rate (ticks/s)
-host_mem_usage 719272 # Number of bytes of host memory used
-host_seconds 1301.41 # Real time elapsed on the host
+host_inst_rate 636228 # Simulator instruction rate (inst/s)
+host_op_rate 747615 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 37416431352 # Simulator tick rate (ticks/s)
+host_mem_usage 669888 # Number of bytes of host memory used
+host_seconds 1385.29 # Real time elapsed on the host
sim_insts 881360160 # Number of instructions simulated
sim_ops 1035663034 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -2119,6 +2119,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal 0 # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 18 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 1264904 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 21840032 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 33709 # Transaction distribution
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/system.terminal
index aeef8e8c7..98f272c44 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-timing/system.terminal
@@ -32,135 +32,135 @@
[ 0.000000] NR_IRQS:64 nr_irqs:64 0
[ 0.000000] Architected cp15 timer(s) running at 100.00MHz (phys).
[ 0.000001] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 2748779069440ns
-[ 0.000039] Console: colour dummy device 80x25
-[ 0.000042] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
-[ 0.000045] pid_max: default: 32768 minimum: 301
-[ 0.000066] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000068] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
-[ 0.000257] hw perfevents: no hardware support available
-[ 1.060142] CPU1: failed to come online
-[ 2.080281] CPU2: failed to come online
-[ 3.100420] CPU3: failed to come online
-[ 3.100425] Brought up 1 CPUs
-[ 3.100427] SMP: Total of 1 processors activated.
-[ 3.100526] devtmpfs: initialized
-[ 3.101795] atomic64_test: passed
-[ 3.101877] regulator-dummy: no parameters
-[ 3.102687] NET: Registered protocol family 16
-[ 3.102964] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
-[ 3.102974] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
-[ 3.103628] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
-[ 3.103632] Serial: AMBA PL011 UART driver
-[ 3.103982] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
-[ 3.104049] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
-[ 3.104599] console [ttyAMA0] enabled
-[ 3.104701] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
-[ 3.104749] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
-[ 3.104799] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
-[ 3.104843] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
-[ 3.130989] 3V3: 3300 mV
-[ 3.131067] vgaarb: loaded
-[ 3.131159] SCSI subsystem initialized
-[ 3.131232] libata version 3.00 loaded.
-[ 3.131321] usbcore: registered new interface driver usbfs
-[ 3.131349] usbcore: registered new interface driver hub
-[ 3.131405] usbcore: registered new device driver usb
-[ 3.131451] pps_core: LinuxPPS API ver. 1 registered
-[ 3.131460] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
-[ 3.131482] PTP clock support registered
-[ 3.131721] Switched to clocksource arch_sys_counter
-[ 3.133944] NET: Registered protocol family 2
-[ 3.134097] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
-[ 3.134124] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
-[ 3.134156] TCP: Hash tables configured (established 2048 bind 2048)
-[ 3.134183] TCP: reno registered
-[ 3.134191] UDP hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.134208] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
-[ 3.134272] NET: Registered protocol family 1
-[ 3.134342] RPC: Registered named UNIX socket transport module.
-[ 3.134352] RPC: Registered udp transport module.
-[ 3.134360] RPC: Registered tcp transport module.
-[ 3.134369] RPC: Registered tcp NFSv4.1 backchannel transport module.
-[ 3.134382] PCI: CLS 0 bytes, default 64
-[ 3.134718] futex hash table entries: 1024 (order: 4, 65536 bytes)
-[ 3.134925] HugeTLB registered 2 MB page size, pre-allocated 0 pages
-[ 3.139187] fuse init (API version 7.23)
-[ 3.139372] msgmni has been set to 469
-[ 3.143858] io scheduler noop registered
-[ 3.143973] io scheduler cfq registered (default)
-[ 3.144797] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
-[ 3.144811] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
-[ 3.144823] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
-[ 3.144836] pci_bus 0000:00: root bus resource [bus 00-ff]
-[ 3.144847] pci_bus 0000:00: scanning bus
-[ 3.144860] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
-[ 3.144874] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
-[ 3.144891] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.144956] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
-[ 3.144970] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
-[ 3.144982] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
-[ 3.144994] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
-[ 3.145006] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
-[ 3.145019] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
-[ 3.145032] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
-[ 3.145097] pci_bus 0000:00: fixups for bus
-[ 3.145106] pci_bus 0000:00: bus scan returning with max=00
-[ 3.145119] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
-[ 3.145143] pci 0000:00:00.0: fixup irq: got 33
-[ 3.145153] pci 0000:00:00.0: assigning IRQ 33
-[ 3.145166] pci 0000:00:01.0: fixup irq: got 34
-[ 3.145176] pci 0000:00:01.0: assigning IRQ 34
-[ 3.145191] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
-[ 3.145205] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
-[ 3.145219] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
-[ 3.145233] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
-[ 3.145245] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
-[ 3.145258] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
-[ 3.145271] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
-[ 3.145284] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
-[ 3.146250] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
-[ 3.146801] ata_piix 0000:00:01.0: version 2.13
-[ 3.146812] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
-[ 3.146842] ata_piix 0000:00:01.0: enabling bus mastering
-[ 3.147447] scsi0 : ata_piix
-[ 3.147647] scsi1 : ata_piix
-[ 3.147707] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
-[ 3.147720] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
-[ 3.147927] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
-[ 3.147939] e1000: Copyright (c) 1999-2006 Intel Corporation.
-[ 3.147961] e1000 0000:00:00.0: enabling device (0000 -> 0002)
-[ 3.147974] e1000 0000:00:00.0: enabling bus mastering
-[ 3.301754] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
-[ 3.301764] ata1.00: 2096640 sectors, multi 0: LBA
-[ 3.301798] ata1.00: configured for UDMA/33
-[ 3.301871] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
-[ 3.302091] sd 0:0:0:0: Attached scsi generic sg0 type 0
-[ 3.302127] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
-[ 3.302188] sd 0:0:0:0: [sda] Write Protect is off
-[ 3.302198] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
-[ 3.302228] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
-[ 3.302444] sda: sda1
-[ 3.302671] sd 0:0:0:0: [sda] Attached SCSI disk
-[ 3.422095] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
-[ 3.422109] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
-[ 3.422140] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
-[ 3.422151] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
-[ 3.422184] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
-[ 3.422196] igb: Copyright (c) 2007-2014 Intel Corporation.
-[ 3.422341] usbcore: registered new interface driver usb-storage
-[ 3.422440] mousedev: PS/2 mouse device common for all mice
-[ 3.422762] usbcore: registered new interface driver usbhid
-[ 3.422773] usbhid: USB HID core driver
-[ 3.422821] TCP: cubic registered
-[ 3.422829] NET: Registered protocol family 17
-
-[ 3.423472] devtmpfs: mounted
-[ 3.423526] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
+[ 0.000040] Console: colour dummy device 80x25
+[ 0.000043] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)
+[ 0.000046] pid_max: default: 32768 minimum: 301
+[ 0.000067] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000069] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)
+[ 0.000281] hw perfevents: no hardware support available
+[ 1.060140] CPU1: failed to come online
+[ 2.080277] CPU2: failed to come online
+[ 3.100414] CPU3: failed to come online
+[ 3.100419] Brought up 1 CPUs
+[ 3.100421] SMP: Total of 1 processors activated.
+[ 3.100521] devtmpfs: initialized
+[ 3.101599] atomic64_test: passed
+[ 3.101677] regulator-dummy: no parameters
+[ 3.102436] NET: Registered protocol family 16
+[ 3.102707] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000
+[ 3.102718] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.
+[ 3.104187] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]
+[ 3.104194] Serial: AMBA PL011 UART driver
+[ 3.104560] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000
+[ 3.104628] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3
+[ 3.105186] console [ttyAMA0] enabled
+[ 3.105314] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000
+[ 3.105363] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000
+[ 3.105412] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000
+[ 3.105457] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000
+[ 3.130945] 3V3: 3300 mV
+[ 3.131024] vgaarb: loaded
+[ 3.131114] SCSI subsystem initialized
+[ 3.131184] libata version 3.00 loaded.
+[ 3.131268] usbcore: registered new interface driver usbfs
+[ 3.131295] usbcore: registered new interface driver hub
+[ 3.131349] usbcore: registered new device driver usb
+[ 3.131393] pps_core: LinuxPPS API ver. 1 registered
+[ 3.131403] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[ 3.131425] PTP clock support registered
+[ 3.131650] Switched to clocksource arch_sys_counter
+[ 3.133712] NET: Registered protocol family 2
+[ 3.133864] TCP established hash table entries: 2048 (order: 2, 16384 bytes)
+[ 3.133892] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)
+[ 3.133924] TCP: Hash tables configured (established 2048 bind 2048)
+[ 3.133963] TCP: reno registered
+[ 3.133970] UDP hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.133988] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
+[ 3.134052] NET: Registered protocol family 1
+[ 3.134122] RPC: Registered named UNIX socket transport module.
+[ 3.134132] RPC: Registered udp transport module.
+[ 3.134141] RPC: Registered tcp transport module.
+[ 3.134149] RPC: Registered tcp NFSv4.1 backchannel transport module.
+[ 3.134162] PCI: CLS 0 bytes, default 64
+[ 3.134478] futex hash table entries: 1024 (order: 4, 65536 bytes)
+[ 3.134677] HugeTLB registered 2 MB page size, pre-allocated 0 pages
+[ 3.138144] fuse init (API version 7.23)
+[ 3.138307] msgmni has been set to 469
+[ 3.142786] io scheduler noop registered
+[ 3.142881] io scheduler cfq registered (default)
+[ 3.143804] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00
+[ 3.143818] pci_bus 0000:00: root bus resource [io 0x0000-0xffff]
+[ 3.143831] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]
+[ 3.143844] pci_bus 0000:00: root bus resource [bus 00-ff]
+[ 3.143855] pci_bus 0000:00: scanning bus
+[ 3.143868] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000
+[ 3.143883] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]
+[ 3.143900] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.143960] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185
+[ 3.143973] pci 0000:00:01.0: reg 0x10: [io 0x0000-0x0007]
+[ 3.143986] pci 0000:00:01.0: reg 0x14: [io 0x0000-0x0003]
+[ 3.143998] pci 0000:00:01.0: reg 0x18: [io 0x0000-0x0007]
+[ 3.144010] pci 0000:00:01.0: reg 0x1c: [io 0x0000-0x0003]
+[ 3.144022] pci 0000:00:01.0: reg 0x20: [io 0x0000-0x000f]
+[ 3.144035] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]
+[ 3.144093] pci_bus 0000:00: fixups for bus
+[ 3.144103] pci_bus 0000:00: bus scan returning with max=00
+[ 3.144116] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc
+[ 3.144141] pci 0000:00:00.0: fixup irq: got 33
+[ 3.144150] pci 0000:00:00.0: assigning IRQ 33
+[ 3.144163] pci 0000:00:01.0: fixup irq: got 34
+[ 3.144173] pci 0000:00:01.0: assigning IRQ 34
+[ 3.144188] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]
+[ 3.144202] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]
+[ 3.144216] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]
+[ 3.144230] pci 0000:00:01.0: BAR 4: assigned [io 0x1000-0x100f]
+[ 3.144243] pci 0000:00:01.0: BAR 0: assigned [io 0x1010-0x1017]
+[ 3.144256] pci 0000:00:01.0: BAR 2: assigned [io 0x1018-0x101f]
+[ 3.144269] pci 0000:00:01.0: BAR 1: assigned [io 0x1020-0x1023]
+[ 3.144282] pci 0000:00:01.0: BAR 3: assigned [io 0x1024-0x1027]
+[ 3.145170] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
+[ 3.145672] ata_piix 0000:00:01.0: version 2.13
+[ 3.145683] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)
+[ 3.145719] ata_piix 0000:00:01.0: enabling bus mastering
+[ 3.146290] scsi0 : ata_piix
+[ 3.146464] scsi1 : ata_piix
+[ 3.146516] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34
+[ 3.146529] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34
+[ 3.146721] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
+[ 3.146734] e1000: Copyright (c) 1999-2006 Intel Corporation.
+[ 3.146755] e1000 0000:00:00.0: enabling device (0000 -> 0002)
+[ 3.146767] e1000 0000:00:00.0: enabling bus mastering
+[ 3.301682] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66
+[ 3.301693] ata1.00: 2096640 sectors, multi 0: LBA
+[ 3.301726] ata1.00: configured for UDMA/33
+[ 3.301800] scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
+[ 3.301991] sd 0:0:0:0: Attached scsi generic sg0 type 0
+[ 3.302026] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)
+[ 3.302082] sd 0:0:0:0: [sda] Write Protect is off
+[ 3.302093] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
+[ 3.302121] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+[ 3.302324] sda: sda1
+[ 3.302524] sd 0:0:0:0: [sda] Attached SCSI disk
+[ 3.422002] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
+[ 3.422017] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection
+[ 3.422045] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k
+[ 3.422056] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.
+[ 3.422086] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k
+[ 3.422098] igb: Copyright (c) 2007-2014 Intel Corporation.
+[ 3.422227] usbcore: registered new interface driver usb-storage
+[ 3.422318] mousedev: PS/2 mouse device common for all mice
+[ 3.422603] usbcore: registered new interface driver usbhid
+[ 3.422613] usbhid: USB HID core driver
+[ 3.422663] TCP: cubic registered
+[ 3.422672] NET: Registered protocol family 17
+
+[ 3.423303] devtmpfs: mounted
+[ 3.423393] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)
-[ 3.470894] udevd[607]: starting version 182
+[ 3.470213] udevd[607]: starting version 182
Starting Bootlog daemon: bootlogd.
-[ 3.606773] random: dd urandom read with 22 bits of entropy available
+[ 3.606506] random: dd urandom read with 20 bits of entropy available
Populating dev cache
net.ipv4.conf.default.rp_filter = 1
net.ipv4.conf.all.rp_filter = 1
@@ -169,7 +169,7 @@ Mon Jan 27 08:00:00 UTC 2014
hwclock: can't open '/dev/misc/rtc': No such file or directory
INIT: Entering runlevel: 5
Configuring network interfaces... udhcpc (v1.21.1) started
-[ 3.811956] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+[ 3.801885] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
Sending discover...
Sending discover...
Sending discover...
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
index cc3750142..92530cc80 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
@@ -14,7 +14,6 @@ children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus io
atags_addr=134217728
boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
@@ -43,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/work/gem5/scratch1/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -146,7 +145,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=4
prefetch_on_access=false
@@ -157,7 +156,6 @@ size=32768
system=system
tags=system.cpu.dcache.tags
tgts_per_mshr=20
-two_queue=false
write_buffers=8
cpu_side=system.cpu.dcache_port
mem_side=system.cpu.toL2Bus.slave[1]
@@ -223,7 +221,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=true
max_miss_count=0
mshrs=4
prefetch_on_access=false
@@ -234,7 +232,6 @@ size=32768
system=system
tags=system.cpu.icache.tags
tgts_per_mshr=20
-two_queue=false
write_buffers=8
cpu_side=system.cpu.icache_port
mem_side=system.cpu.toL2Bus.slave[0]
@@ -334,7 +331,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -345,7 +342,6 @@ size=4194304
system=system
tags=system.cpu.l2cache.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[2]
@@ -423,7 +419,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=false
hit_latency=50
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -434,7 +430,6 @@ size=1024
system=system
tags=system.iocache.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.iobus.master[27]
mem_side=system.membus.slave[3]
@@ -769,6 +764,7 @@ pio_latency=10000
pixel_clock=7299
system=system
vnc=system.vncserver
+workaround_swap_rb=true
dma=system.membus.slave[0]
pio=system.iobus.master[5]
@@ -978,6 +974,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -988,6 +985,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
@@ -1156,7 +1263,6 @@ port=3456
[system.vncserver]
type=VncServer
-capture_exit_frame=-1
eventq_index=0
frame_capture=false
number=0
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
index 6d896ac50..72353edee 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json
@@ -68,9 +68,8 @@
"frontend_latency": 2
},
"symbolfile": "",
- "readfile": "/work/gem5/scratch1/gem5/tests/halt.sh",
+ "readfile": "/work/gem5/outgoing/gem5/tests/halt.sh",
"have_large_asid_64": false,
- "work_end_ckpt_count": 0,
"phys_addr_range_64": 40,
"have_lpae": false,
"cxx_class": "LinuxArmSystem",
@@ -80,7 +79,6 @@
"number": 0,
"frame_capture": false,
"eventq_index": 0,
- "capture_exit_frame": -1,
"cxx_class": "VncServer",
"path": "system.vncserver",
"type": "VncServer",
@@ -132,6 +130,7 @@
"enable_capture": true,
"path": "system.realview.hdlcd",
"pio_addr": 721420288,
+ "workaround_swap_rb": true,
"type": "HDLcd"
},
"mmc_fake": {
@@ -210,22 +209,162 @@
"type": "AmbaFake"
},
"realview_io": {
- "proc_id1": 335544320,
- "name": "realview_io",
"pio": {
"peer": "system.iobus.master[1]",
"role": "SLAVE"
},
+ "system": "system",
+ "cxx_class": "RealViewCtrl",
+ "pio_addr": 469827584,
"pio_latency": 100000,
"clk_domain": "system.clk_domain",
- "system": "system",
+ "osc_sys": {
+ "position": 0,
+ "name": "osc_sys",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 7,
+ "path": "system.realview.realview_io.osc_sys",
+ "freq": 16667,
+ "type": "RealViewOsc"
+ },
"eventq_index": 0,
- "cxx_class": "RealViewCtrl",
"proc_id0": 335544320,
+ "proc_id1": 335544320,
+ "osc_clcd": {
+ "position": 0,
+ "name": "osc_clcd",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 0,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 1,
+ "path": "system.realview.realview_io.osc_clcd",
+ "freq": 42105,
+ "type": "RealViewOsc"
+ },
+ "osc_peripheral": {
+ "position": 0,
+ "name": "osc_peripheral",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 0,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 2,
+ "path": "system.realview.realview_io.osc_peripheral",
+ "freq": 41667,
+ "type": "RealViewOsc"
+ },
+ "osc_hsbm": {
+ "position": 0,
+ "name": "osc_hsbm",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 4,
+ "path": "system.realview.realview_io.osc_hsbm",
+ "freq": 25000,
+ "type": "RealViewOsc"
+ },
+ "osc_mcc": {
+ "position": 0,
+ "name": "osc_mcc",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 0,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 0,
+ "path": "system.realview.realview_io.osc_mcc",
+ "freq": 20000,
+ "type": "RealViewOsc"
+ },
"path": "system.realview.realview_io",
"idreg": 35979264,
+ "osc_system_bus": {
+ "position": 0,
+ "name": "osc_system_bus",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 0,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 4,
+ "path": "system.realview.realview_io.osc_system_bus",
+ "freq": 41667,
+ "type": "RealViewOsc"
+ },
+ "osc_smb": {
+ "position": 0,
+ "name": "osc_smb",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 6,
+ "path": "system.realview.realview_io.osc_smb",
+ "freq": 20000,
+ "type": "RealViewOsc"
+ },
+ "name": "realview_io",
"type": "RealViewCtrl",
- "pio_addr": 469827584
+ "osc_ddr": {
+ "position": 0,
+ "name": "osc_ddr",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 8,
+ "path": "system.realview.realview_io.osc_ddr",
+ "freq": 25000,
+ "type": "RealViewOsc"
+ },
+ "osc_cpu": {
+ "position": 0,
+ "name": "osc_cpu",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 0,
+ "path": "system.realview.realview_io.osc_cpu",
+ "freq": 16667,
+ "type": "RealViewOsc"
+ },
+ "osc_pxl": {
+ "position": 0,
+ "name": "osc_pxl",
+ "parent": "system.realview.realview_io",
+ "voltage_domain": "system.voltage_domain",
+ "dcc": 0,
+ "site": 1,
+ "eventq_index": 0,
+ "cxx_class": "RealViewOsc",
+ "device": 5,
+ "path": "system.realview.realview_io.osc_pxl",
+ "freq": 42105,
+ "type": "RealViewOsc"
+ }
},
"l2x0_fake": {
"system": "system",
@@ -754,7 +893,7 @@
"MSIXCAPNextCapability": 0,
"PXCAPLinkCtrl": 0,
"Revision": 0,
- "hardware_address": "<m5.params.EthernetAddr object at 0x5692fd0>",
+ "hardware_address": "<m5.params.EthernetAddr object at 0x7f90678a01d0>",
"LegacyIOBase": 0,
"pio_latency": 30000,
"platform": "system.realview",
@@ -1029,7 +1168,10 @@
"panic_on_panic": true,
"eventq_index": 0,
"iocache": {
- "is_top_level": true,
+ "cpu_side": {
+ "peer": "system.iobus.master[27]",
+ "role": "SLAVE"
+ },
"prefetcher": null,
"clk_domain": "system.clk_domain",
"write_buffers": 8,
@@ -1064,17 +1206,13 @@
"addr_ranges": [
"2147483648:2415919103"
],
- "assoc": 8,
+ "is_read_only": false,
"prefetch_on_access": false,
"path": "system.iocache",
"name": "iocache",
"type": "BaseCache",
"sequential_access": false,
- "cpu_side": {
- "peer": "system.iobus.master[27]",
- "role": "SLAVE"
- },
- "two_queue": false
+ "assoc": 8
},
"dvfs_handler": {
"enable": false,
@@ -1270,7 +1408,10 @@
"role": "MASTER"
},
"icache": {
- "is_top_level": true,
+ "cpu_side": {
+ "peer": "system.cpu.icache_port",
+ "role": "SLAVE"
+ },
"prefetcher": null,
"clk_domain": "system.cpu_clk_domain",
"write_buffers": 8,
@@ -1305,17 +1446,13 @@
"addr_ranges": [
"0:18446744073709551615"
],
- "assoc": 1,
+ "is_read_only": true,
"prefetch_on_access": false,
"path": "system.cpu.icache",
"name": "icache",
"type": "BaseCache",
"sequential_access": false,
- "cpu_side": {
- "peer": "system.cpu.icache_port",
- "role": "SLAVE"
- },
- "two_queue": false
+ "assoc": 1
},
"interrupts": {
"eventq_index": 0,
@@ -1360,7 +1497,10 @@
"type": "ArmStage2MMU"
},
"l2cache": {
- "is_top_level": false,
+ "cpu_side": {
+ "peer": "system.cpu.toL2Bus.master[0]",
+ "role": "SLAVE"
+ },
"prefetcher": null,
"clk_domain": "system.cpu_clk_domain",
"write_buffers": 8,
@@ -1395,17 +1535,13 @@
"addr_ranges": [
"0:18446744073709551615"
],
- "assoc": 8,
+ "is_read_only": false,
"prefetch_on_access": false,
"path": "system.cpu.l2cache",
"name": "l2cache",
"type": "BaseCache",
"sequential_access": false,
- "cpu_side": {
- "peer": "system.cpu.toL2Bus.master[0]",
- "role": "SLAVE"
- },
- "two_queue": false
+ "assoc": 8
},
"path": "system.cpu",
"max_loads_any_thread": 0,
@@ -1442,7 +1578,10 @@
"progress_interval": 0,
"branchPred": null,
"dcache": {
- "is_top_level": true,
+ "cpu_side": {
+ "peer": "system.cpu.dcache_port",
+ "role": "SLAVE"
+ },
"prefetcher": null,
"clk_domain": "system.cpu_clk_domain",
"write_buffers": 8,
@@ -1477,17 +1616,13 @@
"addr_ranges": [
"0:18446744073709551615"
],
- "assoc": 4,
+ "is_read_only": false,
"prefetch_on_access": false,
"path": "system.cpu.dcache",
"name": "dcache",
"type": "BaseCache",
"sequential_access": false,
- "cpu_side": {
- "peer": "system.cpu.dcache_port",
- "role": "SLAVE"
- },
- "two_queue": false
+ "assoc": 4
},
"isa": [
{
@@ -1580,7 +1715,7 @@
"path": "system.cf0",
"type": "IdeDisk"
},
- "boot_release_addr": 65528,
+ "work_end_ckpt_count": 0,
"mem_mode": "atomic",
"name": "system",
"init_param": 0,
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt
index 52cc263b3..80deda855 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 2.783867 # Nu
sim_ticks 2783867052000 # Number of ticks simulated
final_tick 2783867052000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1269332 # Simulator instruction rate (inst/s)
-host_op_rate 1545209 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 24750158617 # Simulator tick rate (ticks/s)
-host_mem_usage 625572 # Number of bytes of host memory used
-host_seconds 112.48 # Real time elapsed on the host
+host_inst_rate 714694 # Simulator instruction rate (inst/s)
+host_op_rate 870026 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 13935517761 # Simulator tick rate (ticks/s)
+host_mem_usage 573808 # Number of bytes of host memory used
+host_seconds 199.77 # Real time elapsed on the host
sim_insts 142772879 # Number of instructions simulated
sim_ops 173803124 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -746,5 +746,15 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
---------- End Simulation Statistics ----------
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 77c9ca9fd..bf070ce25 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
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -147,7 +145,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=6
prefetch_on_access=false
@@ -158,7 +156,6 @@ size=32768
system=system
tags=system.cpu0.dcache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=16
cpu_side=system.cpu0.dcache_port
mem_side=system.cpu0.toL2Bus.slave[1]
@@ -222,9 +219,9 @@ assoc=2
clk_domain=system.cpu_clk_domain
demand_mshr_reserve=1
eventq_index=0
-forward_snoops=true
+forward_snoops=false
hit_latency=1
-is_top_level=true
+is_read_only=true
max_miss_count=0
mshrs=2
prefetch_on_access=false
@@ -235,7 +232,6 @@ size=32768
system=system
tags=system.cpu0.icache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=8
cpu_side=system.cpu0.icache_port
mem_side=system.cpu0.toL2Bus.slave[0]
@@ -335,7 +331,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=12
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=16
prefetch_on_access=true
@@ -346,7 +342,6 @@ size=1048576
system=system
tags=system.cpu0.l2cache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=8
cpu_side=system.cpu0.toL2Bus.master[0]
mem_side=system.toL2Bus.slave[0]
@@ -454,7 +449,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=6
prefetch_on_access=false
@@ -465,7 +460,6 @@ size=32768
system=system
tags=system.cpu1.dcache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=16
cpu_side=system.cpu1.dcache_port
mem_side=system.cpu1.toL2Bus.slave[1]
@@ -529,9 +523,9 @@ assoc=2
clk_domain=system.cpu_clk_domain
demand_mshr_reserve=1
eventq_index=0
-forward_snoops=true
+forward_snoops=false
hit_latency=1
-is_top_level=true
+is_read_only=true
max_miss_count=0
mshrs=2
prefetch_on_access=false
@@ -542,7 +536,6 @@ size=32768
system=system
tags=system.cpu1.icache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=8
cpu_side=system.cpu1.icache_port
mem_side=system.cpu1.toL2Bus.slave[0]
@@ -642,7 +635,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=12
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=16
prefetch_on_access=true
@@ -653,7 +646,6 @@ size=1048576
system=system
tags=system.cpu1.l2cache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=8
cpu_side=system.cpu1.toL2Bus.master[0]
mem_side=system.toL2Bus.slave[1]
@@ -756,7 +748,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=false
hit_latency=50
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -767,7 +759,6 @@ size=1024
system=system
tags=system.iocache.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.iobus.master[27]
mem_side=system.membus.slave[3]
@@ -792,7 +783,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -803,7 +794,6 @@ size=4194304
system=system
tags=system.l2c.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.toL2Bus.master[0]
mem_side=system.membus.slave[2]
@@ -832,7 +822,7 @@ system=system
use_default_range=false
width=16
default=system.membus.badaddr_responder.pio
-master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port
+master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port
slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side
[system.membus.badaddr_responder]
@@ -1107,7 +1097,8 @@ pio=system.iobus.master[25]
type=GenericTimer
eventq_index=0
gic=system.realview.gic
-int_num=29
+int_phys=29
+int_virt=27
system=system
[system.realview.gic]
@@ -1120,7 +1111,6 @@ dist_pio_delay=10000
eventq_index=0
int_latency=10000
it_lines=128
-msix_addr=0
platform=system.realview
system=system
pio=system.membus.master[2]
@@ -1138,6 +1128,7 @@ pio_latency=10000
pixel_clock=7299
system=system
vnc=system.vncserver
+workaround_swap_rb=true
dma=system.membus.slave[0]
pio=system.iobus.master[5]
@@ -1307,7 +1298,7 @@ int_num_watchdog=30
pio_addr=738721792
pio_latency=100000
system=system
-pio=system.membus.master[3]
+pio=system.membus.master[4]
[system.realview.mmc_fake]
type=AmbaFake
@@ -1347,6 +1338,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1357,6 +1349,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
@@ -1489,7 +1591,7 @@ platform=system.realview
ppint=25
system=system
vcpu_addr=738222080
-pio=system.membus.master[4]
+pio=system.membus.master[3]
[system.realview.vram]
type=SimpleMemory
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 62e4f1a91..af95aaebb 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,19 +1,17 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 31 2014 10:01:44
-gem5 started Oct 31 2014 11:25:21
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:13:40
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re /work/gem5/outgoing/gem5/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: /dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
- 0: system.cpu0.isa: ISA system set to: 0x53ff680 0x53ff680
- 0: system.cpu1.isa: ISA system set to: 0x53ff680 0x53ff680
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80008000
-info: Loading DTB file: /dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-info: Read CNTFREQ_EL0 frequency
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
@@ -29,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2802882713500 because m5_exit instruction encountered
+Exiting @ tick 2802894699500 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 d1669be2b..b13c4e56a 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,11 +4,11 @@ sim_seconds 2.802895 # Nu
sim_ticks 2802894699500 # Number of ticks simulated
final_tick 2802894699500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1692608 # Simulator instruction rate (inst/s)
-host_op_rate 2062417 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 32311218818 # Simulator tick rate (ticks/s)
-host_mem_usage 579900 # Number of bytes of host memory used
-host_seconds 86.75 # Real time elapsed on the host
+host_inst_rate 1155692 # Simulator instruction rate (inst/s)
+host_op_rate 1408193 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 22061708570 # Simulator tick rate (ticks/s)
+host_mem_usage 584036 # Number of bytes of host memory used
+host_seconds 127.05 # Real time elapsed on the host
sim_insts 146828240 # Number of instructions simulated
sim_ops 178908039 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1455,6 +1455,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 44000 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 305308 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 30846 # Transaction distribution
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/system.terminal
index 89f9e916a..d38aec98b 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/system.terminal
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/system.terminal
@@ -199,7 +199,7 @@ oprofile: using timer interrupt.
TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -209,6 +209,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 680, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
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 089dbf6ee..92530cc80 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
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -147,7 +145,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=4
prefetch_on_access=false
@@ -158,7 +156,6 @@ size=32768
system=system
tags=system.cpu.dcache.tags
tgts_per_mshr=20
-two_queue=false
write_buffers=8
cpu_side=system.cpu.dcache_port
mem_side=system.cpu.toL2Bus.slave[1]
@@ -224,7 +221,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=true
max_miss_count=0
mshrs=4
prefetch_on_access=false
@@ -235,7 +232,6 @@ size=32768
system=system
tags=system.cpu.icache.tags
tgts_per_mshr=20
-two_queue=false
write_buffers=8
cpu_side=system.cpu.icache_port
mem_side=system.cpu.toL2Bus.slave[0]
@@ -335,7 +331,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -346,7 +342,6 @@ size=4194304
system=system
tags=system.cpu.l2cache.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[2]
@@ -424,7 +419,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=false
hit_latency=50
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -435,7 +430,6 @@ size=1024
system=system
tags=system.iocache.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.iobus.master[27]
mem_side=system.membus.slave[3]
@@ -464,7 +458,7 @@ system=system
use_default_range=false
width=16
default=system.membus.badaddr_responder.pio
-master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port
+master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port
slave=system.realview.hdlcd.dma system.system_port system.cpu.l2cache.mem_side system.iocache.mem_side
[system.membus.badaddr_responder]
@@ -739,7 +733,8 @@ pio=system.iobus.master[25]
type=GenericTimer
eventq_index=0
gic=system.realview.gic
-int_num=29
+int_phys=29
+int_virt=27
system=system
[system.realview.gic]
@@ -752,7 +747,6 @@ dist_pio_delay=10000
eventq_index=0
int_latency=10000
it_lines=128
-msix_addr=0
platform=system.realview
system=system
pio=system.membus.master[2]
@@ -770,6 +764,7 @@ pio_latency=10000
pixel_clock=7299
system=system
vnc=system.vncserver
+workaround_swap_rb=true
dma=system.membus.slave[0]
pio=system.iobus.master[5]
@@ -939,7 +934,7 @@ int_num_watchdog=30
pio_addr=738721792
pio_latency=100000
system=system
-pio=system.membus.master[3]
+pio=system.membus.master[4]
[system.realview.mmc_fake]
type=AmbaFake
@@ -979,6 +974,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -989,6 +985,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
@@ -1121,7 +1227,7 @@ platform=system.realview
ppint=25
system=system
vcpu_addr=738222080
-pio=system.membus.master[4]
+pio=system.membus.master[3]
[system.realview.vram]
type=SimpleMemory
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 f25d6db4c..cc8e1e24f 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,18 +1,17 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 31 2014 10:01:44
-gem5 started Oct 31 2014 11:25:21
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:13:29
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re /work/gem5/outgoing/gem5/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: /dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
- 0: system.cpu.isa: ISA system set to: 0x5299680 0x5299680
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80008000
-info: Loading DTB file: /dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-info: Read CNTFREQ_EL0 frequency
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
@@ -28,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2783854177000 because m5_exit instruction encountered
+Exiting @ tick 2783867052000 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 19a0730a6..33ede6cdf 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,11 +4,11 @@ sim_seconds 2.783867 # Nu
sim_ticks 2783867052000 # Number of ticks simulated
final_tick 2783867052000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1280569 # Simulator instruction rate (inst/s)
-host_op_rate 1558887 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 24969250003 # Simulator tick rate (ticks/s)
-host_mem_usage 621096 # Number of bytes of host memory used
-host_seconds 111.49 # Real time elapsed on the host
+host_inst_rate 1188421 # Simulator instruction rate (inst/s)
+host_op_rate 1446712 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 23172506899 # Simulator tick rate (ticks/s)
+host_mem_usage 571472 # Number of bytes of host memory used
+host_seconds 120.14 # Real time elapsed on the host
sim_insts 142772879 # Number of instructions simulated
sim_ops 173803124 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -746,5 +746,15 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
---------- End Simulation Statistics ----------
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal
index b3be0ec54..ad91d76dd 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal
@@ -193,7 +193,7 @@ oprofile: using timer interrupt.
TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -203,6 +203,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 673, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
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 bb8aa99f6..8cc96dcc1 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
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -143,7 +141,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=6
prefetch_on_access=false
@@ -154,7 +152,6 @@ size=32768
system=system
tags=system.cpu0.dcache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=16
cpu_side=system.cpu0.dcache_port
mem_side=system.cpu0.toL2Bus.slave[1]
@@ -218,9 +215,9 @@ assoc=2
clk_domain=system.cpu_clk_domain
demand_mshr_reserve=1
eventq_index=0
-forward_snoops=true
+forward_snoops=false
hit_latency=1
-is_top_level=true
+is_read_only=true
max_miss_count=0
mshrs=2
prefetch_on_access=false
@@ -231,7 +228,6 @@ size=32768
system=system
tags=system.cpu0.icache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=8
cpu_side=system.cpu0.icache_port
mem_side=system.cpu0.toL2Bus.slave[0]
@@ -331,7 +327,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=12
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=16
prefetch_on_access=true
@@ -342,7 +338,6 @@ size=1048576
system=system
tags=system.cpu0.l2cache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=8
cpu_side=system.cpu0.toL2Bus.master[0]
mem_side=system.toL2Bus.slave[0]
@@ -446,7 +441,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=6
prefetch_on_access=false
@@ -457,7 +452,6 @@ size=32768
system=system
tags=system.cpu1.dcache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=16
cpu_side=system.cpu1.dcache_port
mem_side=system.cpu1.toL2Bus.slave[1]
@@ -521,9 +515,9 @@ assoc=2
clk_domain=system.cpu_clk_domain
demand_mshr_reserve=1
eventq_index=0
-forward_snoops=true
+forward_snoops=false
hit_latency=1
-is_top_level=true
+is_read_only=true
max_miss_count=0
mshrs=2
prefetch_on_access=false
@@ -534,7 +528,6 @@ size=32768
system=system
tags=system.cpu1.icache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=8
cpu_side=system.cpu1.icache_port
mem_side=system.cpu1.toL2Bus.slave[0]
@@ -634,7 +627,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=12
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=16
prefetch_on_access=true
@@ -645,7 +638,6 @@ size=1048576
system=system
tags=system.cpu1.l2cache.tags
tgts_per_mshr=8
-two_queue=false
write_buffers=8
cpu_side=system.cpu1.toL2Bus.master[0]
mem_side=system.toL2Bus.slave[1]
@@ -748,7 +740,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=false
hit_latency=50
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -759,7 +751,6 @@ size=1024
system=system
tags=system.iocache.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.iobus.master[27]
mem_side=system.membus.slave[3]
@@ -784,7 +775,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -795,7 +786,6 @@ size=4194304
system=system
tags=system.l2c.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.toL2Bus.master[0]
mem_side=system.membus.slave[2]
@@ -824,7 +814,7 @@ system=system
use_default_range=false
width=16
default=system.membus.badaddr_responder.pio
-master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port
+master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port
slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side
[system.membus.badaddr_responder]
@@ -1163,7 +1153,8 @@ pio=system.iobus.master[25]
type=GenericTimer
eventq_index=0
gic=system.realview.gic
-int_num=29
+int_phys=29
+int_virt=27
system=system
[system.realview.gic]
@@ -1176,7 +1167,6 @@ dist_pio_delay=10000
eventq_index=0
int_latency=10000
it_lines=128
-msix_addr=0
platform=system.realview
system=system
pio=system.membus.master[2]
@@ -1194,6 +1184,7 @@ pio_latency=10000
pixel_clock=7299
system=system
vnc=system.vncserver
+workaround_swap_rb=true
dma=system.membus.slave[0]
pio=system.iobus.master[5]
@@ -1363,7 +1354,7 @@ int_num_watchdog=30
pio_addr=738721792
pio_latency=100000
system=system
-pio=system.membus.master[3]
+pio=system.membus.master[4]
[system.realview.mmc_fake]
type=AmbaFake
@@ -1403,6 +1394,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1413,6 +1405,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
@@ -1545,7 +1647,7 @@ platform=system.realview
ppint=25
system=system
vcpu_addr=738222080
-pio=system.membus.master[4]
+pio=system.membus.master[3]
[system.realview.vram]
type=SimpleMemory
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 f808cc158..79f6ab7f9 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,19 +1,17 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 31 2014 10:01:44
-gem5 started Oct 31 2014 11:25:21
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:13:30
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual -re /work/gem5/outgoing/gem5/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: /dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
- 0: system.cpu0.isa: ISA system set to: 0x4f96680 0x4f96680
- 0: system.cpu1.isa: ISA system set to: 0x4f96680 0x4f96680
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80008000
-info: Loading DTB file: /dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-info: Read CNTFREQ_EL0 frequency
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
@@ -29,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2866923142000 because m5_exit instruction encountered
+Exiting @ tick 2868748596000 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 3792a44c9..2deca7899 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,11 +4,11 @@ sim_seconds 2.868749 # Nu
sim_ticks 2868748596000 # Number of ticks simulated
final_tick 2868748596000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 811357 # Simulator instruction rate (inst/s)
-host_op_rate 981408 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 17699889488 # Simulator tick rate (ticks/s)
-host_mem_usage 595428 # Number of bytes of host memory used
-host_seconds 162.08 # Real time elapsed on the host
+host_inst_rate 740337 # Simulator instruction rate (inst/s)
+host_op_rate 895502 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 16150564794 # Simulator tick rate (ticks/s)
+host_mem_usage 599396 # Number of bytes of host memory used
+host_seconds 177.63 # Real time elapsed on the host
sim_insts 131502488 # Number of instructions simulated
sim_ops 159063828 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -2973,6 +2973,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 44042 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 480570 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 30874 # Transaction distribution
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal
index cc9c3e898..d38aec98b 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal
@@ -159,9 +159,9 @@ ata1.00: configured for UDMA/33
scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
sd 0:0:0:0: [sda] 1048320 512-byte logical blocks: (536 MB/511 MiB)
sd 0:0:0:0: [sda] Write Protect is off
-sd 0:0:0:0: Attached scsi generic sg0 type 0
sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+sd 0:0:0:0: Attached scsi generic sg0 type 0
sda: sda1
sd 0:0:0:0: [sda] Attached SCSI disk
e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
@@ -199,7 +199,7 @@ oprofile: using timer interrupt.
TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -209,6 +209,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 680, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
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 3447337f9..8b289555b 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
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -143,7 +141,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=4
prefetch_on_access=false
@@ -154,7 +152,6 @@ size=32768
system=system
tags=system.cpu.dcache.tags
tgts_per_mshr=20
-two_queue=false
write_buffers=8
cpu_side=system.cpu.dcache_port
mem_side=system.cpu.toL2Bus.slave[1]
@@ -220,7 +217,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=true
max_miss_count=0
mshrs=4
prefetch_on_access=false
@@ -231,7 +228,6 @@ size=32768
system=system
tags=system.cpu.icache.tags
tgts_per_mshr=20
-two_queue=false
write_buffers=8
cpu_side=system.cpu.icache_port
mem_side=system.cpu.toL2Bus.slave[0]
@@ -331,7 +327,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -342,7 +338,6 @@ size=4194304
system=system
tags=system.cpu.l2cache.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.cpu.toL2Bus.master[0]
mem_side=system.membus.slave[2]
@@ -420,7 +415,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=false
hit_latency=50
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -431,7 +426,6 @@ size=1024
system=system
tags=system.iocache.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.iobus.master[27]
mem_side=system.membus.slave[3]
@@ -460,7 +454,7 @@ system=system
use_default_range=false
width=16
default=system.membus.badaddr_responder.pio
-master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port
+master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port
slave=system.realview.hdlcd.dma system.system_port system.cpu.l2cache.mem_side system.iocache.mem_side
[system.membus.badaddr_responder]
@@ -799,7 +793,8 @@ pio=system.iobus.master[25]
type=GenericTimer
eventq_index=0
gic=system.realview.gic
-int_num=29
+int_phys=29
+int_virt=27
system=system
[system.realview.gic]
@@ -812,7 +807,6 @@ dist_pio_delay=10000
eventq_index=0
int_latency=10000
it_lines=128
-msix_addr=0
platform=system.realview
system=system
pio=system.membus.master[2]
@@ -830,6 +824,7 @@ pio_latency=10000
pixel_clock=7299
system=system
vnc=system.vncserver
+workaround_swap_rb=true
dma=system.membus.slave[0]
pio=system.iobus.master[5]
@@ -999,7 +994,7 @@ int_num_watchdog=30
pio_addr=738721792
pio_latency=100000
system=system
-pio=system.membus.master[3]
+pio=system.membus.master[4]
[system.realview.mmc_fake]
type=AmbaFake
@@ -1039,6 +1034,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1049,6 +1045,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
@@ -1181,7 +1287,7 @@ platform=system.realview
ppint=25
system=system
vcpu_addr=738222080
-pio=system.membus.master[4]
+pio=system.membus.master[3]
[system.realview.vram]
type=SimpleMemory
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 ce3f5bea6..4dcbeb2f2 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,18 +1,17 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 31 2014 10:01:44
-gem5 started Oct 31 2014 11:25:21
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:15:48
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing -re /work/gem5/outgoing/gem5/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: /dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
- 0: system.cpu.isa: ISA system set to: 0x44d4680 0x44d4680
+info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
info: Using bootloader at address 0x10
info: Using kernel entry physical address at 0x80008000
-info: Loading DTB file: /dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000
+info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000
info: Entering event queue @ 0. Starting simulation...
-info: Read CNTFREQ_EL0 frequency
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
@@ -28,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2902619131000 because m5_exit instruction encountered
+Exiting @ tick 2903467553500 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 21bc80649..2f0ebe667 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,11 +4,11 @@ sim_seconds 2.903468 # Nu
sim_ticks 2903467553500 # Number of ticks simulated
final_tick 2903467553500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 736333 # Simulator instruction rate (inst/s)
-host_op_rate 887789 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 19005878440 # Simulator tick rate (ticks/s)
-host_mem_usage 619548 # Number of bytes of host memory used
-host_seconds 152.77 # Real time elapsed on the host
+host_inst_rate 455888 # Simulator instruction rate (inst/s)
+host_op_rate 549660 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 11767164312 # Simulator tick rate (ticks/s)
+host_mem_usage 571472 # Number of bytes of host memory used
+host_seconds 246.74 # Real time elapsed on the host
sim_insts 112487279 # Number of instructions simulated
sim_ops 135624752 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1469,5 +1469,15 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
---------- End Simulation Statistics ----------
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/system.terminal
index b3be0ec54..ad91d76dd 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/system.terminal
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/system.terminal
@@ -193,7 +193,7 @@ oprofile: using timer interrupt.
TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -203,6 +203,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 673, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini
index 8c83d4cbb..d3065f7a2 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini
@@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
@@ -44,7 +42,7 @@ num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -87,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -147,7 +145,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=4
prefetch_on_access=false
@@ -158,7 +156,6 @@ size=32768
system=system
tags=system.cpu0.dcache.tags
tgts_per_mshr=20
-two_queue=false
write_buffers=8
cpu_side=system.cpu0.dcache_port
mem_side=system.toL2Bus.slave[1]
@@ -224,7 +221,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=true
max_miss_count=0
mshrs=4
prefetch_on_access=false
@@ -235,7 +232,6 @@ size=32768
system=system
tags=system.cpu0.icache.tags
tgts_per_mshr=20
-two_queue=false
write_buffers=8
cpu_side=system.cpu0.icache_port
mem_side=system.toL2Bus.slave[0]
@@ -524,7 +520,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=false
hit_latency=50
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -535,7 +531,6 @@ size=1024
system=system
tags=system.iocache.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.iobus.master[27]
mem_side=system.membus.slave[3]
@@ -560,7 +555,7 @@ demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -571,7 +566,6 @@ size=4194304
system=system
tags=system.l2c.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.toL2Bus.master[0]
mem_side=system.membus.slave[2]
@@ -600,7 +594,7 @@ system=system
use_default_range=false
width=16
default=system.membus.badaddr_responder.pio
-master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port
+master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port
slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side
[system.membus.badaddr_responder]
@@ -875,7 +869,8 @@ pio=system.iobus.master[25]
type=GenericTimer
eventq_index=0
gic=system.realview.gic
-int_num=29
+int_phys=29
+int_virt=27
system=system
[system.realview.gic]
@@ -888,7 +883,6 @@ dist_pio_delay=10000
eventq_index=0
int_latency=10000
it_lines=128
-msix_addr=0
platform=system.realview
system=system
pio=system.membus.master[2]
@@ -906,6 +900,7 @@ pio_latency=10000
pixel_clock=7299
system=system
vnc=system.vncserver
+workaround_swap_rb=true
dma=system.membus.slave[0]
pio=system.iobus.master[5]
@@ -1075,7 +1070,7 @@ int_num_watchdog=30
pio_addr=738721792
pio_latency=100000
system=system
-pio=system.membus.master[3]
+pio=system.membus.master[4]
[system.realview.mmc_fake]
type=AmbaFake
@@ -1115,6 +1110,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1125,6 +1121,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
@@ -1257,7 +1363,7 @@ platform=system.realview
ppint=25
system=system
vcpu_addr=738222080
-pio=system.membus.master[4]
+pio=system.membus.master[3]
[system.realview.vram]
type=SimpleMemory
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout
index 4a0c68df7..29cd0645f 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout
@@ -1,10 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 31 2014 10:01:44
-gem5 started Oct 31 2014 11:27:15
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:14:37
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic
+
Global frequency set at 1000000000000 ticks per second
- 0: system.cpu0.isa: ISA system set to: 0x4171680 0x4171680
- 0: system.cpu1.isa: ISA system set to: 0x4171680 0x4171680
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt
index 948865e8c..86f263873 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 2.783867 # Nu
sim_ticks 2783867052000 # Number of ticks simulated
final_tick 2783867052000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 1197854 # Simulator instruction rate (inst/s)
-host_op_rate 1458195 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 23356431621 # Simulator tick rate (ticks/s)
-host_mem_usage 621348 # Number of bytes of host memory used
-host_seconds 119.19 # Real time elapsed on the host
+host_inst_rate 1097147 # Simulator instruction rate (inst/s)
+host_op_rate 1335600 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 21392785088 # Simulator tick rate (ticks/s)
+host_mem_usage 571732 # Number of bytes of host memory used
+host_seconds 130.13 # Real time elapsed on the host
sim_insts 142772879 # Number of instructions simulated
sim_ops 173803124 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1024,6 +1024,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 71244 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 2291984 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 27546 # Transaction distribution
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/system.terminal
index b3be0ec54..ad91d76dd 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/system.terminal
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/system.terminal
@@ -193,7 +193,7 @@ oprofile: using timer interrupt.
TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -203,6 +203,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 673, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini
index 8c1381ed5..c837f36d0 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini
@@ -12,38 +12,37 @@ time_sync_spin_threshold=100000000
type=LinuxArmSystem
children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
atags_addr=134217728
-boot_loader=/dist/binaries/boot_emm.arm
+boot_loader=/work/gem5/dist/binaries/boot_emm.arm
boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
-boot_release_addr=65528
cache_line_size=64
clk_domain=system.clk_domain
-dtb_filename=/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
+dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
early_kernel_symbols=false
enable_context_switch_stats_dump=false
eventq_index=0
flags_addr=469827632
gic_cpu_addr=738205696
-have_generic_timer=false
have_large_asid_64=false
have_lpae=false
have_security=false
have_virtualization=false
highest_el_is_64=false
init_param=0
-kernel=/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
kernel_addr_check=true
load_addr_mask=268435455
load_offset=2147483648
machine_type=VExpress_EMM
mem_mode=timing
mem_ranges=2147483648:2415919103
-memories=system.realview.nvmem system.physmem system.realview.vram
+memories=system.physmem system.realview.nvmem system.realview.vram
+mmap_using_noreserve=false
multi_proc=true
num_work_ids=16
panic_on_oops=true
panic_on_panic=true
phys_addr_range_64=40
-readfile=/work/gem5.ext/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
reset_addr_64=0
symbolfile=
work_begin_ckpt_count=0
@@ -86,7 +85,7 @@ table_size=65536
[system.cf0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/dist/disks/linux-aarch32-ael.img
+image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
read_only=true
[system.clk_domain]
@@ -138,10 +137,11 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=4
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=4
prefetch_on_access=false
@@ -152,7 +152,6 @@ size=32768
system=system
tags=system.cpu0.dcache.tags
tgts_per_mshr=20
-two_queue=false
write_buffers=8
cpu_side=system.cpu0.dcache_port
mem_side=system.toL2Bus.slave[1]
@@ -172,6 +171,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu0.dstage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu0.dtb
[system.cpu0.dstage2_mmu.stage2_tlb]
@@ -189,7 +189,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.toL2Bus.slave[5]
[system.cpu0.dtb]
type=ArmTLB
@@ -214,10 +213,11 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=1
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=2
-is_top_level=true
+is_read_only=true
max_miss_count=0
mshrs=4
prefetch_on_access=false
@@ -228,7 +228,6 @@ size=32768
system=system
tags=system.cpu0.icache.tags
tgts_per_mshr=20
-two_queue=false
write_buffers=8
cpu_side=system.cpu0.icache_port
mem_side=system.toL2Bus.slave[0]
@@ -282,6 +281,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu0.istage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu0.itb
[system.cpu0.istage2_mmu.stage2_tlb]
@@ -299,7 +299,6 @@ eventq_index=0
is_stage2=true
num_squash_per_cycle=2
sys=system
-port=system.toL2Bus.slave[4]
[system.cpu0.itb]
type=ArmTLB
@@ -360,6 +359,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu1.dstage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu1.dtb
[system.cpu1.dstage2_mmu.stage2_tlb]
@@ -429,6 +429,7 @@ type=ArmStage2MMU
children=stage2_tlb
eventq_index=0
stage2_tlb=system.cpu1.istage2_mmu.stage2_tlb
+sys=system
tlb=system.cpu1.itb
[system.cpu1.istage2_mmu.stage2_tlb]
@@ -492,9 +493,11 @@ sys=system
type=NoncoherentXBar
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=1
+frontend_latency=2
+response_latency=2
use_default_range=true
-width=8
+width=16
default=system.realview.pciconfig.pio
master=system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.hdlcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.rtc.pio system.realview.vram.port system.realview.l2x0_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.aaci_fake.pio system.realview.lan_fake.pio system.realview.usb_fake.pio system.realview.mmc_fake.pio system.realview.energy_ctrl.pio system.realview.ide.pio system.realview.ide.config system.realview.ethernet.pio system.realview.ethernet.config system.iocache.cpu_side
slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma system.realview.ide.dma system.realview.ethernet.dma
@@ -505,10 +508,11 @@ children=tags
addr_ranges=2147483648:2415919103
assoc=8
clk_domain=system.clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=false
hit_latency=50
-is_top_level=true
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -519,7 +523,6 @@ size=1024
system=system
tags=system.iocache.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.iobus.master[27]
mem_side=system.membus.slave[3]
@@ -540,10 +543,11 @@ children=tags
addr_ranges=0:18446744073709551615
assoc=8
clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
eventq_index=0
forward_snoops=true
hit_latency=20
-is_top_level=false
+is_read_only=false
max_miss_count=0
mshrs=20
prefetch_on_access=false
@@ -554,7 +558,6 @@ size=4194304
system=system
tags=system.l2c.tags
tgts_per_mshr=12
-two_queue=false
write_buffers=8
cpu_side=system.toL2Bus.master[0]
mem_side=system.membus.slave[2]
@@ -574,13 +577,16 @@ type=CoherentXBar
children=badaddr_responder
clk_domain=system.clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
snoop_filter=Null
+snoop_response_latency=4
system=system
use_default_range=false
-width=8
+width=16
default=system.membus.badaddr_responder.pio
-master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port
+master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port
slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side
[system.membus.badaddr_responder]
@@ -628,7 +634,7 @@ IDD62=0.000000
VDD=1.500000
VDD2=0.000000
activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
bank_groups_per_rank=0
banks_per_rank=8
burst_length=8
@@ -919,7 +925,8 @@ pio=system.iobus.master[25]
type=GenericTimer
eventq_index=0
gic=system.realview.gic
-int_num=29
+int_phys=29
+int_virt=27
system=system
[system.realview.gic]
@@ -932,7 +939,6 @@ dist_pio_delay=10000
eventq_index=0
int_latency=10000
it_lines=128
-msix_addr=0
platform=system.realview
system=system
pio=system.membus.master[2]
@@ -950,6 +956,7 @@ pio_latency=10000
pixel_clock=7299
system=system
vnc=system.vncserver
+workaround_swap_rb=true
dma=system.membus.slave[0]
pio=system.iobus.master[5]
@@ -1119,7 +1126,7 @@ int_num_watchdog=30
pio_addr=738721792
pio_latency=100000
system=system
-pio=system.membus.master[3]
+pio=system.membus.master[4]
[system.realview.mmc_fake]
type=AmbaFake
@@ -1159,6 +1166,7 @@ pio=system.iobus.default
[system.realview.realview_io]
type=RealViewCtrl
+children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus
clk_domain=system.clk_domain
eventq_index=0
idreg=35979264
@@ -1169,6 +1177,116 @@ proc_id1=335544320
system=system
pio=system.iobus.master[1]
+[system.realview.realview_io.osc_clcd]
+type=RealViewOsc
+dcc=0
+device=1
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_cpu]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_ddr]
+type=RealViewOsc
+dcc=0
+device=8
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_hsbm]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=25000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_mcc]
+type=RealViewOsc
+dcc=0
+device=0
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_peripheral]
+type=RealViewOsc
+dcc=0
+device=2
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_pxl]
+type=RealViewOsc
+dcc=0
+device=5
+eventq_index=0
+freq=42105
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_smb]
+type=RealViewOsc
+dcc=0
+device=6
+eventq_index=0
+freq=20000
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_sys]
+type=RealViewOsc
+dcc=0
+device=7
+eventq_index=0
+freq=16667
+parent=system.realview.realview_io
+position=0
+site=1
+voltage_domain=system.voltage_domain
+
+[system.realview.realview_io.osc_system_bus]
+type=RealViewOsc
+dcc=0
+device=4
+eventq_index=0
+freq=41667
+parent=system.realview.realview_io
+position=0
+site=0
+voltage_domain=system.voltage_domain
+
[system.realview.rtc]
type=PL031
amba_id=3412017
@@ -1301,7 +1419,7 @@ platform=system.realview
ppint=25
system=system
vcpu_addr=738222080
-pio=system.membus.master[4]
+pio=system.membus.master[3]
[system.realview.vram]
type=SimpleMemory
@@ -1339,13 +1457,16 @@ port=3456
type=CoherentXBar
clk_domain=system.cpu_clk_domain
eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
snoop_filter=Null
+snoop_response_latency=1
system=system
use_default_range=false
-width=8
+width=32
master=system.l2c.cpu_side
-slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu0.istage2_mmu.stage2_tlb.walker.port system.cpu0.dstage2_mmu.stage2_tlb.walker.port
+slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port
[system.vncserver]
type=VncServer
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr
index 067647ddd..d2f2052ec 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr
@@ -67,3 +67,15 @@ warn: User mode does not have SPSR
warn: User mode does not have SPSR
warn: User mode does not have SPSR
warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
+warn: User mode does not have SPSR
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout
index 28734ef64..0920e5399 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout
@@ -1,10 +1,9 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Oct 31 2014 10:01:44
-gem5 started Oct 31 2014 11:48:18
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-timing -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-timing
+gem5 compiled Aug 7 2015 10:13:08
+gem5 started Aug 7 2015 10:13:41
+gem5 executing on e104799-lin
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-timing -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-timing
+
Global frequency set at 1000000000000 ticks per second
- 0: system.cpu0.isa: ISA system set to: 0x4989680 0x4989680
- 0: system.cpu1.isa: ISA system set to: 0x4989680 0x4989680
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt
index 505a1af3b..cda6fdde5 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds 2.903518 # Nu
sim_ticks 2903517798500 # Number of ticks simulated
final_tick 2903517798500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 707460 # Simulator instruction rate (inst/s)
-host_op_rate 852978 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 18263496849 # Simulator tick rate (ticks/s)
-host_mem_usage 621100 # Number of bytes of host memory used
-host_seconds 158.98 # Real time elapsed on the host
+host_inst_rate 703123 # Simulator instruction rate (inst/s)
+host_op_rate 847748 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 18151522616 # Simulator tick rate (ticks/s)
+host_mem_usage 572756 # Number of bytes of host memory used
+host_seconds 159.96 # Real time elapsed on the host
sim_insts 112471533 # Number of instructions simulated
sim_ops 135605825 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1910,6 +1910,16 @@ system.realview.ethernet.totalRxOrn 0 # to
system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post
system.realview.ethernet.postedInterrupts 0 # number of posts to CPU
system.realview.ethernet.droppedPackets 0 # number of packets dropped
+system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks
+system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks
+system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.trans_dist::ReadReq 74970 # Transaction distribution
system.toL2Bus.trans_dist::ReadResp 2298377 # Transaction distribution
system.toL2Bus.trans_dist::WriteReq 27589 # Transaction distribution
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal
index b3be0ec54..ad91d76dd 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal
@@ -193,7 +193,7 @@ oprofile: using timer interrupt.
TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -203,6 +203,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 673, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009