From 1d933447fc62de67db938970a8308ac47189fd96 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Thu, 2 Jun 2016 14:14:36 +0100 Subject: stats: Update to match ARM ISA changes --- .../ref/arm/linux/realview-o3-dual/config.ini | 44 ++++++++++++++++++++-- .../ref/arm/linux/realview-o3-dual/simerr | 1 + .../ref/arm/linux/realview-o3-dual/simout | 2 +- .../ref/arm/linux/realview-o3-dual/stats.txt | 26 ++++++------- 4 files changed, 55 insertions(+), 18 deletions(-) (limited to 'tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual') 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 c9a130278..6af9f752e 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 @@ -24,7 +24,7 @@ exit_on_work_items=false flags_addr=469827632 gic_cpu_addr=738205696 have_large_asid_64=false -have_lpae=false +have_lpae=true have_security=false have_virtualization=false highest_el_is_64=false @@ -47,6 +47,8 @@ phys_addr_range_64=40 readfile=/home/stever/hg/m5sim.org/gem5/tests/halt.sh reset_addr_64=0 symbolfile= +thermal_components= +thermal_model=Null work_begin_ckpt_count=0 work_begin_cpu_id_exit=-1 work_begin_exit_count=0 @@ -199,8 +201,15 @@ choicePredictorSize=8192 eventq_index=0 globalCtrBits=2 globalPredictorSize=8192 +indirectHashGHR=true +indirectHashTargets=true +indirectPathLength=3 +indirectSets=256 +indirectTagSize=16 +indirectWays=2 instShiftAmt=2 numThreads=1 +useIndirect=true [system.cpu0.dcache] type=Cache @@ -846,8 +855,15 @@ choicePredictorSize=8192 eventq_index=0 globalCtrBits=2 globalPredictorSize=8192 +indirectHashGHR=true +indirectHashTargets=true +indirectPathLength=3 +indirectSets=256 +indirectTagSize=16 +indirectWays=2 instShiftAmt=2 numThreads=1 +useIndirect=true [system.cpu1.dcache] type=Cache @@ -1499,14 +1515,14 @@ size=4194304 [system.membus] type=CoherentXBar -children=badaddr_responder +children=badaddr_responder snoop_filter 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_filter=system.membus.snoop_filter snoop_response_latency=4 system=system use_default_range=false @@ -1533,6 +1549,13 @@ update_data=false warn_access=warn pio=system.membus.default +[system.membus.snoop_filter] +type=SnoopFilter +eventq_index=0 +lookup_latency=1 +max_capacity=8388608 +system=system + [system.physmem] type=DRAMCtrl IDD0=0.075000 @@ -1737,6 +1760,7 @@ pio=system.iobus.master[5] type=SubSystem children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys eventq_index=0 +thermal_domain=Null [system.realview.dcc.osc_cpu] type=RealViewOsc @@ -1929,6 +1953,7 @@ cpu_pio_delay=10000 dist_addr=738201600 dist_pio_delay=10000 eventq_index=0 +gem5_extensions=true int_latency=10000 it_lines=128 platform=system.realview @@ -2124,8 +2149,9 @@ pio=system.membus.master[4] [system.realview.mcc] type=SubSystem -children=osc_clcd osc_mcc osc_peripheral osc_system_bus +children=osc_clcd osc_mcc osc_peripheral osc_system_bus temp_crtl eventq_index=0 +thermal_domain=Null [system.realview.mcc.osc_clcd] type=RealViewOsc @@ -2171,6 +2197,16 @@ position=0 site=0 voltage_domain=system.voltage_domain +[system.realview.mcc.temp_crtl] +type=RealViewTemperatureSensor +dcc=0 +device=0 +eventq_index=0 +parent=system.realview.realview_io +position=0 +site=0 +system=system + [system.realview.mmc_fake] type=AmbaFake amba_id=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 b6712dc14..3e7bd42ce 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 @@ -33,6 +33,7 @@ warn: CP14 unimplemented crn[1], opc1[0], crm[0], opc2[4] warn: CP14 unimplemented crn[0], opc1[0], crm[7], opc2[0] warn: CP14 unimplemented crn[1], opc1[0], crm[5], opc2[4] warn: allocating bonus target for snoop +warn: allocating bonus target for snoop warn: Returning zero for read from miscreg pmcr warn: Ignoring write to miscreg pmcntenclr warn: Ignoring write to miscreg pmintenclr 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 e3fd3e7c9..5b77a63d3 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 @@ -29,4 +29,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 2837474672000 because m5_exit instruction encountered +Exiting @ tick 2825959731500 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 1ded9ce83..0e8d3a898 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.825960 # Nu sim_ticks 2825959731500 # Number of ticks simulated final_tick 2825959731500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 71367 # Simulator instruction rate (inst/s) -host_op_rate 86573 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 1679006506 # Simulator tick rate (ticks/s) -host_mem_usage 618544 # Number of bytes of host memory used -host_seconds 1683.11 # Real time elapsed on the host +host_inst_rate 152939 # Simulator instruction rate (inst/s) +host_op_rate 185526 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 3598106166 # Simulator tick rate (ticks/s) +host_mem_usage 665816 # Number of bytes of host memory used +host_seconds 785.40 # Real time elapsed on the host sim_insts 120118276 # Number of instructions simulated sim_ops 145712235 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -639,7 +639,7 @@ system.cpu0.rename.IQFullEvents 164556 # Nu system.cpu0.rename.LQFullEvents 58179 # Number of times rename has blocked due to LQ full system.cpu0.rename.SQFullEvents 6849429 # Number of times rename has blocked due to SQ full system.cpu0.rename.RenamedOperands 141656181 # Number of destination operands rename has renamed -system.cpu0.rename.RenameLookups 634615161 # Number of register rename lookups that rename has made +system.cpu0.rename.RenameLookups 634589847 # Number of register rename lookups that rename has made system.cpu0.rename.int_rename_lookups 152645231 # Number of integer rename lookups system.cpu0.rename.fp_rename_lookups 9369 # Number of floating rename lookups system.cpu0.rename.CommittedMaps 130468277 # Number of HB maps that are committed @@ -656,7 +656,7 @@ system.cpu0.iq.iqNonSpecInstsAdded 1713414 # Nu system.cpu0.iq.iqInstsIssued 132756465 # Number of instructions issued system.cpu0.iq.iqSquashedInstsIssued 452944 # Number of squashed instructions issued system.cpu0.iq.iqSquashedInstsExamined 10581179 # Number of squashed instructions iterated over during squash; mainly for profiling -system.cpu0.iq.iqSquashedOperandsExamined 21721412 # Number of squashed operands that are examined and possibly removed from graph +system.cpu0.iq.iqSquashedOperandsExamined 21719888 # Number of squashed operands that are examined and possibly removed from graph system.cpu0.iq.iqSquashedNonSpecRemoved 120083 # Number of squashed non-spec instructions that were removed system.cpu0.iq.issued_per_cycle::samples 198828221 # Number of insts issued each cycle system.cpu0.iq.issued_per_cycle::mean 0.667694 # Number of insts issued each cycle @@ -777,9 +777,9 @@ system.cpu0.iew.iewDispNonSpecInsts 875924 # Nu system.cpu0.iew.iewIQFullEvents 28511 # Number of times the IQ has become full, causing a stall system.cpu0.iew.iewLSQFullEvents 132116 # Number of times the LSQ has become full, causing a stall system.cpu0.iew.memOrderViolationEvents 19339 # Number of memory order violations -system.cpu0.iew.predictedTakenIncorrect 261904 # Number of branches that were predicted taken incorrectly +system.cpu0.iew.predictedTakenIncorrect 261906 # Number of branches that were predicted taken incorrectly system.cpu0.iew.predictedNotTakenIncorrect 398193 # Number of branches that were predicted not taken incorrectly -system.cpu0.iew.branchMispredicts 660097 # Number of branch mispredicts detected at execute +system.cpu0.iew.branchMispredicts 660099 # Number of branch mispredicts detected at execute system.cpu0.iew.iewExecutedInsts 131724041 # Number of executed instructions system.cpu0.iew.iewExecLoadInsts 23895876 # Number of load instructions executed system.cpu0.iew.iewExecSquashedInsts 965291 # Number of squashed instructions skipped in execute @@ -878,7 +878,7 @@ system.cpu0.fp_regfile_reads 8185 # nu system.cpu0.fp_regfile_writes 2264 # number of floating regfile writes system.cpu0.cc_regfile_reads 464897652 # number of cc regfile reads system.cpu0.cc_regfile_writes 49725456 # number of cc regfile writes -system.cpu0.misc_regfile_reads 274171027 # number of misc regfile reads +system.cpu0.misc_regfile_reads 274163615 # number of misc regfile reads system.cpu0.misc_regfile_writes 1224889 # number of misc regfile writes system.cpu0.dcache.tags.replacements 709828 # number of replacements system.cpu0.dcache.tags.tagsinuse 497.174198 # Cycle average of tags in use @@ -1860,7 +1860,7 @@ system.cpu1.rename.IQFullEvents 36982 # Nu system.cpu1.rename.LQFullEvents 15461 # Number of times rename has blocked due to LQ full system.cpu1.rename.SQFullEvents 1675349 # Number of times rename has blocked due to SQ full system.cpu1.rename.RenamedOperands 22265644 # Number of destination operands rename has renamed -system.cpu1.rename.RenameLookups 103654423 # Number of register rename lookups that rename has made +system.cpu1.rename.RenameLookups 103648875 # Number of register rename lookups that rename has made system.cpu1.rename.int_rename_lookups 25648399 # Number of integer rename lookups system.cpu1.rename.fp_rename_lookups 1667 # Number of floating rename lookups system.cpu1.rename.CommittedMaps 19867778 # Number of HB maps that are committed @@ -1877,7 +1877,7 @@ system.cpu1.iq.iqNonSpecInstsAdded 559995 # Nu system.cpu1.iq.iqInstsIssued 21251983 # Number of instructions issued system.cpu1.iq.iqSquashedInstsIssued 91992 # Number of squashed instructions issued system.cpu1.iq.iqSquashedInstsExamined 2044542 # Number of squashed instructions iterated over during squash; mainly for profiling -system.cpu1.iq.iqSquashedOperandsExamined 4727165 # Number of squashed operands that are examined and possibly removed from graph +system.cpu1.iq.iqSquashedOperandsExamined 4726903 # Number of squashed operands that are examined and possibly removed from graph system.cpu1.iq.iqSquashedNonSpecRemoved 43295 # Number of squashed non-spec instructions that were removed system.cpu1.iq.issued_per_cycle::samples 34136181 # Number of insts issued each cycle system.cpu1.iq.issued_per_cycle::mean 0.622565 # Number of insts issued each cycle @@ -2099,7 +2099,7 @@ system.cpu1.fp_regfile_reads 1401 # nu system.cpu1.fp_regfile_writes 516 # number of floating regfile writes system.cpu1.cc_regfile_reads 75464831 # number of cc regfile reads system.cpu1.cc_regfile_writes 6816973 # number of cc regfile writes -system.cpu1.misc_regfile_reads 50047969 # number of misc regfile reads +system.cpu1.misc_regfile_reads 50047460 # number of misc regfile reads system.cpu1.misc_regfile_writes 387254 # number of misc regfile writes system.cpu1.dcache.tags.replacements 189214 # number of replacements system.cpu1.dcache.tags.tagsinuse 472.223119 # Cycle average of tags in use -- cgit v1.2.3