changeset 6317351a288c in /z/repo/gem5 details: http://repo.gem5.org/gem5?cmd=changeset;node=6317351a288c description: x86: Update stats for the new Linux delay port.
diffstat: tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini | 44 ++- tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout | 6 +- tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt | 28 +- tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini | 44 ++- tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.json | 95 ++++-- tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/simout | 4 +- tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/stats.txt | 148 +++++----- tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini | 44 ++- tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout | 6 +- tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt | 14 +- tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini | 44 ++- tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout | 6 +- tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt | 28 +- 13 files changed, 304 insertions(+), 207 deletions(-) diffs (truncated from 1291 to 300 lines): diff -r a4d0e8c2869c -r 6317351a288c tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini Fri Nov 21 17:22:02 2014 -0800 +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini Fri Nov 21 17:22:19 2014 -0800 @@ -20,7 +20,7 @@ init_param=0 intel_mp_pointer=system.intel_mp_pointer intel_mp_table=system.intel_mp_table -kernel=/usr/local/google/home/gabeblack/gem5/x86_system_files/binaries/x86_64-vmlinux-2.6.22.9 +kernel=/usr/local/google/home/gabeblack/gem5/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 kernel_addr_check=true load_addr_mask=18446744073709551615 load_offset=0 @@ -1193,7 +1193,7 @@ use_default_range=false width=8 default=system.pc.pciconfig.pio -master=system.apicbridge.slave 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_exist.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.iocache.cpu_side +master=system.apicbridge.slave 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.iocache.cpu_side slave=system.bridge.master system.pc.south_bridge.ide.dma system.pc.south_bridge.io_apic.int_master [system.iocache] @@ -1218,7 +1218,7 @@ tgts_per_mshr=12 two_queue=false write_buffers=8 -cpu_side=system.iobus.master[18] +cpu_side=system.iobus.master[19] mem_side=system.membus.slave[4] [system.iocache.tags] @@ -1265,7 +1265,7 @@ [system.pc] type=Pc -children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist 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 pciconfig south_bridge eventq_index=0 intrctrl=system.intrctrl system=system @@ -1286,7 +1286,7 @@ system=system update_data=false warn_access= -pio=system.iobus.master[12] +pio=system.iobus.master[13] [system.pc.com_1] type=Uart8250 @@ -1298,7 +1298,7 @@ platform=system.pc system=system terminal=system.pc.com_1.terminal -pio=system.iobus.master[13] +pio=system.iobus.master[14] [system.pc.com_1.terminal] type=Terminal @@ -1324,7 +1324,7 @@ system=system update_data=false warn_access= -pio=system.iobus.master[14] +pio=system.iobus.master[15] [system.pc.fake_com_3] type=IsaFake @@ -1342,7 +1342,7 @@ system=system update_data=false warn_access= -pio=system.iobus.master[15] +pio=system.iobus.master[16] [system.pc.fake_com_4] type=IsaFake @@ -1360,7 +1360,7 @@ system=system update_data=false warn_access= -pio=system.iobus.master[16] +pio=system.iobus.master[17] [system.pc.fake_floppy] type=IsaFake @@ -1378,9 +1378,9 @@ system=system update_data=false warn_access= -pio=system.iobus.master[17] +pio=system.iobus.master[18] -[system.pc.i_dont_exist] +[system.pc.i_dont_exist1] type=IsaFake clk_domain=system.clk_domain eventq_index=0 @@ -1398,6 +1398,24 @@ warn_access= pio=system.iobus.master[11] +[system.pc.i_dont_exist2] +type=IsaFake +clk_domain=system.clk_domain +eventq_index=0 +fake_mem=false +pio_addr=9223372036854776045 +pio_latency=100000 +pio_size=1 +ret_bad_addr=false +ret_data16=65535 +ret_data32=4294967295 +ret_data64=18446744073709551615 +ret_data8=255 +system=system +update_data=false +warn_access= +pio=system.iobus.master[12] + [system.pc.pciconfig] type=PciConfigAll bus=0 @@ -1560,7 +1578,7 @@ [system.pc.south_bridge.ide.disks0.image.child] type=RawDiskImage eventq_index=0 -image_file=/usr/local/google/home/gabeblack/gem5/x86_system_files/disks/linux-x86.img +image_file=/usr/local/google/home/gabeblack/gem5/dist/m5/system/disks/linux-x86.img read_only=true [system.pc.south_bridge.ide.disks1] @@ -1583,7 +1601,7 @@ [system.pc.south_bridge.ide.disks1.image.child] type=RawDiskImage eventq_index=0 -image_file=/usr/local/google/home/gabeblack/gem5/x86_system_files/disks/linux-bigswap2.img +image_file=/usr/local/google/home/gabeblack/gem5/dist/m5/system/disks/linux-bigswap2.img read_only=true [system.pc.south_bridge.int_lines0] diff -r a4d0e8c2869c -r 6317351a288c tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout Fri Nov 21 17:22:02 2014 -0800 +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout Fri Nov 21 17:22:19 2014 -0800 @@ -1,12 +1,12 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Nov 16 2014 23:19:52 -gem5 started Nov 16 2014 23:20:03 +gem5 compiled Nov 19 2014 14:40:22 +gem5 started Nov 19 2014 14:41:52 gem5 executing on gabeblackz620.mtv.corp.google.com command line: build/X86/gem5.opt -d build/X86/tests/opt/long/fs/10.linux-boot/x86/linux/pc-o3-timing -re /usr/local/google/home/gabeblack/gem5/hg/gem5/tests/run.py build/X86/tests/opt/long/fs/10.linux-boot/x86/linux/pc-o3-timing Global frequency set at 1000000000000 ticks per second -info: kernel located at: /usr/local/google/home/gabeblack/gem5/x86_system_files/binaries/x86_64-vmlinux-2.6.22.9 +info: kernel located at: /usr/local/google/home/gabeblack/gem5/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 0: rtc: Real-time clock set to Sun Jan 1 00:00:00 2012 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 5125902116500 because m5_exit instruction encountered diff -r a4d0e8c2869c -r 6317351a288c tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt Fri Nov 21 17:22:02 2014 -0800 +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt Fri Nov 21 17:22:19 2014 -0800 @@ -4,11 +4,11 @@ sim_ticks 5125902116500 # Number of ticks simulated final_tick 5125902116500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 225212 # Simulator instruction rate (inst/s) -host_op_rate 445179 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 2829401321 # Simulator tick rate (ticks/s) -host_mem_usage 748772 # Number of bytes of host memory used -host_seconds 1811.66 # Real time elapsed on the host +host_inst_rate 226565 # Simulator instruction rate (inst/s) +host_op_rate 447853 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 2846393388 # Simulator tick rate (ticks/s) +host_mem_usage 748824 # Number of bytes of host memory used +host_seconds 1800.84 # Real time elapsed on the host sim_insts 408006726 # Number of instructions simulated sim_ops 806511598 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -1342,7 +1342,7 @@ system.iobus.pkt_count_system.bridge.master::system.pc.south_bridge.pit.pio 30 # Packet count per connected master and slave (bytes) system.iobus.pkt_count_system.bridge.master::system.pc.south_bridge.speaker.pio 427356 # Packet count per connected master and slave (bytes) system.iobus.pkt_count_system.bridge.master::system.pc.south_bridge.io_apic.pio 1210 # Packet count per connected master and slave (bytes) -system.iobus.pkt_count_system.bridge.master::system.pc.i_dont_exist.pio 170 # Packet count per connected master and slave (bytes) +system.iobus.pkt_count_system.bridge.master::system.pc.i_dont_exist1.pio 170 # Packet count per connected master and slave (bytes) system.iobus.pkt_count_system.bridge.master::system.pc.behind_pci.pio 2 # Packet count per connected master and slave (bytes) system.iobus.pkt_count_system.bridge.master::system.pc.com_1.pio 27696 # Packet count per connected master and slave (bytes) system.iobus.pkt_count_system.bridge.master::system.pc.fake_com_2.pio 12 # Packet count per connected master and slave (bytes) @@ -1366,7 +1366,7 @@ system.iobus.pkt_size_system.bridge.master::system.pc.south_bridge.pit.pio 15 # Cumulative packet size per connected master and slave (bytes) system.iobus.pkt_size_system.bridge.master::system.pc.south_bridge.speaker.pio 213678 # Cumulative packet size per connected master and slave (bytes) system.iobus.pkt_size_system.bridge.master::system.pc.south_bridge.io_apic.pio 2420 # Cumulative packet size per connected master and slave (bytes) -system.iobus.pkt_size_system.bridge.master::system.pc.i_dont_exist.pio 85 # Cumulative packet size per connected master and slave (bytes) +system.iobus.pkt_size_system.bridge.master::system.pc.i_dont_exist1.pio 85 # Cumulative packet size per connected master and slave (bytes) system.iobus.pkt_size_system.bridge.master::system.pc.behind_pci.pio 1 # Cumulative packet size per connected master and slave (bytes) system.iobus.pkt_size_system.bridge.master::system.pc.com_1.pio 13848 # Cumulative packet size per connected master and slave (bytes) system.iobus.pkt_size_system.bridge.master::system.pc.fake_com_2.pio 6 # Cumulative packet size per connected master and slave (bytes) @@ -1404,22 +1404,22 @@ system.iobus.reqLayer10.utilization 0.0 # Layer utilization (%) system.iobus.reqLayer11.occupancy 170000 # Layer occupancy (ticks) system.iobus.reqLayer11.utilization 0.0 # Layer utilization (%) -system.iobus.reqLayer12.occupancy 2000 # Layer occupancy (ticks) -system.iobus.reqLayer12.utilization 0.0 # Layer utilization (%) -system.iobus.reqLayer13.occupancy 20719000 # Layer occupancy (ticks) +system.iobus.reqLayer13.occupancy 2000 # Layer occupancy (ticks) system.iobus.reqLayer13.utilization 0.0 # Layer utilization (%) -system.iobus.reqLayer14.occupancy 9000 # Layer occupancy (ticks) +system.iobus.reqLayer14.occupancy 20719000 # Layer occupancy (ticks) system.iobus.reqLayer14.utilization 0.0 # Layer utilization (%) system.iobus.reqLayer15.occupancy 9000 # Layer occupancy (ticks) system.iobus.reqLayer15.utilization 0.0 # Layer utilization (%) system.iobus.reqLayer16.occupancy 9000 # Layer occupancy (ticks) system.iobus.reqLayer16.utilization 0.0 # Layer utilization (%) -system.iobus.reqLayer17.occupancy 10000 # Layer occupancy (ticks) +system.iobus.reqLayer17.occupancy 9000 # Layer occupancy (ticks) system.iobus.reqLayer17.utilization 0.0 # Layer utilization (%) -system.iobus.reqLayer18.occupancy 422009356 # Layer occupancy (ticks) +system.iobus.reqLayer18.occupancy 10000 # Layer occupancy (ticks) system.iobus.reqLayer18.utilization 0.0 # Layer utilization (%) -system.iobus.reqLayer19.occupancy 1064000 # Layer occupancy (ticks) +system.iobus.reqLayer19.occupancy 422009356 # Layer occupancy (ticks) system.iobus.reqLayer19.utilization 0.0 # Layer utilization (%) +system.iobus.reqLayer20.occupancy 1064000 # Layer occupancy (ticks) +system.iobus.reqLayer20.utilization 0.0 # Layer utilization (%) system.iobus.respLayer0.occupancy 460543000 # Layer occupancy (ticks) system.iobus.respLayer0.utilization 0.0 # Layer utilization (%) system.iobus.respLayer1.occupancy 52362257 # Layer occupancy (ticks) diff -r a4d0e8c2869c -r 6317351a288c tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini Fri Nov 21 17:22:02 2014 -0800 +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini Fri Nov 21 17:22:19 2014 -0800 @@ -20,7 +20,7 @@ init_param=0 intel_mp_pointer=system.intel_mp_pointer intel_mp_table=system.intel_mp_table -kernel=/usr/local/google/home/gabeblack/gem5/x86_system_files/binaries/x86_64-vmlinux-2.6.22.9 +kernel=/usr/local/google/home/gabeblack/gem5/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 kernel_addr_check=true load_addr_mask=18446744073709551615 load_offset=0 @@ -1214,7 +1214,7 @@ use_default_range=false width=8 default=system.pc.pciconfig.pio -master=system.apicbridge.slave 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_exist.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.iocache.cpu_side +master=system.apicbridge.slave 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.iocache.cpu_side slave=system.bridge.master system.pc.south_bridge.ide.dma system.pc.south_bridge.io_apic.int_master [system.iocache] @@ -1239,7 +1239,7 @@ tgts_per_mshr=12 two_queue=false write_buffers=8 -cpu_side=system.iobus.master[18] +cpu_side=system.iobus.master[19] mem_side=system.membus.slave[4] [system.iocache.tags] @@ -1321,7 +1321,7 @@ [system.pc] type=Pc -children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy i_dont_exist 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 pciconfig south_bridge eventq_index=0 intrctrl=system.intrctrl system=system @@ -1342,7 +1342,7 @@ system=system update_data=false warn_access= -pio=system.iobus.master[12] +pio=system.iobus.master[13] [system.pc.com_1] type=Uart8250 @@ -1354,7 +1354,7 @@ platform=system.pc system=system terminal=system.pc.com_1.terminal -pio=system.iobus.master[13] +pio=system.iobus.master[14] [system.pc.com_1.terminal] type=Terminal @@ -1380,7 +1380,7 @@ system=system update_data=false warn_access= -pio=system.iobus.master[14] +pio=system.iobus.master[15] [system.pc.fake_com_3] type=IsaFake @@ -1398,7 +1398,7 @@ system=system update_data=false warn_access= -pio=system.iobus.master[15] +pio=system.iobus.master[16] [system.pc.fake_com_4] _______________________________________________ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
