stats: updates due to recent chagnesets

3 files changed, 59 insertions, 14 deletions

diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
index 87bce23ee..586b5ebfb 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
@@ -38,6 +38,7 @@ 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
@@ -141,6 +142,7 @@ 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
@@ -157,6 +159,7 @@ system=system
 tags=system.cpu0.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu0.dcache_port
 mem_side=system.cpu0.toL2Bus.slave[1]
 
@@ -217,6 +220,7 @@ 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
@@ -233,6 +237,7 @@ system=system
 tags=system.cpu0.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu0.icache_port
 mem_side=system.cpu0.toL2Bus.slave[0]
 
@@ -252,6 +257,7 @@ eventq_index=0
 
 [system.cpu0.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -327,6 +333,7 @@ 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
@@ -343,6 +350,7 @@ system=system
 tags=system.cpu0.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu0.toL2Bus.master[0]
 mem_side=system.toL2Bus.slave[0]
 
@@ -383,12 +391,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
@@ -396,6 +405,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
@@ -445,6 +461,7 @@ 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
@@ -461,6 +478,7 @@ system=system
 tags=system.cpu1.dcache.tags
 tgts_per_mshr=8
 write_buffers=16
+writeback_clean=true
 cpu_side=system.cpu1.dcache_port
 mem_side=system.cpu1.toL2Bus.slave[1]
 
@@ -521,6 +539,7 @@ 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
@@ -537,6 +556,7 @@ system=system
 tags=system.cpu1.icache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=true
 cpu_side=system.cpu1.icache_port
 mem_side=system.cpu1.toL2Bus.slave[0]
 
@@ -556,6 +576,7 @@ eventq_index=0
 
 [system.cpu1.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -631,6 +652,7 @@ 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
@@ -647,6 +669,7 @@ system=system
 tags=system.cpu1.l2cache.tags
 tgts_per_mshr=8
 write_buffers=8
+writeback_clean=false
 cpu_side=system.cpu1.toL2Bus.master[0]
 mem_side=system.toL2Bus.slave[1]
 
@@ -687,12 +710,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
@@ -700,6 +724,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
@@ -744,6 +775,7 @@ children=tags
 addr_ranges=2147483648:2415919103
 assoc=8
 clk_domain=system.clk_domain
+clusivity=mostly_incl
 demand_mshr_reserve=1
 eventq_index=0
 forward_snoops=false
@@ -760,6 +792,7 @@ system=system
 tags=system.iocache.tags
 tgts_per_mshr=12
 write_buffers=8
+writeback_clean=false
 cpu_side=system.iobus.master[27]
 mem_side=system.membus.slave[3]
 
@@ -779,6 +812,7 @@ 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
@@ -795,6 +829,7 @@ system=system
 tags=system.l2c.tags
 tgts_per_mshr=12
 write_buffers=8
+writeback_clean=false
 cpu_side=system.toL2Bus.master[0]
 mem_side=system.membus.slave[2]
 
@@ -1630,12 +1665,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
@@ -1643,6 +1679,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/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
index af95aaebb..8b953d20b 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
@@ -1,16 +1,18 @@
+Redirecting stdout to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual/simout
+Redirecting stderr to build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual/simerr
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Aug  7 2015 10:13:08
-gem5 started Aug  7 2015 10:13:40
-gem5 executing on e104799-lin
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual
+gem5 compiled Nov 15 2015 15:24:37
+gem5 started Nov 15 2015 15:25:11
+gem5 executing on ribera.cs.wisc.edu, pid 11029
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re /scratch/nilay/GEM5/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual
 
 Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+info: kernel located at: /scratch/nilay/GEM5/system/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: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000
+info: Loading DTB file: /scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000
 info: Entering event queue @ 0.  Starting simulation...
 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
index 4554ab525..f7532a630 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.802895                       # Nu
 sim_ticks                                2802894699500                       # Number of ticks simulated
 final_tick                               2802894699500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1249421                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1522401                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            23850961642                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 637428                       # Number of bytes of host memory used
-host_seconds                                   117.52                       # Real time elapsed on the host
+host_inst_rate                                 842767                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1026899                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            16088096135                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 630892                       # Number of bytes of host memory used
+host_seconds                                   174.22                       # Real time elapsed on the host
 sim_insts                                   146828240                       # Number of instructions simulated
 sim_ops                                     178908039                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts