diff options
Diffstat (limited to 'tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing')
4 files changed, 84 insertions, 74 deletions
diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini index f05a137d3..3130a22aa 100644 --- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini +++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini @@ -15,9 +15,11 @@ 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 +num_work_ids=16 physmem=system.physmem readfile=tests/halt.sh smbios_table=system.smbios_table @@ -704,6 +706,7 @@ port=system.physmem.port[0] system.bridge.side_b system.iocache.mem_side system. [system.membus.badaddr_responder] type=IsaFake +fake_mem=false pio_addr=0 pio_latency=1000 pio_size=8 @@ -726,6 +729,7 @@ system=system [system.pc.behind_pci] type=IsaFake +fake_mem=false pio_addr=9223372036854779128 pio_latency=1000 pio_size=8 @@ -742,15 +746,31 @@ pio=system.iobus.port[12] [system.pc.com_1] type=Uart8250 +children=terminal pio_addr=9223372036854776824 pio_latency=1000 platform=system.pc system=system -terminal=system.pc.terminal +terminal=system.pc.com_1.terminal pio=system.iobus.port[13] +[system.pc.com_1.terminal] +type=Terminal +intr_control=system.intrctrl +number=0 +output=true +port=3456 + +[system.pc.com_1.terminal] +type=Terminal +intr_control=system.intrctrl +number=0 +output=true +port=3456 + [system.pc.fake_com_2] type=IsaFake +fake_mem=false pio_addr=9223372036854776568 pio_latency=1000 pio_size=8 @@ -767,6 +787,7 @@ pio=system.iobus.port[14] [system.pc.fake_com_3] type=IsaFake +fake_mem=false pio_addr=9223372036854776808 pio_latency=1000 pio_size=8 @@ -783,6 +804,7 @@ pio=system.iobus.port[15] [system.pc.fake_com_4] type=IsaFake +fake_mem=false pio_addr=9223372036854776552 pio_latency=1000 pio_size=8 @@ -799,6 +821,7 @@ pio=system.iobus.port[16] [system.pc.fake_floppy] type=IsaFake +fake_mem=false pio_addr=9223372036854776818 pio_latency=1000 pio_size=2 @@ -815,6 +838,7 @@ pio=system.iobus.port[17] [system.pc.i_dont_exist] type=IsaFake +fake_mem=false pio_addr=9223372036854775936 pio_latency=1000 pio_size=1 @@ -843,7 +867,6 @@ type=SouthBridge children=cmos dma1 ide int_lines0 int_lines1 int_lines2 int_lines3 int_lines4 int_lines5 int_lines6 io_apic keyboard pic1 pic2 pit speaker cmos=system.pc.south_bridge.cmos dma1=system.pc.south_bridge.dma1 -int_lines=system.pc.south_bridge.int_lines0 system.pc.south_bridge.int_lines1 system.pc.south_bridge.int_lines2 system.pc.south_bridge.int_lines3 system.pc.south_bridge.int_lines4 system.pc.south_bridge.int_lines5 system.pc.south_bridge.int_lines6 io_apic=system.pc.south_bridge.io_apic keyboard=system.pc.south_bridge.keyboard pic1=system.pc.south_bridge.pic1 @@ -855,7 +878,8 @@ speaker=system.pc.south_bridge.speaker [system.pc.south_bridge.cmos] type=Cmos -int_pin=system.pc.south_bridge.int_lines2.source +children=int_pin +int_pin=system.pc.south_bridge.cmos.int_pin pio_addr=9223372036854775920 pio_latency=1000 platform=system.pc @@ -863,6 +887,9 @@ system=system time=Sun Jan 1 00:00:00 2012 pio=system.iobus.port[1] +[system.pc.south_bridge.cmos.int_pin] +type=X86IntSourcePin + [system.pc.south_bridge.dma1] type=I8237 pio_addr=9223372036854775808 @@ -945,7 +972,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] @@ -965,70 +992,58 @@ 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] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines0.sink -source=system.pc.south_bridge.int_lines0.source +source=system.pc.south_bridge.pic1.output [system.pc.south_bridge.int_lines0.sink] type=X86IntSinkPin device=system.pc.south_bridge.io_apic number=0 -[system.pc.south_bridge.int_lines0.source] -type=X86IntSourcePin - [system.pc.south_bridge.int_lines1] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines1.sink -source=system.pc.south_bridge.int_lines1.source +source=system.pc.south_bridge.pic2.output [system.pc.south_bridge.int_lines1.sink] type=X86IntSinkPin device=system.pc.south_bridge.pic1 number=2 -[system.pc.south_bridge.int_lines1.source] -type=X86IntSourcePin - [system.pc.south_bridge.int_lines2] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines2.sink -source=system.pc.south_bridge.int_lines2.source +source=system.pc.south_bridge.cmos.int_pin [system.pc.south_bridge.int_lines2.sink] type=X86IntSinkPin device=system.pc.south_bridge.pic2 number=0 -[system.pc.south_bridge.int_lines2.source] -type=X86IntSourcePin - [system.pc.south_bridge.int_lines3] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines3.sink -source=system.pc.south_bridge.int_lines3.source +source=system.pc.south_bridge.pit.int_pin [system.pc.south_bridge.int_lines3.sink] type=X86IntSinkPin device=system.pc.south_bridge.pic1 number=0 -[system.pc.south_bridge.int_lines3.source] -type=X86IntSourcePin - [system.pc.south_bridge.int_lines4] type=X86IntLine children=sink sink=system.pc.south_bridge.int_lines4.sink -source=system.pc.south_bridge.int_lines3.source +source=system.pc.south_bridge.pit.int_pin [system.pc.south_bridge.int_lines4.sink] type=X86IntSinkPin @@ -1037,32 +1052,26 @@ number=2 [system.pc.south_bridge.int_lines5] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines5.sink -source=system.pc.south_bridge.int_lines5.source +source=system.pc.south_bridge.keyboard.keyboard_int_pin [system.pc.south_bridge.int_lines5.sink] type=X86IntSinkPin device=system.pc.south_bridge.io_apic number=1 -[system.pc.south_bridge.int_lines5.source] -type=X86IntSourcePin - [system.pc.south_bridge.int_lines6] type=X86IntLine -children=sink source +children=sink sink=system.pc.south_bridge.int_lines6.sink -source=system.pc.south_bridge.int_lines6.source +source=system.pc.south_bridge.keyboard.mouse_int_pin [system.pc.south_bridge.int_lines6.sink] type=X86IntSinkPin device=system.pc.south_bridge.io_apic number=12 -[system.pc.south_bridge.int_lines6.source] -type=X86IntSourcePin - [system.pc.south_bridge.io_apic] type=I82094AA apic_id=1 @@ -1077,20 +1086,28 @@ pio=system.iobus.port[9] [system.pc.south_bridge.keyboard] type=I8042 +children=keyboard_int_pin mouse_int_pin command_port=9223372036854775908 data_port=9223372036854775904 -keyboard_int_pin=system.pc.south_bridge.int_lines5.source -mouse_int_pin=system.pc.south_bridge.int_lines6.source +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 platform=system.pc system=system pio=system.iobus.port[4] +[system.pc.south_bridge.keyboard.keyboard_int_pin] +type=X86IntSourcePin + +[system.pc.south_bridge.keyboard.mouse_int_pin] +type=X86IntSourcePin + [system.pc.south_bridge.pic1] type=I8259 +children=output mode=I8259Master -output=system.pc.south_bridge.int_lines0.source +output=system.pc.south_bridge.pic1.output pio_addr=9223372036854775840 pio_latency=1000 platform=system.pc @@ -1098,10 +1115,14 @@ slave=system.pc.south_bridge.pic2 system=system pio=system.iobus.port[5] +[system.pc.south_bridge.pic1.output] +type=X86IntSourcePin + [system.pc.south_bridge.pic2] type=I8259 +children=output mode=I8259Slave -output=system.pc.south_bridge.int_lines1.source +output=system.pc.south_bridge.pic2.output pio_addr=9223372036854775968 pio_latency=1000 platform=system.pc @@ -1109,15 +1130,22 @@ slave=Null system=system pio=system.iobus.port[6] +[system.pc.south_bridge.pic2.output] +type=X86IntSourcePin + [system.pc.south_bridge.pit] type=I8254 -int_pin=system.pc.south_bridge.int_lines3.source +children=int_pin +int_pin=system.pc.south_bridge.pit.int_pin pio_addr=9223372036854775872 pio_latency=1000 platform=system.pc system=system pio=system.iobus.port[7] +[system.pc.south_bridge.pit.int_pin] +type=X86IntSourcePin + [system.pc.south_bridge.speaker] type=PcSpeaker i8254=system.pc.south_bridge.pit @@ -1127,13 +1155,6 @@ platform=system.pc system=system pio=system.iobus.port[8] -[system.pc.terminal] -type=Terminal -intr_control=system.intrctrl -number=0 -output=true -port=3456 - [system.physmem] type=PhysicalMemory file= diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simerr b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simerr index 99f9676e9..fd09f1faf 100755 --- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simerr +++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simerr @@ -1,17 +1,9 @@ warn: Sockets disabled, not accepting terminal connections -For more information see: http://www.m5sim.org/warn/8742226b warn: Reading current count from inactive timer. -For more information see: http://www.m5sim.org/warn/1ea2be46 warn: Sockets disabled, not accepting gdb connections -For more information see: http://www.m5sim.org/warn/d946bea6 warn: Don't know what interrupt to clear for console. -For more information see: http://www.m5sim.org/warn/7fe1004f warn: instruction 'fxsave' unimplemented -For more information see: http://www.m5sim.org/warn/437d5238 warn: Tried to clear PCI interrupt 14 -For more information see: http://www.m5sim.org/warn/77378d57 warn: Unknown mouse command 0xe1. -For more information see: http://www.m5sim.org/warn/2447512a warn: instruction 'wbinvd' unimplemented -For more information see: http://www.m5sim.org/warn/437d5238 hack: be nice to actually delete the event here diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout index f1baa96ff..ec51a2abf 100755 --- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout +++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/simout @@ -1,15 +1,12 @@ -M5 Simulator System +gem5 Simulator System. http://gem5.org +gem5 is copyrighted software; use the --copyright option for details. -Copyright (c) 2001-2008 -The Regents of The University of Michigan -All Rights Reserved - - -M5 compiled Apr 19 2011 12:44:38 -M5 started Apr 19 2011 12:46:29 -M5 executing on maize -command line: build/X86_FS/m5.fast -d build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-timing -re tests/run.py build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-timing +gem5 compiled Jan 9 2012 20:47:38 +gem5 started Jan 9 2012 21:05:49 +gem5 executing on ribera.cs.wisc.edu +command line: build/X86_FS/gem5.fast -d build/X86_FS/tests/fast/quick/10.linux-boot/x86/linux/pc-simple-timing -re tests/run.py build/X86_FS/tests/fast/quick/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 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 5195470393000 because m5_exit instruction encountered diff --git a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt index f2563a156..3c6185134 100644 --- a/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt +++ b/tests/quick/10.linux-boot/ref/x86/linux/pc-simple-timing/stats.txt @@ -3,11 +3,11 @@ sim_seconds 5.195470 # Number of seconds simulated sim_ticks 5195470393000 # Number of ticks simulated sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1914891 # Simulator instruction rate (inst/s) -host_tick_rate 37635937594 # Simulator tick rate (ticks/s) -host_mem_usage 372104 # Number of bytes of host memory used -host_seconds 138.05 # Real time elapsed on the host -sim_insts 264342001 # Number of instructions simulated +host_inst_rate 1858401 # Simulator instruction rate (inst/s) +host_tick_rate 36414646229 # Simulator tick rate (ticks/s) +host_mem_usage 372180 # Number of bytes of host memory used +host_seconds 142.68 # Real time elapsed on the host +sim_insts 265147881 # Number of instructions simulated system.l2c.replacements 136133 # number of replacements system.l2c.tagsinuse 31389.895470 # Cycle average of tags in use system.l2c.total_refs 3363370 # Total number of references to valid blocks. @@ -257,7 +257,7 @@ system.pc.south_bridge.ide.disks1.dma_write_txs 1 system.cpu.numCycles 10390940786 # number of cpu cycles simulated system.cpu.numWorkItemsStarted 0 # number of work items this cpu started system.cpu.numWorkItemsCompleted 0 # number of work items this cpu completed -system.cpu.num_insts 264342001 # Number of instructions executed +system.cpu.num_insts 265147881 # Number of instructions executed system.cpu.num_int_alu_accesses 249556386 # Number of integer alu accesses system.cpu.num_fp_alu_accesses 0 # Number of float alu accesses system.cpu.num_func_calls 0 # number of times a function call or return occured |