stats: update for previous changeset

Very small differences in IQ-specific O3 stats.

8 files changed, 62 insertions, 49 deletions

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 537f6d0ab..845c48f32 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
@@ -23,6 +23,7 @@ load_offset=0
 mem_mode=timing
 mem_ranges=
 memories=system.physmem
+mmap_using_noreserve=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -135,7 +136,7 @@ dcache_port=system.cpu.dcache.cpu_side
 icache_port=system.cpu.icache.cpu_side
 
 [system.cpu.branchPred]
-type=BranchPredictor
+type=BiModeBP
 BTBEntries=2048
 BTBTagSize=18
 RASSize=16
@@ -145,11 +146,7 @@ eventq_index=0
 globalCtrBits=2
 globalPredictorSize=8192
 instShiftAmt=2
-localCtrBits=2
-localHistoryTableSize=2048
-localPredictorSize=2048
 numThreads=1
-predType=bi-mode
 
 [system.cpu.dcache]
 type=BaseCache
@@ -192,6 +189,7 @@ type=ArmStage2MMU
 children=stage2_tlb
 eventq_index=0
 stage2_tlb=system.cpu.dstage2_mmu.stage2_tlb
+sys=system
 tlb=system.cpu.dtb
 
 [system.cpu.dstage2_mmu.stage2_tlb]
@@ -209,7 +207,6 @@ eventq_index=0
 is_stage2=true
 num_squash_per_cycle=2
 sys=system
-port=system.cpu.toL2Bus.slave[5]
 
 [system.cpu.dtb]
 type=ArmTLB
@@ -501,7 +498,7 @@ 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
@@ -568,6 +565,7 @@ type=ArmStage2MMU
 children=stage2_tlb
 eventq_index=0
 stage2_tlb=system.cpu.istage2_mmu.stage2_tlb
+sys=system
 tlb=system.cpu.itb
 
 [system.cpu.istage2_mmu.stage2_tlb]
@@ -585,7 +583,6 @@ eventq_index=0
 is_stage2=true
 num_squash_per_cycle=2
 sys=system
-port=system.cpu.toL2Bus.slave[4]
 
 [system.cpu.itb]
 type=ArmTLB
@@ -669,13 +666,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.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.istage2_mmu.stage2_tlb.walker.port system.cpu.dstage2_mmu.stage2_tlb.walker.port
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -691,9 +691,9 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/arm/linux/parser
+executable=/home/stever/m5/dist/cpu2000/binaries/arm/linux/parser
 gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/parser/mdred/input/parser.in
+input=/home/stever/m5/dist/cpu2000/data/parser/mdred/input/parser.in
 kvmInSE=false
 max_stack_size=67108864
 output=cout
@@ -724,11 +724,14 @@ transition_latency=100000000
 type=CoherentXBar
 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
 master=system.physmem.port
 slave=system.system_port system.cpu.l2cache.mem_side
 
@@ -759,7 +762,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
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 5d8946ede..be90b0340 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,2 +1,3 @@
+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 0d3306a6b..84abcb43e 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,12 +1,13 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jun 21 2014 11:22:42
-gem5 started Jun 21 2014 21:42:28
+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
+
 Global frequency set at 1000000000000 ticks per second
-      0: system.cpu.isa: ISA system set to: 0 0x6824800
+      0: system.cpu.isa: ISA system set to: 0 0x3ca3710
 info: Entering event queue @ 0.  Starting simulation...
 
  Reading the dictionary files: *************************************************
@@ -68,4 +69,4 @@ info: Increasing stack size by one page.
   about 2 million people attended 
   the five best costumes got prizes 
 No errors!
-Exiting @ tick 201639641000 because target called exit()
+Exiting @ tick 233381523500 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 f698c7645..2bb46ae0a 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.233382                       # Nu
 sim_ticks                                233381523500                       # Number of ticks simulated
 final_tick                               233381523500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 139639                       # Simulator instruction rate (inst/s)
-host_op_rate                                   151279                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               64502789                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 317896                       # Number of bytes of host memory used
-host_seconds                                  3618.16                       # Real time elapsed on the host
+host_inst_rate                                 138194                       # Simulator instruction rate (inst/s)
+host_op_rate                                   149713                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               63835070                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 248488                       # Number of bytes of host memory used
+host_seconds                                  3656.01                       # Real time elapsed on the host
 sim_insts                                   505237723                       # Number of instructions simulated
 sim_ops                                     547350944                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -478,7 +478,7 @@ system.cpu.iq.iqInstsAdded                  668168633                       # Nu
 system.cpu.iq.iqNonSpecInstsAdded             2978333                       # Number of non-speculative instructions added to the IQ
 system.cpu.iq.iqInstsIssued                 610244720                       # Number of instructions issued
 system.cpu.iq.iqSquashedInstsIssued           5860928                       # Number of squashed instructions issued
-system.cpu.iq.iqSquashedInstsExamined       122748160                       # Number of squashed instructions iterated over during squash; mainly for profiling
+system.cpu.iq.iqSquashedInstsExamined       123796022                       # Number of squashed instructions iterated over during squash; mainly for profiling
 system.cpu.iq.iqSquashedOperandsExamined    319249921                       # Number of squashed operands that are examined and possibly removed from graph
 system.cpu.iq.iqSquashedNonSpecRemoved            701                       # Number of squashed non-spec instructions that were removed
 system.cpu.iq.issued_per_cycle::samples     465881386                       # Number of insts issued each cycle
@@ -571,7 +571,7 @@ system.cpu.iq.rate                           1.307397                       # In
 system.cpu.iq.fu_busy_cnt                   135784339                       # FU busy when requested
 system.cpu.iq.fu_busy_rate                   0.222508                       # FU busy rate (busy events/executed inst)
 system.cpu.iq.int_inst_queue_reads         1828015800                       # Number of integer instruction queue reads
-system.cpu.iq.int_inst_queue_writes         793923222                       # Number of integer instruction queue writes
+system.cpu.iq.int_inst_queue_writes         794971084                       # Number of integer instruction queue writes
 system.cpu.iq.int_inst_queue_wakeup_accesses    594984495                       # Number of integer instruction queue wakeup accesses
 system.cpu.iq.fp_inst_queue_reads                 293                       # Number of floating instruction queue reads
 system.cpu.iq.fp_inst_queue_writes                316                       # Number of floating instruction queue writes
diff --git a/tests/long/se/20.parser/ref/x86/linux/o3-timing/config.ini b/tests/long/se/20.parser/ref/x86/linux/o3-timing/config.ini
index 4683e5b55..cc46946c9 100644
--- a/tests/long/se/20.parser/ref/x86/linux/o3-timing/config.ini
+++ b/tests/long/se/20.parser/ref/x86/linux/o3-timing/config.ini
@@ -23,6 +23,7 @@ load_offset=0
 mem_mode=timing
 mem_ranges=
 memories=system.physmem
+mmap_using_noreserve=false
 num_work_ids=16
 readfile=
 symbolfile=
@@ -139,7 +140,7 @@ clk_domain=system.cpu_clk_domain
 eventq_index=0
 
 [system.cpu.branchPred]
-type=BranchPredictor
+type=TournamentBP
 BTBEntries=4096
 BTBTagSize=16
 RASSize=16
@@ -153,7 +154,6 @@ localCtrBits=2
 localHistoryTableSize=2048
 localPredictorSize=2048
 numThreads=1
-predType=tournament
 
 [system.cpu.dcache]
 type=BaseCache
@@ -620,8 +620,11 @@ size=2097152
 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
@@ -642,9 +645,9 @@ env=
 errout=cerr
 euid=100
 eventq_index=0
-executable=/scratch/nilay/GEM5/dist/m5/cpu2000/binaries/x86/linux/parser
+executable=/home/stever/m5/dist/cpu2000/binaries/x86/linux/parser
 gid=100
-input=/scratch/nilay/GEM5/dist/m5/cpu2000/data/parser/mdred/input/parser.in
+input=/home/stever/m5/dist/cpu2000/data/parser/mdred/input/parser.in
 kvmInSE=false
 max_stack_size=67108864
 output=cout
@@ -675,11 +678,14 @@ transition_latency=100000000
 type=CoherentXBar
 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
 master=system.physmem.port system.cpu.interrupts.pio system.cpu.interrupts.int_slave
 slave=system.system_port system.cpu.l2cache.mem_side system.cpu.interrupts.int_master
 
@@ -710,7 +716,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
diff --git a/tests/long/se/20.parser/ref/x86/linux/o3-timing/simerr b/tests/long/se/20.parser/ref/x86/linux/o3-timing/simerr
index 1a4f96712..341b479f7 100755
--- a/tests/long/se/20.parser/ref/x86/linux/o3-timing/simerr
+++ b/tests/long/se/20.parser/ref/x86/linux/o3-timing/simerr
@@ -1 +1,2 @@
+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/20.parser/ref/x86/linux/o3-timing/simout b/tests/long/se/20.parser/ref/x86/linux/o3-timing/simout
index 746dbf385..09a2affd6 100755
--- a/tests/long/se/20.parser/ref/x86/linux/o3-timing/simout
+++ b/tests/long/se/20.parser/ref/x86/linux/o3-timing/simout
@@ -1,16 +1,17 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jun 21 2014 11:13:07
-gem5 started Jun 21 2014 22:34:22
+gem5 compiled Apr 22 2015 08:10:29
+gem5 started Apr 22 2015 09:35:25
 gem5 executing on phenom
 command line: build/X86/gem5.opt -d build/X86/tests/opt/long/se/20.parser/x86/linux/o3-timing -re /home/stever/hg/m5sim.org/gem5/tests/run.py build/X86/tests/opt/long/se/20.parser/x86/linux/o3-timing
+
 Global frequency set at 1000000000000 ticks per second
 info: Entering event queue @ 0.  Starting simulation...
 
- Reading the dictionary files: *********info: Increasing stack size by one page.
-info: Increasing stack size by one page.
-******************************info: Increasing stack size by one page.
+ Reading the dictionary files: *******info: Increasing stack size by one page.
+**info: Increasing stack size by one page.
+**************************************info: Increasing stack size by one page.
 info: Increasing stack size by one page.
 info: Increasing stack size by one page.
 info: Increasing stack size by one page.
@@ -22,7 +23,7 @@ info: Increasing stack size by one page.
 info: Increasing stack size by one page.
 info: Increasing stack size by one page.
 info: Increasing stack size by one page.
-**********
+**
  58924 words stored in 3784810 bytes
 
 
@@ -88,4 +89,4 @@ info: Increasing stack size by one page.
   about 2 million people attended 
   the five best costumes got prizes 
 No errors!
-Exiting @ tick 456433328000 because target called exit()
+Exiting @ tick 455715234500 because target called exit()
diff --git a/tests/long/se/20.parser/ref/x86/linux/o3-timing/stats.txt b/tests/long/se/20.parser/ref/x86/linux/o3-timing/stats.txt
index 9b577089a..08f5e873d 100644
--- a/tests/long/se/20.parser/ref/x86/linux/o3-timing/stats.txt
+++ b/tests/long/se/20.parser/ref/x86/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.455715                       # Nu
 sim_ticks                                455715234500                       # Number of ticks simulated
 final_tick                               455715234500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                  71545                       # Simulator instruction rate (inst/s)
-host_op_rate                                   132294                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               39430208                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 421584                       # Number of bytes of host memory used
-host_seconds                                 11557.52                       # Real time elapsed on the host
+host_inst_rate                                  95556                       # Simulator instruction rate (inst/s)
+host_op_rate                                   176693                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               52663419                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 364636                       # Number of bytes of host memory used
+host_seconds                                  8653.35                       # Real time elapsed on the host
 sim_insts                                   826877109                       # Number of instructions simulated
 sim_ops                                    1528988701                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -370,7 +370,7 @@ system.cpu.iq.iqInstsAdded                 2112788093                       # Nu
 system.cpu.iq.iqNonSpecInstsAdded               24468                       # Number of non-speculative instructions added to the IQ
 system.cpu.iq.iqInstsIssued                1829137533                       # Number of instructions issued
 system.cpu.iq.iqSquashedInstsIssued            426447                       # Number of squashed instructions issued
-system.cpu.iq.iqSquashedInstsExamined       579133879                       # Number of squashed instructions iterated over during squash; mainly for profiling
+system.cpu.iq.iqSquashedInstsExamined       583823860                       # Number of squashed instructions iterated over during squash; mainly for profiling
 system.cpu.iq.iqSquashedOperandsExamined   1007575077                       # Number of squashed operands that are examined and possibly removed from graph
 system.cpu.iq.iqSquashedNonSpecRemoved          23916                       # Number of squashed non-spec instructions that were removed
 system.cpu.iq.issued_per_cycle::samples     911228208                       # Number of insts issued each cycle
@@ -463,10 +463,10 @@ system.cpu.iq.rate                           2.006886                       # In
 system.cpu.iq.fu_busy_cnt                    26638041                       # FU busy when requested
 system.cpu.iq.fu_busy_rate                   0.014563                       # FU busy rate (busy events/executed inst)
 system.cpu.iq.int_inst_queue_reads         4596535787                       # Number of integer instruction queue reads
-system.cpu.iq.int_inst_queue_writes        2692210314                       # Number of integer instruction queue writes
+system.cpu.iq.int_inst_queue_writes        2696900293                       # Number of integer instruction queue writes
 system.cpu.iq.int_inst_queue_wakeup_accesses   1799537822                       # Number of integer instruction queue wakeup accesses
 system.cpu.iq.fp_inst_queue_reads               31975                       # Number of floating instruction queue reads
-system.cpu.iq.fp_inst_queue_writes              69900                       # Number of floating instruction queue writes
+system.cpu.iq.fp_inst_queue_writes              69902                       # Number of floating instruction queue writes
 system.cpu.iq.fp_inst_queue_wakeup_accesses         6901                       # Number of floating instruction queue wakeup accesses
 system.cpu.iq.int_alu_accesses             1853040947                       # Number of integer alu accesses
 system.cpu.iq.fp_alu_accesses                   14852                       # Number of floating point alu accesses