From fe5deb4a22260b3e67839fb1efa978cff51e79ba Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Tue, 11 Sep 2012 09:34:40 -0500 Subject: x86 Regressions: Update stats due to register predication --- .../ref/x86/linux/pc-simple-atomic/config.ini | 83 ++++++++++++++-------- .../ref/x86/linux/pc-simple-atomic/simout | 10 +-- .../ref/x86/linux/pc-simple-atomic/stats.txt | 14 ++-- .../ref/x86/linux/pc-simple-timing/config.ini | 83 ++++++++++++++-------- .../ref/x86/linux/pc-simple-timing/simout | 12 ++-- .../ref/x86/linux/pc-simple-timing/stats.txt | 14 ++-- 6 files changed, 133 insertions(+), 83 deletions(-) (limited to 'tests/quick/fs/10.linux-boot/ref/x86') 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 725aa519b..497b35da8 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 @@ -11,11 +11,12 @@ type=LinuxX86System children=acpi_description_table_pointer apicbridge bridge cpu e820_table intel_mp_pointer intel_mp_table intrctrl iobus iocache l2c membus pc physmem smbios_table toL2Bus acpi_description_table_pointer=system.acpi_description_table_pointer boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1 +clock=1 e820_table=system.e820_table init_param=0 intel_mp_pointer=system.intel_mp_pointer intel_mp_table=system.intel_mp_table -kernel=/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 +kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9 load_addr_mask=18446744073709551615 mem_mode=atomic memories=system.physmem @@ -51,23 +52,21 @@ oem_table_id= [system.apicbridge] type=Bridge +clock=1 delay=50000 -nack_delay=4000 ranges=11529215046068469760:11529215046068473855 req_size=16 resp_size=16 -write_ack=false master=system.membus.slave[0] slave=system.iobus.master[0] [system.bridge] type=Bridge +clock=1 delay=50000 -nack_delay=4000 ranges=4273995776:4273999871 9223372036854775808:11529215046068469759 13835058055282163712:18446744073709551615 req_size=16 resp_size=16 -write_ack=false master=system.iobus.slave[0] slave=system.membus.master[1] @@ -92,7 +91,6 @@ max_insts_any_thread=0 max_loads_all_threads=0 max_loads_any_thread=0 numThreads=1 -phase=0 profile=0 progress_interval=0 simulate_data_stalls=false @@ -109,6 +107,7 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 block_size=64 +clock=1 forward_snoops=true hash_delay=1 is_top_level=true @@ -137,6 +136,7 @@ walker=system.cpu.dtb.walker [system.cpu.dtb.walker] type=X86PagetableWalker +clock=1 system=system port=system.cpu.dtb_walker_cache.cpu_side @@ -145,6 +145,7 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=2 block_size=64 +clock=1 forward_snoops=true hash_delay=1 is_top_level=true @@ -170,6 +171,7 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 block_size=64 +clock=1 forward_snoops=true hash_delay=1 is_top_level=true @@ -192,9 +194,10 @@ mem_side=system.toL2Bus.slave[0] [system.cpu.interrupts] type=X86LocalApic +clock=1 int_latency=1000 pio_addr=2305843009213693952 -pio_latency=1000 +pio_latency=100000 system=system int_master=system.membus.slave[4] int_slave=system.membus.master[3] @@ -208,6 +211,7 @@ walker=system.cpu.itb.walker [system.cpu.itb.walker] type=X86PagetableWalker +clock=1 system=system port=system.cpu.itb_walker_cache.cpu_side @@ -216,6 +220,7 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=2 block_size=64 +clock=1 forward_snoops=true hash_delay=1 is_top_level=true @@ -618,6 +623,7 @@ type=BaseCache addr_ranges=0:134217727 assoc=8 block_size=64 +clock=1 forward_snoops=false hash_delay=1 is_top_level=true @@ -643,6 +649,7 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=8 block_size=64 +clock=1 forward_snoops=true hash_delay=1 is_top_level=false @@ -677,9 +684,10 @@ slave=system.apicbridge.master system.system_port system.iocache.mem_side system [system.membus.badaddr_responder] type=IsaFake +clock=1 fake_mem=false pio_addr=0 -pio_latency=1000 +pio_latency=100000 pio_size=8 ret_bad_addr=true ret_data16=65535 @@ -699,9 +707,10 @@ system=system [system.pc.behind_pci] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854779128 -pio_latency=1000 +pio_latency=100000 pio_size=8 ret_bad_addr=false ret_data16=65535 @@ -716,8 +725,9 @@ pio=system.iobus.master[12] [system.pc.com_1] type=Uart8250 children=terminal +clock=1 pio_addr=9223372036854776824 -pio_latency=1000 +pio_latency=100000 platform=system.pc system=system terminal=system.pc.com_1.terminal @@ -739,9 +749,10 @@ port=3456 [system.pc.fake_com_2] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854776568 -pio_latency=1000 +pio_latency=100000 pio_size=8 ret_bad_addr=false ret_data16=65535 @@ -755,9 +766,10 @@ pio=system.iobus.master[14] [system.pc.fake_com_3] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854776808 -pio_latency=1000 +pio_latency=100000 pio_size=8 ret_bad_addr=false ret_data16=65535 @@ -771,9 +783,10 @@ pio=system.iobus.master[15] [system.pc.fake_com_4] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854776552 -pio_latency=1000 +pio_latency=100000 pio_size=8 ret_bad_addr=false ret_data16=65535 @@ -787,9 +800,10 @@ pio=system.iobus.master[16] [system.pc.fake_floppy] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854776818 -pio_latency=1000 +pio_latency=100000 pio_size=2 ret_bad_addr=false ret_data16=65535 @@ -803,9 +817,10 @@ pio=system.iobus.master[17] [system.pc.i_dont_exist] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854775936 -pio_latency=1000 +pio_latency=100000 pio_size=1 ret_bad_addr=false ret_data16=65535 @@ -820,7 +835,8 @@ pio=system.iobus.master[11] [system.pc.pciconfig] type=PciConfigAll bus=0 -pio_latency=1 +clock=1 +pio_latency=30000 platform=system.pc size=16777216 system=system @@ -835,7 +851,6 @@ io_apic=system.pc.south_bridge.io_apic keyboard=system.pc.south_bridge.keyboard pic1=system.pc.south_bridge.pic1 pic2=system.pc.south_bridge.pic2 -pio_latency=1000 pit=system.pc.south_bridge.pit platform=system.pc speaker=system.pc.south_bridge.speaker @@ -843,9 +858,10 @@ speaker=system.pc.south_bridge.speaker [system.pc.south_bridge.cmos] type=Cmos children=int_pin +clock=1 int_pin=system.pc.south_bridge.cmos.int_pin pio_addr=9223372036854775920 -pio_latency=1000 +pio_latency=100000 system=system time=Sun Jan 1 00:00:00 2012 pio=system.iobus.master[1] @@ -855,8 +871,9 @@ type=X86IntSourcePin [system.pc.south_bridge.dma1] type=I8237 +clock=1 pio_addr=9223372036854775808 -pio_latency=1000 +pio_latency=100000 system=system pio=system.iobus.master[2] @@ -901,16 +918,15 @@ SubClassCode=1 SubsystemID=0 SubsystemVendorID=0 VendorID=32902 +clock=1 config_latency=20000 ctrl_offset=0 disks=system.pc.south_bridge.ide.disks0 system.pc.south_bridge.ide.disks1 io_shift=0 -max_backoff_delay=10000000 -min_backoff_delay=4000 pci_bus=0 pci_dev=4 pci_func=0 -pio_latency=1000 +pio_latency=30000 platform=system.pc system=system config=system.iobus.master[4] @@ -934,7 +950,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks0.image.child] type=RawDiskImage -image_file=/dist/m5/system/disks/linux-x86.img +image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img read_only=true [system.pc.south_bridge.ide.disks1] @@ -954,7 +970,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks1.image.child] type=RawDiskImage -image_file=/dist/m5/system/disks/linux-bigswap2.img +image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img read_only=true [system.pc.south_bridge.int_lines0] @@ -1037,10 +1053,11 @@ number=12 [system.pc.south_bridge.io_apic] type=I82094AA apic_id=1 +clock=1 external_int_pic=system.pc.south_bridge.pic1 int_latency=1000 pio_addr=4273995776 -pio_latency=1000 +pio_latency=100000 system=system int_master=system.iobus.slave[2] pio=system.iobus.master[10] @@ -1048,12 +1065,13 @@ pio=system.iobus.master[10] [system.pc.south_bridge.keyboard] type=I8042 children=keyboard_int_pin mouse_int_pin +clock=1 command_port=9223372036854775908 data_port=9223372036854775904 keyboard_int_pin=system.pc.south_bridge.keyboard.keyboard_int_pin mouse_int_pin=system.pc.south_bridge.keyboard.mouse_int_pin pio_addr=0 -pio_latency=1000 +pio_latency=100000 system=system pio=system.iobus.master[5] @@ -1066,10 +1084,11 @@ type=X86IntSourcePin [system.pc.south_bridge.pic1] type=I8259 children=output +clock=1 mode=I8259Master output=system.pc.south_bridge.pic1.output pio_addr=9223372036854775840 -pio_latency=1000 +pio_latency=100000 slave=system.pc.south_bridge.pic2 system=system pio=system.iobus.master[6] @@ -1080,10 +1099,11 @@ type=X86IntSourcePin [system.pc.south_bridge.pic2] type=I8259 children=output +clock=1 mode=I8259Slave output=system.pc.south_bridge.pic2.output pio_addr=9223372036854775968 -pio_latency=1000 +pio_latency=100000 slave=Null system=system pio=system.iobus.master[7] @@ -1094,9 +1114,10 @@ type=X86IntSourcePin [system.pc.south_bridge.pit] type=I8254 children=int_pin +clock=1 int_pin=system.pc.south_bridge.pit.int_pin pio_addr=9223372036854775872 -pio_latency=1000 +pio_latency=100000 system=system pio=system.iobus.master[8] @@ -1105,14 +1126,16 @@ type=X86IntSourcePin [system.pc.south_bridge.speaker] type=PcSpeaker +clock=1 i8254=system.pc.south_bridge.pit pio_addr=9223372036854775905 -pio_latency=1000 +pio_latency=100000 system=system pio=system.iobus.master[9] [system.physmem] type=SimpleMemory +clock=1 conf_table_reported=false file= in_addr_map=true 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 7a86428b1..c9e113bf6 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,13 +1,15 @@ +Redirecting stdout to build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-atomic/simout +Redirecting stderr to build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-atomic/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Jul 26 2012 21:30:36 -gem5 started Jul 26 2012 22:49:04 -gem5 executing on zizzer +gem5 compiled Sep 10 2012 21:50:34 +gem5 started Sep 10 2012 21:50:39 +gem5 executing on ribera.cs.wisc.edu command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-atomic -re tests/run.py build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-atomic warning: add_child('terminal'): child 'terminal' already has parent Global frequency set at 1000000000000 ticks per second -info: kernel located at: /dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 +info: kernel located at: /scratch/nilay/GEM5/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 5112043255000 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 4f10e01e9..58cc29985 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.112043 # Nu sim_ticks 5112043255000 # Number of ticks simulated final_tick 5112043255000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1419112 # Simulator instruction rate (inst/s) -host_op_rate 2905734 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 36306590178 # Simulator tick rate (ticks/s) -host_mem_usage 362152 # Number of bytes of host memory used -host_seconds 140.80 # Real time elapsed on the host +host_inst_rate 1011485 # Simulator instruction rate (inst/s) +host_op_rate 2071087 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 25877843451 # Simulator tick rate (ticks/s) +host_mem_usage 397304 # Number of bytes of host memory used +host_seconds 197.55 # Real time elapsed on the host sim_insts 199813914 # Number of instructions simulated sim_ops 409133298 # Number of ops (including micro ops) simulated system.physmem.bytes_read::pc.south_bridge.ide 2464768 # Number of bytes read from this memory @@ -221,8 +221,8 @@ system.cpu.num_func_calls 0 # nu system.cpu.num_conditional_control_insts 39954974 # number of instructions that are conditional controls system.cpu.num_int_insts 374297264 # number of integer instructions system.cpu.num_fp_insts 0 # number of float instructions -system.cpu.num_int_register_reads 1159028989 # number of times the integer registers were read -system.cpu.num_int_register_writes 636431681 # number of times the integer registers were written +system.cpu.num_int_register_reads 915470380 # number of times the integer registers were read +system.cpu.num_int_register_writes 480331069 # number of times the integer registers were written system.cpu.num_fp_register_reads 0 # number of times the floating registers were read system.cpu.num_fp_register_writes 0 # number of times the floating registers were written system.cpu.num_mem_refs 35626517 # number of memory refs 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 ae091f3af..4abbfe44c 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 @@ -11,11 +11,12 @@ type=LinuxX86System children=acpi_description_table_pointer apicbridge bridge cpu e820_table intel_mp_pointer intel_mp_table intrctrl iobus iocache l2c membus pc physmem smbios_table toL2Bus acpi_description_table_pointer=system.acpi_description_table_pointer boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1 +clock=1 e820_table=system.e820_table init_param=0 intel_mp_pointer=system.intel_mp_pointer intel_mp_table=system.intel_mp_table -kernel=/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 +kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9 load_addr_mask=18446744073709551615 mem_mode=timing memories=system.physmem @@ -51,23 +52,21 @@ oem_table_id= [system.apicbridge] type=Bridge +clock=1 delay=50000 -nack_delay=4000 ranges=11529215046068469760:11529215046068473855 req_size=16 resp_size=16 -write_ack=false master=system.membus.slave[0] slave=system.iobus.master[0] [system.bridge] type=Bridge +clock=1 delay=50000 -nack_delay=4000 ranges=4273995776:4273999871 9223372036854775808:11529215046068469759 13835058055282163712:18446744073709551615 req_size=16 resp_size=16 -write_ack=false master=system.iobus.slave[0] slave=system.membus.master[1] @@ -91,7 +90,6 @@ max_insts_any_thread=0 max_loads_all_threads=0 max_loads_any_thread=0 numThreads=1 -phase=0 profile=0 progress_interval=0 system=system @@ -105,6 +103,7 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=4 block_size=64 +clock=1 forward_snoops=true hash_delay=1 is_top_level=true @@ -133,6 +132,7 @@ walker=system.cpu.dtb.walker [system.cpu.dtb.walker] type=X86PagetableWalker +clock=1 system=system port=system.cpu.dtb_walker_cache.cpu_side @@ -141,6 +141,7 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=2 block_size=64 +clock=1 forward_snoops=true hash_delay=1 is_top_level=false @@ -166,6 +167,7 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=1 block_size=64 +clock=1 forward_snoops=true hash_delay=1 is_top_level=true @@ -188,9 +190,10 @@ mem_side=system.toL2Bus.slave[0] [system.cpu.interrupts] type=X86LocalApic +clock=1 int_latency=1000 pio_addr=2305843009213693952 -pio_latency=1000 +pio_latency=100000 system=system int_master=system.membus.slave[4] int_slave=system.membus.master[3] @@ -204,6 +207,7 @@ walker=system.cpu.itb.walker [system.cpu.itb.walker] type=X86PagetableWalker +clock=1 system=system port=system.cpu.itb_walker_cache.cpu_side @@ -212,6 +216,7 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=2 block_size=64 +clock=1 forward_snoops=true hash_delay=1 is_top_level=false @@ -614,6 +619,7 @@ type=BaseCache addr_ranges=0:134217727 assoc=8 block_size=64 +clock=1 forward_snoops=false hash_delay=1 is_top_level=false @@ -639,6 +645,7 @@ type=BaseCache addr_ranges=0:18446744073709551615 assoc=8 block_size=64 +clock=1 forward_snoops=true hash_delay=1 is_top_level=false @@ -673,9 +680,10 @@ slave=system.apicbridge.master system.system_port system.iocache.mem_side system [system.membus.badaddr_responder] type=IsaFake +clock=1 fake_mem=false pio_addr=0 -pio_latency=1000 +pio_latency=100000 pio_size=8 ret_bad_addr=true ret_data16=65535 @@ -695,9 +703,10 @@ system=system [system.pc.behind_pci] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854779128 -pio_latency=1000 +pio_latency=100000 pio_size=8 ret_bad_addr=false ret_data16=65535 @@ -712,8 +721,9 @@ pio=system.iobus.master[12] [system.pc.com_1] type=Uart8250 children=terminal +clock=1 pio_addr=9223372036854776824 -pio_latency=1000 +pio_latency=100000 platform=system.pc system=system terminal=system.pc.com_1.terminal @@ -735,9 +745,10 @@ port=3456 [system.pc.fake_com_2] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854776568 -pio_latency=1000 +pio_latency=100000 pio_size=8 ret_bad_addr=false ret_data16=65535 @@ -751,9 +762,10 @@ pio=system.iobus.master[14] [system.pc.fake_com_3] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854776808 -pio_latency=1000 +pio_latency=100000 pio_size=8 ret_bad_addr=false ret_data16=65535 @@ -767,9 +779,10 @@ pio=system.iobus.master[15] [system.pc.fake_com_4] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854776552 -pio_latency=1000 +pio_latency=100000 pio_size=8 ret_bad_addr=false ret_data16=65535 @@ -783,9 +796,10 @@ pio=system.iobus.master[16] [system.pc.fake_floppy] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854776818 -pio_latency=1000 +pio_latency=100000 pio_size=2 ret_bad_addr=false ret_data16=65535 @@ -799,9 +813,10 @@ pio=system.iobus.master[17] [system.pc.i_dont_exist] type=IsaFake +clock=1 fake_mem=false pio_addr=9223372036854775936 -pio_latency=1000 +pio_latency=100000 pio_size=1 ret_bad_addr=false ret_data16=65535 @@ -816,7 +831,8 @@ pio=system.iobus.master[11] [system.pc.pciconfig] type=PciConfigAll bus=0 -pio_latency=1 +clock=1 +pio_latency=30000 platform=system.pc size=16777216 system=system @@ -831,7 +847,6 @@ io_apic=system.pc.south_bridge.io_apic keyboard=system.pc.south_bridge.keyboard pic1=system.pc.south_bridge.pic1 pic2=system.pc.south_bridge.pic2 -pio_latency=1000 pit=system.pc.south_bridge.pit platform=system.pc speaker=system.pc.south_bridge.speaker @@ -839,9 +854,10 @@ speaker=system.pc.south_bridge.speaker [system.pc.south_bridge.cmos] type=Cmos children=int_pin +clock=1 int_pin=system.pc.south_bridge.cmos.int_pin pio_addr=9223372036854775920 -pio_latency=1000 +pio_latency=100000 system=system time=Sun Jan 1 00:00:00 2012 pio=system.iobus.master[1] @@ -851,8 +867,9 @@ type=X86IntSourcePin [system.pc.south_bridge.dma1] type=I8237 +clock=1 pio_addr=9223372036854775808 -pio_latency=1000 +pio_latency=100000 system=system pio=system.iobus.master[2] @@ -897,16 +914,15 @@ SubClassCode=1 SubsystemID=0 SubsystemVendorID=0 VendorID=32902 +clock=1 config_latency=20000 ctrl_offset=0 disks=system.pc.south_bridge.ide.disks0 system.pc.south_bridge.ide.disks1 io_shift=0 -max_backoff_delay=10000000 -min_backoff_delay=4000 pci_bus=0 pci_dev=4 pci_func=0 -pio_latency=1000 +pio_latency=30000 platform=system.pc system=system config=system.iobus.master[4] @@ -930,7 +946,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks0.image.child] type=RawDiskImage -image_file=/dist/m5/system/disks/linux-x86.img +image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img read_only=true [system.pc.south_bridge.ide.disks1] @@ -950,7 +966,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks1.image.child] type=RawDiskImage -image_file=/dist/m5/system/disks/linux-bigswap2.img +image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img read_only=true [system.pc.south_bridge.int_lines0] @@ -1033,10 +1049,11 @@ number=12 [system.pc.south_bridge.io_apic] type=I82094AA apic_id=1 +clock=1 external_int_pic=system.pc.south_bridge.pic1 int_latency=1000 pio_addr=4273995776 -pio_latency=1000 +pio_latency=100000 system=system int_master=system.iobus.slave[2] pio=system.iobus.master[10] @@ -1044,12 +1061,13 @@ pio=system.iobus.master[10] [system.pc.south_bridge.keyboard] type=I8042 children=keyboard_int_pin mouse_int_pin +clock=1 command_port=9223372036854775908 data_port=9223372036854775904 keyboard_int_pin=system.pc.south_bridge.keyboard.keyboard_int_pin mouse_int_pin=system.pc.south_bridge.keyboard.mouse_int_pin pio_addr=0 -pio_latency=1000 +pio_latency=100000 system=system pio=system.iobus.master[5] @@ -1062,10 +1080,11 @@ type=X86IntSourcePin [system.pc.south_bridge.pic1] type=I8259 children=output +clock=1 mode=I8259Master output=system.pc.south_bridge.pic1.output pio_addr=9223372036854775840 -pio_latency=1000 +pio_latency=100000 slave=system.pc.south_bridge.pic2 system=system pio=system.iobus.master[6] @@ -1076,10 +1095,11 @@ type=X86IntSourcePin [system.pc.south_bridge.pic2] type=I8259 children=output +clock=1 mode=I8259Slave output=system.pc.south_bridge.pic2.output pio_addr=9223372036854775968 -pio_latency=1000 +pio_latency=100000 slave=Null system=system pio=system.iobus.master[7] @@ -1090,9 +1110,10 @@ type=X86IntSourcePin [system.pc.south_bridge.pit] type=I8254 children=int_pin +clock=1 int_pin=system.pc.south_bridge.pit.int_pin pio_addr=9223372036854775872 -pio_latency=1000 +pio_latency=100000 system=system pio=system.iobus.master[8] @@ -1101,14 +1122,16 @@ type=X86IntSourcePin [system.pc.south_bridge.speaker] type=PcSpeaker +clock=1 i8254=system.pc.south_bridge.pit pio_addr=9223372036854775905 -pio_latency=1000 +pio_latency=100000 system=system pio=system.iobus.master[9] [system.physmem] type=SimpleMemory +clock=1 conf_table_reported=false file= in_addr_map=true 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 4564af214..954f254a4 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,13 +1,15 @@ +Redirecting stdout to build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-timing/simout +Redirecting stderr to build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-timing/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Jul 26 2012 21:30:36 -gem5 started Jul 26 2012 22:51:36 -gem5 executing on zizzer +gem5 compiled Sep 10 2012 21:50:34 +gem5 started Sep 10 2012 21:50:39 +gem5 executing on ribera.cs.wisc.edu command line: build/X86/gem5.opt -d build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-timing -re tests/run.py build/X86/tests/opt/quick/fs/10.linux-boot/x86/linux/pc-simple-timing warning: add_child('terminal'): child 'terminal' already has parent Global frequency set at 1000000000000 ticks per second -info: kernel located at: /dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 +info: kernel located at: /scratch/nilay/GEM5/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 5191766314000 because m5_exit instruction encountered +Exiting @ tick 5196043137000 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 2aa8a86ab..5fafbec2b 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.196043 # Nu sim_ticks 5196043137000 # Number of ticks simulated final_tick 5196043137000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1241473 # Simulator instruction rate (inst/s) -host_op_rate 2393258 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 50303585789 # Simulator tick rate (ticks/s) -host_mem_usage 354304 # Number of bytes of host memory used -host_seconds 103.29 # Real time elapsed on the host +host_inst_rate 682761 # Simulator instruction rate (inst/s) +host_op_rate 1316197 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 27664981075 # Simulator tick rate (ticks/s) +host_mem_usage 397336 # Number of bytes of host memory used +host_seconds 187.82 # Real time elapsed on the host sim_insts 128236332 # Number of instructions simulated sim_ops 247208442 # Number of ops (including micro ops) simulated system.physmem.bytes_read::pc.south_bridge.ide 2881344 # Number of bytes read from this memory @@ -365,8 +365,8 @@ system.cpu.num_func_calls 0 # nu system.cpu.num_conditional_control_insts 23151326 # number of instructions that are conditional controls system.cpu.num_int_insts 231946757 # number of integer instructions system.cpu.num_fp_insts 0 # number of float instructions -system.cpu.num_int_register_reads 720715933 # number of times the integer registers were read -system.cpu.num_int_register_writes 387556667 # number of times the integer registers were written +system.cpu.num_int_register_reads 566912178 # number of times the integer registers were read +system.cpu.num_int_register_writes 293147449 # number of times the integer registers were written system.cpu.num_fp_register_reads 0 # number of times the floating registers were read system.cpu.num_fp_register_writes 0 # number of times the floating registers were written system.cpu.num_mem_refs 22230275 # number of memory refs -- cgit v1.2.3