changeset 91a6f8f07074 in /z/repo/gem5 details: http://repo.gem5.org/gem5?cmd=changeset;node=91a6f8f07074 description: X86: Update stats for the slightly changed TLB behavior.
diffstat: tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini | 97 +- tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/simout | 11 +- tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt | 1512 +++++----- tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/system.pc.com_1.terminal | 2 +- 4 files changed, 814 insertions(+), 808 deletions(-) diffs (truncated from 2043 to 300 lines): diff -r 397cbf4b11a6 -r 91a6f8f07074 tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini --- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini Tue Apr 24 00:48:41 2012 -0700 +++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini Tue Apr 24 00:48:57 2012 -0700 @@ -20,7 +20,6 @@ mem_mode=timing memories=system.physmem num_work_ids=16 -physmem=system.physmem readfile=tests/halt.sh smbios_table=system.smbios_table symbolfile= @@ -31,7 +30,7 @@ work_end_ckpt_count=0 work_end_exit_count=0 work_item_id=-1 -system_port=system.membus.port[3] +system_port=system.membus.slave[1] [system.acpi_description_table_pointer] type=X86ACPIRSDP @@ -58,8 +57,8 @@ req_size=16 resp_size=16 write_ack=false -master=system.membus.port[2] -slave=system.iobus.port[1] +master=system.membus.slave[0] +slave=system.iobus.master[0] [system.bridge] type=Bridge @@ -69,8 +68,8 @@ req_size=16 resp_size=16 write_ack=false -master=system.iobus.port[0] -slave=system.membus.port[1] +master=system.iobus.slave[0] +slave=system.membus.master[1] [system.cpu] type=DerivO3CPU @@ -171,7 +170,7 @@ [system.cpu.dcache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=4 block_size=64 forward_snoops=true @@ -192,7 +191,7 @@ two_queue=false write_buffers=8 cpu_side=system.cpu.dcache_port -mem_side=system.toL2Bus.port[2] +mem_side=system.toL2Bus.slave[1] [system.cpu.dtb] type=X86TLB @@ -207,7 +206,7 @@ [system.cpu.dtb_walker_cache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=2 block_size=64 forward_snoops=true @@ -228,7 +227,7 @@ two_queue=false write_buffers=8 cpu_side=system.cpu.dtb.walker.port -mem_side=system.toL2Bus.port[4] +mem_side=system.toL2Bus.slave[3] [system.cpu.fuPool] type=FUPool @@ -495,7 +494,7 @@ [system.cpu.icache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=1 block_size=64 forward_snoops=true @@ -516,7 +515,7 @@ two_queue=false write_buffers=8 cpu_side=system.cpu.icache_port -mem_side=system.toL2Bus.port[1] +mem_side=system.toL2Bus.slave[0] [system.cpu.interrupts] type=X86LocalApic @@ -524,8 +523,9 @@ pio_addr=2305843009213693952 pio_latency=1000 system=system -int_port=system.membus.port[7] -pio=system.membus.port[6] +int_master=system.membus.slave[4] +int_slave=system.membus.master[3] +pio=system.membus.master[2] [system.cpu.itb] type=X86TLB @@ -540,7 +540,7 @@ [system.cpu.itb_walker_cache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=2 block_size=64 forward_snoops=true @@ -561,7 +561,7 @@ two_queue=false write_buffers=8 cpu_side=system.cpu.itb.walker.port -mem_side=system.toL2Bus.port[3] +mem_side=system.toL2Bus.slave[2] [system.cpu.tracer] type=ExeTracer @@ -938,11 +938,12 @@ use_default_range=true width=64 default=system.pc.pciconfig.pio -port=system.bridge.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.ide.dma 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.south_bridge.io_apic.int_port 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_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 +slave=system.bridge.master system.pc.south_bridge.ide.dma system.pc.south_bridge.io_apic.int_master [system.iocache] type=BaseCache -addr_range=0:134217727 +addr_ranges=0:134217727 assoc=8 block_size=64 forward_snoops=false @@ -962,12 +963,12 @@ trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.iobus.port[21] -mem_side=system.membus.port[4] +cpu_side=system.iobus.master[18] +mem_side=system.membus.slave[2] [system.l2c] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=8 block_size=64 forward_snoops=true @@ -987,8 +988,8 @@ trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.toL2Bus.port[0] -mem_side=system.membus.port[5] +cpu_side=system.toL2Bus.master[0] +mem_side=system.membus.slave[3] [system.membus] type=Bus @@ -1000,7 +1001,8 @@ use_default_range=false width=64 default=system.membus.badaddr_responder.pio -port=system.physmem.port[0] system.bridge.slave system.apicbridge.master system.system_port system.iocache.mem_side system.l2c.mem_side system.cpu.interrupts.pio system.cpu.interrupts.int_port +master=system.physmem.port[0] system.bridge.slave system.cpu.interrupts.pio system.cpu.interrupts.int_slave +slave=system.apicbridge.master system.system_port system.iocache.mem_side system.l2c.mem_side system.cpu.interrupts.int_master [system.membus.badaddr_responder] type=IsaFake @@ -1038,7 +1040,7 @@ system=system update_data=false warn_access= -pio=system.iobus.port[15] +pio=system.iobus.master[12] [system.pc.com_1] type=Uart8250 @@ -1048,7 +1050,7 @@ platform=system.pc system=system terminal=system.pc.com_1.terminal -pio=system.iobus.port[16] +pio=system.iobus.master[13] [system.pc.com_1.terminal] type=Terminal @@ -1078,7 +1080,7 @@ system=system update_data=false warn_access= -pio=system.iobus.port[17] +pio=system.iobus.master[14] [system.pc.fake_com_3] type=IsaFake @@ -1094,7 +1096,7 @@ system=system update_data=false warn_access= -pio=system.iobus.port[18] +pio=system.iobus.master[15] [system.pc.fake_com_4] type=IsaFake @@ -1110,7 +1112,7 @@ system=system update_data=false warn_access= -pio=system.iobus.port[19] +pio=system.iobus.master[16] [system.pc.fake_floppy] type=IsaFake @@ -1126,7 +1128,7 @@ system=system update_data=false warn_access= -pio=system.iobus.port[20] +pio=system.iobus.master[17] [system.pc.i_dont_exist] type=IsaFake @@ -1142,7 +1144,7 @@ system=system update_data=false warn_access= -pio=system.iobus.port[14] +pio=system.iobus.master[11] [system.pc.pciconfig] type=PciConfigAll @@ -1175,7 +1177,7 @@ pio_latency=1000 system=system time=Sun Jan 1 00:00:00 2012 -pio=system.iobus.port[2] +pio=system.iobus.master[1] [system.pc.south_bridge.cmos.int_pin] type=X86IntSourcePin @@ -1185,7 +1187,7 @@ pio_addr=9223372036854775808 pio_latency=1000 system=system -pio=system.iobus.port[3] +pio=system.iobus.master[2] [system.pc.south_bridge.ide] type=IdeController @@ -1240,9 +1242,9 @@ pio_latency=1000 platform=system.pc system=system -config=system.iobus.port[5] -dma=system.iobus.port[6] -pio=system.iobus.port[4] +config=system.iobus.master[4] +dma=system.iobus.slave[1] +pio=system.iobus.master[3] [system.pc.south_bridge.ide.disks0] type=IdeDisk @@ -1369,8 +1371,8 @@ pio_addr=4273995776 pio_latency=1000 system=system -int_port=system.iobus.port[13] -pio=system.iobus.port[12] +int_master=system.iobus.slave[2] +pio=system.iobus.master[10] [system.pc.south_bridge.keyboard] type=I8042 @@ -1382,7 +1384,7 @@ pio_addr=0 pio_latency=1000 system=system -pio=system.iobus.port[7] +pio=system.iobus.master[5] [system.pc.south_bridge.keyboard.keyboard_int_pin] type=X86IntSourcePin @@ -1399,7 +1401,7 @@ pio_latency=1000 slave=system.pc.south_bridge.pic2 system=system -pio=system.iobus.port[8] +pio=system.iobus.master[6] [system.pc.south_bridge.pic1.output] _______________________________________________ gem5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/gem5-dev
