From 3840a72f372600ca177ac8765d80853cc92988d0 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Wed, 30 Dec 2015 11:18:44 -0500 Subject: stats: more updates due to PCI changes A couple of the long regressions have been showing as CHANGED since 11244:a2af58a06c4e despite the updates in 11245:1c5102c0a7a9. The x86 regression looks like it was just missed, but it's not clear why the ARM one is giving different results (perhaps a non-determinism between zizzer and wherever the updated results were run?). --- .../ref/arm/linux/realview-o3-dual/config.ini | 11 ++++++----- .../fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout | 12 ++++++------ .../10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt | 14 +++++++------- 3 files changed, 19 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 b9459834e..86dfdefb9 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,14 +12,15 @@ 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=/work/gem5/dist/binaries/boot_emm.arm +boot_loader=/dist/m5/system/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=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb +dtb_filename=/dist/m5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb early_kernel_symbols=false enable_context_switch_stats_dump=false eventq_index=0 +exit_on_work_items=false flags_addr=469827632 gic_cpu_addr=738205696 have_large_asid_64=false @@ -28,7 +29,7 @@ have_security=false have_virtualization=false highest_el_is_64=false init_param=0 -kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 +kernel=/dist/m5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5 kernel_addr_check=true load_addr_mask=268435455 load_offset=2147483648 @@ -43,7 +44,7 @@ num_work_ids=16 panic_on_oops=true panic_on_panic=true phys_addr_range_64=40 -readfile=/work/gem5/outgoing/gem5_2/tests/halt.sh +readfile=/z/stever/hg/gem5/tests/halt.sh reset_addr_64=0 symbolfile= work_begin_ckpt_count=0 @@ -86,7 +87,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage eventq_index=0 -image_file=/work/gem5/dist/disks/linux-aarch32-ael.img +image_file=/dist/m5/system/disks/linux-aarch32-ael.img read_only=true [system.clk_domain] 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 c56e46cb6..83ce066a0 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,16 +1,16 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Dec 4 2015 11:13:17 -gem5 started Dec 4 2015 11:33:05 -gem5 executing on e104799-lin, pid 30938 -command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual -re /work/gem5/outgoing/gem5_2/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual +gem5 compiled Dec 30 2015 02:49:35 +gem5 started Dec 30 2015 02:49:58 +gem5 executing on zizzer, pid 30293 +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-dual -re /z/stever/hg/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: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 +info: kernel located at: /dist/m5/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: /dist/m5/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/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 9f7a5e2b6..2941c59e8 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.827515 # Nu sim_ticks 2827514981500 # Number of ticks simulated final_tick 2827514981500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 101964 # Simulator instruction rate (inst/s) -host_op_rate 123693 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 2400293976 # Simulator tick rate (ticks/s) -host_mem_usage 620072 # Number of bytes of host memory used -host_seconds 1177.99 # Real time elapsed on the host +host_inst_rate 72486 # Simulator instruction rate (inst/s) +host_op_rate 87933 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 1706351372 # Simulator tick rate (ticks/s) +host_mem_usage 605296 # Number of bytes of host memory used +host_seconds 1657.05 # Real time elapsed on the host sim_insts 120112531 # Number of instructions simulated sim_ops 145708890 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -770,9 +770,9 @@ system.cpu0.iew.iewDispNonSpecInsts 903285 # Nu system.cpu0.iew.iewIQFullEvents 28583 # Number of times the IQ has become full, causing a stall system.cpu0.iew.iewLSQFullEvents 172530 # Number of times the LSQ has become full, causing a stall system.cpu0.iew.memOrderViolationEvents 20852 # Number of memory order violations -system.cpu0.iew.predictedTakenIncorrect 314243 # Number of branches that were predicted taken incorrectly +system.cpu0.iew.predictedTakenIncorrect 314241 # Number of branches that were predicted taken incorrectly system.cpu0.iew.predictedNotTakenIncorrect 420118 # Number of branches that were predicted not taken incorrectly -system.cpu0.iew.branchMispredicts 734361 # Number of branch mispredicts detected at execute +system.cpu0.iew.branchMispredicts 734359 # Number of branch mispredicts detected at execute system.cpu0.iew.iewExecutedInsts 135106830 # Number of executed instructions system.cpu0.iew.iewExecLoadInsts 24606381 # Number of load instructions executed system.cpu0.iew.iewExecSquashedInsts 1083325 # Number of squashed instructions skipped in execute -- cgit v1.2.3