From 2d2a5aa410eb99d79367ae66125514b3975c4618 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 21 Nov 2014 17:22:19 -0800 Subject: [PATCH] x86: Update stats for the new Linux delay port. --- .../ref/x86/linux/pc-o3-timing/config.ini | 44 ++++-- .../ref/x86/linux/pc-o3-timing/simout | 6 +- .../ref/x86/linux/pc-o3-timing/stats.txt | 28 ++-- .../x86/linux/pc-switcheroo-full/config.ini | 44 ++++-- .../x86/linux/pc-switcheroo-full/config.json | 95 ++++++----- .../ref/x86/linux/pc-switcheroo-full/simout | 4 +- .../x86/linux/pc-switcheroo-full/stats.txt | 148 +++++++++--------- .../ref/x86/linux/pc-simple-atomic/config.ini | 44 ++++-- .../ref/x86/linux/pc-simple-atomic/simout | 6 +- .../ref/x86/linux/pc-simple-atomic/stats.txt | 14 +- .../ref/x86/linux/pc-simple-timing/config.ini | 44 ++++-- .../ref/x86/linux/pc-simple-timing/simout | 6 +- .../ref/x86/linux/pc-simple-timing/stats.txt | 28 ++-- 13 files changed, 304 insertions(+), 207 deletions(-) diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini index e3424a85b..354237141 100644 --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini @@ -20,7 +20,7 @@ eventq_index=0 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 @@ header_cycles=1 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 @@ tags=system.iocache.tags 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 @@ pio=system.membus.default [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 @@ ret_data8=255 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 @@ pio_latency=100000 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 @@ ret_data8=255 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 @@ ret_data8=255 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 @@ ret_data8=255 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 @@ ret_data8=255 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 @@ update_data=false 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 @@ table_size=65536 [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 @@ table_size=65536 [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 --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout index 91003600d..0bfe3bfc6 100755 --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout @@ -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 --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt index a6e63eaeb..2703d8c6d 100644 --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt @@ -4,11 +4,11 @@ sim_seconds 5.125902 # Nu 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.pic2.pio 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.pic2.pio 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.occupancy 1014000 # La 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 --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini index d43104caf..b8b0e9f76 100644 --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini @@ -20,7 +20,7 @@ eventq_index=0 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 @@ header_cycles=1 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 @@ tags=system.iocache.tags 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 @@ pio=system.membus.default [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 @@ ret_data8=255 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 @@ pio_latency=100000 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 @@ ret_data8=255 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 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.master[15] +pio=system.iobus.master[16] [system.pc.fake_com_4] type=IsaFake @@ -1416,7 +1416,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.master[16] +pio=system.iobus.master[17] [system.pc.fake_floppy] type=IsaFake @@ -1434,9 +1434,9 @@ ret_data8=255 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 @@ -1454,6 +1454,24 @@ update_data=false 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 @@ -1616,7 +1634,7 @@ table_size=65536 [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] @@ -1639,7 +1657,7 @@ table_size=65536 [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 --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.json b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.json index 3be878044..0df868e7b 100644 --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.json +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.json @@ -2,7 +2,7 @@ "name": null, "sim_quantum": 0, "system": { - "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", "l2c": { "is_top_level": false, "prefetcher": null, @@ -106,7 +106,8 @@ "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.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", @@ -667,7 +668,7 @@ "type": "BaseCache", "sequential_access": false, "cpu_side": { - "peer": "system.iobus.master[18]", + "peer": "system.iobus.master[19]", "role": "SLAVE" }, "two_queue": false @@ -791,7 +792,7 @@ "name": "fake_com_4", "warn_access": "", "pio": { - "peer": "system.iobus.master[16]", + "peer": "system.iobus.master[17]", "role": "SLAVE" }, "ret_bad_addr": false, @@ -833,7 +834,7 @@ "name": "fake_com_2", "warn_access": "", "pio": { - "peer": "system.iobus.master[14]", + "peer": "system.iobus.master[15]", "role": "SLAVE" }, "ret_bad_addr": false, @@ -1176,7 +1177,7 @@ "eventq_index": 0, "cxx_class": "RawDiskImage", "path": "system.pc.south_bridge.ide.disks0.image.child", - "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", "type": "RawDiskImage" }, "path": "system.pc.south_bridge.ide.disks0.image", @@ -1204,7 +1205,7 @@ "eventq_index": 0, "cxx_class": "RawDiskImage", "path": "system.pc.south_bridge.ide.disks1.image.child", - "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", "type": "RawDiskImage" }, "path": "system.pc.south_bridge.ide.disks1.image", @@ -1323,7 +1324,7 @@ "name": "fake_floppy", "warn_access": "", "pio": { - "peer": "system.iobus.master[17]", + "peer": "system.iobus.master[18]", "role": "SLAVE" }, "ret_bad_addr": false, @@ -1341,12 +1342,60 @@ "type": "IsaFake", "ret_data16": 65535 }, + "i_dont_exist2": { + "system": "system", + "ret_data8": 255, + "name": "i_dont_exist2", + "warn_access": "", + "pio": { + "peer": "system.iobus.master[12]", + "role": "SLAVE" + }, + "ret_bad_addr": false, + "pio_latency": 100000, + "clk_domain": "system.clk_domain", + "fake_mem": false, + "pio_size": 1, + "ret_data32": 4294967295, + "eventq_index": 0, + "update_data": false, + "ret_data64": 18446744073709551615, + "cxx_class": "IsaFake", + "path": "system.pc.i_dont_exist2", + "pio_addr": 9223372036854776045, + "type": "IsaFake", + "ret_data16": 65535 + }, "system": "system", + "i_dont_exist1": { + "system": "system", + "ret_data8": 255, + "name": "i_dont_exist1", + "warn_access": "", + "pio": { + "peer": "system.iobus.master[11]", + "role": "SLAVE" + }, + "ret_bad_addr": false, + "pio_latency": 100000, + "clk_domain": "system.clk_domain", + "fake_mem": false, + "pio_size": 1, + "ret_data32": 4294967295, + "eventq_index": 0, + "update_data": false, + "ret_data64": 18446744073709551615, + "cxx_class": "IsaFake", + "path": "system.pc.i_dont_exist1", + "pio_addr": 9223372036854775936, + "type": "IsaFake", + "ret_data16": 65535 + }, "intrctrl": "system.intrctrl", "com_1": { "name": "com_1", "pio": { - "peer": "system.iobus.master[13]", + "peer": "system.iobus.master[14]", "role": "SLAVE" }, "pio_latency": 100000, @@ -1379,7 +1428,7 @@ "name": "behind_pci", "warn_access": "", "pio": { - "peer": "system.iobus.master[12]", + "peer": "system.iobus.master[13]", "role": "SLAVE" }, "ret_bad_addr": false, @@ -1398,37 +1447,13 @@ "ret_data16": 65535 }, "type": "Pc", - "i_dont_exist": { - "system": "system", - "ret_data8": 255, - "name": "i_dont_exist", - "warn_access": "", - "pio": { - "peer": "system.iobus.master[11]", - "role": "SLAVE" - }, - "ret_bad_addr": false, - "pio_latency": 100000, - "clk_domain": "system.clk_domain", - "fake_mem": false, - "pio_size": 1, - "ret_data32": 4294967295, - "eventq_index": 0, - "update_data": false, - "ret_data64": 18446744073709551615, - "cxx_class": "IsaFake", - "path": "system.pc.i_dont_exist", - "pio_addr": 9223372036854775936, - "type": "IsaFake", - "ret_data16": 65535 - }, "fake_com_3": { "system": "system", "ret_data8": 255, "name": "fake_com_3", "warn_access": "", "pio": { - "peer": "system.iobus.master[15]", + "peer": "system.iobus.master[16]", "role": "SLAVE" }, "ret_bad_addr": false, diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/simout b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/simout index 498a02071..d4863e151 100755 --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/simout +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/simout @@ -1,8 +1,8 @@ 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-switcheroo-full -re /usr/local/google/home/gabeblack/gem5/hg/gem5/tests/run.py build/X86/tests/opt/long/fs/10.linux-boot/x86/linux/pc-switcheroo-full Global frequency set at 1000000000000 ticks per second diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/stats.txt b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/stats.txt index 4de64b96e..33c10e980 100644 --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/stats.txt +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/stats.txt @@ -4,13 +4,13 @@ sim_seconds 5.137752 # Nu sim_ticks 5137751757500 # Number of ticks simulated final_tick 5137751757500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 342085 # Simulator instruction rate (inst/s) -host_op_rate 680107 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 7217672543 # Simulator tick rate (ticks/s) -host_mem_usage 932836 # Number of bytes of host memory used -host_seconds 711.83 # Real time elapsed on the host -sim_insts 243506025 # Number of instructions simulated -sim_ops 484120527 # Number of ops (including micro ops) simulated +host_inst_rate 356493 # Simulator instruction rate (inst/s) +host_op_rate 708752 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 7521667943 # Simulator tick rate (ticks/s) +host_mem_usage 932888 # Number of bytes of host memory used +host_seconds 683.06 # Real time elapsed on the host +sim_insts 243506024 # Number of instructions simulated +sim_ops 484120523 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts system.clk_domain.clock 1000 # Clock period in ticks system.physmem.bytes_read::cpu0.itb.walker 256 # Number of bytes read from this memory @@ -306,10 +306,10 @@ system.physmem.readRowHitRate 79.65 # Ro system.physmem.writeRowHitRate 73.04 # Row buffer hit rate for writes system.physmem.avgGap 32320761.47 # Average gap between requests system.physmem.pageHitRate 76.54 # Row buffer hit rate, read and write combined -system.physmem.memoryStateTime::IDLE 4942660463000 # Time in different power states +system.physmem.memoryStateTime::IDLE 4942660459000 # Time in different power states system.physmem.memoryStateTime::REF 171560740000 # Time in different power states system.physmem.memoryStateTime::PRE_PDN 0 # Time in different power states -system.physmem.memoryStateTime::ACT 23528333250 # Time in different power states +system.physmem.memoryStateTime::ACT 23528337250 # Time in different power states system.physmem.memoryStateTime::ACT_PDN 0 # Time in different power states system.physmem.actEnergy::0 135618840 # Energy for activate commands per rank (pJ) system.physmem.actEnergy::1 145892880 # Energy for activate commands per rank (pJ) @@ -321,11 +321,11 @@ system.physmem.writeEnergy::0 231893280 # En system.physmem.writeEnergy::1 252266400 # Energy for write commands per rank (pJ) system.physmem.refreshEnergy::0 335572807440 # Energy for refresh commands per rank (pJ) system.physmem.refreshEnergy::1 335572807440 # Energy for refresh commands per rank (pJ) -system.physmem.actBackEnergy::0 122729524065 # Energy for active background per rank (pJ) +system.physmem.actBackEnergy::0 122729526630 # Energy for active background per rank (pJ) system.physmem.actBackEnergy::1 123386936985 # Energy for active background per rank (pJ) -system.physmem.preBackEnergy::0 2974992236250 # Energy for precharge background per rank (pJ) +system.physmem.preBackEnergy::0 2974992234000 # Energy for precharge background per rank (pJ) system.physmem.preBackEnergy::1 2974415558250 # Energy for precharge background per rank (pJ) -system.physmem.totalEnergy::0 3434046565050 # Total energy per rank (pJ) +system.physmem.totalEnergy::0 3434046565365 # Total energy per rank (pJ) system.physmem.totalEnergy::1 3434197896405 # Total energy per rank (pJ) system.physmem.averagePower::0 668.395092 # Core power per rank (mW) system.physmem.averagePower::1 668.424547 # Core power per rank (mW) @@ -395,9 +395,9 @@ system.cpu0.kern.inst.arm 0 # nu system.cpu0.kern.inst.quiesce 0 # number of quiesce instructions executed system.cpu0.dcache.tags.replacements 1637866 # number of replacements system.cpu0.dcache.tags.tagsinuse 511.999423 # Cycle average of tags in use -system.cpu0.dcache.tags.total_refs 19673585 # Total number of references to valid blocks. +system.cpu0.dcache.tags.total_refs 19673583 # Total number of references to valid blocks. system.cpu0.dcache.tags.sampled_refs 1638378 # Sample count of references to valid blocks. -system.cpu0.dcache.tags.avg_refs 12.007965 # Average number of references to valid blocks. +system.cpu0.dcache.tags.avg_refs 12.007963 # Average number of references to valid blocks. system.cpu0.dcache.tags.warmup_cycle 7549500 # Cycle when the warmup percentage was hit. system.cpu0.dcache.tags.occ_blocks::cpu0.data 126.297276 # Average occupied blocks per requestor system.cpu0.dcache.tags.occ_blocks::cpu1.data 280.648639 # Average occupied blocks per requestor @@ -411,28 +411,28 @@ system.cpu0.dcache.tags.age_task_id_blocks_1024::0 270 system.cpu0.dcache.tags.age_task_id_blocks_1024::1 221 # Occupied blocks per task id system.cpu0.dcache.tags.age_task_id_blocks_1024::2 21 # Occupied blocks per task id system.cpu0.dcache.tags.occ_task_id_percent::1024 1 # Percentage of cache occupancy per task id -system.cpu0.dcache.tags.tag_accesses 88453877 # Number of tag accesses -system.cpu0.dcache.tags.data_accesses 88453877 # Number of data accesses +system.cpu0.dcache.tags.tag_accesses 88453869 # Number of tag accesses +system.cpu0.dcache.tags.data_accesses 88453869 # Number of data accesses system.cpu0.dcache.ReadReq_hits::cpu0.data 5010669 # number of ReadReq hits -system.cpu0.dcache.ReadReq_hits::cpu1.data 2623262 # number of ReadReq hits +system.cpu0.dcache.ReadReq_hits::cpu1.data 2623261 # number of ReadReq hits system.cpu0.dcache.ReadReq_hits::cpu2.data 3898583 # number of ReadReq hits -system.cpu0.dcache.ReadReq_hits::total 11532514 # number of ReadReq hits +system.cpu0.dcache.ReadReq_hits::total 11532513 # number of ReadReq hits system.cpu0.dcache.WriteReq_hits::cpu0.data 3480346 # number of WriteReq hits -system.cpu0.dcache.WriteReq_hits::cpu1.data 1810737 # number of WriteReq hits +system.cpu0.dcache.WriteReq_hits::cpu1.data 1810736 # number of WriteReq hits system.cpu0.dcache.WriteReq_hits::cpu2.data 2788314 # number of WriteReq hits -system.cpu0.dcache.WriteReq_hits::total 8079397 # number of WriteReq hits +system.cpu0.dcache.WriteReq_hits::total 8079396 # number of WriteReq hits system.cpu0.dcache.SoftPFReq_hits::cpu0.data 20263 # number of SoftPFReq hits system.cpu0.dcache.SoftPFReq_hits::cpu1.data 10587 # number of SoftPFReq hits system.cpu0.dcache.SoftPFReq_hits::cpu2.data 29029 # number of SoftPFReq hits system.cpu0.dcache.SoftPFReq_hits::total 59879 # number of SoftPFReq hits system.cpu0.dcache.demand_hits::cpu0.data 8491015 # number of demand (read+write) hits -system.cpu0.dcache.demand_hits::cpu1.data 4433999 # number of demand (read+write) hits +system.cpu0.dcache.demand_hits::cpu1.data 4433997 # number of demand (read+write) hits system.cpu0.dcache.demand_hits::cpu2.data 6686897 # number of demand (read+write) hits -system.cpu0.dcache.demand_hits::total 19611911 # number of demand (read+write) hits +system.cpu0.dcache.demand_hits::total 19611909 # number of demand (read+write) hits system.cpu0.dcache.overall_hits::cpu0.data 8511278 # number of overall hits -system.cpu0.dcache.overall_hits::cpu1.data 4444586 # number of overall hits +system.cpu0.dcache.overall_hits::cpu1.data 4444584 # number of overall hits system.cpu0.dcache.overall_hits::cpu2.data 6715926 # number of overall hits -system.cpu0.dcache.overall_hits::total 19671790 # number of overall hits +system.cpu0.dcache.overall_hits::total 19671788 # number of overall hits system.cpu0.dcache.ReadReq_misses::cpu0.data 362952 # number of ReadReq misses system.cpu0.dcache.ReadReq_misses::cpu1.data 164891 # number of ReadReq misses system.cpu0.dcache.ReadReq_misses::cpu2.data 772037 # number of ReadReq misses @@ -466,25 +466,25 @@ system.cpu0.dcache.overall_miss_latency::cpu1.data 4877372572 system.cpu0.dcache.overall_miss_latency::cpu2.data 15775545755 # number of overall miss cycles system.cpu0.dcache.overall_miss_latency::total 20652918327 # number of overall miss cycles system.cpu0.dcache.ReadReq_accesses::cpu0.data 5373621 # number of ReadReq accesses(hits+misses) -system.cpu0.dcache.ReadReq_accesses::cpu1.data 2788153 # number of ReadReq accesses(hits+misses) +system.cpu0.dcache.ReadReq_accesses::cpu1.data 2788152 # number of ReadReq accesses(hits+misses) system.cpu0.dcache.ReadReq_accesses::cpu2.data 4670620 # number of ReadReq accesses(hits+misses) -system.cpu0.dcache.ReadReq_accesses::total 12832394 # number of ReadReq accesses(hits+misses) +system.cpu0.dcache.ReadReq_accesses::total 12832393 # number of ReadReq accesses(hits+misses) system.cpu0.dcache.WriteReq_accesses::cpu0.data 3614306 # number of WriteReq accesses(hits+misses) -system.cpu0.dcache.WriteReq_accesses::cpu1.data 1875866 # number of WriteReq accesses(hits+misses) +system.cpu0.dcache.WriteReq_accesses::cpu1.data 1875865 # number of WriteReq accesses(hits+misses) system.cpu0.dcache.WriteReq_accesses::cpu2.data 2914829 # number of WriteReq accesses(hits+misses) -system.cpu0.dcache.WriteReq_accesses::total 8405001 # number of WriteReq accesses(hits+misses) +system.cpu0.dcache.WriteReq_accesses::total 8405000 # number of WriteReq accesses(hits+misses) system.cpu0.dcache.SoftPFReq_accesses::cpu0.data 172200 # number of SoftPFReq accesses(hits+misses) system.cpu0.dcache.SoftPFReq_accesses::cpu1.data 74881 # number of SoftPFReq accesses(hits+misses) system.cpu0.dcache.SoftPFReq_accesses::cpu2.data 219392 # number of SoftPFReq accesses(hits+misses) system.cpu0.dcache.SoftPFReq_accesses::total 466473 # number of SoftPFReq accesses(hits+misses) system.cpu0.dcache.demand_accesses::cpu0.data 8987927 # number of demand (read+write) accesses -system.cpu0.dcache.demand_accesses::cpu1.data 4664019 # number of demand (read+write) accesses +system.cpu0.dcache.demand_accesses::cpu1.data 4664017 # number of demand (read+write) accesses system.cpu0.dcache.demand_accesses::cpu2.data 7585449 # number of demand (read+write) accesses -system.cpu0.dcache.demand_accesses::total 21237395 # number of demand (read+write) accesses +system.cpu0.dcache.demand_accesses::total 21237393 # number of demand (read+write) accesses system.cpu0.dcache.overall_accesses::cpu0.data 9160127 # number of overall (read+write) accesses -system.cpu0.dcache.overall_accesses::cpu1.data 4738900 # number of overall (read+write) accesses +system.cpu0.dcache.overall_accesses::cpu1.data 4738898 # number of overall (read+write) accesses system.cpu0.dcache.overall_accesses::cpu2.data 7804841 # number of overall (read+write) accesses -system.cpu0.dcache.overall_accesses::total 21703868 # number of overall (read+write) accesses +system.cpu0.dcache.overall_accesses::total 21703866 # number of overall (read+write) accesses system.cpu0.dcache.ReadReq_miss_rate::cpu0.data 0.067543 # miss rate for ReadReq accesses system.cpu0.dcache.ReadReq_miss_rate::cpu1.data 0.059140 # miss rate for ReadReq accesses system.cpu0.dcache.ReadReq_miss_rate::cpu2.data 0.165296 # miss rate for ReadReq accesses @@ -620,9 +620,9 @@ system.cpu0.dcache.overall_avg_mshr_uncacheable_latency::total inf system.cpu0.dcache.no_allocate_misses 0 # Number of misses that were no-allocate system.cpu0.icache.tags.replacements 866413 # number of replacements system.cpu0.icache.tags.tagsinuse 510.840210 # Cycle average of tags in use -system.cpu0.icache.tags.total_refs 130156159 # Total number of references to valid blocks. +system.cpu0.icache.tags.total_refs 130156157 # Total number of references to valid blocks. system.cpu0.icache.tags.sampled_refs 866925 # Sample count of references to valid blocks. -system.cpu0.icache.tags.avg_refs 150.135432 # Average number of references to valid blocks. +system.cpu0.icache.tags.avg_refs 150.135429 # Average number of references to valid blocks. system.cpu0.icache.tags.warmup_cycle 149014386250 # Cycle when the warmup percentage was hit. system.cpu0.icache.tags.occ_blocks::cpu0.inst 138.994027 # Average occupied blocks per requestor system.cpu0.icache.tags.occ_blocks::cpu1.inst 266.522548 # Average occupied blocks per requestor @@ -636,20 +636,20 @@ system.cpu0.icache.tags.age_task_id_blocks_1024::0 84 system.cpu0.icache.tags.age_task_id_blocks_1024::1 133 # Occupied blocks per task id system.cpu0.icache.tags.age_task_id_blocks_1024::2 295 # Occupied blocks per task id system.cpu0.icache.tags.occ_task_id_percent::1024 1 # Percentage of cache occupancy per task id -system.cpu0.icache.tags.tag_accesses 131912504 # Number of tag accesses -system.cpu0.icache.tags.data_accesses 131912504 # Number of data accesses +system.cpu0.icache.tags.tag_accesses 131912502 # Number of tag accesses +system.cpu0.icache.tags.data_accesses 131912502 # Number of data accesses system.cpu0.icache.ReadReq_hits::cpu0.inst 87639896 # number of ReadReq hits -system.cpu0.icache.ReadReq_hits::cpu1.inst 39531787 # number of ReadReq hits +system.cpu0.icache.ReadReq_hits::cpu1.inst 39531785 # number of ReadReq hits system.cpu0.icache.ReadReq_hits::cpu2.inst 2984476 # number of ReadReq hits -system.cpu0.icache.ReadReq_hits::total 130156159 # number of ReadReq hits +system.cpu0.icache.ReadReq_hits::total 130156157 # number of ReadReq hits system.cpu0.icache.demand_hits::cpu0.inst 87639896 # number of demand (read+write) hits -system.cpu0.icache.demand_hits::cpu1.inst 39531787 # number of demand (read+write) hits +system.cpu0.icache.demand_hits::cpu1.inst 39531785 # number of demand (read+write) hits system.cpu0.icache.demand_hits::cpu2.inst 2984476 # number of demand (read+write) hits -system.cpu0.icache.demand_hits::total 130156159 # number of demand (read+write) hits +system.cpu0.icache.demand_hits::total 130156157 # number of demand (read+write) hits system.cpu0.icache.overall_hits::cpu0.inst 87639896 # number of overall hits -system.cpu0.icache.overall_hits::cpu1.inst 39531787 # number of overall hits +system.cpu0.icache.overall_hits::cpu1.inst 39531785 # number of overall hits system.cpu0.icache.overall_hits::cpu2.inst 2984476 # number of overall hits -system.cpu0.icache.overall_hits::total 130156159 # number of overall hits +system.cpu0.icache.overall_hits::total 130156157 # number of overall hits system.cpu0.icache.ReadReq_misses::cpu0.inst 328528 # number of ReadReq misses system.cpu0.icache.ReadReq_misses::cpu1.inst 162109 # number of ReadReq misses system.cpu0.icache.ReadReq_misses::cpu2.inst 398768 # number of ReadReq misses @@ -672,17 +672,17 @@ system.cpu0.icache.overall_miss_latency::cpu1.inst 2245844750 system.cpu0.icache.overall_miss_latency::cpu2.inst 5606326194 # number of overall miss cycles system.cpu0.icache.overall_miss_latency::total 7852170944 # number of overall miss cycles system.cpu0.icache.ReadReq_accesses::cpu0.inst 87968424 # number of ReadReq accesses(hits+misses) -system.cpu0.icache.ReadReq_accesses::cpu1.inst 39693896 # number of ReadReq accesses(hits+misses) +system.cpu0.icache.ReadReq_accesses::cpu1.inst 39693894 # number of ReadReq accesses(hits+misses) system.cpu0.icache.ReadReq_accesses::cpu2.inst 3383244 # number of ReadReq accesses(hits+misses) -system.cpu0.icache.ReadReq_accesses::total 131045564 # number of ReadReq accesses(hits+misses) +system.cpu0.icache.ReadReq_accesses::total 131045562 # number of ReadReq accesses(hits+misses) system.cpu0.icache.demand_accesses::cpu0.inst 87968424 # number of demand (read+write) accesses -system.cpu0.icache.demand_accesses::cpu1.inst 39693896 # number of demand (read+write) accesses +system.cpu0.icache.demand_accesses::cpu1.inst 39693894 # number of demand (read+write) accesses system.cpu0.icache.demand_accesses::cpu2.inst 3383244 # number of demand (read+write) accesses -system.cpu0.icache.demand_accesses::total 131045564 # number of demand (read+write) accesses +system.cpu0.icache.demand_accesses::total 131045562 # number of demand (read+write) accesses system.cpu0.icache.overall_accesses::cpu0.inst 87968424 # number of overall (read+write) accesses -system.cpu0.icache.overall_accesses::cpu1.inst 39693896 # number of overall (read+write) accesses +system.cpu0.icache.overall_accesses::cpu1.inst 39693894 # number of overall (read+write) accesses system.cpu0.icache.overall_accesses::cpu2.inst 3383244 # number of overall (read+write) accesses -system.cpu0.icache.overall_accesses::total 131045564 # number of overall (read+write) accesses +system.cpu0.icache.overall_accesses::total 131045562 # number of overall (read+write) accesses system.cpu0.icache.ReadReq_miss_rate::cpu0.inst 0.003735 # miss rate for ReadReq accesses system.cpu0.icache.ReadReq_miss_rate::cpu1.inst 0.004084 # miss rate for ReadReq accesses system.cpu0.icache.ReadReq_miss_rate::cpu2.inst 0.117866 # miss rate for ReadReq accesses @@ -758,30 +758,30 @@ system.cpu0.icache.no_allocate_misses 0 # Nu system.cpu1.numCycles 2606022983 # number of cpu cycles simulated system.cpu1.numWorkItemsStarted 0 # number of work items this cpu started system.cpu1.numWorkItemsCompleted 0 # number of work items this cpu completed -system.cpu1.committedInsts 35939339 # Number of instructions committed -system.cpu1.committedOps 69774923 # Number of ops (including micro ops) committed -system.cpu1.num_int_alu_accesses 64844483 # Number of integer alu accesses +system.cpu1.committedInsts 35939338 # Number of instructions committed +system.cpu1.committedOps 69774919 # Number of ops (including micro ops) committed +system.cpu1.num_int_alu_accesses 64844479 # Number of integer alu accesses system.cpu1.num_fp_alu_accesses 0 # Number of float alu accesses system.cpu1.num_func_calls 499287 # number of times a function call or return occured system.cpu1.num_conditional_control_insts 6580388 # number of instructions that are conditional controls -system.cpu1.num_int_insts 64844483 # number of integer instructions +system.cpu1.num_int_insts 64844479 # number of integer instructions system.cpu1.num_fp_insts 0 # number of float instructions -system.cpu1.num_int_register_reads 120226227 # number of times the integer registers were read -system.cpu1.num_int_register_writes 55826198 # number of times the integer registers were written +system.cpu1.num_int_register_reads 120226215 # number of times the integer registers were read +system.cpu1.num_int_register_writes 55826195 # number of times the integer registers were written system.cpu1.num_fp_register_reads 0 # number of times the floating registers were read system.cpu1.num_fp_register_writes 0 # number of times the floating registers were written -system.cpu1.num_cc_register_reads 36586824 # number of times the CC registers were read -system.cpu1.num_cc_register_writes 27309791 # number of times the CC registers were written -system.cpu1.num_mem_refs 4927873 # number of memory refs -system.cpu1.num_load_insts 3050339 # Number of load instructions -system.cpu1.num_store_insts 1877534 # Number of store instructions -system.cpu1.num_idle_cycles 2477290986.248718 # Number of idle cycles -system.cpu1.num_busy_cycles 128731996.751282 # Number of busy cycles +system.cpu1.num_cc_register_reads 36586823 # number of times the CC registers were read +system.cpu1.num_cc_register_writes 27309789 # number of times the CC registers were written +system.cpu1.num_mem_refs 4927871 # number of memory refs +system.cpu1.num_load_insts 3050338 # Number of load instructions +system.cpu1.num_store_insts 1877533 # Number of store instructions +system.cpu1.num_idle_cycles 2477290988.277639 # Number of idle cycles +system.cpu1.num_busy_cycles 128731994.722361 # Number of busy cycles system.cpu1.not_idle_fraction 0.049398 # Percentage of non-idle cycles system.cpu1.idle_fraction 0.950602 # Percentage of idle cycles system.cpu1.Branches 7259898 # Number of branches fetched system.cpu1.op_class::No_OpClass 35461 0.05% 0.05% # Class of executed instruction -system.cpu1.op_class::IntAlu 64754697 92.80% 92.86% # Class of executed instruction +system.cpu1.op_class::IntAlu 64754695 92.80% 92.86% # Class of executed instruction system.cpu1.op_class::IntMult 31756 0.05% 92.90% # Class of executed instruction system.cpu1.op_class::IntDiv 25505 0.04% 92.94% # Class of executed instruction system.cpu1.op_class::FloatAdd 0 0.00% 92.94% # Class of executed instruction @@ -810,11 +810,11 @@ system.cpu1.op_class::SimdFloatMisc 0 0.00% 92.94% # Cl system.cpu1.op_class::SimdFloatMult 0 0.00% 92.94% # Class of executed instruction system.cpu1.op_class::SimdFloatMultAcc 0 0.00% 92.94% # Class of executed instruction system.cpu1.op_class::SimdFloatSqrt 0 0.00% 92.94% # Class of executed instruction -system.cpu1.op_class::MemRead 3050339 4.37% 97.31% # Class of executed instruction -system.cpu1.op_class::MemWrite 1877534 2.69% 100.00% # Class of executed instruction +system.cpu1.op_class::MemRead 3050338 4.37% 97.31% # Class of executed instruction +system.cpu1.op_class::MemWrite 1877533 2.69% 100.00% # Class of executed instruction system.cpu1.op_class::IprAccess 0 0.00% 100.00% # Class of executed instruction system.cpu1.op_class::InstPrefetch 0 0.00% 100.00% # Class of executed instruction -system.cpu1.op_class::total 69775292 # Class of executed instruction +system.cpu1.op_class::total 69775288 # Class of executed instruction system.cpu1.kern.inst.arm 0 # number of arm instructions executed system.cpu1.kern.inst.quiesce 0 # number of quiesce instructions executed system.cpu2.branchPred.lookups 29000272 # Number of BP lookups @@ -1142,7 +1142,7 @@ system.iobus.pkt_count_system.bridge.master::system.pc.south_bridge.pic2.pio 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 7085054 # Packet count per connected master and slave (bytes) system.iobus.pkt_count_system.bridge.master::system.pc.south_bridge.io_apic.pio 1126 # 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 27782 # 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) @@ -1166,7 +1166,7 @@ system.iobus.pkt_size_system.bridge.master::system.pc.south_bridge.pic2.pio 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 3542527 # Cumulative packet size per connected master and slave (bytes) system.iobus.pkt_size_system.bridge.master::system.pc.south_bridge.io_apic.pio 2252 # 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 13891 # 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) @@ -1204,16 +1204,16 @@ system.iobus.reqLayer10.occupancy 333000 # La system.iobus.reqLayer10.utilization 0.0 # Layer utilization (%) system.iobus.reqLayer11.occupancy 134000 # Layer occupancy (ticks) system.iobus.reqLayer11.utilization 0.0 # Layer utilization (%) -system.iobus.reqLayer13.occupancy 10264000 # Layer occupancy (ticks) -system.iobus.reqLayer13.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.reqLayer14.occupancy 10264000 # Layer occupancy (ticks) +system.iobus.reqLayer14.utilization 0.0 # Layer utilization (%) +system.iobus.reqLayer17.occupancy 9000 # Layer occupancy (ticks) system.iobus.reqLayer17.utilization 0.0 # Layer utilization (%) -system.iobus.reqLayer18.occupancy 199614020 # Layer occupancy (ticks) +system.iobus.reqLayer18.occupancy 10000 # Layer occupancy (ticks) system.iobus.reqLayer18.utilization 0.0 # Layer utilization (%) -system.iobus.reqLayer19.occupancy 1032000 # Layer occupancy (ticks) +system.iobus.reqLayer19.occupancy 199614020 # Layer occupancy (ticks) system.iobus.reqLayer19.utilization 0.0 # Layer utilization (%) +system.iobus.reqLayer20.occupancy 1032000 # Layer occupancy (ticks) +system.iobus.reqLayer20.utilization 0.0 # Layer utilization (%) system.iobus.respLayer0.occupancy 303080000 # Layer occupancy (ticks) system.iobus.respLayer0.utilization 0.0 # Layer utilization (%) system.iobus.respLayer1.occupancy 27344255 # Layer occupancy (ticks) diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini index e4451124c..80ccc521c 100644 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini @@ -20,7 +20,7 @@ eventq_index=0 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 @@ -817,7 +817,7 @@ header_cycles=1 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] @@ -842,7 +842,7 @@ tags=system.iocache.tags 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] @@ -889,7 +889,7 @@ pio=system.membus.default [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 @@ -910,7 +910,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.master[12] +pio=system.iobus.master[13] [system.pc.com_1] type=Uart8250 @@ -922,7 +922,7 @@ pio_latency=100000 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 @@ -948,7 +948,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.master[14] +pio=system.iobus.master[15] [system.pc.fake_com_3] type=IsaFake @@ -966,7 +966,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.master[15] +pio=system.iobus.master[16] [system.pc.fake_com_4] type=IsaFake @@ -984,7 +984,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.master[16] +pio=system.iobus.master[17] [system.pc.fake_floppy] type=IsaFake @@ -1002,9 +1002,9 @@ ret_data8=255 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 @@ -1022,6 +1022,24 @@ update_data=false 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 @@ -1184,7 +1202,7 @@ table_size=65536 [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] @@ -1207,7 +1225,7 @@ table_size=65536 [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 --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout index b2d8b456f..c350160c4 100755 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/simout @@ -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/quick/fs/10.linux-boot/x86/linux/pc-simple-atomic -re /usr/local/google/home/gabeblack/gem5/hg/gem5/tests/run.py build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-atomic 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 5112155173500 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt index 1c8458cfb..2aea37e39 100644 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/stats.txt @@ -4,11 +4,11 @@ sim_seconds 5.112155 # Nu sim_ticks 5112155173500 # Number of ticks simulated final_tick 5112155173500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1971048 # Simulator instruction rate (inst/s) -host_op_rate 4035436 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 50372945560 # Simulator tick rate (ticks/s) -host_mem_usage 594916 # Number of bytes of host memory used -host_seconds 101.49 # Real time elapsed on the host +host_inst_rate 1977176 # Simulator instruction rate (inst/s) +host_op_rate 4047982 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 50529549296 # Simulator tick rate (ticks/s) +host_mem_usage 594968 # Number of bytes of host memory used +host_seconds 101.17 # Real time elapsed on the host sim_insts 200033988 # Number of instructions simulated sim_ops 409540726 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -506,7 +506,7 @@ system.iobus.pkt_count_system.bridge.master::system.pc.south_bridge.pic2.pio 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 19999988 # Packet count per connected master and slave (bytes) system.iobus.pkt_count_system.bridge.master::system.pc.south_bridge.io_apic.pio 1098 # 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 27812 # 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) @@ -530,7 +530,7 @@ system.iobus.pkt_size_system.bridge.master::system.pc.south_bridge.pic2.pio 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 9999994 # Cumulative packet size per connected master and slave (bytes) system.iobus.pkt_size_system.bridge.master::system.pc.south_bridge.io_apic.pio 2196 # 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 13906 # 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) diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini index ccaf4ac7e..014efe16e 100644 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini @@ -20,7 +20,7 @@ eventq_index=0 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 @@ -813,7 +813,7 @@ header_cycles=1 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] @@ -838,7 +838,7 @@ tags=system.iocache.tags 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] @@ -885,7 +885,7 @@ pio=system.membus.default [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 @@ -906,7 +906,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.master[12] +pio=system.iobus.master[13] [system.pc.com_1] type=Uart8250 @@ -918,7 +918,7 @@ pio_latency=100000 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 @@ -944,7 +944,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.master[14] +pio=system.iobus.master[15] [system.pc.fake_com_3] type=IsaFake @@ -962,7 +962,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.master[15] +pio=system.iobus.master[16] [system.pc.fake_com_4] type=IsaFake @@ -980,7 +980,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.master[16] +pio=system.iobus.master[17] [system.pc.fake_floppy] type=IsaFake @@ -998,9 +998,9 @@ ret_data8=255 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 @@ -1018,6 +1018,24 @@ update_data=false 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 @@ -1180,7 +1198,7 @@ table_size=65536 [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] @@ -1203,7 +1221,7 @@ table_size=65536 [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 --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout index f0d75ee6e..6b41f0951 100755 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/simout @@ -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/quick/fs/10.linux-boot/x86/linux/pc-simple-timing -re /usr/local/google/home/gabeblack/gem5/hg/gem5/tests/run.py build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-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 5194410635000 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt index 83f38fa06..f23e1bb1d 100644 --- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt @@ -4,11 +4,11 @@ sim_seconds 5.194411 # Nu sim_ticks 5194410635000 # Number of ticks simulated final_tick 5194410635000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1282120 # Simulator instruction rate (inst/s) -host_op_rate 2471507 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 51858853246 # Simulator tick rate (ticks/s) -host_mem_usage 594916 # Number of bytes of host memory used -host_seconds 100.16 # Real time elapsed on the host +host_inst_rate 1318005 # Simulator instruction rate (inst/s) +host_op_rate 2540682 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 53310327218 # Simulator tick rate (ticks/s) +host_mem_usage 594964 # Number of bytes of host memory used +host_seconds 97.44 # Real time elapsed on the host sim_insts 128422722 # Number of instructions simulated sim_ops 247557000 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -1084,7 +1084,7 @@ system.iobus.pkt_count_system.bridge.master::system.pc.south_bridge.pic2.pio 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 436684 # 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) @@ -1108,7 +1108,7 @@ system.iobus.pkt_size_system.bridge.master::system.pc.south_bridge.pic2.pio 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 218342 # 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) @@ -1146,22 +1146,22 @@ system.iobus.reqLayer10.occupancy 1014000 # La 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 421906845 # 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 421906845 # 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 469814000 # Layer occupancy (ticks) system.iobus.respLayer0.utilization 0.0 # Layer utilization (%) system.iobus.respLayer1.occupancy 52234501 # Layer occupancy (ticks) -- 2.30.2