stats: update for previous changeset

Very small differences in IQ-specific O3 stats.

5 files changed, 232 insertions, 201 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/config.ini
index 7c36695c6..05f59cec5 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/config.ini
@@ -12,12 +12,12 @@ time_sync_spin_threshold=100000000
 type=LinuxArmSystem
 children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
 atags_addr=134217728
-boot_loader=/projects/pd/randd/dist/binaries/boot_emm.arm64
+boot_loader=/home/stever/m5/aarch-system-2014-10/binaries/boot_emm.arm64
 boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
 boot_release_addr=65528
 cache_line_size=64
 clk_domain=system.clk_domain
-dtb_filename=/projects/pd/randd/dist/binaries/vexpress.aarch64.20140821.dtb
+dtb_filename=/home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch64.20140821.dtb
 early_kernel_symbols=false
 enable_context_switch_stats_dump=false
 eventq_index=0
@@ -30,20 +30,21 @@ have_security=false
 have_virtualization=false
 highest_el_is_64=false
 init_param=0
-kernel=/projects/pd/randd/dist/binaries/vmlinux.aarch64.20140821
+kernel=/home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch64.20140821
 kernel_addr_check=true
 load_addr_mask=268435455
 load_offset=2147483648
 machine_type=VExpress_EMM64
 mem_mode=timing
 mem_ranges=2147483648:2415919103
-memories=system.realview.nvmem system.physmem system.realview.vram
+memories=system.physmem system.realview.nvmem system.realview.vram
+mmap_using_noreserve=false
 multi_proc=true
 num_work_ids=16
 panic_on_oops=true
 panic_on_panic=true
 phys_addr_range_64=40
-readfile=/work/gem5.latest/tests/halt.sh
+readfile=/home/stever/hg/m5sim.org/gem5/tests/halt.sh
 reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
@@ -86,7 +87,7 @@ table_size=65536
 [system.cf0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/projects/pd/randd/dist/disks/linaro-minimal-aarch64.img
+image_file=/home/stever/m5/aarch-system-2014-10/disks/linaro-minimal-aarch64.img
 read_only=true
 
 [system.clk_domain]
@@ -189,7 +190,7 @@ dcache_port=system.cpu0.dcache.cpu_side
 icache_port=system.cpu0.icache.cpu_side
 
 [system.cpu0.branchPred]
-type=BranchPredictor
+type=BiModeBP
 BTBEntries=2048
 BTBTagSize=18
 RASSize=16
@@ -199,11 +200,7 @@ eventq_index=0
 globalCtrBits=2
 globalPredictorSize=8192
 instShiftAmt=2
-localCtrBits=2
-localHistoryTableSize=2048
-localPredictorSize=2048
 numThreads=1
-predType=bi-mode
 
 [system.cpu0.dcache]
 type=BaseCache
@@ -211,6 +208,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -245,6 +243,7 @@ type=ArmStage2MMU
 children=stage2_tlb
 eventq_index=0
 stage2_tlb=system.cpu0.dstage2_mmu.stage2_tlb
+sys=system
 tlb=system.cpu0.dtb
 
 [system.cpu0.dstage2_mmu.stage2_tlb]
@@ -262,7 +261,6 @@ eventq_index=0
 is_stage2=true
 num_squash_per_cycle=2
 sys=system
-port=system.cpu0.toL2Bus.slave[5]
 
 [system.cpu0.dtb]
 type=ArmTLB
@@ -552,8 +550,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
+forward_snoops=false
 hit_latency=1
 is_top_level=true
 max_miss_count=0
@@ -620,6 +619,7 @@ type=ArmStage2MMU
 children=stage2_tlb
 eventq_index=0
 stage2_tlb=system.cpu0.istage2_mmu.stage2_tlb
+sys=system
 tlb=system.cpu0.itb
 
 [system.cpu0.istage2_mmu.stage2_tlb]
@@ -637,7 +637,6 @@ eventq_index=0
 is_stage2=true
 num_squash_per_cycle=2
 sys=system
-port=system.cpu0.toL2Bus.slave[4]
 
 [system.cpu0.itb]
 type=ArmTLB
@@ -662,6 +661,7 @@ children=prefetcher tags
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=12
@@ -683,19 +683,27 @@ mem_side=system.toL2Bus.slave[0]
 
 [system.cpu0.l2cache.prefetcher]
 type=StridePrefetcher
+cache_snoop=false
 clk_domain=system.cpu_clk_domain
-cross_pages=false
-data_accesses_only=false
 degree=8
 eventq_index=0
-inst_tagged=true
 latency=1
-on_miss_only=false
-on_prefetch=true
-on_read_only=false
-serial_squash=false
-size=100
+max_conf=7
+min_conf=0
+on_data=true
+on_inst=true
+on_miss=false
+on_read=true
+on_write=true
+queue_filter=true
+queue_size=32
+queue_squash=true
+start_conf=4
 sys=system
+table_assoc=4
+table_sets=16
+tag_prefetch=true
+thresh_conf=4
 use_master_id=true
 
 [system.cpu0.l2cache.tags]
@@ -712,13 +720,16 @@ size=1048576
 type=CoherentXBar
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
 snoop_filter=Null
+snoop_response_latency=1
 system=system
 use_default_range=false
 width=32
 master=system.cpu0.l2cache.cpu_side
-slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu0.istage2_mmu.stage2_tlb.walker.port system.cpu0.dstage2_mmu.stage2_tlb.walker.port
+slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port
 
 [system.cpu0.tracer]
 type=ExeTracer
@@ -816,7 +827,7 @@ dcache_port=system.cpu1.dcache.cpu_side
 icache_port=system.cpu1.icache.cpu_side
 
 [system.cpu1.branchPred]
-type=BranchPredictor
+type=BiModeBP
 BTBEntries=2048
 BTBTagSize=18
 RASSize=16
@@ -826,11 +837,7 @@ eventq_index=0
 globalCtrBits=2
 globalPredictorSize=8192
 instShiftAmt=2
-localCtrBits=2
-localHistoryTableSize=2048
-localPredictorSize=2048
 numThreads=1
-predType=bi-mode
 
 [system.cpu1.dcache]
 type=BaseCache
@@ -838,6 +845,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=2
@@ -872,6 +880,7 @@ type=ArmStage2MMU
 children=stage2_tlb
 eventq_index=0
 stage2_tlb=system.cpu1.dstage2_mmu.stage2_tlb
+sys=system
 tlb=system.cpu1.dtb
 
 [system.cpu1.dstage2_mmu.stage2_tlb]
@@ -889,7 +898,6 @@ eventq_index=0
 is_stage2=true
 num_squash_per_cycle=2
 sys=system
-port=system.cpu1.toL2Bus.slave[5]
 
 [system.cpu1.dtb]
 type=ArmTLB
@@ -1179,8 +1187,9 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
-forward_snoops=true
+forward_snoops=false
 hit_latency=1
 is_top_level=true
 max_miss_count=0
@@ -1247,6 +1256,7 @@ type=ArmStage2MMU
 children=stage2_tlb
 eventq_index=0
 stage2_tlb=system.cpu1.istage2_mmu.stage2_tlb
+sys=system
 tlb=system.cpu1.itb
 
 [system.cpu1.istage2_mmu.stage2_tlb]
@@ -1264,7 +1274,6 @@ eventq_index=0
 is_stage2=true
 num_squash_per_cycle=2
 sys=system
-port=system.cpu1.toL2Bus.slave[4]
 
 [system.cpu1.itb]
 type=ArmTLB
@@ -1289,6 +1298,7 @@ children=prefetcher tags
 addr_ranges=0:18446744073709551615
 assoc=16
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=12
@@ -1310,19 +1320,27 @@ mem_side=system.toL2Bus.slave[1]
 
 [system.cpu1.l2cache.prefetcher]
 type=StridePrefetcher
+cache_snoop=false
 clk_domain=system.cpu_clk_domain
-cross_pages=false
-data_accesses_only=false
 degree=8
 eventq_index=0
-inst_tagged=true
 latency=1
-on_miss_only=false
-on_prefetch=true
-on_read_only=false
-serial_squash=false
-size=100
+max_conf=7
+min_conf=0
+on_data=true
+on_inst=true
+on_miss=false
+on_read=true
+on_write=true
+queue_filter=true
+queue_size=32
+queue_squash=true
+start_conf=4
 sys=system
+table_assoc=4
+table_sets=16
+tag_prefetch=true
+thresh_conf=4
 use_master_id=true
 
 [system.cpu1.l2cache.tags]
@@ -1339,13 +1357,16 @@ size=1048576
 type=CoherentXBar
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
 snoop_filter=Null
+snoop_response_latency=1
 system=system
 use_default_range=false
 width=32
 master=system.cpu1.l2cache.cpu_side
-slave=system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu1.itb.walker.port system.cpu1.dtb.walker.port system.cpu1.istage2_mmu.stage2_tlb.walker.port system.cpu1.dstage2_mmu.stage2_tlb.walker.port
+slave=system.cpu1.icache.mem_side system.cpu1.dcache.mem_side system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
 
 [system.cpu1.tracer]
 type=ExeTracer
@@ -1376,9 +1397,11 @@ sys=system
 type=NoncoherentXBar
 clk_domain=system.clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=1
+frontend_latency=2
+response_latency=2
 use_default_range=true
-width=8
+width=16
 default=system.realview.pciconfig.pio
 master=system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.hdlcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.rtc.pio system.realview.vram.port system.realview.l2x0_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.aaci_fake.pio system.realview.lan_fake.pio system.realview.usb_fake.pio system.realview.mmc_fake.pio system.realview.energy_ctrl.pio system.realview.ide.pio system.realview.ide.config system.realview.ethernet.pio system.realview.ethernet.config system.iocache.cpu_side
 slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma system.realview.ide.dma system.realview.ethernet.dma
@@ -1389,6 +1412,7 @@ children=tags
 addr_ranges=2147483648:2415919103
 assoc=8
 clk_domain=system.clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=false
 hit_latency=50
@@ -1424,6 +1448,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=8
 clk_domain=system.cpu_clk_domain
+demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=true
 hit_latency=20
@@ -1458,13 +1483,16 @@ type=CoherentXBar
 children=badaddr_responder
 clk_domain=system.clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=4
+frontend_latency=3
+response_latency=2
 snoop_filter=Null
+snoop_response_latency=4
 system=system
 use_default_range=false
-width=8
+width=16
 default=system.membus.badaddr_responder.pio
-master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port
+master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port
 slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side
 
 [system.membus.badaddr_responder]
@@ -1512,7 +1540,7 @@ IDD62=0.000000
 VDD=1.500000
 VDD2=0.000000
 activation_limit=4
-addr_mapping=RoRaBaChCo
+addr_mapping=RoRaBaCoCh
 bank_groups_per_rank=0
 banks_per_rank=8
 burst_length=8
@@ -1816,7 +1844,6 @@ dist_pio_delay=10000
 eventq_index=0
 int_latency=10000
 it_lines=128
-msix_addr=0
 platform=system.realview
 system=system
 pio=system.membus.master[2]
@@ -2003,7 +2030,7 @@ int_num_watchdog=30
 pio_addr=738721792
 pio_latency=100000
 system=system
-pio=system.membus.master[3]
+pio=system.membus.master[4]
 
 [system.realview.mmc_fake]
 type=AmbaFake
@@ -2185,7 +2212,7 @@ platform=system.realview
 ppint=25
 system=system
 vcpu_addr=738222080
-pio=system.membus.master[4]
+pio=system.membus.master[3]
 
 [system.realview.vram]
 type=SimpleMemory
@@ -2223,11 +2250,14 @@ port=3456
 type=CoherentXBar
 clk_domain=system.cpu_clk_domain
 eventq_index=0
-header_cycles=1
+forward_latency=0
+frontend_latency=1
+response_latency=1
 snoop_filter=Null
+snoop_response_latency=1
 system=system
 use_default_range=false
-width=8
+width=32
 master=system.l2c.cpu_side
 slave=system.cpu0.l2cache.mem_side system.cpu1.l2cache.mem_side
 
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr
index bbb1cd360..fa6d20798 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simerr
@@ -7,6 +7,6 @@ warn: Existing EnergyCtrl, but no enabled DVFSHandler found.
 warn: SCReg: Writing 0 to dcc0:site0:pos0:fn7:dev0
 warn: Tried to read RealView I/O at offset 0x60 that doesn't exist
 warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
-warn: allocating bonus target for snoop
 warn: Tried to read RealView I/O at offset 0x8 that doesn't exist
 warn: Tried to read RealView I/O at offset 0x48 that doesn't exist
+warn: allocating bonus target for snoop
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout
index c9871ea6d..3913964ad 100644..100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/simout
@@ -1,17 +1,18 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Oct 29 2014 09:18:22
-gem5 started Oct 29 2014 11:56:54
-gem5 executing on u200540-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-dual -re /work/gem5.latest/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-dual
+gem5 compiled Apr 22 2015 10:58:25
+gem5 started Apr 22 2015 13:01:24
+gem5 executing on phenom
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-dual -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview64-o3-dual
+
 Selected 64-bit ARM architecture, updating default disk image...
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.aarch64.20140821
-      0: system.cpu0.isa: ISA system set to: 0x5878b00 0x5878b00
-      0: system.cpu1.isa: ISA system set to: 0x5878b00 0x5878b00
+info: kernel located at: /home/stever/m5/aarch-system-2014-10/binaries/vmlinux.aarch64.20140821
+      0: system.cpu0.isa: ISA system set to: 0x305baa0 0x305baa0
+      0: system.cpu1.isa: ISA system set to: 0x305baa0 0x305baa0
 info: Using bootloader at address 0x10
 info: Using kernel entry physical address at 0x80080000
-info: Loading DTB file: /projects/pd/randd/dist/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
+info: Loading DTB file: /home/stever/m5/aarch-system-2014-10/binaries/vexpress.aarch64.20140821.dtb at address 0x88000000
 info: Entering event queue @ 0.  Starting simulation...
-Exiting @ tick 47379674621500 because m5_exit instruction encountered
+Exiting @ tick 47305566199500 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt
index 8729ed0b6..417d3b817 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                 47.305566                       # Nu
 sim_ticks                                47305566199500                       # Number of ticks simulated
 final_tick                               47305566199500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 109110                       # Simulator instruction rate (inst/s)
-host_op_rate                                   128307                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             5804669404                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 767140                       # Number of bytes of host memory used
-host_seconds                                  8149.57                       # Real time elapsed on the host
+host_inst_rate                                 108918                       # Simulator instruction rate (inst/s)
+host_op_rate                                   128082                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             5794473291                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 707548                       # Number of bytes of host memory used
+host_seconds                                  8163.91                       # Real time elapsed on the host
 sim_insts                                   889196991                       # Number of instructions simulated
 sim_ops                                    1045647845                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -640,7 +640,7 @@ system.cpu0.iq.iqInstsAdded                 585335843                       # Nu
 system.cpu0.iq.iqNonSpecInstsAdded           14506928                       # Number of non-speculative instructions added to the IQ
 system.cpu0.iq.iqInstsIssued                587846614                       # Number of instructions issued
 system.cpu0.iq.iqSquashedInstsIssued          2739409                       # Number of squashed instructions issued
-system.cpu0.iq.iqSquashedInstsExamined       51306825                       # Number of squashed instructions iterated over during squash; mainly for profiling
+system.cpu0.iq.iqSquashedInstsExamined       54557687                       # Number of squashed instructions iterated over during squash; mainly for profiling
 system.cpu0.iq.iqSquashedOperandsExamined     35502721                       # Number of squashed operands that are examined and possibly removed from graph
 system.cpu0.iq.iqSquashedNonSpecRemoved        263475                       # Number of squashed non-spec instructions that were removed
 system.cpu0.iq.issued_per_cycle::samples    706084889                       # Number of insts issued each cycle
@@ -733,10 +733,10 @@ system.cpu0.iq.rate                          0.806867                       # In
 system.cpu0.iq.fu_busy_cnt                  134946779                       # FU busy when requested
 system.cpu0.iq.fu_busy_rate                  0.229561                       # FU busy rate (busy events/executed inst)
 system.cpu0.iq.int_inst_queue_reads        2018256641                       # Number of integer instruction queue reads
-system.cpu0.iq.int_inst_queue_writes        650811943                       # Number of integer instruction queue writes
+system.cpu0.iq.int_inst_queue_writes        654059965                       # Number of integer instruction queue writes
 system.cpu0.iq.int_inst_queue_wakeup_accesses    571438682                       # Number of integer instruction queue wakeup accesses
 system.cpu0.iq.fp_inst_queue_reads            1207660                       # Number of floating instruction queue reads
-system.cpu0.iq.fp_inst_queue_writes            476069                       # Number of floating instruction queue writes
+system.cpu0.iq.fp_inst_queue_writes            478909                       # Number of floating instruction queue writes
 system.cpu0.iq.fp_inst_queue_wakeup_accesses       443638                       # Number of floating instruction queue wakeup accesses
 system.cpu0.iq.int_alu_accesses             722040340                       # Number of integer alu accesses
 system.cpu0.iq.fp_alu_accesses                 753051                       # Number of floating point alu accesses
@@ -1888,7 +1888,7 @@ system.cpu1.iq.iqInstsAdded                 535459998                       # Nu
 system.cpu1.iq.iqNonSpecInstsAdded           14979383                       # Number of non-speculative instructions added to the IQ
 system.cpu1.iq.iqInstsIssued                539826932                       # Number of instructions issued
 system.cpu1.iq.iqSquashedInstsIssued          2475624                       # Number of squashed instructions issued
-system.cpu1.iq.iqSquashedInstsExamined       46992661                       # Number of squashed instructions iterated over during squash; mainly for profiling
+system.cpu1.iq.iqSquashedInstsExamined       50076597                       # Number of squashed instructions iterated over during squash; mainly for profiling
 system.cpu1.iq.iqSquashedOperandsExamined     32301398                       # Number of squashed operands that are examined and possibly removed from graph
 system.cpu1.iq.iqSquashedNonSpecRemoved        273094                       # Number of squashed non-spec instructions that were removed
 system.cpu1.iq.issued_per_cycle::samples    643136774                       # Number of insts issued each cycle
@@ -1981,10 +1981,10 @@ system.cpu1.iq.rate                          0.818910                       # In
 system.cpu1.iq.fu_busy_cnt                  122894739                       # FU busy when requested
 system.cpu1.iq.fu_busy_rate                  0.227656                       # FU busy rate (busy events/executed inst)
 system.cpu1.iq.int_inst_queue_reads        1846883379                       # Number of integer instruction queue reads
-system.cpu1.iq.int_inst_queue_writes        597058317                       # Number of integer instruction queue writes
+system.cpu1.iq.int_inst_queue_writes        600138356                       # Number of integer instruction queue writes
 system.cpu1.iq.int_inst_queue_wakeup_accesses    524462260                       # Number of integer instruction queue wakeup accesses
 system.cpu1.iq.fp_inst_queue_reads            1277620                       # Number of floating instruction queue reads
-system.cpu1.iq.fp_inst_queue_writes            514947                       # Number of floating instruction queue writes
+system.cpu1.iq.fp_inst_queue_writes            518844                       # Number of floating instruction queue writes
 system.cpu1.iq.fp_inst_queue_wakeup_accesses       476158                       # Number of floating instruction queue wakeup accesses
 system.cpu1.iq.int_alu_accesses             661932910                       # Number of integer alu accesses
 system.cpu1.iq.fp_alu_accesses                 788750                       # Number of floating point alu accesses
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/system.terminal
index 76059ddbc..106828a6d 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview64-o3-dual/system.terminal
@@ -32,135 +32,135 @@
 [    0.000000] NR_IRQS:64 nr_irqs:64 0

 [    0.000000] Architected cp15 timer(s) running at 100.00MHz (phys).

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

-[    0.000013] Console: colour dummy device 80x25

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

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

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

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

-[    0.000089] hw perfevents: no hardware support available

-[    0.060023] CPU1: Booted secondary processor

-[    1.080047] CPU2: failed to come online

-[    2.100092] CPU3: failed to come online

-[    2.100094] Brought up 2 CPUs

-[    2.100095] SMP: Total of 2 processors activated.

-[    2.100128] devtmpfs: initialized

-[    2.100481] atomic64_test: passed

-[    2.100508] regulator-dummy: no parameters

-[    2.100743] NET: Registered protocol family 16

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

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

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

-[    2.100989] Serial: AMBA PL011 UART driver

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

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

-[    2.101667] console [ttyAMA0] enabled

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

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

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

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

-[    2.140191] 3V3: 3300 mV 

-[    2.140222] vgaarb: loaded

-[    2.140252] SCSI subsystem initialized

-[    2.140281] libata version 3.00 loaded.

-[    2.140314] usbcore: registered new interface driver usbfs

-[    2.140329] usbcore: registered new interface driver hub

-[    2.140353] usbcore: registered new device driver usb

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

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

-[    2.140399] PTP clock support registered

-[    2.140483] Switched to clocksource arch_sys_counter

-[    2.141463] NET: Registered protocol family 2

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

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

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

-[    2.141554] TCP: reno registered

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

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

-[    2.141596] NET: Registered protocol family 1

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

-[    2.141644] RPC: Registered udp transport module.

-[    2.141652] RPC: Registered tcp transport module.

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

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

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

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

-[    2.143024] fuse init (API version 7.23)

-[    2.143086] msgmni has been set to 469

-[    2.143317] io scheduler noop registered

-[    2.143357] io scheduler cfq registered (default)

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

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

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

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

-[    2.143624] pci_bus 0000:00: scanning bus

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-[    2.144591] scsi0 : ata_piix

-[    2.144642] scsi1 : ata_piix

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-[    2.290760]  sda: sda1

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

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

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

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

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

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

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

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

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

-[    2.411032] usbcore: registered new interface driver usbhid

-[    2.411041] usbhid: USB HID core driver

-[    2.411064] TCP: cubic registered

-[    2.411070] NET: Registered protocol family 17

-
-[    2.411367] devtmpfs: mounted

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

+[    0.000015] Console: colour dummy device 80x25

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

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

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

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

+[    0.000102] hw perfevents: no hardware support available

+[    0.060025] CPU1: Booted secondary processor

+[    1.080050] CPU2: failed to come online

+[    2.100095] CPU3: failed to come online

+[    2.100098] Brought up 2 CPUs

+[    2.100098] SMP: Total of 2 processors activated.

+[    2.100138] devtmpfs: initialized

+[    2.100444] atomic64_test: passed

+[    2.100472] regulator-dummy: no parameters

+[    2.100696] NET: Registered protocol family 16

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

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

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

+[    2.100984] Serial: AMBA PL011 UART driver

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

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

+[    2.101687] console [ttyAMA0] enabled

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

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

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

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

+[    2.140205] 3V3: 3300 mV 

+[    2.140237] vgaarb: loaded

+[    2.140268] SCSI subsystem initialized

+[    2.140296] libata version 3.00 loaded.

+[    2.140328] usbcore: registered new interface driver usbfs

+[    2.140342] usbcore: registered new interface driver hub

+[    2.140362] usbcore: registered new device driver usb

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

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

+[    2.140408] PTP clock support registered

+[    2.140494] Switched to clocksource arch_sys_counter

+[    2.141571] NET: Registered protocol family 2

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

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

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

+[    2.141678] TCP: reno registered

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

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

+[    2.141722] NET: Registered protocol family 1

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

+[    2.141766] RPC: Registered udp transport module.

+[    2.141774] RPC: Registered tcp transport module.

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

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

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

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

+[    2.143005] fuse init (API version 7.23)

+[    2.143061] msgmni has been set to 469

+[    2.143642] io scheduler noop registered

+[    2.143678] io scheduler cfq registered (default)

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

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

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

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

+[    2.143952] pci_bus 0000:00: scanning bus

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+[    2.144903] scsi0 : ata_piix

+[    2.144950] scsi1 : ata_piix

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+[    2.290769]  sda: sda1

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

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

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

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

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

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

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

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

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

+[    2.411093] usbcore: registered new interface driver usbhid

+[    2.411103] usbhid: USB HID core driver

+[    2.411126] TCP: cubic registered

+[    2.411133] NET: Registered protocol family 17

+
+[    2.411442] devtmpfs: mounted

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

 
 
-[    2.447368] udevd[609]: starting version 182

+[    2.447379] udevd[609]: starting version 182

 Starting Bootlog daemon: bootlogd.


-[    2.532352] random: dd urandom read with 18 bits of entropy available

+[    2.532355] random: dd urandom read with 17 bits of entropy available

 Populating dev cache


 net.ipv4.conf.default.rp_filter = 1


 net.ipv4.conf.all.rp_filter = 1


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


 
INIT: Entering runlevel: 5



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


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

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

 Sending discover...


 Sending discover...


 Sending discover...