changeset 953f7d1cc9e3 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=953f7d1cc9e3
description:
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?).
diffstat:
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
| 11 +-
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
| 12 +-
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
| 14 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
| 312 +--
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simerr
| 4 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simout
| 15 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
| 1064 ++++-----
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/system.pc.com_1.terminal
| 6 +-
8 files changed, 603 insertions(+), 835 deletions(-)
diffs (truncated from 3863 to 300 lines):
diff -r 456e9a93be4b -r 953f7d1cc9e3
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
Mon Dec 28 15:43:06 2015 -0500
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini
Wed Dec 30 11:18:44 2015 -0500
@@ -12,14 +12,15 @@
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_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 @@
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 @@
[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 -r 456e9a93be4b -r 953f7d1cc9e3
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout Mon Dec
28 15:43:06 2015 -0500
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout Wed Dec
30 11:18:44 2015 -0500
@@ -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 -r 456e9a93be4b -r 953f7d1cc9e3
tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
Mon Dec 28 15:43:06 2015 -0500
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt
Wed Dec 30 11:18:44 2015 -0500
@@ -4,11 +4,11 @@
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.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
diff -r 456e9a93be4b -r 953f7d1cc9e3
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
---
a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
Mon Dec 28 15:43:06 2015 -0500
+++
b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
Wed Dec 30 11:18:44 2015 -0500
@@ -17,10 +17,11 @@
clk_domain=system.clk_domain
e820_table=system.e820_table
eventq_index=0
+exit_on_work_items=false
init_param=0
intel_mp_pointer=system.intel_mp_pointer
intel_mp_table=system.intel_mp_table
-kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9.smp
+kernel=/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9.smp
kernel_addr_check=true
load_addr_mask=18446744073709551615
load_offset=0
@@ -28,8 +29,9 @@
mem_ranges=0:134217727
memories=system.mem_ctrls
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+readfile=/z/stever/hg/gem5/tests/halt.sh
smbios_table=system.smbios_table
symbolfile=
work_begin_ckpt_count=0
@@ -707,8 +709,8 @@
response_latency=2
use_default_range=false
width=16
-default=system.pc.pciconfig.pio
-master=system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio
system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config
system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio
system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio
system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio
system.pc.i_dont_exist1.pio system.pc.i_dont_exist2.pio
system.pc.behind_pci.pio system.pc.com_1.pio system.pc.fake_com_2.pio
system.pc.fake_com_3.pio system.pc.fake_com_4.pio system.pc.fake_floppy.pio
system.ruby.l1_cntrl0.sequencer.pio_slave_port
system.ruby.l1_cntrl1.sequencer.pio_slave_port
system.ruby.io_controller.dma_sequencer.slave
+default=system.pc.pci_host.pio
+master=system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio
system.pc.south_bridge.ide.pio system.pc.south_bridge.keyboard.pio
system.pc.south_bridge.pic1.pio system.pc.south_bridge.pic2.pio
system.pc.south_bridge.pit.pio system.pc.south_bridge.speaker.pio
system.pc.south_bridge.io_apic.pio system.pc.i_dont_exist1.pio
system.pc.i_dont_exist2.pio system.pc.behind_pci.pio system.pc.com_1.pio
system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio
system.pc.fake_floppy.pio system.ruby.l1_cntrl0.sequencer.pio_slave_port
system.ruby.l1_cntrl1.sequencer.pio_slave_port
system.ruby.io_controller.dma_sequencer.slave
slave=system.pc.south_bridge.io_apic.int_master
system.ruby.l1_cntrl0.sequencer.pio_master_port
system.ruby.l1_cntrl0.sequencer.mem_master_port
system.ruby.l1_cntrl1.sequencer.pio_master_port
system.ruby.l1_cntrl1.sequencer.mem_master_port
[system.mem_ctrls]
@@ -790,7 +792,7 @@
[system.pc]
type=Pc
-children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy
i_dont_exist1 i_dont_exist2 pciconfig south_bridge
+children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy
i_dont_exist1 i_dont_exist2 pci_host south_bridge
eventq_index=0
intrctrl=system.intrctrl
system=system
@@ -811,7 +813,7 @@
system=system
update_data=false
warn_access=
-pio=system.iobus.master[12]
+pio=system.iobus.master[11]
[system.pc.com_1]
type=Uart8250
@@ -823,7 +825,7 @@
platform=system.pc
system=system
terminal=system.pc.com_1.terminal
-pio=system.iobus.master[13]
+pio=system.iobus.master[12]
[system.pc.com_1.terminal]
type=Terminal
@@ -849,7 +851,7 @@
system=system
update_data=false
warn_access=
-pio=system.iobus.master[14]
+pio=system.iobus.master[13]
[system.pc.fake_com_3]
type=IsaFake
@@ -867,7 +869,7 @@
system=system
update_data=false
warn_access=
-pio=system.iobus.master[15]
+pio=system.iobus.master[14]
[system.pc.fake_com_4]
type=IsaFake
@@ -885,7 +887,7 @@
system=system
update_data=false
warn_access=
-pio=system.iobus.master[16]
+pio=system.iobus.master[15]
[system.pc.fake_floppy]
type=IsaFake
@@ -903,7 +905,7 @@
system=system
update_data=false
warn_access=
-pio=system.iobus.master[17]
+pio=system.iobus.master[16]
[system.pc.i_dont_exist1]
type=IsaFake
@@ -921,7 +923,7 @@
system=system
update_data=false
warn_access=
-pio=system.iobus.master[10]
+pio=system.iobus.master[9]
[system.pc.i_dont_exist2]
type=IsaFake
@@ -939,17 +941,19 @@
system=system
update_data=false
warn_access=
-pio=system.iobus.master[11]
-
-[system.pc.pciconfig]
-type=PciConfigAll
-bus=0
+pio=system.iobus.master[10]
+
+[system.pc.pci_host]
+type=GenericPciHost
clk_domain=system.clk_domain
-eventq_index=0
-pio_addr=0
-pio_latency=30000
+conf_base=13835058055282163712
+conf_device_bits=8
+conf_size=16777216
+eventq_index=0
+pci_dma_base=0
+pci_mem_base=0
+pci_pio_base=9223372036854775808
platform=system.pc
-size=16777216
system=system
pio=system.iobus.default
@@ -1072,14 +1076,13 @@
ctrl_offset=0
disks=system.pc.south_bridge.ide.disks0 system.pc.south_bridge.ide.disks1
eventq_index=0
+host=system.pc.pci_host
io_shift=0
pci_bus=0
pci_dev=4
pci_func=0
pio_latency=30000
-platform=system.pc
system=system
-config=system.iobus.master[3]
dma=system.ruby.dma_cntrl0.dma_sequencer.slave
pio=system.iobus.master[2]
@@ -1103,7 +1106,7 @@
[system.pc.south_bridge.ide.disks0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img
+image_file=/dist/m5/system/disks/linux-x86.img
read_only=true
[system.pc.south_bridge.ide.disks1]
@@ -1126,7 +1129,7 @@
[system.pc.south_bridge.ide.disks1.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
+image_file=/dist/m5/system/disks/linux-bigswap2.img
read_only=true
[system.pc.south_bridge.int_lines0]
@@ -1231,7 +1234,7 @@
pio_latency=100000
system=system
int_master=system.iobus.slave[0]
-pio=system.iobus.master[9]
+pio=system.iobus.master[8]
[system.pc.south_bridge.keyboard]
type=I8042
@@ -1245,7 +1248,7 @@
pio_addr=0
pio_latency=100000
system=system
-pio=system.iobus.master[4]
+pio=system.iobus.master[3]
[system.pc.south_bridge.keyboard.keyboard_int_pin]
type=X86IntSourcePin
@@ -1266,7 +1269,7 @@
pio_latency=100000
slave=system.pc.south_bridge.pic2
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
