summaryrefslogtreecommitdiff
path: root/tests/quick
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2015-12-04 00:19:05 +0000
committerAndreas Sandberg <andreas.sandberg@arm.com>2015-12-04 00:19:05 +0000
commit5a249e03a4efa79d5513a5e2ebdd27159a14dbb9 (patch)
tree100fe7fd1211e2aa0f6848d932a2ebf37e5bc508 /tests/quick
parent6a05179e13a2ac8e72feb4bd00647013940d814e (diff)
downloadgem5-5a249e03a4efa79d5513a5e2ebdd27159a14dbb9.tar.xz
stats: Update to reflect changes to RealView platform code
Diffstat (limited to 'tests/quick')
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini245
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json320
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt30
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini245
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout14
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt30
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini245
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout14
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt30
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini245
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout14
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt30
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal2
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini245
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout14
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt30
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini245
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout10
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt30
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini245
-rwxr-xr-xtests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout10
-rw-r--r--tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt30
22 files changed, 1195 insertions, 1128 deletions
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 21e533763..2db2ddc0e 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
@@ -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
@@ -43,7 +43,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
@@ -86,7 +86,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]
@@ -512,7 +512,7 @@ port=system.membus.master[5]
[system.realview]
type=RealView
-children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
+children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
eventq_index=0
intrctrl=system.intrctrl
pci_cfg_base=805306368
@@ -637,6 +637,77 @@ vnc=system.vncserver
dma=system.iobus.slave[1]
pio=system.iobus.master[4]
+[system.realview.dcc]
+type=SubSystem
+children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys
+eventq_index=0
+
+[system.realview.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.energy_ctrl]
type=EnergyCtrl
clk_domain=system.clk_domain
@@ -781,7 +852,7 @@ pio_addr=721420288
pio_latency=10000
pixel_buffer_size=2048
pixel_chunk=32
-pxl_clk=system.realview.realview_io.osc_pxl
+pxl_clk=system.realview.dcc.osc_pxl
system=system
vnc=system.vncserver
workaround_dma_line_count=true
@@ -957,6 +1028,55 @@ pio_latency=100000
system=system
pio=system.membus.master[4]
+[system.realview.mcc]
+type=SubSystem
+children=osc_clcd osc_mcc osc_peripheral osc_system_bus
+eventq_index=0
+
+[system.realview.mcc.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.mcc.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.mcc.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.mcc.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.mmc_fake]
type=AmbaFake
amba_id=0
@@ -995,7 +1115,6 @@ 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
@@ -1006,116 +1125,6 @@ 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/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 9c5707f32..8406c4bfc 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
@@ -6,7 +6,7 @@
"mmap_using_noreserve": false,
"kernel_addr_check": true,
"highest_el_is_64": false,
- "kernel": "/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5",
+ "kernel": "/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5",
"iobus": {
"slave": {
"peer": [
@@ -68,7 +68,7 @@
"frontend_latency": 2
},
"symbolfile": "",
- "readfile": "/scratch/nilay/GEM5/gem5/tests/halt.sh",
+ "readfile": "/work/gem5/outgoing/gem5/tests/halt.sh",
"have_large_asid_64": false,
"phys_addr_range_64": 40,
"have_lpae": false,
@@ -87,7 +87,7 @@
"multi_proc": true,
"early_kernel_symbols": false,
"panic_on_oops": true,
- "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",
"panic_on_panic": true,
"enable_context_switch_stats_dump": false,
"work_begin_ckpt_count": 0,
@@ -110,7 +110,7 @@
"realview": {
"hdlcd": {
"vnc": "system.vncserver",
- "pxl_clk": "system.realview.realview_io.osc_pxl",
+ "pxl_clk": "system.realview.dcc.osc_pxl",
"name": "hdlcd",
"workaround_dma_line_count": true,
"amba_id": 1314816,
@@ -213,162 +213,22 @@
"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",
- "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"
- },
+ "system": "system",
"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",
- "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"
- }
+ "pio_addr": 469827584
},
"l2x0_fake": {
"system": "system",
@@ -603,6 +463,160 @@
"pio_addr": 470024192,
"type": "AmbaFake"
},
+ "mcc": {
+ "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.mcc.osc_peripheral",
+ "freq": 41667,
+ "type": "RealViewOsc"
+ },
+ "name": "mcc",
+ "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.mcc.osc_mcc",
+ "freq": 20000,
+ "type": "RealViewOsc"
+ },
+ "type": "SubSystem",
+ "eventq_index": 0,
+ "cxx_class": "SubSystem",
+ "path": "system.realview.mcc",
+ "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.mcc.osc_clcd",
+ "freq": 42105,
+ "type": "RealViewOsc"
+ },
+ "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.mcc.osc_system_bus",
+ "freq": 41667,
+ "type": "RealViewOsc"
+ }
+ },
+ "dcc": {
+ "name": "dcc",
+ "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.dcc.osc_hsbm",
+ "freq": 25000,
+ "type": "RealViewOsc"
+ },
+ "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.dcc.osc_sys",
+ "freq": 16667,
+ "type": "RealViewOsc"
+ },
+ "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.dcc.osc_ddr",
+ "freq": 25000,
+ "type": "RealViewOsc"
+ },
+ "eventq_index": 0,
+ "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.dcc.osc_cpu",
+ "freq": 16667,
+ "type": "RealViewOsc"
+ },
+ "cxx_class": "SubSystem",
+ "path": "system.realview.dcc",
+ "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.dcc.osc_smb",
+ "freq": 20000,
+ "type": "RealViewOsc"
+ },
+ "type": "SubSystem",
+ "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.dcc.osc_pxl",
+ "freq": 42105,
+ "type": "RealViewOsc"
+ }
+ },
"pciconfig": {
"name": "pciconfig",
"pio": {
@@ -897,7 +911,7 @@
"MSIXCAPNextCapability": 0,
"PXCAPLinkCtrl": 0,
"Revision": 0,
- "hardware_address": "<m5.params.EthernetAddr object at 0x4626a90>",
+ "hardware_address": "00:90:00:00:00:01",
"LegacyIOBase": 0,
"pio_latency": 30000,
"platform": "system.realview",
@@ -1725,7 +1739,7 @@
"eventq_index": 0,
"cxx_class": "RawDiskImage",
"path": "system.cf0.image.child",
- "image_file": "/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img",
+ "image_file": "/work/gem5/dist/disks/linux-aarch32-ael.img",
"type": "RawDiskImage"
},
"path": "system.cf0.image",
@@ -1765,7 +1779,9 @@
"system.realview.vram"
],
"work_begin_cpu_id_exit": -1,
- "boot_loader": "/scratch/nilay/GEM5/system/binaries/boot_emm.arm",
+ "boot_loader": [
+ "/work/gem5/dist/binaries/boot_emm.arm"
+ ],
"num_work_ids": 16
},
"time_sync_period": 100000000000,
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 d84a29255..4f7058700 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 930781 # Simulator instruction rate (inst/s)
-host_op_rate 1133077 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 18148903353 # Simulator tick rate (ticks/s)
-host_mem_usage 620884 # Number of bytes of host memory used
-host_seconds 153.39 # Real time elapsed on the host
+host_inst_rate 648383 # Simulator instruction rate (inst/s)
+host_op_rate 789303 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 12642549042 # Simulator tick rate (ticks/s)
+host_mem_usage 580896 # Number of bytes of host memory used
+host_seconds 220.20 # 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
@@ -728,6 +728,12 @@ system.membus.snoop_fanout::overflows 0 0.00% 100.00% # Re
system.membus.snoop_fanout::min_value 1 # Request fanout histogram
system.membus.snoop_fanout::max_value 1 # Request fanout histogram
system.membus.snoop_fanout::total 434821 # Request fanout histogram
+system.realview.dcc.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.dcc.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.dcc.osc_smb.clock 20000 # Clock period in ticks
+system.realview.dcc.osc_sys.clock 16667 # Clock period in ticks
system.realview.ethernet.descDMAReads 0 # Number of descriptors the device read w/ DMA
system.realview.ethernet.descDMAWrites 0 # Number of descriptors the device wrote w/ DMA
system.realview.ethernet.descDmaReadBytes 0 # number of descriptor bytes read w/ DMA
@@ -759,15 +765,9 @@ 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_pxl.clock 42105 # Clock period in ticks
-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_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.realview.mcc.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.mcc.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.mcc.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.mcc.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 586b5ebfb..540fdcdef 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,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
@@ -43,7 +43,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
@@ -86,7 +86,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]
@@ -893,7 +893,7 @@ port=system.membus.master[5]
[system.realview]
type=RealView
-children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
+children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
eventq_index=0
intrctrl=system.intrctrl
pci_cfg_base=805306368
@@ -1018,6 +1018,77 @@ vnc=system.vncserver
dma=system.iobus.slave[1]
pio=system.iobus.master[4]
+[system.realview.dcc]
+type=SubSystem
+children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys
+eventq_index=0
+
+[system.realview.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.energy_ctrl]
type=EnergyCtrl
clk_domain=system.clk_domain
@@ -1162,7 +1233,7 @@ pio_addr=721420288
pio_latency=10000
pixel_buffer_size=2048
pixel_chunk=32
-pxl_clk=system.realview.realview_io.osc_pxl
+pxl_clk=system.realview.dcc.osc_pxl
system=system
vnc=system.vncserver
workaround_dma_line_count=true
@@ -1338,6 +1409,55 @@ pio_latency=100000
system=system
pio=system.membus.master[4]
+[system.realview.mcc]
+type=SubSystem
+children=osc_clcd osc_mcc osc_peripheral osc_system_bus
+eventq_index=0
+
+[system.realview.mcc.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.mcc.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.mcc.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.mcc.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.mmc_fake]
type=AmbaFake
amba_id=0
@@ -1376,7 +1496,6 @@ 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
@@ -1387,116 +1506,6 @@ 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/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 8b953d20b..d22933e16 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,18 +1,16 @@
-Redirecting stdout to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual/simout
-Redirecting stderr to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Nov 15 2015 15:24:37
-gem5 started Nov 15 2015 15:25:11
-gem5 executing on ribera.cs.wisc.edu, pid 11029
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual
+gem5 compiled Dec 3 2015 15:48:05
+gem5 started Dec 3 2015 15:54:29
+gem5 executing on e104799-lin, pid 1782
+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: /scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+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: /scratch/nilay/GEM5/system/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: 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
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 f7532a630..5ccc65a5c 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 842767 # Simulator instruction rate (inst/s)
-host_op_rate 1026899 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 16088096135 # Simulator tick rate (ticks/s)
-host_mem_usage 630892 # Number of bytes of host memory used
-host_seconds 174.22 # Real time elapsed on the host
+host_inst_rate 515393 # Simulator instruction rate (inst/s)
+host_op_rate 627998 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 9838648327 # Simulator tick rate (ticks/s)
+host_mem_usage 594196 # Number of bytes of host memory used
+host_seconds 284.89 # 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
@@ -1435,6 +1435,12 @@ system.membus.snoop_fanout::overflows 0 0.00% 100.00% # Re
system.membus.snoop_fanout::min_value 1 # Request fanout histogram
system.membus.snoop_fanout::max_value 1 # Request fanout histogram
system.membus.snoop_fanout::total 581009 # Request fanout histogram
+system.realview.dcc.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.dcc.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.dcc.osc_smb.clock 20000 # Clock period in ticks
+system.realview.dcc.osc_sys.clock 16667 # Clock period in ticks
system.realview.ethernet.descDMAReads 0 # Number of descriptors the device read w/ DMA
system.realview.ethernet.descDMAWrites 0 # Number of descriptors the device wrote w/ DMA
system.realview.ethernet.descDmaReadBytes 0 # number of descriptor bytes read w/ DMA
@@ -1466,16 +1472,10 @@ 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_pxl.clock 42105 # Clock period in ticks
-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_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.realview.mcc.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.mcc.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.mcc.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.mcc.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.snoop_filter.tot_requests 863003 # Total number of requests made to the snoop filter.
system.toL2Bus.snoop_filter.hit_single_requests 444472 # Number of requests hitting in the snoop filter with a single holder of the requested data.
system.toL2Bus.snoop_filter.hit_multi_requests 128485 # Number of requests hitting in the snoop filter with multiple (>1) holders of the requested data.
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 21e533763..2db2ddc0e 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,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
@@ -43,7 +43,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
@@ -86,7 +86,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]
@@ -512,7 +512,7 @@ port=system.membus.master[5]
[system.realview]
type=RealView
-children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
+children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
eventq_index=0
intrctrl=system.intrctrl
pci_cfg_base=805306368
@@ -637,6 +637,77 @@ vnc=system.vncserver
dma=system.iobus.slave[1]
pio=system.iobus.master[4]
+[system.realview.dcc]
+type=SubSystem
+children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys
+eventq_index=0
+
+[system.realview.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.energy_ctrl]
type=EnergyCtrl
clk_domain=system.clk_domain
@@ -781,7 +852,7 @@ pio_addr=721420288
pio_latency=10000
pixel_buffer_size=2048
pixel_chunk=32
-pxl_clk=system.realview.realview_io.osc_pxl
+pxl_clk=system.realview.dcc.osc_pxl
system=system
vnc=system.vncserver
workaround_dma_line_count=true
@@ -957,6 +1028,55 @@ pio_latency=100000
system=system
pio=system.membus.master[4]
+[system.realview.mcc]
+type=SubSystem
+children=osc_clcd osc_mcc osc_peripheral osc_system_bus
+eventq_index=0
+
+[system.realview.mcc.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.mcc.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.mcc.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.mcc.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.mmc_fake]
type=AmbaFake
amba_id=0
@@ -995,7 +1115,6 @@ 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
@@ -1006,116 +1125,6 @@ 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/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 a1781eb6c..7352915d9 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,16 @@
-Redirecting stdout to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic/simout
-Redirecting stderr to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Nov 15 2015 15:24:37
-gem5 started Nov 15 2015 15:25:11
-gem5 executing on ribera.cs.wisc.edu, pid 11030
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic
+gem5 compiled Dec 3 2015 15:48:05
+gem5 started Dec 3 2015 15:54:29
+gem5 executing on e104799-lin, pid 1776
+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: /scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+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: /scratch/nilay/GEM5/system/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: 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
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 e13e9ca16..ed7366920 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 866228 # Simulator instruction rate (inst/s)
-host_op_rate 1054494 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 16890212334 # Simulator tick rate (ticks/s)
-host_mem_usage 616684 # Number of bytes of host memory used
-host_seconds 164.82 # Real time elapsed on the host
+host_inst_rate 528399 # Simulator instruction rate (inst/s)
+host_op_rate 643241 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 10303020007 # Simulator tick rate (ticks/s)
+host_mem_usage 581016 # Number of bytes of host memory used
+host_seconds 270.20 # 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
@@ -728,6 +728,12 @@ system.membus.snoop_fanout::overflows 0 0.00% 100.00% # Re
system.membus.snoop_fanout::min_value 1 # Request fanout histogram
system.membus.snoop_fanout::max_value 1 # Request fanout histogram
system.membus.snoop_fanout::total 434821 # Request fanout histogram
+system.realview.dcc.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.dcc.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.dcc.osc_smb.clock 20000 # Clock period in ticks
+system.realview.dcc.osc_sys.clock 16667 # Clock period in ticks
system.realview.ethernet.descDMAReads 0 # Number of descriptors the device read w/ DMA
system.realview.ethernet.descDMAWrites 0 # Number of descriptors the device wrote w/ DMA
system.realview.ethernet.descDmaReadBytes 0 # number of descriptor bytes read w/ DMA
@@ -759,15 +765,9 @@ 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_pxl.clock 42105 # Clock period in ticks
-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_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.realview.mcc.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.mcc.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.mcc.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.mcc.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-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini
index 2709cd845..58c91ec69 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,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
@@ -43,7 +43,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
@@ -86,7 +86,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]
@@ -949,7 +949,7 @@ port=system.membus.master[5]
[system.realview]
type=RealView
-children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
+children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
eventq_index=0
intrctrl=system.intrctrl
pci_cfg_base=805306368
@@ -1074,6 +1074,77 @@ vnc=system.vncserver
dma=system.iobus.slave[1]
pio=system.iobus.master[4]
+[system.realview.dcc]
+type=SubSystem
+children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys
+eventq_index=0
+
+[system.realview.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.energy_ctrl]
type=EnergyCtrl
clk_domain=system.clk_domain
@@ -1218,7 +1289,7 @@ pio_addr=721420288
pio_latency=10000
pixel_buffer_size=2048
pixel_chunk=32
-pxl_clk=system.realview.realview_io.osc_pxl
+pxl_clk=system.realview.dcc.osc_pxl
system=system
vnc=system.vncserver
workaround_dma_line_count=true
@@ -1394,6 +1465,55 @@ pio_latency=100000
system=system
pio=system.membus.master[4]
+[system.realview.mcc]
+type=SubSystem
+children=osc_clcd osc_mcc osc_peripheral osc_system_bus
+eventq_index=0
+
+[system.realview.mcc.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.mcc.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.mcc.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.mcc.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.mmc_fake]
type=AmbaFake
amba_id=0
@@ -1432,7 +1552,6 @@ 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
@@ -1443,116 +1562,6 @@ 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/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 eac0c48d7..4bb037bf9 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,18 +1,16 @@
-Redirecting stdout to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual/simout
-Redirecting stderr to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Nov 15 2015 15:24:37
-gem5 started Nov 15 2015 15:29:29
-gem5 executing on ribera.cs.wisc.edu, pid 11176
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual
+gem5 compiled Dec 3 2015 15:48:05
+gem5 started Dec 3 2015 15:54:29
+gem5 executing on e104799-lin, pid 1787
+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: /scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+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: /scratch/nilay/GEM5/system/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: 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
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 eb2ef3a3a..c9db9f143 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.871820 # Nu
sim_ticks 2871819744000 # Number of ticks simulated
final_tick 2871819744000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 515898 # Simulator instruction rate (inst/s)
-host_op_rate 624021 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 11272108590 # Simulator tick rate (ticks/s)
-host_mem_usage 651632 # Number of bytes of host memory used
-host_seconds 254.77 # Real time elapsed on the host
+host_inst_rate 357244 # Simulator instruction rate (inst/s)
+host_op_rate 432116 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 7805602288 # Simulator tick rate (ticks/s)
+host_mem_usage 614840 # Number of bytes of host memory used
+host_seconds 367.92 # Real time elapsed on the host
sim_insts 131436334 # Number of instructions simulated
sim_ops 158983282 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -2979,6 +2979,12 @@ system.membus.respLayer2.occupancy 1134075509 # La
system.membus.respLayer2.utilization 0.0 # Layer utilization (%)
system.membus.respLayer3.occupancy 64085297 # Layer occupancy (ticks)
system.membus.respLayer3.utilization 0.0 # Layer utilization (%)
+system.realview.dcc.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.dcc.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.dcc.osc_smb.clock 20000 # Clock period in ticks
+system.realview.dcc.osc_sys.clock 16667 # Clock period in ticks
system.realview.ethernet.descDMAReads 0 # Number of descriptors the device read w/ DMA
system.realview.ethernet.descDMAWrites 0 # Number of descriptors the device wrote w/ DMA
system.realview.ethernet.descDmaReadBytes 0 # number of descriptor bytes read w/ DMA
@@ -3010,16 +3016,10 @@ 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_pxl.clock 42105 # Clock period in ticks
-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_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.realview.mcc.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.mcc.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.mcc.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.mcc.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.snoop_filter.tot_requests 961177 # Total number of requests made to the snoop filter.
system.toL2Bus.snoop_filter.hit_single_requests 518872 # Number of requests hitting in the snoop filter with a single holder of the requested data.
system.toL2Bus.snoop_filter.hit_multi_requests 139554 # Number of requests hitting in the snoop filter with multiple (>1) holders of the requested data.
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 d38aec98b..263610058 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
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 8fafdb847..3ed11f6b1 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,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
@@ -43,7 +43,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
@@ -86,7 +86,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]
@@ -572,7 +572,7 @@ port=system.membus.master[5]
[system.realview]
type=RealView
-children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
+children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
eventq_index=0
intrctrl=system.intrctrl
pci_cfg_base=805306368
@@ -697,6 +697,77 @@ vnc=system.vncserver
dma=system.iobus.slave[1]
pio=system.iobus.master[4]
+[system.realview.dcc]
+type=SubSystem
+children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys
+eventq_index=0
+
+[system.realview.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.energy_ctrl]
type=EnergyCtrl
clk_domain=system.clk_domain
@@ -841,7 +912,7 @@ pio_addr=721420288
pio_latency=10000
pixel_buffer_size=2048
pixel_chunk=32
-pxl_clk=system.realview.realview_io.osc_pxl
+pxl_clk=system.realview.dcc.osc_pxl
system=system
vnc=system.vncserver
workaround_dma_line_count=true
@@ -1017,6 +1088,55 @@ pio_latency=100000
system=system
pio=system.membus.master[4]
+[system.realview.mcc]
+type=SubSystem
+children=osc_clcd osc_mcc osc_peripheral osc_system_bus
+eventq_index=0
+
+[system.realview.mcc.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.mcc.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.mcc.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.mcc.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.mmc_fake]
type=AmbaFake
amba_id=0
@@ -1055,7 +1175,6 @@ 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
@@ -1066,116 +1185,6 @@ 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/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 4175a9aa7..f435b44af 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,16 @@
-Redirecting stdout to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing/simout
-Redirecting stderr to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Nov 15 2015 15:24:37
-gem5 started Nov 15 2015 15:25:11
-gem5 executing on ribera.cs.wisc.edu, pid 11026
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing
+gem5 compiled Dec 3 2015 15:48:05
+gem5 started Dec 3 2015 15:54:29
+gem5 executing on e104799-lin, pid 1785
+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: /scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+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: /scratch/nilay/GEM5/system/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: 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
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 419fb1080..ae445de86 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.909604 # Nu
sim_ticks 2909603958500 # Number of ticks simulated
final_tick 2909603958500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 491347 # Simulator instruction rate (inst/s)
-host_op_rate 592409 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 12712752157 # Simulator tick rate (ticks/s)
-host_mem_usage 616676 # Number of bytes of host memory used
-host_seconds 228.87 # Real time elapsed on the host
+host_inst_rate 366627 # Simulator instruction rate (inst/s)
+host_op_rate 442036 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 9485837068 # Simulator tick rate (ticks/s)
+host_mem_usage 580620 # Number of bytes of host memory used
+host_seconds 306.73 # Real time elapsed on the host
sim_insts 112455934 # Number of instructions simulated
sim_ops 135586369 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1449,6 +1449,12 @@ system.membus.respLayer2.occupancy 952261248 # La
system.membus.respLayer2.utilization 0.0 # Layer utilization (%)
system.membus.respLayer3.occupancy 64129261 # Layer occupancy (ticks)
system.membus.respLayer3.utilization 0.0 # Layer utilization (%)
+system.realview.dcc.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.dcc.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.dcc.osc_smb.clock 20000 # Clock period in ticks
+system.realview.dcc.osc_sys.clock 16667 # Clock period in ticks
system.realview.ethernet.descDMAReads 0 # Number of descriptors the device read w/ DMA
system.realview.ethernet.descDMAWrites 0 # Number of descriptors the device wrote w/ DMA
system.realview.ethernet.descDmaReadBytes 0 # number of descriptor bytes read w/ DMA
@@ -1480,15 +1486,9 @@ 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_pxl.clock 42105 # Clock period in ticks
-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_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.realview.mcc.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.mcc.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.mcc.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.mcc.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-switcheroo-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini
index dfabc2419..c18617da5 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,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
@@ -43,7 +43,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
@@ -86,7 +86,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]
@@ -641,7 +641,7 @@ port=system.membus.master[5]
[system.realview]
type=RealView
-children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
+children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
eventq_index=0
intrctrl=system.intrctrl
pci_cfg_base=805306368
@@ -766,6 +766,77 @@ vnc=system.vncserver
dma=system.iobus.slave[1]
pio=system.iobus.master[4]
+[system.realview.dcc]
+type=SubSystem
+children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys
+eventq_index=0
+
+[system.realview.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.energy_ctrl]
type=EnergyCtrl
clk_domain=system.clk_domain
@@ -910,7 +981,7 @@ pio_addr=721420288
pio_latency=10000
pixel_buffer_size=2048
pixel_chunk=32
-pxl_clk=system.realview.realview_io.osc_pxl
+pxl_clk=system.realview.dcc.osc_pxl
system=system
vnc=system.vncserver
workaround_dma_line_count=true
@@ -1086,6 +1157,55 @@ pio_latency=100000
system=system
pio=system.membus.master[4]
+[system.realview.mcc]
+type=SubSystem
+children=osc_clcd osc_mcc osc_peripheral osc_system_bus
+eventq_index=0
+
+[system.realview.mcc.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.mcc.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.mcc.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.mcc.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.mmc_fake]
type=AmbaFake
amba_id=0
@@ -1124,7 +1244,6 @@ 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
@@ -1135,116 +1254,6 @@ 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/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 49dc882ba..a9e51249c 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,11 +1,9 @@
-Redirecting stdout to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic/simout
-Redirecting stderr to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Nov 15 2015 15:24:37
-gem5 started Nov 15 2015 15:28:30
-gem5 executing on ribera.cs.wisc.edu, pid 11126
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic
+gem5 compiled Dec 3 2015 15:48:05
+gem5 started Dec 3 2015 15:55:07
+gem5 executing on e104799-lin, pid 1838
+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
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 8a13f16f8..bf5be371b 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 895317 # Simulator instruction rate (inst/s)
-host_op_rate 1089905 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 17457402345 # Simulator tick rate (ticks/s)
-host_mem_usage 617704 # Number of bytes of host memory used
-host_seconds 159.47 # Real time elapsed on the host
+host_inst_rate 544117 # Simulator instruction rate (inst/s)
+host_op_rate 662376 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 10609508545 # Simulator tick rate (ticks/s)
+host_mem_usage 578316 # Number of bytes of host memory used
+host_seconds 262.39 # 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
@@ -999,6 +999,12 @@ system.membus.snoop_fanout::overflows 0 0.00% 100.00% # Re
system.membus.snoop_fanout::min_value 1 # Request fanout histogram
system.membus.snoop_fanout::max_value 1 # Request fanout histogram
system.membus.snoop_fanout::total 434809 # Request fanout histogram
+system.realview.dcc.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.dcc.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.dcc.osc_smb.clock 20000 # Clock period in ticks
+system.realview.dcc.osc_sys.clock 16667 # Clock period in ticks
system.realview.ethernet.descDMAReads 0 # Number of descriptors the device read w/ DMA
system.realview.ethernet.descDMAWrites 0 # Number of descriptors the device wrote w/ DMA
system.realview.ethernet.descDmaReadBytes 0 # number of descriptor bytes read w/ DMA
@@ -1030,16 +1036,10 @@ 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_pxl.clock 42105 # Clock period in ticks
-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_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.realview.mcc.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.mcc.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.mcc.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.mcc.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.snoop_filter.tot_requests 5060706 # Total number of requests made to the snoop filter.
system.toL2Bus.snoop_filter.hit_single_requests 2541063 # Number of requests hitting in the snoop filter with a single holder of the requested data.
system.toL2Bus.snoop_filter.hit_multi_requests 39274 # Number of requests hitting in the snoop filter with multiple (>1) holders of the requested data.
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 8eb7ddc6d..79996f19b 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,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
@@ -43,7 +43,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
@@ -86,7 +86,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]
@@ -697,7 +697,7 @@ port=system.membus.master[5]
[system.realview]
type=RealView
-children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
+children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake
eventq_index=0
intrctrl=system.intrctrl
pci_cfg_base=805306368
@@ -822,6 +822,77 @@ vnc=system.vncserver
dma=system.iobus.slave[1]
pio=system.iobus.master[4]
+[system.realview.dcc]
+type=SubSystem
+children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys
+eventq_index=0
+
+[system.realview.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.energy_ctrl]
type=EnergyCtrl
clk_domain=system.clk_domain
@@ -966,7 +1037,7 @@ pio_addr=721420288
pio_latency=10000
pixel_buffer_size=2048
pixel_chunk=32
-pxl_clk=system.realview.realview_io.osc_pxl
+pxl_clk=system.realview.dcc.osc_pxl
system=system
vnc=system.vncserver
workaround_dma_line_count=true
@@ -1142,6 +1213,55 @@ pio_latency=100000
system=system
pio=system.membus.master[4]
+[system.realview.mcc]
+type=SubSystem
+children=osc_clcd osc_mcc osc_peripheral osc_system_bus
+eventq_index=0
+
+[system.realview.mcc.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.mcc.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.mcc.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.mcc.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.mmc_fake]
type=AmbaFake
amba_id=0
@@ -1180,7 +1300,6 @@ 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
@@ -1191,116 +1310,6 @@ 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/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 40eee6881..1355ee684 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,11 +1,9 @@
-Redirecting stdout to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-timing/simout
-Redirecting stderr to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-timing/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Nov 15 2015 15:24:37
-gem5 started Nov 15 2015 15:25:11
-gem5 executing on ribera.cs.wisc.edu, pid 11032
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-timing
+gem5 compiled Dec 3 2015 15:48:05
+gem5 started Dec 3 2015 15:55:08
+gem5 executing on e104799-lin, pid 1845
+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
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 5a3760388..acd379650 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.909654 # Nu
sim_ticks 2909653700500 # Number of ticks simulated
final_tick 2909653700500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
sim_freq 1000000000000 # Frequency of simulated ticks
-host_inst_rate 503686 # Simulator instruction rate (inst/s)
-host_op_rate 607284 # Simulator op (including micro ops) rate (op/s)
-host_tick_rate 13032832598 # Simulator tick rate (ticks/s)
-host_mem_usage 617700 # Number of bytes of host memory used
-host_seconds 223.26 # Real time elapsed on the host
+host_inst_rate 367664 # Simulator instruction rate (inst/s)
+host_op_rate 443285 # Simulator op (including micro ops) rate (op/s)
+host_tick_rate 9513271691 # Simulator tick rate (ticks/s)
+host_mem_usage 578564 # Number of bytes of host memory used
+host_seconds 305.85 # Real time elapsed on the host
sim_insts 112450652 # Number of instructions simulated
sim_ops 135579653 # Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 # Voltage in Volts
@@ -1890,6 +1890,12 @@ system.membus.respLayer2.occupancy 952221498 # La
system.membus.respLayer2.utilization 0.0 # Layer utilization (%)
system.membus.respLayer3.occupancy 64071640 # Layer occupancy (ticks)
system.membus.respLayer3.utilization 0.0 # Layer utilization (%)
+system.realview.dcc.osc_cpu.clock 16667 # Clock period in ticks
+system.realview.dcc.osc_ddr.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_hsbm.clock 25000 # Clock period in ticks
+system.realview.dcc.osc_pxl.clock 42105 # Clock period in ticks
+system.realview.dcc.osc_smb.clock 20000 # Clock period in ticks
+system.realview.dcc.osc_sys.clock 16667 # Clock period in ticks
system.realview.ethernet.descDMAReads 0 # Number of descriptors the device read w/ DMA
system.realview.ethernet.descDMAWrites 0 # Number of descriptors the device wrote w/ DMA
system.realview.ethernet.descDmaReadBytes 0 # number of descriptor bytes read w/ DMA
@@ -1921,16 +1927,10 @@ 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_pxl.clock 42105 # Clock period in ticks
-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_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.realview.mcc.osc_clcd.clock 42105 # Clock period in ticks
+system.realview.mcc.osc_mcc.clock 20000 # Clock period in ticks
+system.realview.mcc.osc_peripheral.clock 41667 # Clock period in ticks
+system.realview.mcc.osc_system_bus.clock 41667 # Clock period in ticks
system.toL2Bus.snoop_filter.tot_requests 5052869 # Total number of requests made to the snoop filter.
system.toL2Bus.snoop_filter.hit_single_requests 2537534 # Number of requests hitting in the snoop filter with a single holder of the requested data.
system.toL2Bus.snoop_filter.hit_multi_requests 38120 # Number of requests hitting in the snoop filter with multiple (>1) holders of the requested data.