stats: update stats for mmap() change.

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

4 files changed, 34 insertions, 18 deletions

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