stats: Update for UDelayEvent quiesce change

5 files changed, 51 insertions, 26 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
index 7ab7491a1..7d52baa5c 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
@@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000
 type=LinuxArmSystem
 children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain
 atags_addr=134217728
-boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm
+boot_loader=/home/joel/research/gem5/full_system_files/binaries/boot_emm.arm
 boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1
 cache_line_size=64
 clk_domain=system.clk_domain
-dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
+dtb_filename=/home/joel/research/gem5/full_system_files/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb
 early_kernel_symbols=false
 enable_context_switch_stats_dump=false
 eventq_index=0
@@ -28,7 +28,7 @@ have_security=false
 have_virtualization=false
 highest_el_is_64=false
 init_param=0
-kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/home/joel/research/gem5/full_system_files/binaries/vmlinux.aarch32.ll_20131205.0-gem5
 kernel_addr_check=true
 load_addr_mask=268435455
 load_offset=2147483648
@@ -38,11 +38,12 @@ mem_ranges=2147483648:2415919103
 memories=system.physmem system.realview.nvmem system.realview.vram
 mmap_using_noreserve=false
 multi_proc=true
+multi_thread=false
 num_work_ids=16
 panic_on_oops=true
 panic_on_panic=true
 phys_addr_range_64=40
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/home/joel/research/gem5/gem5/tests/halt.sh
 reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
@@ -85,7 +86,7 @@ table_size=65536
 [system.cf0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img
+image_file=/home/joel/research/gem5/full_system_files/disks/linux-aarch32-ael.img
 read_only=true
 
 [system.clk_domain]
@@ -582,6 +583,7 @@ eventq_index=0
 
 [system.cpu0.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -713,12 +715,13 @@ size=1048576
 
 [system.cpu0.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu0.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -726,6 +729,13 @@ 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.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu0.tracer]
 type=ExeTracer
 eventq_index=0
@@ -1216,6 +1226,7 @@ eventq_index=0
 
 [system.cpu1.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -1347,12 +1358,13 @@ size=1048576
 
 [system.cpu1.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.cpu1.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -1360,6 +1372,13 @@ 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.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.cpu1.tracer]
 type=ExeTracer
 eventq_index=0
@@ -2354,12 +2373,13 @@ port=3456
 
 [system.toL2Bus]
 type=CoherentXBar
+children=snoop_filter
 clk_domain=system.cpu_clk_domain
 eventq_index=0
 forward_latency=0
 frontend_latency=1
 response_latency=1
-snoop_filter=Null
+snoop_filter=system.toL2Bus.snoop_filter
 snoop_response_latency=1
 system=system
 use_default_range=false
@@ -2367,6 +2387,13 @@ width=32
 master=system.l2c.cpu_side
 slave=system.cpu0.l2cache.mem_side system.cpu1.l2cache.mem_side
 
+[system.toL2Bus.snoop_filter]
+type=SnoopFilter
+eventq_index=0
+lookup_latency=0
+max_capacity=8388608
+system=system
+
 [system.vncserver]
 type=VncServer
 eventq_index=0
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr
index 579777365..0663012e4 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simerr
@@ -43,4 +43,4 @@ warn: Ignoring write to miscreg pmintenclr
 warn: Ignoring write to miscreg pmovsr
 warn: Ignoring write to miscreg pmcr
 warn: 	instruction 'mcr dcisw' unimplemented
-warn: CP14 unimplemented crn[9], opc1[1], crm[0], opc2[2]
+warn: CP14 unimplemented crn[3], opc1[2], crm[8], opc2[2]
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
index 01c286841..fd0c77f94 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
@@ -1,18 +1,16 @@
-Redirecting stdout to build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual/simout
-Redirecting stderr to build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual/simerr
 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 14 2015 23:52:21
-gem5 executing on ribera.cs.wisc.edu
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual
+gem5 compiled Oct 10 2015 11:28:39
+gem5 started Oct 10 2015 11:45:23
+gem5 executing on artery, pid 26655
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual -re /home/joel/research/gem5/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual
 
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+info: kernel located at: /home/joel/research/gem5/full_system_files/binaries/vmlinux.aarch32.ll_20131205.0-gem5
 info: Using bootloader at address 0x10
 info: Using kernel entry physical address at 0x80008000
-info: Loading DTB file: /scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000
+info: Loading DTB file: /home/joel/research/gem5/full_system_files/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000
 info: Entering event queue @ 0.  Starting simulation...
 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
@@ -29,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
-Exiting @ tick 2825405893500 because m5_exit instruction encountered
+Exiting @ tick 2627260787000 because m5_exit instruction encountered
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
index 79173486d..1b6a9683d 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.627261                       # Nu
 sim_ticks                                2627260787000                       # Number of ticks simulated
 final_tick                               2627260787000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  87166                       # Simulator instruction rate (inst/s)
-host_op_rate                                   105753                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             1901847747                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 660800                       # Number of bytes of host memory used
-host_seconds                                  1381.43                       # Real time elapsed on the host
+host_inst_rate                                  73269                       # Simulator instruction rate (inst/s)
+host_op_rate                                    88893                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1598642516                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 609448                       # Number of bytes of host memory used
+host_seconds                                  1643.43                       # Real time elapsed on the host
 sim_insts                                   120413300                       # Number of instructions simulated
 sim_ops                                     146090184                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -764,9 +764,9 @@ system.cpu0.iew.iewDispNonSpecInsts            848677                       # Nu
 system.cpu0.iew.iewIQFullEvents                 24988                       # Number of times the IQ has become full, causing a stall
 system.cpu0.iew.iewLSQFullEvents               163669                       # Number of times the LSQ has become full, causing a stall
 system.cpu0.iew.memOrderViolationEvents         18608                       # Number of memory order violations
-system.cpu0.iew.predictedTakenIncorrect        265561                       # Number of branches that were predicted taken incorrectly
+system.cpu0.iew.predictedTakenIncorrect        265563                       # Number of branches that were predicted taken incorrectly
 system.cpu0.iew.predictedNotTakenIncorrect       373947                       # Number of branches that were predicted not taken incorrectly
-system.cpu0.iew.branchMispredicts              639508                       # Number of branch mispredicts detected at execute
+system.cpu0.iew.branchMispredicts              639510                       # Number of branch mispredicts detected at execute
 system.cpu0.iew.iewExecutedInsts             94079743                       # Number of executed instructions
 system.cpu0.iew.iewExecLoadInsts             17020662                       # Number of load instructions executed
 system.cpu0.iew.iewExecSquashedInsts           955277                       # Number of squashed instructions skipped in execute
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal
index 03b467a01..d38aec98b 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal
@@ -158,10 +158,10 @@ ata1.00: 1048320 sectors, multi 0: LBA
 ata1.00: configured for UDMA/33

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

 sd 0:0:0:0: [sda] 1048320 512-byte logical blocks: (536 MB/511 MiB)

-sd 0:0:0:0: Attached scsi generic sg0 type 0

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

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

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

+sd 0:0:0:0: Attached scsi generic sg0 type 0

  sda: sda1

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

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