stats: update stats for mmap() change.

SE O3 runs see an additional reg read per mmap() call.

37 files changed, 420 insertions, 281 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/system.terminal
index b17305731..7c4566f67 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-switcheroo-full/system.terminal
@@ -33,134 +33,134 @@
 [    0.000000] Architected cp15 timer(s) running at 100.00MHz (phys).

 [    0.000000] sched_clock: 56 bits at 100MHz, resolution 10ns, wraps every 2748779069440ns

 [    0.000014] Console: colour dummy device 80x25

-[    0.000016] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)

-[    0.000017] pid_max: default: 32768 minimum: 301

-[    0.000025] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)

-[    0.000026] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)

-[    0.000087] hw perfevents: no hardware support available

-[    1.060050] CPU1: failed to come online

+[    0.000015] Calibrating delay loop (skipped) preset value.. 3997.69 BogoMIPS (lpj=19988480)

+[    0.000016] pid_max: default: 32768 minimum: 301

+[    0.000024] Mount-cache hash table entries: 512 (order: 0, 4096 bytes)

+[    0.000025] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes)

+[    0.000086] hw perfevents: no hardware support available

+[    1.060049] CPU1: failed to come online

 [    2.080100] CPU2: failed to come online

 [    3.100151] CPU3: failed to come online

 [    3.100153] Brought up 1 CPUs

-[    3.100154] SMP: Total of 1 processors activated.

+[    3.100153] SMP: Total of 1 processors activated.

 [    3.100180] devtmpfs: initialized

-[    3.100808] atomic64_test: passed

-[    3.100875] regulator-dummy: no parameters

-[    3.101140] NET: Registered protocol family 16

-[    3.101229] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000

-[    3.101233] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.

-[    3.101272] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]

-[    3.101273] Serial: AMBA PL011 UART driver

-[    3.101394] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000

-[    3.101446] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3

-[    3.102017] console [ttyAMA0] enabled

-[    3.102081] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000

-[    3.102107] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000

-[    3.102133] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000

-[    3.102158] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000

+[    3.100805] atomic64_test: passed

+[    3.100869] regulator-dummy: no parameters

+[    3.101131] NET: Registered protocol family 16

+[    3.101220] vdso: 2 pages (1 code, 1 data) at base ffffffc0006cd000

+[    3.101223] hw-breakpoint: found 2 breakpoint and 2 watchpoint registers.

+[    3.101262] software IO TLB [mem 0x8d400000-0x8d800000] (4MB) mapped at [ffffffc00d400000-ffffffc00d7fffff]

+[    3.101264] Serial: AMBA PL011 UART driver

+[    3.101385] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/sysctl@020000

+[    3.101407] 1c090000.uart: ttyAMA0 at MMIO 0x1c090000 (irq = 37, base_baud = 0) is a PL011 rev3

+[    3.101978] console [ttyAMA0] enabled

+[    3.102041] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0a0000

+[    3.102067] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0b0000

+[    3.102093] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/uart@0c0000

+[    3.102118] of_amba_device_create(): amba_device_add() failed (-19) for /smb/motherboard/iofpga@3,00000000/wdt@0f0000

 [    3.130359] 3V3: 3300 mV 

 [    3.130380] vgaarb: loaded

-[    3.130422] SCSI subsystem initialized

-[    3.130494] libata version 3.00 loaded.

-[    3.130583] usbcore: registered new interface driver usbfs

-[    3.130611] usbcore: registered new interface driver hub

-[    3.130664] usbcore: registered new device driver usb

-[    3.130699] pps_core: LinuxPPS API ver. 1 registered

-[    3.130708] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>

-[    3.130728] PTP clock support registered

-[    3.130897] Switched to clocksource arch_sys_counter

-[    3.131875] NET: Registered protocol family 2

-[    3.131949] TCP established hash table entries: 2048 (order: 2, 16384 bytes)

-[    3.131965] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)

-[    3.131982] TCP: Hash tables configured (established 2048 bind 2048)

-[    3.131996] TCP: reno registered

-[    3.132003] UDP hash table entries: 256 (order: 1, 8192 bytes)

-[    3.132015] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)

-[    3.132046] NET: Registered protocol family 1

-[    3.132081] RPC: Registered named UNIX socket transport module.

-[    3.132091] RPC: Registered udp transport module.

-[    3.132099] RPC: Registered tcp transport module.

-[    3.132107] RPC: Registered tcp NFSv4.1 backchannel transport module.

-[    3.132118] PCI: CLS 0 bytes, default 64

-[    3.132221] futex hash table entries: 1024 (order: 4, 65536 bytes)

-[    3.132270] HugeTLB registered 2 MB page size, pre-allocated 0 pages

-[    3.134007] fuse init (API version 7.23)

-[    3.134064] msgmni has been set to 469

-[    3.136091] io scheduler noop registered

-[    3.136128] io scheduler cfq registered (default)

-[    3.136418] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00

-[    3.136420] pci_bus 0000:00: root bus resource [io  0x0000-0xffff]

-[    3.136421] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]

-[    3.136423] pci_bus 0000:00: root bus resource [bus 00-ff]

-[    3.136424] pci_bus 0000:00: scanning bus

-[    3.136427] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000

-[    3.136428] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]

-[    3.136431] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]

-[    3.136459] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185

-[    3.136473] pci 0000:00:01.0: reg 0x10: [io  0x0000-0x0007]

-[    3.136486] pci 0000:00:01.0: reg 0x14: [io  0x0000-0x0003]

-[    3.136499] pci 0000:00:01.0: reg 0x18: [io  0x0000-0x0007]

-[    3.136511] pci 0000:00:01.0: reg 0x1c: [io  0x0000-0x0003]

-[    3.136524] pci 0000:00:01.0: reg 0x20: [io  0x0000-0x000f]

-[    3.136537] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]

-[    3.136597] pci_bus 0000:00: fixups for bus

-[    3.136607] pci_bus 0000:00: bus scan returning with max=00

-[    3.136622] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc

-[    3.136649] pci 0000:00:00.0: fixup irq: got 33

-[    3.136659] pci 0000:00:00.0: assigning IRQ 33

-[    3.136672] pci 0000:00:01.0: fixup irq: got 34

-[    3.136682] pci 0000:00:01.0: assigning IRQ 34

-[    3.136697] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]

-[    3.136712] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]

-[    3.136726] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]

-[    3.136739] pci 0000:00:01.0: BAR 4: assigned [io  0x1000-0x100f]

-[    3.136751] pci 0000:00:01.0: BAR 0: assigned [io  0x1010-0x1017]

-[    3.136763] pci 0000:00:01.0: BAR 2: assigned [io  0x1018-0x101f]

-[    3.136775] pci 0000:00:01.0: BAR 1: assigned [io  0x1020-0x1023]

-[    3.136787] pci 0000:00:01.0: BAR 3: assigned [io  0x1024-0x1027]

-[    3.137187] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled

-[    3.137353] ata_piix 0000:00:01.0: version 2.13

-[    3.137355] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)

-[    3.137360] ata_piix 0000:00:01.0: enabling bus mastering

-[    3.137757] scsi0 : ata_piix

-[    3.137894] scsi1 : ata_piix

-[    3.137932] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34

-[    3.137945] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34

-[    3.138020] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI

-[    3.138031] e1000: Copyright (c) 1999-2006 Intel Corporation.

-[    3.138045] e1000 0000:00:00.0: enabling device (0000 -> 0002)

-[    3.138055] e1000 0000:00:00.0: enabling bus mastering

-[    3.290899] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66

-[    3.290901] ata1.00: 2096640 sectors, multi 0: LBA 

-[    3.290907] ata1.00: configured for UDMA/33

-[    3.290924] scsi 0:0:0:0: Direct-Access     ATA      M5 IDE Disk      n/a  PQ: 0 ANSI: 5

-[    3.290985] sd 0:0:0:0: Attached scsi generic sg0 type 0

-[    3.290993] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)

-[    3.291007] sd 0:0:0:0: [sda] Write Protect is off

-[    3.291008] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00

-[    3.291015] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA

-[    3.291068]  sda: sda1

-[    3.291130] sd 0:0:0:0: [sda] Attached SCSI disk

-[    3.411193] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01

-[    3.411208] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection

-[    3.411238] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k

-[    3.411249] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.

-[    3.411280] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k

-[    3.411293] igb: Copyright (c) 2007-2014 Intel Corporation.

-[    3.411416] usbcore: registered new interface driver usb-storage

-[    3.411488] mousedev: PS/2 mouse device common for all mice

-[    3.411666] usbcore: registered new interface driver usbhid

-[    3.411675] usbhid: USB HID core driver

-[    3.411700] TCP: cubic registered

-[    3.411707] NET: Registered protocol family 17

-
-[    3.411942] devtmpfs: mounted

-[    3.411950] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)

+[    3.130421] SCSI subsystem initialized

+[    3.130492] libata version 3.00 loaded.

+[    3.130577] usbcore: registered new interface driver usbfs

+[    3.130605] usbcore: registered new interface driver hub

+[    3.130658] usbcore: registered new device driver usb

+[    3.130692] pps_core: LinuxPPS API ver. 1 registered

+[    3.130701] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>

+[    3.130721] PTP clock support registered

+[    3.130886] Switched to clocksource arch_sys_counter

+[    3.131839] NET: Registered protocol family 2

+[    3.131931] TCP established hash table entries: 2048 (order: 2, 16384 bytes)

+[    3.131947] TCP bind hash table entries: 2048 (order: 3, 32768 bytes)

+[    3.131964] TCP: Hash tables configured (established 2048 bind 2048)

+[    3.131979] TCP: reno registered

+[    3.131985] UDP hash table entries: 256 (order: 1, 8192 bytes)

+[    3.131997] UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)

+[    3.132028] NET: Registered protocol family 1

+[    3.132061] RPC: Registered named UNIX socket transport module.

+[    3.132071] RPC: Registered udp transport module.

+[    3.132079] RPC: Registered tcp transport module.

+[    3.132087] RPC: Registered tcp NFSv4.1 backchannel transport module.

+[    3.132098] PCI: CLS 0 bytes, default 64

+[    3.132201] futex hash table entries: 1024 (order: 4, 65536 bytes)

+[    3.132250] HugeTLB registered 2 MB page size, pre-allocated 0 pages

+[    3.133974] fuse init (API version 7.23)

+[    3.134030] msgmni has been set to 469

+[    3.136051] io scheduler noop registered

+[    3.136088] io scheduler cfq registered (default)

+[    3.136364] pci-host-generic 30000000.pci: PCI host bridge to bus 0000:00

+[    3.136366] pci_bus 0000:00: root bus resource [io  0x0000-0xffff]

+[    3.136367] pci_bus 0000:00: root bus resource [mem 0x40000000-0x4fffffff]

+[    3.136369] pci_bus 0000:00: root bus resource [bus 00-ff]

+[    3.136370] pci_bus 0000:00: scanning bus

+[    3.136372] pci 0000:00:00.0: [8086:1075] type 00 class 0x020000

+[    3.136374] pci 0000:00:00.0: reg 0x10: [mem 0x00000000-0x0001ffff]

+[    3.136377] pci 0000:00:00.0: reg 0x30: [mem 0x00000000-0x000007ff pref]

+[    3.136394] pci 0000:00:01.0: [8086:7111] type 00 class 0x010185

+[    3.136396] pci 0000:00:01.0: reg 0x10: [io  0x0000-0x0007]

+[    3.136398] pci 0000:00:01.0: reg 0x14: [io  0x0000-0x0003]

+[    3.136399] pci 0000:00:01.0: reg 0x18: [io  0x0000-0x0007]

+[    3.136401] pci 0000:00:01.0: reg 0x1c: [io  0x0000-0x0003]

+[    3.136403] pci 0000:00:01.0: reg 0x20: [io  0x0000-0x000f]

+[    3.136405] pci 0000:00:01.0: reg 0x30: [mem 0x00000000-0x000007ff pref]

+[    3.136422] pci_bus 0000:00: fixups for bus

+[    3.136423] pci_bus 0000:00: bus scan returning with max=00

+[    3.136425] pci 0000:00:00.0: calling quirk_e100_interrupt+0x0/0x1cc

+[    3.136430] pci 0000:00:00.0: fixup irq: got 33

+[    3.136431] pci 0000:00:00.0: assigning IRQ 33

+[    3.136434] pci 0000:00:01.0: fixup irq: got 34

+[    3.136435] pci 0000:00:01.0: assigning IRQ 34

+[    3.136437] pci 0000:00:00.0: BAR 0: assigned [mem 0x40000000-0x4001ffff]

+[    3.136439] pci 0000:00:00.0: BAR 6: assigned [mem 0x40020000-0x400207ff pref]

+[    3.136441] pci 0000:00:01.0: BAR 6: assigned [mem 0x40020800-0x40020fff pref]

+[    3.136442] pci 0000:00:01.0: BAR 4: assigned [io  0x1000-0x100f]

+[    3.136444] pci 0000:00:01.0: BAR 0: assigned [io  0x1010-0x1017]

+[    3.136458] pci 0000:00:01.0: BAR 2: assigned [io  0x1018-0x101f]

+[    3.136471] pci 0000:00:01.0: BAR 1: assigned [io  0x1020-0x1023]

+[    3.136484] pci 0000:00:01.0: BAR 3: assigned [io  0x1024-0x1027]

+[    3.137065] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled

+[    3.137231] ata_piix 0000:00:01.0: version 2.13

+[    3.137233] ata_piix 0000:00:01.0: enabling device (0000 -> 0001)

+[    3.137238] ata_piix 0000:00:01.0: enabling bus mastering

+[    3.137427] scsi0 : ata_piix

+[    3.137561] scsi1 : ata_piix

+[    3.137617] ata1: PATA max UDMA/33 cmd 0x1010 ctl 0x1020 bmdma 0x1000 irq 34

+[    3.137630] ata2: PATA max UDMA/33 cmd 0x1018 ctl 0x1024 bmdma 0x1008 irq 34

+[    3.137788] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI

+[    3.137801] e1000: Copyright (c) 1999-2006 Intel Corporation.

+[    3.137820] e1000 0000:00:00.0: enabling device (0000 -> 0002)

+[    3.137832] e1000 0000:00:00.0: enabling bus mastering

+[    3.290888] ata1.00: ATA-7: M5 IDE Disk, , max UDMA/66

+[    3.290890] ata1.00: 2096640 sectors, multi 0: LBA 

+[    3.290896] ata1.00: configured for UDMA/33

+[    3.290913] scsi 0:0:0:0: Direct-Access     ATA      M5 IDE Disk      n/a  PQ: 0 ANSI: 5

+[    3.290974] sd 0:0:0:0: Attached scsi generic sg0 type 0

+[    3.290982] sd 0:0:0:0: [sda] 2096640 512-byte logical blocks: (1.07 GB/1023 MiB)

+[    3.290996] sd 0:0:0:0: [sda] Write Protect is off

+[    3.290997] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00

+[    3.291004] sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA

+[    3.291057]  sda: sda1

+[    3.291119] sd 0:0:0:0: [sda] Attached SCSI disk

+[    3.411182] e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01

+[    3.411197] e1000 0000:00:00.0 eth0: Intel(R) PRO/1000 Network Connection

+[    3.411227] e1000e: Intel(R) PRO/1000 Network Driver - 2.3.2-k

+[    3.411238] e1000e: Copyright(c) 1999 - 2014 Intel Corporation.

+[    3.411269] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.0.5-k

+[    3.411282] igb: Copyright (c) 2007-2014 Intel Corporation.

+[    3.411405] usbcore: registered new interface driver usb-storage

+[    3.411475] mousedev: PS/2 mouse device common for all mice

+[    3.411653] usbcore: registered new interface driver usbhid

+[    3.411663] usbhid: USB HID core driver

+[    3.411687] TCP: cubic registered

+[    3.411694] NET: Registered protocol family 17

+
+[    3.411928] devtmpfs: mounted

+[    3.411936] Freeing unused kernel memory: 208K (ffffffc000692000 - ffffffc0006c6000)

 
 
-[    3.450204] udevd[607]: starting version 182

+[    3.450190] udevd[607]: starting version 182

 Starting Bootlog daemon: bootlogd.


-[    3.543300] random: dd urandom read with 19 bits of entropy available

+[    3.533187] random: dd urandom read with 19 bits of entropy available

 Populating dev cache


 net.ipv4.conf.default.rp_filter = 1


 net.ipv4.conf.all.rp_filter = 1


@@ -169,7 +169,7 @@ Mon Jan 27 08:00:00 UTC 2014
 hwclock: can't open '/dev/misc/rtc': No such file or directory


 
INIT: Entering runlevel: 5



 Configuring network interfaces... udhcpc (v1.21.1) started


-[    3.681115] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None

+[    3.671104] e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None

 Sending discover...


 Sending discover...


 Sending discover...


diff --git a/tests/long/se/10.mcf/ref/arm/linux/o3-timing/config.ini b/tests/long/se/10.mcf/ref/arm/linux/o3-timing/config.ini
index 86dba512f..692f636a0 100644
--- a/tests/long/se/10.mcf/ref/arm/linux/o3-timing/config.ini
+++ b/tests/long/se/10.mcf/ref/arm/linux/o3-timing/config.ini
@@ -15,6 +15,7 @@ boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
+exit_on_work_items=false
 init_param=0
 kernel=
 kernel_addr_check=true
@@ -24,6 +25,7 @@ mem_mode=timing
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -154,9 +156,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=false
 max_miss_count=0
@@ -170,6 +172,7 @@ system=system
 tags=system.cpu.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -495,9 +498,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=false
 hit_latency=1
 is_read_only=true
 max_miss_count=0
@@ -511,6 +514,7 @@ system=system
 tags=system.cpu.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -530,6 +534,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -605,9 +610,9 @@ children=prefetcher tags
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_excl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=12
 is_read_only=false
 max_miss_count=0
@@ -621,6 +626,7 @@ system=system
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -661,12 +667,14 @@ size=1048576
 
 [system.cpu.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+point_of_coherency=false
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -674,6 +682,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
@@ -688,9 +703,9 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/arm/linux/mcf
+executable=/dist/m5/cpu2000/binaries/arm/linux/mcf
 gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
+input=/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
 kvmInSE=false
 max_stack_size=67108864
 output=cout
@@ -723,6 +738,7 @@ clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+point_of_coherency=true
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
diff --git a/tests/long/se/10.mcf/ref/arm/linux/o3-timing/simerr b/tests/long/se/10.mcf/ref/arm/linux/o3-timing/simerr
index e9c9539d6..df9319b88 100755
--- a/tests/long/se/10.mcf/ref/arm/linux/o3-timing/simerr
+++ b/tests/long/se/10.mcf/ref/arm/linux/o3-timing/simerr
@@ -1,2 +1,2 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
-warn: Sockets disabled, not accepting gdb connections
+warn: CP14 unimplemented crn[8], opc1[2], crm[9], opc2[4]
diff --git a/tests/long/se/10.mcf/ref/arm/linux/o3-timing/simout b/tests/long/se/10.mcf/ref/arm/linux/o3-timing/simout
index 976e948eb..5203c92b4 100755
--- a/tests/long/se/10.mcf/ref/arm/linux/o3-timing/simout
+++ b/tests/long/se/10.mcf/ref/arm/linux/o3-timing/simout
@@ -3,10 +3,10 @@ Redirecting stderr to build/ARM/tests/opt/long/se/10.mcf/arm/linux/o3-timing/sim
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Sep 14 2015 23:29:19
-gem5 started Sep 15 2015 02:12:41
-gem5 executing on ribera.cs.wisc.edu
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/10.mcf/arm/linux/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/long/se/10.mcf/arm/linux/o3-timing
+gem5 compiled Mar 15 2016 19:53:43
+gem5 started Mar 15 2016 19:54:42
+gem5 executing on dinar2c11, pid 10367
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/10.mcf/arm/linux/o3-timing -re /home/stever/gem5-public/tests/run.py build/ARM/tests/opt/long/se/10.mcf/arm/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
@@ -26,4 +26,4 @@ simplex iterations         : 2663
 flow value                 : 3080014995
 checksum                   : 68389
 optimal
-Exiting @ tick 58182114500 because target called exit()
+Exiting @ tick 58178990500 because target called exit()
diff --git a/tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt
index 9603ee85e..00e478cc7 100644
--- a/tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/10.mcf/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.058179                       # Nu
 sim_ticks                                 58178990500                       # Number of ticks simulated
 final_tick                                58178990500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 122973                       # Simulator instruction rate (inst/s)
-host_op_rate                                   123585                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               78976040                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 539340                       # Number of bytes of host memory used
-host_seconds                                   736.67                       # Real time elapsed on the host
+host_inst_rate                                  60429                       # Simulator instruction rate (inst/s)
+host_op_rate                                    60730                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               38808737                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 520460                       # Number of bytes of host memory used
+host_seconds                                  1499.12                       # Real time elapsed on the host
 sim_insts                                    90589799                       # Number of instructions simulated
 sim_ops                                      91041030                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -683,7 +683,7 @@ system.cpu.cpi                               1.284449                       # CP
 system.cpu.cpi_total                         1.284449                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               0.778544                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         0.778544                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads                108112150                       # number of integer regfile reads
+system.cpu.int_regfile_reads                108112154                       # number of integer regfile reads
 system.cpu.int_regfile_writes                58701199                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                        58                       # number of floating regfile reads
 system.cpu.fp_regfile_writes                       93                       # number of floating regfile writes
diff --git a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini
index d4aa178ac..23b1feb0a 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini
+++ b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/config.ini
@@ -15,6 +15,7 @@ boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
+exit_on_work_items=false
 init_param=0
 kernel=
 kernel_addr_check=true
@@ -24,6 +25,7 @@ mem_mode=timing
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -161,9 +163,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=false
 max_miss_count=0
@@ -177,6 +179,7 @@ system=system
 tags=system.cpu.dcache.tags
 tgts_per_mshr=20
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -518,9 +521,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=true
 max_miss_count=0
@@ -534,6 +537,7 @@ system=system
 tags=system.cpu.icache.tags
 tgts_per_mshr=20
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -584,9 +588,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=8
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=20
 is_read_only=false
 max_miss_count=0
@@ -600,6 +604,7 @@ system=system
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=12
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -615,12 +620,14 @@ size=2097152
 
 [system.cpu.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+point_of_coherency=false
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -628,6 +635,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
@@ -642,9 +656,9 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/mcf
+executable=/dist/m5/cpu2000/binaries/x86/linux/mcf
 gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
+input=/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
 kvmInSE=false
 max_stack_size=67108864
 output=cout
@@ -677,6 +691,7 @@ clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+point_of_coherency=true
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
diff --git a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simerr b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simerr
index e9c9539d6..d6398cf75 100755
--- a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simerr
+++ b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simerr
@@ -1,2 +1 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (256 Mbytes)
-warn: Sockets disabled, not accepting gdb connections
diff --git a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout
index efb33d70a..4c5d4c468 100755
--- a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout
+++ b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/simout
@@ -3,10 +3,10 @@ Redirecting stderr to build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing/sim
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Sep 14 2015 22:13:36
-gem5 started Sep 14 2015 22:43:54
-gem5 executing on ribera.cs.wisc.edu
-command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing
+gem5 compiled Mar 15 2016 19:39:16
+gem5 started Mar 15 2016 19:40:29
+gem5 executing on dinar2c11, pid 3692
+command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing -re /home/stever/gem5-public/tests/run.py build/X86/tests/opt/long/se/10.mcf/x86/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
@@ -27,4 +27,4 @@ simplex iterations         : 2663
 flow value                 : 3080014995
 checksum                   : 68389
 optimal
-Exiting @ tick 61602395500 because target called exit()
+Exiting @ tick 61602281500 because target called exit()
diff --git a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt
index 9741f69fb..19e7a4fbe 100644
--- a/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/long/se/10.mcf/ref/x86/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.061602                       # Nu
 sim_ticks                                 61602281500                       # Number of ticks simulated
 final_tick                                61602281500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 110070                       # Simulator instruction rate (inst/s)
-host_op_rate                                   193816                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               42918086                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 460124                       # Number of bytes of host memory used
-host_seconds                                  1435.35                       # Real time elapsed on the host
+host_inst_rate                                  59652                       # Simulator instruction rate (inst/s)
+host_op_rate                                   105038                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               23259273                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 445096                       # Number of bytes of host memory used
+host_seconds                                  2648.50                       # Real time elapsed on the host
 sim_insts                                   157988547                       # Number of instructions simulated
 sim_ops                                     278192464                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -565,7 +565,7 @@ system.cpu.cpi                               0.779832                       # CP
 system.cpu.cpi_total                         0.779832                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               1.282327                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         1.282327                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads                491477132                       # number of integer regfile reads
+system.cpu.int_regfile_reads                491477136                       # number of integer regfile reads
 system.cpu.int_regfile_writes               239432261                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                       110                       # number of floating regfile reads
 system.cpu.fp_regfile_writes                       84                       # number of floating regfile writes
diff --git a/tests/long/se/20.parser/ref/arm/linux/o3-timing/config.ini b/tests/long/se/20.parser/ref/arm/linux/o3-timing/config.ini
index 2ccb6f3ec..85cb6a033 100644
--- a/tests/long/se/20.parser/ref/arm/linux/o3-timing/config.ini
+++ b/tests/long/se/20.parser/ref/arm/linux/o3-timing/config.ini
@@ -15,6 +15,7 @@ boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
+exit_on_work_items=false
 init_param=0
 kernel=
 kernel_addr_check=true
@@ -24,6 +25,7 @@ mem_mode=timing
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -154,9 +156,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=false
 max_miss_count=0
@@ -170,6 +172,7 @@ system=system
 tags=system.cpu.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -495,9 +498,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=false
 hit_latency=1
 is_read_only=true
 max_miss_count=0
@@ -511,6 +514,7 @@ system=system
 tags=system.cpu.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -530,6 +534,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -605,9 +610,9 @@ children=prefetcher tags
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_excl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=12
 is_read_only=false
 max_miss_count=0
@@ -621,6 +626,7 @@ system=system
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -661,12 +667,14 @@ size=1048576
 
 [system.cpu.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+point_of_coherency=false
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -674,6 +682,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
@@ -688,9 +703,9 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/arm/linux/parser
+executable=/dist/m5/cpu2000/binaries/arm/linux/parser
 gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/parser/mdred/input/parser.in
+input=/dist/m5/cpu2000/data/parser/mdred/input/parser.in
 kvmInSE=false
 max_stack_size=67108864
 output=cout
@@ -723,6 +738,7 @@ clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+point_of_coherency=true
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
diff --git a/tests/long/se/20.parser/ref/arm/linux/o3-timing/simerr b/tests/long/se/20.parser/ref/arm/linux/o3-timing/simerr
index be90b0340..eeb19437b 100755
--- a/tests/long/se/20.parser/ref/arm/linux/o3-timing/simerr
+++ b/tests/long/se/20.parser/ref/arm/linux/o3-timing/simerr
@@ -1,3 +1,2 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
-warn: Sockets disabled, not accepting gdb connections
 warn: CP14 unimplemented crn[8], opc1[2], crm[9], opc2[4]
diff --git a/tests/long/se/20.parser/ref/arm/linux/o3-timing/simout b/tests/long/se/20.parser/ref/arm/linux/o3-timing/simout
index 84abcb43e..67ec871cc 100755
--- a/tests/long/se/20.parser/ref/arm/linux/o3-timing/simout
+++ b/tests/long/se/20.parser/ref/arm/linux/o3-timing/simout
@@ -1,13 +1,14 @@
+Redirecting stdout to build/ARM/tests/opt/long/se/20.parser/arm/linux/o3-timing/simout
+Redirecting stderr to build/ARM/tests/opt/long/se/20.parser/arm/linux/o3-timing/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 11:19:35
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/20.parser/arm/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/se/20.parser/arm/linux/o3-timing
+gem5 compiled Mar 15 2016 19:53:43
+gem5 started Mar 15 2016 21:14:27
+gem5 executing on dinar2c11, pid 11560
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/20.parser/arm/linux/o3-timing -re /home/stever/gem5-public/tests/run.py build/ARM/tests/opt/long/se/20.parser/arm/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.isa: ISA system set to: 0 0x3ca3710
 info: Entering event queue @ 0.  Starting simulation...
 
  Reading the dictionary files: *************************************************
@@ -69,4 +70,4 @@ info: Increasing stack size by one page.
   about 2 million people attended 
   the five best costumes got prizes 
 No errors!
-Exiting @ tick 233381523500 because target called exit()
+Exiting @ tick 233975583000 because target called exit()
diff --git a/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt
index 965a91be2..8f47426de 100644
--- a/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.233976                       # Nu
 sim_ticks                                233975583000                       # Number of ticks simulated
 final_tick                               233975583000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 134400                       # Simulator instruction rate (inst/s)
-host_op_rate                                   145602                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               62240486                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 347620                       # Number of bytes of host memory used
-host_seconds                                  3759.22                       # Real time elapsed on the host
+host_inst_rate                                  86832                       # Simulator instruction rate (inst/s)
+host_op_rate                                    94070                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               40212079                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 330216                       # Number of bytes of host memory used
+host_seconds                                  5818.54                       # Real time elapsed on the host
 sim_insts                                   505237724                       # Number of instructions simulated
 sim_ops                                     547350945                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -703,7 +703,7 @@ system.cpu.cpi                               0.926200                       # CP
 system.cpu.cpi_total                         0.926200                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               1.079680                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         1.079680                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads                611089761                       # number of integer regfile reads
+system.cpu.int_regfile_reads                611089815                       # number of integer regfile reads
 system.cpu.int_regfile_writes               328120494                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                        16                       # number of floating regfile reads
 system.cpu.cc_regfile_reads                2170189724                       # number of cc regfile reads
diff --git a/tests/long/se/30.eon/ref/arm/linux/o3-timing/config.ini b/tests/long/se/30.eon/ref/arm/linux/o3-timing/config.ini
index be385b04e..d1a772d56 100644
--- a/tests/long/se/30.eon/ref/arm/linux/o3-timing/config.ini
+++ b/tests/long/se/30.eon/ref/arm/linux/o3-timing/config.ini
@@ -15,6 +15,7 @@ boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
+exit_on_work_items=false
 init_param=0
 kernel=
 kernel_addr_check=true
@@ -24,6 +25,7 @@ mem_mode=timing
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -154,9 +156,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=false
 max_miss_count=0
@@ -170,6 +172,7 @@ system=system
 tags=system.cpu.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -495,9 +498,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=false
 hit_latency=1
 is_read_only=true
 max_miss_count=0
@@ -511,6 +514,7 @@ system=system
 tags=system.cpu.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -530,6 +534,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -605,9 +610,9 @@ children=prefetcher tags
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_excl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=12
 is_read_only=false
 max_miss_count=0
@@ -621,6 +626,7 @@ system=system
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -661,12 +667,14 @@ size=1048576
 
 [system.cpu.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+point_of_coherency=false
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -674,6 +682,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
@@ -688,7 +703,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/arm/linux/eon
+executable=/dist/m5/cpu2000/binaries/arm/linux/eon
 gid=100
 input=cin
 kvmInSE=false
@@ -723,6 +738,7 @@ clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+point_of_coherency=true
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
diff --git a/tests/long/se/30.eon/ref/arm/linux/o3-timing/simerr b/tests/long/se/30.eon/ref/arm/linux/o3-timing/simerr
index 613c6a6b7..0c3e31a9c 100755
--- a/tests/long/se/30.eon/ref/arm/linux/o3-timing/simerr
+++ b/tests/long/se/30.eon/ref/arm/linux/o3-timing/simerr
@@ -1,5 +1,4 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
-warn: Sockets disabled, not accepting gdb connections
 getting pixel output filename pixels_out.cook
 opening control file chair.control.cook
 opening camera file chair.camera
diff --git a/tests/long/se/30.eon/ref/arm/linux/o3-timing/simout b/tests/long/se/30.eon/ref/arm/linux/o3-timing/simout
index cbd037166..578b6774f 100755
--- a/tests/long/se/30.eon/ref/arm/linux/o3-timing/simout
+++ b/tests/long/se/30.eon/ref/arm/linux/o3-timing/simout
@@ -3,10 +3,10 @@ Redirecting stderr to build/ARM/tests/opt/long/se/30.eon/arm/linux/o3-timing/sim
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Sep 14 2015 23:29:19
-gem5 started Sep 15 2015 01:15:27
-gem5 executing on ribera.cs.wisc.edu
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/30.eon/arm/linux/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/long/se/30.eon/arm/linux/o3-timing
+gem5 compiled Mar 15 2016 19:53:43
+gem5 started Mar 15 2016 21:05:26
+gem5 executing on dinar2c11, pid 11410
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/30.eon/arm/linux/o3-timing -re /home/stever/gem5-public/tests/run.py build/ARM/tests/opt/long/se/30.eon/arm/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
@@ -16,4 +16,4 @@ info: Increasing stack size by one page.
 info: Increasing stack size by one page.
 info: Increasing stack size by one page.
 OO-style eon Time= 0.110000
-Exiting @ tick 112687034500 because target called exit()
+Exiting @ tick 116576497500 because target called exit()
diff --git a/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt
index ac901384d..95007fcba 100644
--- a/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.116576                       # Nu
 sim_ticks                                116576497500                       # Number of ticks simulated
 final_tick                               116576497500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 117910                       # Simulator instruction rate (inst/s)
-host_op_rate                                   141564                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               50343079                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 339456                       # Number of bytes of host memory used
-host_seconds                                  2315.64                       # Real time elapsed on the host
+host_inst_rate                                  72932                       # Simulator instruction rate (inst/s)
+host_op_rate                                    87563                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               31139070                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 321028                       # Number of bytes of host memory used
+host_seconds                                  3743.74                       # Real time elapsed on the host
 sim_insts                                   273037220                       # Number of instructions simulated
 sim_ops                                     327811602                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -664,7 +664,7 @@ system.cpu.cpi                               0.853924                       # CP
 system.cpu.cpi_total                         0.853924                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               1.171065                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         1.171065                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads                331328730                       # number of integer regfile reads
+system.cpu.int_regfile_reads                331328732                       # number of integer regfile reads
 system.cpu.int_regfile_writes               136938455                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                 187108865                       # number of floating regfile reads
 system.cpu.fp_regfile_writes                132177694                       # number of floating regfile writes
diff --git a/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/config.ini b/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/config.ini
index d3d29952c..b3e0aa264 100644
--- a/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/config.ini
+++ b/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/config.ini
@@ -15,6 +15,7 @@ boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
+exit_on_work_items=false
 init_param=0
 kernel=
 kernel_addr_check=true
@@ -24,6 +25,7 @@ mem_mode=timing
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -154,9 +156,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=false
 max_miss_count=0
@@ -170,6 +172,7 @@ system=system
 tags=system.cpu.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -495,9 +498,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=false
 hit_latency=1
 is_read_only=true
 max_miss_count=0
@@ -511,6 +514,7 @@ system=system
 tags=system.cpu.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -530,6 +534,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -605,9 +610,9 @@ children=prefetcher tags
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_excl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=12
 is_read_only=false
 max_miss_count=0
@@ -621,6 +626,7 @@ system=system
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -661,12 +667,14 @@ size=1048576
 
 [system.cpu.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+point_of_coherency=false
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -674,6 +682,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
@@ -688,7 +703,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/arm/linux/perlbmk
+executable=/dist/m5/cpu2000/binaries/arm/linux/perlbmk
 gid=100
 input=cin
 kvmInSE=false
@@ -723,6 +738,7 @@ clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+point_of_coherency=true
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
diff --git a/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simerr b/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simerr
index 2e6ab1e7e..04ac82056 100755
--- a/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simerr
+++ b/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simerr
@@ -1,3 +1,2 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
-warn: Sockets disabled, not accepting gdb connections
 warn: fcntl64(3, 2) passed through to host
diff --git a/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simout b/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simout
index d52ca5008..b72d2648e 100755
--- a/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simout
+++ b/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/simout
@@ -1,13 +1,14 @@
+Redirecting stdout to build/ARM/tests/opt/long/se/40.perlbmk/arm/linux/o3-timing/simout
+Redirecting stderr to build/ARM/tests/opt/long/se/40.perlbmk/arm/linux/o3-timing/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 11:51:12
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/40.perlbmk/arm/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/se/40.perlbmk/arm/linux/o3-timing
+gem5 compiled Mar 15 2016 19:53:43
+gem5 started Mar 15 2016 20:24:49
+gem5 executing on dinar2c11, pid 10851
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/40.perlbmk/arm/linux/o3-timing -re /home/stever/gem5-public/tests/run.py build/ARM/tests/opt/long/se/40.perlbmk/arm/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.isa: ISA system set to: 0 0x36128d0
 info: Entering event queue @ 0.  Starting simulation...
 info: Increasing stack size by one page.
 info: Increasing stack size by one page.
@@ -649,4 +650,4 @@ info: Increasing stack size by one page.
 2000: 2845746745
 1000: 2068042552
 0: 290958364
-Exiting @ tick 409399480000 because target called exit()
+Exiting @ tick 452563515000 because target called exit()
diff --git a/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt
index 9b1e23041..e148c082a 100644
--- a/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/40.perlbmk/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.452564                       # Nu
 sim_ticks                                452563515000                       # Number of ticks simulated
 final_tick                               452563515000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  88595                       # Simulator instruction rate (inst/s)
-host_op_rate                                   109072                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               62584453                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 324544                       # Number of bytes of host memory used
-host_seconds                                  7231.25                       # Real time elapsed on the host
+host_inst_rate                                  57394                       # Simulator instruction rate (inst/s)
+host_op_rate                                    70660                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               40544083                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 306292                       # Number of bytes of host memory used
+host_seconds                                 11162.26                       # Real time elapsed on the host
 sim_insts                                   640649299                       # Number of instructions simulated
 sim_ops                                     788724958                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -703,7 +703,7 @@ system.cpu.cpi                               1.412828                       # CP
 system.cpu.cpi_total                         1.412828                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               0.707800                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         0.707800                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads                995808117                       # number of integer regfile reads
+system.cpu.int_regfile_reads                995808121                       # number of integer regfile reads
 system.cpu.int_regfile_writes               567906123                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                  31889839                       # number of floating regfile reads
 system.cpu.fp_regfile_writes                 22959494                       # number of floating regfile writes
diff --git a/tests/long/se/50.vortex/ref/arm/linux/o3-timing/config.ini b/tests/long/se/50.vortex/ref/arm/linux/o3-timing/config.ini
index af3d3e8bc..20ac0edc3 100644
--- a/tests/long/se/50.vortex/ref/arm/linux/o3-timing/config.ini
+++ b/tests/long/se/50.vortex/ref/arm/linux/o3-timing/config.ini
@@ -15,6 +15,7 @@ boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
+exit_on_work_items=false
 init_param=0
 kernel=
 kernel_addr_check=true
@@ -24,6 +25,7 @@ mem_mode=timing
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -154,9 +156,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=false
 max_miss_count=0
@@ -170,6 +172,7 @@ system=system
 tags=system.cpu.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -495,9 +498,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=false
 hit_latency=1
 is_read_only=true
 max_miss_count=0
@@ -511,6 +514,7 @@ system=system
 tags=system.cpu.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -530,6 +534,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -605,9 +610,9 @@ children=prefetcher tags
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_excl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=12
 is_read_only=false
 max_miss_count=0
@@ -621,6 +626,7 @@ system=system
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -661,12 +667,14 @@ size=1048576
 
 [system.cpu.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+point_of_coherency=false
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -674,6 +682,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
@@ -688,7 +703,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/arm/linux/vortex
+executable=/dist/m5/cpu2000/binaries/arm/linux/vortex
 gid=100
 input=cin
 kvmInSE=false
@@ -723,6 +738,7 @@ clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+point_of_coherency=true
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
diff --git a/tests/long/se/50.vortex/ref/arm/linux/o3-timing/simerr b/tests/long/se/50.vortex/ref/arm/linux/o3-timing/simerr
index 341b479f7..f9e2ef3b2 100755
--- a/tests/long/se/50.vortex/ref/arm/linux/o3-timing/simerr
+++ b/tests/long/se/50.vortex/ref/arm/linux/o3-timing/simerr
@@ -1,2 +1 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
-warn: Sockets disabled, not accepting gdb connections
diff --git a/tests/long/se/50.vortex/ref/arm/linux/o3-timing/simout b/tests/long/se/50.vortex/ref/arm/linux/o3-timing/simout
index fb2980f08..84fd6d051 100755
--- a/tests/long/se/50.vortex/ref/arm/linux/o3-timing/simout
+++ b/tests/long/se/50.vortex/ref/arm/linux/o3-timing/simout
@@ -1,13 +1,14 @@
+Redirecting stdout to build/ARM/tests/opt/long/se/50.vortex/arm/linux/o3-timing/simout
+Redirecting stderr to build/ARM/tests/opt/long/se/50.vortex/arm/linux/o3-timing/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 11:16:00
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/50.vortex/arm/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/se/50.vortex/arm/linux/o3-timing
+gem5 compiled Mar 15 2016 19:53:43
+gem5 started Mar 15 2016 20:46:50
+gem5 executing on dinar2c11, pid 11157
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/50.vortex/arm/linux/o3-timing -re /home/stever/gem5-public/tests/run.py build/ARM/tests/opt/long/se/50.vortex/arm/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.isa: ISA system set to: 0 0x3dc8200
 info: Entering event queue @ 0.  Starting simulation...
 info: Increasing stack size by one page.
-Exiting @ tick 33359312000 because target called exit()
+Exiting @ tick 33784139000 because target called exit()
diff --git a/tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt
index 56872871d..cb62ae8cf 100644
--- a/tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/50.vortex/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.033784                       # Nu
 sim_ticks                                 33784139000                       # Number of ticks simulated
 final_tick                                33784139000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 118438                       # Simulator instruction rate (inst/s)
-host_op_rate                                   151468                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               56430150                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 329476                       # Number of bytes of host memory used
-host_seconds                                   598.69                       # Real time elapsed on the host
+host_inst_rate                                  59206                       # Simulator instruction rate (inst/s)
+host_op_rate                                    75718                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               28209032                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 312216                       # Number of bytes of host memory used
+host_seconds                                  1197.64                       # Real time elapsed on the host
 sim_insts                                    70907630                       # Number of instructions simulated
 sim_ops                                      90682585                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -690,7 +690,7 @@ system.cpu.cpi                               0.952906                       # CP
 system.cpu.cpi_total                         0.952906                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               1.049422                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         1.049422                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads                102292430                       # number of integer regfile reads
+system.cpu.int_regfile_reads                102292438                       # number of integer regfile reads
 system.cpu.int_regfile_writes                56802415                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                        38                       # number of floating regfile reads
 system.cpu.fp_regfile_writes                       22                       # number of floating regfile writes
diff --git a/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/config.ini b/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/config.ini
index 578352db1..6544ce244 100644
--- a/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/config.ini
+++ b/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/config.ini
@@ -15,6 +15,7 @@ boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
+exit_on_work_items=false
 init_param=0
 kernel=
 kernel_addr_check=true
@@ -24,6 +25,7 @@ mem_mode=timing
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -154,9 +156,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=false
 max_miss_count=0
@@ -170,6 +172,7 @@ system=system
 tags=system.cpu.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -495,9 +498,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=false
 hit_latency=1
 is_read_only=true
 max_miss_count=0
@@ -511,6 +514,7 @@ system=system
 tags=system.cpu.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -530,6 +534,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -605,9 +610,9 @@ children=prefetcher tags
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_excl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=12
 is_read_only=false
 max_miss_count=0
@@ -621,6 +626,7 @@ system=system
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -661,12 +667,14 @@ size=1048576
 
 [system.cpu.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+point_of_coherency=false
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -674,6 +682,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
@@ -688,7 +703,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/arm/linux/bzip2
+executable=/dist/m5/cpu2000/binaries/arm/linux/bzip2
 gid=100
 input=cin
 kvmInSE=false
@@ -723,6 +738,7 @@ clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+point_of_coherency=true
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
diff --git a/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simerr b/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simerr
index be90b0340..eeb19437b 100755
--- a/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simerr
+++ b/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simerr
@@ -1,3 +1,2 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
-warn: Sockets disabled, not accepting gdb connections
 warn: CP14 unimplemented crn[8], opc1[2], crm[9], opc2[4]
diff --git a/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simout b/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simout
index c0864581d..2b7c8fd88 100755
--- a/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simout
+++ b/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/simout
@@ -1,13 +1,14 @@
+Redirecting stdout to build/ARM/tests/opt/long/se/60.bzip2/arm/linux/o3-timing/simout
+Redirecting stderr to build/ARM/tests/opt/long/se/60.bzip2/arm/linux/o3-timing/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 12:38:48
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/60.bzip2/arm/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/se/60.bzip2/arm/linux/o3-timing
+gem5 compiled Mar 15 2016 19:53:43
+gem5 started Mar 15 2016 20:34:58
+gem5 executing on dinar2c11, pid 10996
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/60.bzip2/arm/linux/o3-timing -re /home/stever/gem5-public/tests/run.py build/ARM/tests/opt/long/se/60.bzip2/arm/linux/o3-timing
 
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.isa: ISA system set to: 0 0x39c9fd0
 info: Entering event queue @ 0.  Starting simulation...
 spec_init
 Loading Input Data
@@ -26,4 +27,4 @@ Uncompressing Data
 Uncompressed data 1048576 bytes in length
 Uncompressed data compared correctly
 Tested 1MB buffer: OK!
-Exiting @ tick 771782683000 because target called exit()
+Exiting @ tick 767874998000 because target called exit()
diff --git a/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt
index 901b0011b..d2ad49fd9 100644
--- a/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/60.bzip2/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.767875                       # Nu
 sim_ticks                                767874998000                       # Number of ticks simulated
 final_tick                               767874998000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 133325                       # Simulator instruction rate (inst/s)
-host_op_rate                                   143638                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               66282190                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 359880                       # Number of bytes of host memory used
-host_seconds                                 11584.94                       # Real time elapsed on the host
+host_inst_rate                                  97609                       # Simulator instruction rate (inst/s)
+host_op_rate                                   105159                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               48526138                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 342328                       # Number of bytes of host memory used
+host_seconds                                 15823.95                       # Real time elapsed on the host
 sim_insts                                  1544563024                       # Number of instructions simulated
 sim_ops                                    1664032416                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -706,7 +706,7 @@ system.cpu.cpi                               0.994294                       # CP
 system.cpu.cpi_total                         0.994294                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               1.005739                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         1.005739                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads               2175836503                       # number of integer regfile reads
+system.cpu.int_regfile_reads               2175836515                       # number of integer regfile reads
 system.cpu.int_regfile_writes              1261593461                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                        40                       # number of floating regfile reads
 system.cpu.fp_regfile_writes                       51                       # number of floating regfile writes
diff --git a/tests/long/se/70.twolf/ref/arm/linux/o3-timing/config.ini b/tests/long/se/70.twolf/ref/arm/linux/o3-timing/config.ini
index cec07c5fb..3195ac533 100644
--- a/tests/long/se/70.twolf/ref/arm/linux/o3-timing/config.ini
+++ b/tests/long/se/70.twolf/ref/arm/linux/o3-timing/config.ini
@@ -15,6 +15,7 @@ boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
+exit_on_work_items=false
 init_param=0
 kernel=
 kernel_addr_check=true
@@ -24,6 +25,7 @@ mem_mode=timing
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -154,9 +156,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=false
 max_miss_count=0
@@ -170,6 +172,7 @@ system=system
 tags=system.cpu.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -495,9 +498,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=false
 hit_latency=1
 is_read_only=true
 max_miss_count=0
@@ -511,6 +514,7 @@ system=system
 tags=system.cpu.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -530,6 +534,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -605,9 +610,9 @@ children=prefetcher tags
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_excl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=12
 is_read_only=false
 max_miss_count=0
@@ -621,6 +626,7 @@ system=system
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -661,12 +667,14 @@ size=1048576
 
 [system.cpu.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+point_of_coherency=false
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -674,6 +682,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
@@ -688,7 +703,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/arm/linux/twolf
+executable=/dist/m5/cpu2000/binaries/arm/linux/twolf
 gid=100
 input=cin
 kvmInSE=false
@@ -723,6 +738,7 @@ clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+point_of_coherency=true
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
diff --git a/tests/long/se/70.twolf/ref/arm/linux/o3-timing/simerr b/tests/long/se/70.twolf/ref/arm/linux/o3-timing/simerr
index 341b479f7..f9e2ef3b2 100755
--- a/tests/long/se/70.twolf/ref/arm/linux/o3-timing/simerr
+++ b/tests/long/se/70.twolf/ref/arm/linux/o3-timing/simerr
@@ -1,2 +1 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
-warn: Sockets disabled, not accepting gdb connections
diff --git a/tests/long/se/70.twolf/ref/arm/linux/o3-timing/simout b/tests/long/se/70.twolf/ref/arm/linux/o3-timing/simout
index e77a79916..e145846b2 100755
--- a/tests/long/se/70.twolf/ref/arm/linux/o3-timing/simout
+++ b/tests/long/se/70.twolf/ref/arm/linux/o3-timing/simout
@@ -1,15 +1,16 @@
+Redirecting stdout to build/ARM/tests/opt/long/se/70.twolf/arm/linux/o3-timing/simout
+Redirecting stderr to build/ARM/tests/opt/long/se/70.twolf/arm/linux/o3-timing/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Apr 22 2015 10:58:25
-gem5 started Apr 22 2015 12:02:59
-gem5 executing on phenom
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/70.twolf/arm/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/se/70.twolf/arm/linux/o3-timing
+gem5 compiled Mar 15 2016 19:53:43
+gem5 started Mar 15 2016 20:14:36
+gem5 executing on dinar2c11, pid 10702
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/se/70.twolf/arm/linux/o3-timing -re /home/stever/gem5-public/tests/run.py build/ARM/tests/opt/long/se/70.twolf/arm/linux/o3-timing
 
 Couldn't unlink  build/ARM/tests/opt/long/se/70.twolf/arm/linux/o3-timing/smred.sav
 Couldn't unlink  build/ARM/tests/opt/long/se/70.twolf/arm/linux/o3-timing/smred.sv2
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.isa: ISA system set to: 0 0x2e8fab0
 info: Entering event queue @ 0.  Starting simulation...
 
 TimberWolfSC version:v4.3a date:Mon Jan 25 18:50:36 EST 1988
@@ -25,4 +26,4 @@ info: Increasing stack size by one page.
  76  77  78  79  80  81  82  83  84  85  86  87  88  89  90 
  91  92  93  94  95  96  97  98  99 100 101 102 103 104 105 
 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 
-122 123 124 Exiting @ tick 85027009000 because target called exit()
+122 123 124 Exiting @ tick 85490431000 because target called exit()
diff --git a/tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt
index 403ef08b8..03798f86c 100644
--- a/tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/70.twolf/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.085490                       # Nu
 sim_ticks                                 85490431000                       # Number of ticks simulated
 final_tick                                85490431000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 128362                       # Simulator instruction rate (inst/s)
-host_op_rate                                   135315                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               63688458                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 319620                       # Number of bytes of host memory used
-host_seconds                                  1342.32                       # Real time elapsed on the host
+host_inst_rate                                  61561                       # Simulator instruction rate (inst/s)
+host_op_rate                                    64896                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               30544518                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 301600                       # Number of bytes of host memory used
+host_seconds                                  2798.88                       # Real time elapsed on the host
 sim_insts                                   172303022                       # Number of instructions simulated
 sim_ops                                     181635954                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -664,7 +664,7 @@ system.cpu.cpi                               0.992327                       # CP
 system.cpu.cpi_total                         0.992327                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               1.007733                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         1.007733                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads                218966975                       # number of integer regfile reads
+system.cpu.int_regfile_reads                218966992                       # number of integer regfile reads
 system.cpu.int_regfile_writes               114516229                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                   2904204                       # number of floating regfile reads
 system.cpu.fp_regfile_writes                  2441504                       # number of floating regfile writes
diff --git a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini
index 1647d5712..c90c082f2 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini
+++ b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/config.ini
@@ -15,6 +15,7 @@ boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
+exit_on_work_items=false
 init_param=0
 kernel=
 kernel_addr_check=true
@@ -24,6 +25,7 @@ mem_mode=timing
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -161,9 +163,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=false
 max_miss_count=0
@@ -177,6 +179,7 @@ system=system
 tags=system.cpu.dcache.tags
 tgts_per_mshr=20
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.dcache_port
 mem_side=system.cpu.toL2Bus.slave[1]
 
@@ -518,9 +521,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=2
 is_read_only=true
 max_miss_count=0
@@ -534,6 +537,7 @@ system=system
 tags=system.cpu.icache.tags
 tgts_per_mshr=20
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu.icache_port
 mem_side=system.cpu.toL2Bus.slave[0]
 
@@ -584,9 +588,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=8
 clk_domain=system.cpu_clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
 hit_latency=20
 is_read_only=false
 max_miss_count=0
@@ -600,6 +604,7 @@ system=system
 tags=system.cpu.l2cache.tags
 tgts_per_mshr=12
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
@@ -615,12 +620,14 @@ size=2097152
 
 [system.cpu.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
+point_of_coherency=false
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -628,6 +635,13 @@ width=32
 master=system.cpu.l2cache.cpu_side
 slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
+[system.cpu.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu.tracer]
 type=ExeTracer
 eventq_index=0
@@ -642,7 +656,7 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/home/stever/m5/dist/cpu2000/binaries/x86/linux/twolf
+executable=/dist/m5/cpu2000/binaries/x86/linux/twolf
 gid=100
 input=cin
 kvmInSE=false
@@ -677,6 +691,7 @@ clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+point_of_coherency=true
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
diff --git a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simerr b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simerr
index 341b479f7..f9e2ef3b2 100755
--- a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simerr
+++ b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simerr
@@ -1,2 +1 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
-warn: Sockets disabled, not accepting gdb connections
diff --git a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout
index 61db655d7..8f9f5bdd9 100755
--- a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout
+++ b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/simout
@@ -3,10 +3,10 @@ Redirecting stderr to build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing/s
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Sep 14 2015 22:13:36
-gem5 started Sep 14 2015 23:11:50
-gem5 executing on ribera.cs.wisc.edu
-command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing -re /scratch/nilay/GEM5/gem5/tests/run.py build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing
+gem5 compiled Mar 15 2016 19:39:16
+gem5 started Mar 15 2016 19:40:28
+gem5 executing on dinar2c11, pid 3690
+command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing -re /home/stever/gem5-public/tests/run.py build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing
 
 Couldn't unlink  build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing/smred.sav
 Couldn't unlink  build/X86/tests/opt/long/se/70.twolf/x86/linux/o3-timing/smred.sv2
@@ -28,4 +28,4 @@ info: Increasing stack size by one page.
  91  92  93  94  95  96  97  98  99 100 101 102 103 104 105 
 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 
 122 123 124 info: Increasing stack size by one page.
-Exiting @ tick 79147317000 because target called exit()
+Exiting @ tick 79140979500 because target called exit()
diff --git a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt
index 4de03aa93..f2dc6cd5a 100644
--- a/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/long/se/70.twolf/ref/x86/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.079141                       # Nu
 sim_ticks                                 79140979500                       # Number of ticks simulated
 final_tick                                79140979500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  91812                       # Simulator instruction rate (inst/s)
-host_op_rate                                   153885                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               55016334                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 351180                       # Number of bytes of host memory used
-host_seconds                                  1438.50                       # Real time elapsed on the host
+host_inst_rate                                  48534                       # Simulator instruction rate (inst/s)
+host_op_rate                                    81347                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               29082810                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 336912                       # Number of bytes of host memory used
+host_seconds                                  2721.23                       # Real time elapsed on the host
 sim_insts                                   132071192                       # Number of instructions simulated
 sim_ops                                     221363384                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -547,7 +547,7 @@ system.cpu.cpi                               1.198459                       # CP
 system.cpu.cpi_total                         1.198459                       # CPI: Total CPI of All Threads
 system.cpu.ipc                               0.834405                       # IPC: Instructions Per Cycle
 system.cpu.ipc_total                         0.834405                       # IPC: Total IPC of All Threads
-system.cpu.int_regfile_reads                448575218                       # number of integer regfile reads
+system.cpu.int_regfile_reads                448575235                       # number of integer regfile reads
 system.cpu.int_regfile_writes               232602901                       # number of integer regfile writes
 system.cpu.fp_regfile_reads                   3212636                       # number of floating regfile reads
 system.cpu.fp_regfile_writes                  1997796                       # number of floating regfile writes