diff options
Diffstat (limited to 'tests/long/10.linux-boot/ref')
15 files changed, 270 insertions, 197 deletions
diff --git a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini index 78fc12019..94bfc8925 100644 --- a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini +++ b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/config.ini @@ -10,13 +10,14 @@ type=LinuxAlphaSystem children=bridge cpu0 cpu1 disk0 disk2 intrctrl iobus iocache l2c membus physmem simple_disk terminal toL2Bus tsunami boot_cpu_frequency=500 boot_osflags=root=/dev/hda1 console=ttyS0 -console=/projects/pd/randd/dist/binaries/console +console=/dist/m5/system/binaries/console init_param=0 -kernel=/projects/pd/randd/dist/binaries/vmlinux +kernel=/dist/m5/system/binaries/vmlinux load_addr_mask=1099511627775 mem_mode=timing memories=system.physmem -pal=/projects/pd/randd/dist/binaries/ts_osfpal +num_work_ids=16 +pal=/dist/m5/system/binaries/ts_osfpal physmem=system.physmem readfile=tests/halt.sh symbolfile= @@ -29,20 +30,18 @@ work_cpus_ckpt_count=0 work_end_ckpt_count=0 work_end_exit_count=0 work_item_id=-1 +system_port=system.membus.port[2] [system.bridge] type=Bridge delay=50000 -filter_ranges_a=0:18446744073709551615 -filter_ranges_b=0:8589934591 nack_delay=4000 -req_size_a=16 -req_size_b=16 -resp_size_a=16 -resp_size_b=16 +ranges=8796093022208:18446744073709551615 +req_size=16 +resp_size=16 write_ack=false -side_a=system.iobus.port[0] -side_b=system.membus.port[0] +master=system.iobus.port[0] +slave=system.membus.port[0] [system.cpu0] type=DerivO3CPU @@ -933,7 +932,7 @@ table_size=65536 [system.disk0.image.child] type=RawDiskImage -image_file=/projects/pd/randd/dist/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.disk2] @@ -953,7 +952,7 @@ table_size=65536 [system.disk2.image.child] type=RawDiskImage -image_file=/projects/pd/randd/dist/disks/linux-bigswap2.img +image_file=/dist/m5/system/disks/linux-bigswap2.img read_only=true [system.intrctrl] @@ -969,7 +968,7 @@ header_cycles=1 use_default_range=true width=64 default=system.tsunami.pciconfig.pio -port=system.bridge.side_a system.tsunami.cchip.pio system.tsunami.pchip.pio system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio system.tsunami.uart.pio system.tsunami.backdoor.pio system.tsunami.ide.pio system.tsunami.ethernet.pio system.iocache.cpu_side system.tsunami.ethernet.config system.tsunami.ethernet.dma system.tsunami.ide.config system.tsunami.ide.dma +port=system.bridge.master system.tsunami.cchip.pio system.tsunami.pchip.pio system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio system.tsunami.uart.pio system.tsunami.backdoor.pio system.tsunami.ide.pio system.tsunami.ide.config system.tsunami.ide.dma system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.iocache.cpu_side [system.iocache] type=BaseCache @@ -1000,8 +999,8 @@ tgts_per_mshr=12 trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.iobus.port[28] -mem_side=system.membus.port[2] +cpu_side=system.iobus.port[32] +mem_side=system.membus.port[3] [system.l2c] type=BaseCache @@ -1033,7 +1032,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.toL2Bus.port[0] -mem_side=system.membus.port[3] +mem_side=system.membus.port[4] [system.membus] type=Bus @@ -1045,7 +1044,7 @@ header_cycles=1 use_default_range=false width=64 default=system.membus.badaddr_responder.pio -port=system.bridge.side_b system.physmem.port[0] system.iocache.mem_side system.l2c.mem_side +port=system.bridge.slave system.physmem.port[0] system.system_port system.iocache.mem_side system.l2c.mem_side [system.membus.badaddr_responder] type=IsaFake @@ -1082,7 +1081,7 @@ system=system [system.simple_disk.disk] type=RawDiskImage -image_file=/projects/pd/randd/dist/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.terminal] @@ -1195,9 +1194,9 @@ system=system tx_delay=1000000 tx_fifo_size=524288 tx_thread=false -config=system.iobus.port[29] -dma=system.iobus.port[30] -pio=system.iobus.port[27] +config=system.iobus.port[30] +dma=system.iobus.port[31] +pio=system.iobus.port[29] [system.tsunami.fake_OROM] type=IsaFake @@ -1583,8 +1582,8 @@ pci_func=0 pio_latency=1000 platform=system.tsunami system=system -config=system.iobus.port[31] -dma=system.iobus.port[32] +config=system.iobus.port[27] +dma=system.iobus.port[28] pio=system.iobus.port[26] [system.tsunami.io] diff --git a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/simout b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/simout index cb23e1c15..35f0311de 100755 --- a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/simout +++ b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/simout @@ -1,13 +1,13 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Nov 21 2011 16:05:33 -gem5 started Nov 21 2011 19:03:16 -gem5 executing on u200540-lin +gem5 compiled Jan 23 2012 03:53:29 +gem5 started Jan 23 2012 06:11:48 +gem5 executing on zizzer command line: build/ALPHA_FS/gem5.opt -d build/ALPHA_FS/tests/opt/long/10.linux-boot/alpha/linux/tsunami-o3-dual -re tests/run.py build/ALPHA_FS/tests/opt/long/10.linux-boot/alpha/linux/tsunami-o3-dual Global frequency set at 1000000000000 ticks per second -info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux 0: system.tsunami.io.rtc: Real-time clock set to Thu Jan 1 00:00:00 2009 +info: kernel located at: /dist/m5/system/binaries/vmlinux info: Entering event queue @ 0. Starting simulation... info: Launching CPU 1 @ 106949500 Exiting @ tick 1897465263500 because m5_exit instruction encountered diff --git a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt index 65d49a60e..d2e784a3f 100644 --- a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt +++ b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt @@ -2,12 +2,23 @@ ---------- Begin Simulation Statistics ---------- sim_seconds 1.897465 # Number of seconds simulated sim_ticks 1897465263500 # Number of ticks simulated +final_tick 1897465263500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 138767 # Simulator instruction rate (inst/s) -host_tick_rate 4690907118 # Simulator tick rate (ticks/s) -host_mem_usage 293696 # Number of bytes of host memory used -host_seconds 404.50 # Real time elapsed on the host +host_inst_rate 131690 # Simulator instruction rate (inst/s) +host_tick_rate 4451680142 # Simulator tick rate (ticks/s) +host_mem_usage 298548 # Number of bytes of host memory used +host_seconds 426.24 # Real time elapsed on the host sim_insts 56130966 # Number of instructions simulated +system.physmem.bytes_read 30408320 # Number of bytes read from this memory +system.physmem.bytes_inst_read 1097728 # Number of instructions bytes read from this memory +system.physmem.bytes_written 10468544 # Number of bytes written to this memory +system.physmem.num_reads 475130 # Number of read requests responded to by this memory +system.physmem.num_writes 163571 # Number of write requests responded to by this memory +system.physmem.num_other 0 # Number of other requests responded to by this memory +system.physmem.bw_read 16025758 # Total read bandwidth from this memory (bytes/s) +system.physmem.bw_inst_read 578523 # Instruction read bandwidth from this memory (bytes/s) +system.physmem.bw_write 5517120 # Write bandwidth from this memory (bytes/s) +system.physmem.bw_total 21542879 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 397795 # number of replacements system.l2c.tagsinuse 35116.884908 # Cycle average of tags in use system.l2c.total_refs 2482671 # Total number of references to valid blocks. diff --git a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/config.ini b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/config.ini index c437d8a70..b0a37466e 100644 --- a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/config.ini +++ b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/config.ini @@ -10,13 +10,14 @@ type=LinuxAlphaSystem children=bridge cpu disk0 disk2 intrctrl iobus iocache l2c membus physmem simple_disk terminal toL2Bus tsunami boot_cpu_frequency=500 boot_osflags=root=/dev/hda1 console=ttyS0 -console=/projects/pd/randd/dist/binaries/console +console=/dist/m5/system/binaries/console init_param=0 -kernel=/projects/pd/randd/dist/binaries/vmlinux +kernel=/dist/m5/system/binaries/vmlinux load_addr_mask=1099511627775 mem_mode=timing memories=system.physmem -pal=/projects/pd/randd/dist/binaries/ts_osfpal +num_work_ids=16 +pal=/dist/m5/system/binaries/ts_osfpal physmem=system.physmem readfile=tests/halt.sh symbolfile= @@ -29,20 +30,18 @@ work_cpus_ckpt_count=0 work_end_ckpt_count=0 work_end_exit_count=0 work_item_id=-1 +system_port=system.membus.port[2] [system.bridge] type=Bridge delay=50000 -filter_ranges_a=0:18446744073709551615 -filter_ranges_b=0:8589934591 nack_delay=4000 -req_size_a=16 -req_size_b=16 -resp_size_a=16 -resp_size_b=16 +ranges=8796093022208:18446744073709551615 +req_size=16 +resp_size=16 write_ack=false -side_a=system.iobus.port[0] -side_b=system.membus.port[0] +master=system.iobus.port[0] +slave=system.membus.port[0] [system.cpu] type=DerivO3CPU @@ -497,7 +496,7 @@ table_size=65536 [system.disk0.image.child] type=RawDiskImage -image_file=/projects/pd/randd/dist/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.disk2] @@ -517,7 +516,7 @@ table_size=65536 [system.disk2.image.child] type=RawDiskImage -image_file=/projects/pd/randd/dist/disks/linux-bigswap2.img +image_file=/dist/m5/system/disks/linux-bigswap2.img read_only=true [system.intrctrl] @@ -533,7 +532,7 @@ header_cycles=1 use_default_range=true width=64 default=system.tsunami.pciconfig.pio -port=system.bridge.side_a system.tsunami.cchip.pio system.tsunami.pchip.pio system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio system.tsunami.uart.pio system.tsunami.backdoor.pio system.tsunami.ide.pio system.tsunami.ethernet.pio system.iocache.cpu_side system.tsunami.ethernet.config system.tsunami.ethernet.dma system.tsunami.ide.config system.tsunami.ide.dma +port=system.bridge.master system.tsunami.cchip.pio system.tsunami.pchip.pio system.tsunami.fake_sm_chip.pio system.tsunami.fake_uart1.pio system.tsunami.fake_uart2.pio system.tsunami.fake_uart3.pio system.tsunami.fake_uart4.pio system.tsunami.fake_ppc.pio system.tsunami.fake_OROM.pio system.tsunami.fake_pnp_addr.pio system.tsunami.fake_pnp_write.pio system.tsunami.fake_pnp_read0.pio system.tsunami.fake_pnp_read1.pio system.tsunami.fake_pnp_read2.pio system.tsunami.fake_pnp_read3.pio system.tsunami.fake_pnp_read4.pio system.tsunami.fake_pnp_read5.pio system.tsunami.fake_pnp_read6.pio system.tsunami.fake_pnp_read7.pio system.tsunami.fake_ata0.pio system.tsunami.fake_ata1.pio system.tsunami.fb.pio system.tsunami.io.pio system.tsunami.uart.pio system.tsunami.backdoor.pio system.tsunami.ide.pio system.tsunami.ide.config system.tsunami.ide.dma system.tsunami.ethernet.pio system.tsunami.ethernet.config system.tsunami.ethernet.dma system.iocache.cpu_side [system.iocache] type=BaseCache @@ -564,8 +563,8 @@ tgts_per_mshr=12 trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.iobus.port[28] -mem_side=system.membus.port[2] +cpu_side=system.iobus.port[32] +mem_side=system.membus.port[3] [system.l2c] type=BaseCache @@ -597,7 +596,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.toL2Bus.port[0] -mem_side=system.membus.port[3] +mem_side=system.membus.port[4] [system.membus] type=Bus @@ -609,7 +608,7 @@ header_cycles=1 use_default_range=false width=64 default=system.membus.badaddr_responder.pio -port=system.bridge.side_b system.physmem.port[0] system.iocache.mem_side system.l2c.mem_side +port=system.bridge.slave system.physmem.port[0] system.system_port system.iocache.mem_side system.l2c.mem_side [system.membus.badaddr_responder] type=IsaFake @@ -646,7 +645,7 @@ system=system [system.simple_disk.disk] type=RawDiskImage -image_file=/projects/pd/randd/dist/disks/linux-latest.img +image_file=/dist/m5/system/disks/linux-latest.img read_only=true [system.terminal] @@ -759,9 +758,9 @@ system=system tx_delay=1000000 tx_fifo_size=524288 tx_thread=false -config=system.iobus.port[29] -dma=system.iobus.port[30] -pio=system.iobus.port[27] +config=system.iobus.port[30] +dma=system.iobus.port[31] +pio=system.iobus.port[29] [system.tsunami.fake_OROM] type=IsaFake @@ -1147,8 +1146,8 @@ pci_func=0 pio_latency=1000 platform=system.tsunami system=system -config=system.iobus.port[31] -dma=system.iobus.port[32] +config=system.iobus.port[27] +dma=system.iobus.port[28] pio=system.iobus.port[26] [system.tsunami.io] diff --git a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/simout b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/simout index b8893b11f..2911b29fc 100755 --- a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/simout +++ b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/simout @@ -1,12 +1,12 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Nov 21 2011 16:05:33 -gem5 started Nov 21 2011 18:56:50 -gem5 executing on u200540-lin +gem5 compiled Jan 23 2012 03:53:29 +gem5 started Jan 23 2012 06:11:15 +gem5 executing on zizzer command line: build/ALPHA_FS/gem5.opt -d build/ALPHA_FS/tests/opt/long/10.linux-boot/alpha/linux/tsunami-o3 -re tests/run.py build/ALPHA_FS/tests/opt/long/10.linux-boot/alpha/linux/tsunami-o3 Global frequency set at 1000000000000 ticks per second -info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux 0: system.tsunami.io.rtc: Real-time clock set to Thu Jan 1 00:00:00 2009 +info: kernel located at: /dist/m5/system/binaries/vmlinux info: Entering event queue @ 0. Starting simulation... Exiting @ tick 1858873594500 because m5_exit instruction encountered diff --git a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt index 16f374a0c..de8941321 100644 --- a/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt +++ b/tests/long/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt @@ -2,12 +2,23 @@ ---------- Begin Simulation Statistics ---------- sim_seconds 1.858874 # Number of seconds simulated sim_ticks 1858873594500 # Number of ticks simulated +final_tick 1858873594500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 141632 # Simulator instruction rate (inst/s) -host_tick_rate 4958330764 # Simulator tick rate (ticks/s) -host_mem_usage 290572 # Number of bytes of host memory used -host_seconds 374.90 # Real time elapsed on the host +host_inst_rate 134152 # Simulator instruction rate (inst/s) +host_tick_rate 4696460042 # Simulator tick rate (ticks/s) +host_mem_usage 295432 # Number of bytes of host memory used +host_seconds 395.80 # Real time elapsed on the host sim_insts 53097697 # Number of instructions simulated +system.physmem.bytes_read 29819840 # Number of bytes read from this memory +system.physmem.bytes_inst_read 1062784 # Number of instructions bytes read from this memory +system.physmem.bytes_written 10193408 # Number of bytes written to this memory +system.physmem.num_reads 465935 # Number of read requests responded to by this memory +system.physmem.num_writes 159272 # Number of write requests responded to by this memory +system.physmem.num_other 0 # Number of other requests responded to by this memory +system.physmem.bw_read 16041887 # Total read bandwidth from this memory (bytes/s) +system.physmem.bw_inst_read 571735 # Instruction read bandwidth from this memory (bytes/s) +system.physmem.bw_write 5483648 # Write bandwidth from this memory (bytes/s) +system.physmem.bw_total 21525535 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 391354 # number of replacements system.l2c.tagsinuse 34898.086140 # Cycle average of tags in use system.l2c.total_refs 2410581 # Total number of references to valid blocks. diff --git a/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini b/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini index e6a0de845..6f9417ef5 100644 --- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini +++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini @@ -32,20 +32,18 @@ work_cpus_ckpt_count=0 work_end_ckpt_count=0 work_end_exit_count=0 work_item_id=-1 +system_port=system.membus.port[7] [system.bridge] type=Bridge delay=50000 -filter_ranges_a=0:18446744073709551615 -filter_ranges_b=0:268435455 nack_delay=4000 -req_size_a=16 -req_size_b=16 -resp_size_a=16 -resp_size_b=16 +ranges=268435456:520093695 1073741824:18446744073709551615 +req_size=16 +resp_size=16 write_ack=false -side_a=system.iobus.port[0] -side_b=system.membus.port[0] +master=system.iobus.port[0] +slave=system.membus.port[0] [system.cf0] type=IdeDisk @@ -987,7 +985,7 @@ clock=1000 header_cycles=1 use_default_range=false width=64 -port=system.bridge.side_a system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc_fake.pio system.realview.flash_fake.pio system.iocache.cpu_side system.realview.cf_ctrl.config system.realview.cf_ctrl.dma system.realview.clcd.dma +port=system.bridge.master system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.clcd.dma system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.cf_ctrl.dma system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc_fake.pio system.realview.flash_fake.pio system.iocache.cpu_side [system.iocache] type=BaseCache @@ -1018,8 +1016,8 @@ tgts_per_mshr=12 trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.iobus.port[25] -mem_side=system.membus.port[7] +cpu_side=system.iobus.port[28] +mem_side=system.membus.port[8] [system.l2c] type=BaseCache @@ -1051,7 +1049,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.toL2Bus.port[0] -mem_side=system.membus.port[8] +mem_side=system.membus.port[9] [system.membus] type=Bus @@ -1063,7 +1061,7 @@ header_cycles=1 use_default_range=false width=64 default=system.membus.badaddr_responder.pio -port=system.bridge.side_b system.nvmem.port[0] system.physmem.port[0] system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.iocache.mem_side system.l2c.mem_side +port=system.bridge.slave system.nvmem.port[0] system.physmem.port[0] system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.system_port system.iocache.mem_side system.l2c.mem_side [system.membus.badaddr_responder] type=IsaFake @@ -1125,7 +1123,7 @@ pio_addr=268451840 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[21] +pio=system.iobus.port[24] [system.realview.cf_ctrl] type=IdeController @@ -1179,9 +1177,9 @@ pci_func=0 pio_latency=1000 platform=system.realview system=system -config=system.iobus.port[26] -dma=system.iobus.port[27] -pio=system.iobus.port[8] +config=system.iobus.port[10] +dma=system.iobus.port[11] +pio=system.iobus.port[9] [system.realview.clcd] type=Pl111 @@ -1196,7 +1194,7 @@ pio_latency=10000 platform=system.realview system=system vnc=system.vncserver -dma=system.iobus.port[28] +dma=system.iobus.port[6] pio=system.iobus.port[5] [system.realview.dmac_fake] @@ -1207,7 +1205,7 @@ pio_addr=268632064 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[9] +pio=system.iobus.port[12] [system.realview.flash_fake] type=IsaFake @@ -1224,7 +1222,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[24] +pio=system.iobus.port[27] [system.realview.gic] type=Gic @@ -1246,7 +1244,7 @@ pio_addr=268513280 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[16] +pio=system.iobus.port[19] [system.realview.gpio1_fake] type=AmbaFake @@ -1256,7 +1254,7 @@ pio_addr=268517376 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[17] +pio=system.iobus.port[20] [system.realview.gpio2_fake] type=AmbaFake @@ -1266,7 +1264,7 @@ pio_addr=268521472 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[18] +pio=system.iobus.port[21] [system.realview.kmi0] type=Pl050 @@ -1280,7 +1278,7 @@ pio_latency=1000 platform=system.realview system=system vnc=system.vncserver -pio=system.iobus.port[6] +pio=system.iobus.port[7] [system.realview.kmi1] type=Pl050 @@ -1294,7 +1292,7 @@ pio_latency=1000 platform=system.realview system=system vnc=system.vncserver -pio=system.iobus.port[7] +pio=system.iobus.port[8] [system.realview.l2x0_fake] type=IsaFake @@ -1333,7 +1331,7 @@ pio_addr=268455936 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[22] +pio=system.iobus.port[25] [system.realview.realview_io] type=RealViewCtrl @@ -1354,7 +1352,7 @@ pio_addr=268529664 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[23] +pio=system.iobus.port[26] [system.realview.sci_fake] type=AmbaFake @@ -1364,7 +1362,7 @@ pio_addr=268492800 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[20] +pio=system.iobus.port[23] [system.realview.smc_fake] type=AmbaFake @@ -1374,7 +1372,7 @@ pio_addr=269357056 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[13] +pio=system.iobus.port[16] [system.realview.sp810_fake] type=AmbaFake @@ -1384,7 +1382,7 @@ pio_addr=268439552 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[14] +pio=system.iobus.port[17] [system.realview.ssp_fake] type=AmbaFake @@ -1394,7 +1392,7 @@ pio_addr=268488704 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[19] +pio=system.iobus.port[22] [system.realview.timer0] type=Sp804 @@ -1445,7 +1443,7 @@ pio_addr=268476416 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[10] +pio=system.iobus.port[13] [system.realview.uart2_fake] type=AmbaFake @@ -1455,7 +1453,7 @@ pio_addr=268480512 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[11] +pio=system.iobus.port[14] [system.realview.uart3_fake] type=AmbaFake @@ -1465,7 +1463,7 @@ pio_addr=268484608 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[12] +pio=system.iobus.port[15] [system.realview.watchdog_fake] type=AmbaFake @@ -1475,7 +1473,7 @@ pio_addr=268500992 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[15] +pio=system.iobus.port[18] [system.terminal] type=Terminal diff --git a/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/simout b/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/simout index 13d4b63f2..28da0bb31 100755 --- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/simout +++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/simout @@ -1,10 +1,8 @@ -Redirecting stdout to build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3-dual/simout -Redirecting stderr to build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3-dual/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Jan 8 2012 22:12:58 -gem5 started Jan 9 2012 03:33:38 +gem5 compiled Jan 23 2012 04:21:22 +gem5 started Jan 23 2012 09:54:17 gem5 executing on zizzer command line: build/ARM_FS/gem5.opt -d build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3-dual -re tests/run.py build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3-dual Global frequency set at 1000000000000 ticks per second diff --git a/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt b/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt index 3163bcf32..11b3b4098 100644 --- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt +++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt @@ -2,12 +2,32 @@ ---------- Begin Simulation Statistics ---------- sim_seconds 2.582494 # Number of seconds simulated sim_ticks 2582494395500 # Number of ticks simulated +final_tick 2582494395500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 65512 # Simulator instruction rate (inst/s) -host_tick_rate 2118472138 # Simulator tick rate (ticks/s) -host_mem_usage 384260 # Number of bytes of host memory used -host_seconds 1219.04 # Real time elapsed on the host +host_inst_rate 77486 # Simulator instruction rate (inst/s) +host_tick_rate 2505663009 # Simulator tick rate (ticks/s) +host_mem_usage 386072 # Number of bytes of host memory used +host_seconds 1030.66 # Real time elapsed on the host sim_insts 79862069 # Number of instructions simulated +system.nvmem.bytes_read 384 # Number of bytes read from this memory +system.nvmem.bytes_inst_read 384 # Number of instructions bytes read from this memory +system.nvmem.bytes_written 0 # Number of bytes written to this memory +system.nvmem.num_reads 6 # Number of read requests responded to by this memory +system.nvmem.num_writes 0 # Number of write requests responded to by this memory +system.nvmem.num_other 0 # Number of other requests responded to by this memory +system.nvmem.bw_read 149 # Total read bandwidth from this memory (bytes/s) +system.nvmem.bw_inst_read 149 # Instruction read bandwidth from this memory (bytes/s) +system.nvmem.bw_total 149 # Total bandwidth to/from this memory (bytes/s) +system.physmem.bytes_read 131490980 # Number of bytes read from this memory +system.physmem.bytes_inst_read 1177856 # Number of instructions bytes read from this memory +system.physmem.bytes_written 10251344 # Number of bytes written to this memory +system.physmem.num_reads 15129077 # Number of read requests responded to by this memory +system.physmem.num_writes 870131 # Number of write requests responded to by this memory +system.physmem.num_other 0 # Number of other requests responded to by this memory +system.physmem.bw_read 50916269 # Total read bandwidth from this memory (bytes/s) +system.physmem.bw_inst_read 456092 # Instruction read bandwidth from this memory (bytes/s) +system.physmem.bw_write 3969551 # Write bandwidth from this memory (bytes/s) +system.physmem.bw_total 54885821 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 132200 # number of replacements system.l2c.tagsinuse 27582.989225 # Cycle average of tags in use system.l2c.total_refs 1817822 # Total number of references to valid blocks. diff --git a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini index 0e78591b5..c84a9ea85 100644 --- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini +++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/config.ini @@ -32,20 +32,18 @@ work_cpus_ckpt_count=0 work_end_ckpt_count=0 work_end_exit_count=0 work_item_id=-1 +system_port=system.membus.port[7] [system.bridge] type=Bridge delay=50000 -filter_ranges_a=0:18446744073709551615 -filter_ranges_b=0:268435455 nack_delay=4000 -req_size_a=16 -req_size_b=16 -resp_size_a=16 -resp_size_b=16 +ranges=268435456:520093695 1073741824:18446744073709551615 +req_size=16 +resp_size=16 write_ack=false -side_a=system.iobus.port[0] -side_b=system.membus.port[0] +master=system.iobus.port[0] +slave=system.membus.port[0] [system.cf0] type=IdeDisk @@ -533,7 +531,7 @@ clock=1000 header_cycles=1 use_default_range=false width=64 -port=system.bridge.side_a system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc_fake.pio system.realview.flash_fake.pio system.iocache.cpu_side system.realview.cf_ctrl.config system.realview.cf_ctrl.dma system.realview.clcd.dma +port=system.bridge.master system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.clcd.dma system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.cf_ctrl.dma system.realview.dmac_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.smc_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.gpio0_fake.pio system.realview.gpio1_fake.pio system.realview.gpio2_fake.pio system.realview.ssp_fake.pio system.realview.sci_fake.pio system.realview.aaci_fake.pio system.realview.mmc_fake.pio system.realview.rtc_fake.pio system.realview.flash_fake.pio system.iocache.cpu_side [system.iocache] type=BaseCache @@ -564,8 +562,8 @@ tgts_per_mshr=12 trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.iobus.port[25] -mem_side=system.membus.port[7] +cpu_side=system.iobus.port[28] +mem_side=system.membus.port[8] [system.l2c] type=BaseCache @@ -597,7 +595,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.toL2Bus.port[0] -mem_side=system.membus.port[8] +mem_side=system.membus.port[9] [system.membus] type=Bus @@ -609,7 +607,7 @@ header_cycles=1 use_default_range=false width=64 default=system.membus.badaddr_responder.pio -port=system.bridge.side_b system.nvmem.port[0] system.physmem.port[0] system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.iocache.mem_side system.l2c.mem_side +port=system.bridge.slave system.nvmem.port[0] system.physmem.port[0] system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.system_port system.iocache.mem_side system.l2c.mem_side [system.membus.badaddr_responder] type=IsaFake @@ -671,7 +669,7 @@ pio_addr=268451840 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[21] +pio=system.iobus.port[24] [system.realview.cf_ctrl] type=IdeController @@ -725,9 +723,9 @@ pci_func=0 pio_latency=1000 platform=system.realview system=system -config=system.iobus.port[26] -dma=system.iobus.port[27] -pio=system.iobus.port[8] +config=system.iobus.port[10] +dma=system.iobus.port[11] +pio=system.iobus.port[9] [system.realview.clcd] type=Pl111 @@ -742,7 +740,7 @@ pio_latency=10000 platform=system.realview system=system vnc=system.vncserver -dma=system.iobus.port[28] +dma=system.iobus.port[6] pio=system.iobus.port[5] [system.realview.dmac_fake] @@ -753,7 +751,7 @@ pio_addr=268632064 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[9] +pio=system.iobus.port[12] [system.realview.flash_fake] type=IsaFake @@ -770,7 +768,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[24] +pio=system.iobus.port[27] [system.realview.gic] type=Gic @@ -792,7 +790,7 @@ pio_addr=268513280 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[16] +pio=system.iobus.port[19] [system.realview.gpio1_fake] type=AmbaFake @@ -802,7 +800,7 @@ pio_addr=268517376 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[17] +pio=system.iobus.port[20] [system.realview.gpio2_fake] type=AmbaFake @@ -812,7 +810,7 @@ pio_addr=268521472 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[18] +pio=system.iobus.port[21] [system.realview.kmi0] type=Pl050 @@ -826,7 +824,7 @@ pio_latency=1000 platform=system.realview system=system vnc=system.vncserver -pio=system.iobus.port[6] +pio=system.iobus.port[7] [system.realview.kmi1] type=Pl050 @@ -840,7 +838,7 @@ pio_latency=1000 platform=system.realview system=system vnc=system.vncserver -pio=system.iobus.port[7] +pio=system.iobus.port[8] [system.realview.l2x0_fake] type=IsaFake @@ -879,7 +877,7 @@ pio_addr=268455936 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[22] +pio=system.iobus.port[25] [system.realview.realview_io] type=RealViewCtrl @@ -900,7 +898,7 @@ pio_addr=268529664 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[23] +pio=system.iobus.port[26] [system.realview.sci_fake] type=AmbaFake @@ -910,7 +908,7 @@ pio_addr=268492800 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[20] +pio=system.iobus.port[23] [system.realview.smc_fake] type=AmbaFake @@ -920,7 +918,7 @@ pio_addr=269357056 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[13] +pio=system.iobus.port[16] [system.realview.sp810_fake] type=AmbaFake @@ -930,7 +928,7 @@ pio_addr=268439552 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[14] +pio=system.iobus.port[17] [system.realview.ssp_fake] type=AmbaFake @@ -940,7 +938,7 @@ pio_addr=268488704 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[19] +pio=system.iobus.port[22] [system.realview.timer0] type=Sp804 @@ -991,7 +989,7 @@ pio_addr=268476416 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[10] +pio=system.iobus.port[13] [system.realview.uart2_fake] type=AmbaFake @@ -1001,7 +999,7 @@ pio_addr=268480512 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[11] +pio=system.iobus.port[14] [system.realview.uart3_fake] type=AmbaFake @@ -1011,7 +1009,7 @@ pio_addr=268484608 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[12] +pio=system.iobus.port[15] [system.realview.watchdog_fake] type=AmbaFake @@ -1021,7 +1019,7 @@ pio_addr=268500992 pio_latency=1000 platform=system.realview system=system -pio=system.iobus.port[15] +pio=system.iobus.port[18] [system.terminal] type=Terminal diff --git a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout index 9d4c8ae86..231dec8b1 100755 --- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout +++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/simout @@ -1,10 +1,8 @@ -Redirecting stdout to build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3/simout -Redirecting stderr to build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3/simerr gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Jan 8 2012 22:12:58 -gem5 started Jan 9 2012 03:32:35 +gem5 compiled Jan 23 2012 04:21:22 +gem5 started Jan 23 2012 09:54:06 gem5 executing on zizzer command line: build/ARM_FS/gem5.opt -d build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3 -re tests/run.py build/ARM_FS/tests/opt/long/10.linux-boot/arm/linux/realview-o3 Global frequency set at 1000000000000 ticks per second diff --git a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt index 768983a75..ad6b1630f 100644 --- a/tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt +++ b/tests/long/10.linux-boot/ref/arm/linux/realview-o3/stats.txt @@ -2,12 +2,32 @@ ---------- Begin Simulation Statistics ---------- sim_seconds 2.503566 # Number of seconds simulated sim_ticks 2503566110500 # Number of ticks simulated +final_tick 2503566110500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 72389 # Simulator instruction rate (inst/s) -host_tick_rate 2360079964 # Simulator tick rate (ticks/s) -host_mem_usage 384076 # Number of bytes of host memory used -host_seconds 1060.80 # Real time elapsed on the host +host_inst_rate 76624 # Simulator instruction rate (inst/s) +host_tick_rate 2498140220 # Simulator tick rate (ticks/s) +host_mem_usage 386188 # Number of bytes of host memory used +host_seconds 1002.17 # Real time elapsed on the host sim_insts 76790007 # Number of instructions simulated +system.nvmem.bytes_read 64 # Number of bytes read from this memory +system.nvmem.bytes_inst_read 64 # Number of instructions bytes read from this memory +system.nvmem.bytes_written 0 # Number of bytes written to this memory +system.nvmem.num_reads 1 # Number of read requests responded to by this memory +system.nvmem.num_writes 0 # Number of write requests responded to by this memory +system.nvmem.num_other 0 # Number of other requests responded to by this memory +system.nvmem.bw_read 26 # Total read bandwidth from this memory (bytes/s) +system.nvmem.bw_inst_read 26 # Instruction read bandwidth from this memory (bytes/s) +system.nvmem.bw_total 26 # Total bandwidth to/from this memory (bytes/s) +system.physmem.bytes_read 130731152 # Number of bytes read from this memory +system.physmem.bytes_inst_read 1101568 # Number of instructions bytes read from this memory +system.physmem.bytes_written 9585992 # Number of bytes written to this memory +system.physmem.num_reads 15117140 # Number of read requests responded to by this memory +system.physmem.num_writes 856673 # Number of write requests responded to by this memory +system.physmem.num_other 0 # Number of other requests responded to by this memory +system.physmem.bw_read 52217975 # Total read bandwidth from this memory (bytes/s) +system.physmem.bw_inst_read 440000 # Instruction read bandwidth from this memory (bytes/s) +system.physmem.bw_write 3828935 # Write bandwidth from this memory (bytes/s) +system.physmem.bw_total 56046910 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 119509 # number of replacements system.l2c.tagsinuse 25929.897253 # Cycle average of tags in use system.l2c.total_refs 1795434 # Total number of references to valid blocks. diff --git a/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini b/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini index 9ef75afe6..f406247a4 100644 --- a/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini +++ b/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/config.ini @@ -7,7 +7,7 @@ time_sync_spin_threshold=100000000 [system] type=LinuxX86System -children=acpi_description_table_pointer bridge cpu e820_table intel_mp_pointer intel_mp_table intrctrl iobus iocache l2c membus pc physmem smbios_table toL2Bus +children=acpi_description_table_pointer bridge cpu e820_table intel_mp_pointer intel_mp_table intrctrl iobridge iobus iocache l2c membus pc physmem smbios_table toL2Bus acpi_description_table_pointer=system.acpi_description_table_pointer boot_cpu_frequency=500 boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1 @@ -15,7 +15,7 @@ e820_table=system.e820_table init_param=0 intel_mp_pointer=system.intel_mp_pointer intel_mp_table=system.intel_mp_table -kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9 +kernel=/dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 load_addr_mask=18446744073709551615 mem_mode=timing memories=system.physmem @@ -31,6 +31,7 @@ work_cpus_ckpt_count=0 work_end_ckpt_count=0 work_end_exit_count=0 work_item_id=-1 +system_port=system.membus.port[3] [system.acpi_description_table_pointer] type=X86ACPIRSDP @@ -52,16 +53,13 @@ oem_table_id= [system.bridge] type=Bridge delay=50000 -filter_ranges_a=0:1152921504606846975 -filter_ranges_b=0:134217727 nack_delay=4000 -req_size_a=16 -req_size_b=16 -resp_size_a=16 -resp_size_b=16 +ranges=4273995776:4273999871 9223372036854775808:11529215046068469759 13835058055282163712:18446744073709551615 +req_size=16 +resp_size=16 write_ack=false -side_a=system.iobus.port[0] -side_b=system.membus.port[1] +master=system.iobus.port[0] +slave=system.membus.port[1] [system.cpu] type=DerivO3CPU @@ -535,8 +533,8 @@ pio_addr=2305843009213693952 pio_latency=1000 platform=system.pc system=system -int_port=system.membus.port[5] -pio=system.membus.port[4] +int_port=system.membus.port[7] +pio=system.membus.port[6] [system.cpu.itb] type=X86TLB @@ -947,6 +945,17 @@ subtractive_decode=true type=IntrControl sys=system +[system.iobridge] +type=Bridge +delay=50000 +nack_delay=4000 +ranges=11529215046068469760:11529215046068473855 +req_size=16 +resp_size=16 +write_ack=false +master=system.membus.port[2] +slave=system.iobus.port[1] + [system.iobus] type=Bus block_size=64 @@ -956,7 +965,7 @@ header_cycles=1 use_default_range=true width=64 default=system.pc.pciconfig.pio -port=system.bridge.side_a system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio 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 system.pc.south_bridge.ide.config system.pc.south_bridge.ide.dma +port=system.bridge.master system.iobridge.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 [system.iocache] type=BaseCache @@ -987,8 +996,8 @@ tgts_per_mshr=12 trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.iobus.port[18] -mem_side=system.membus.port[2] +cpu_side=system.iobus.port[21] +mem_side=system.membus.port[4] [system.l2c] type=BaseCache @@ -1020,7 +1029,7 @@ trace_addr=0 two_queue=false write_buffers=8 cpu_side=system.toL2Bus.port[0] -mem_side=system.membus.port[3] +mem_side=system.membus.port[5] [system.membus] type=Bus @@ -1032,7 +1041,7 @@ header_cycles=1 use_default_range=false width=64 default=system.membus.badaddr_responder.pio -port=system.physmem.port[0] system.bridge.side_b system.iocache.mem_side system.l2c.mem_side system.cpu.interrupts.pio system.cpu.interrupts.int_port +port=system.physmem.port[0] system.bridge.slave system.iobridge.master system.system_port system.iocache.mem_side system.l2c.mem_side system.cpu.interrupts.pio system.cpu.interrupts.int_port [system.membus.badaddr_responder] type=IsaFake @@ -1072,7 +1081,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[12] +pio=system.iobus.port[15] [system.pc.com_1] type=Uart8250 @@ -1082,7 +1091,7 @@ pio_latency=1000 platform=system.pc system=system terminal=system.pc.com_1.terminal -pio=system.iobus.port[13] +pio=system.iobus.port[16] [system.pc.com_1.terminal] type=Terminal @@ -1113,7 +1122,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[14] +pio=system.iobus.port[17] [system.pc.fake_com_3] type=IsaFake @@ -1130,7 +1139,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[15] +pio=system.iobus.port[18] [system.pc.fake_com_4] type=IsaFake @@ -1147,7 +1156,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[16] +pio=system.iobus.port[19] [system.pc.fake_floppy] type=IsaFake @@ -1164,7 +1173,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[17] +pio=system.iobus.port[20] [system.pc.i_dont_exist] type=IsaFake @@ -1181,7 +1190,7 @@ ret_data8=255 system=system update_data=false warn_access= -pio=system.iobus.port[11] +pio=system.iobus.port[14] [system.pc.pciconfig] type=PciConfigAll @@ -1215,7 +1224,7 @@ pio_latency=1000 platform=system.pc system=system time=Sun Jan 1 00:00:00 2012 -pio=system.iobus.port[1] +pio=system.iobus.port[2] [system.pc.south_bridge.cmos.int_pin] type=X86IntSourcePin @@ -1226,7 +1235,7 @@ pio_addr=9223372036854775808 pio_latency=1000 platform=system.pc system=system -pio=system.iobus.port[2] +pio=system.iobus.port[3] [system.pc.south_bridge.ide] type=IdeController @@ -1281,9 +1290,9 @@ pci_func=0 pio_latency=1000 platform=system.pc system=system -config=system.iobus.port[19] -dma=system.iobus.port[20] -pio=system.iobus.port[3] +config=system.iobus.port[5] +dma=system.iobus.port[6] +pio=system.iobus.port[4] [system.pc.south_bridge.ide.disks0] type=IdeDisk @@ -1302,7 +1311,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks0.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img +image_file=/dist/m5/system/disks/linux-x86.img read_only=true [system.pc.south_bridge.ide.disks1] @@ -1322,7 +1331,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks1.image.child] type=RawDiskImage -image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img +image_file=/dist/m5/system/disks/linux-bigswap2.img read_only=true [system.pc.south_bridge.int_lines0] @@ -1411,8 +1420,8 @@ pio_addr=4273995776 pio_latency=1000 platform=system.pc system=system -int_port=system.iobus.port[10] -pio=system.iobus.port[9] +int_port=system.iobus.port[13] +pio=system.iobus.port[12] [system.pc.south_bridge.keyboard] type=I8042 @@ -1425,7 +1434,7 @@ pio_addr=0 pio_latency=1000 platform=system.pc system=system -pio=system.iobus.port[4] +pio=system.iobus.port[7] [system.pc.south_bridge.keyboard.keyboard_int_pin] type=X86IntSourcePin @@ -1443,7 +1452,7 @@ pio_latency=1000 platform=system.pc slave=system.pc.south_bridge.pic2 system=system -pio=system.iobus.port[5] +pio=system.iobus.port[8] [system.pc.south_bridge.pic1.output] type=X86IntSourcePin @@ -1458,7 +1467,7 @@ pio_latency=1000 platform=system.pc slave=Null system=system -pio=system.iobus.port[6] +pio=system.iobus.port[9] [system.pc.south_bridge.pic2.output] type=X86IntSourcePin @@ -1471,7 +1480,7 @@ pio_addr=9223372036854775872 pio_latency=1000 platform=system.pc system=system -pio=system.iobus.port[7] +pio=system.iobus.port[10] [system.pc.south_bridge.pit.int_pin] type=X86IntSourcePin @@ -1483,7 +1492,7 @@ pio_addr=9223372036854775905 pio_latency=1000 platform=system.pc system=system -pio=system.iobus.port[8] +pio=system.iobus.port[11] [system.physmem] type=PhysicalMemory diff --git a/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/simout b/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/simout index 18f42b689..873e1bea2 100755 --- a/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/simout +++ b/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/simout @@ -1,12 +1,13 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Jan 9 2012 20:47:38 -gem5 started Jan 9 2012 21:13:16 -gem5 executing on ribera.cs.wisc.edu -command line: build/X86_FS/gem5.fast -d build/X86_FS/tests/fast/long/10.linux-boot/x86/linux/pc-o3-timing -re tests/run.py build/X86_FS/tests/fast/long/10.linux-boot/x86/linux/pc-o3-timing +gem5 compiled Jan 23 2012 04:12:17 +gem5 started Jan 23 2012 08:29:15 +gem5 executing on zizzer +command line: build/X86_FS/gem5.opt -d build/X86_FS/tests/opt/long/10.linux-boot/x86/linux/pc-o3-timing -re tests/run.py build/X86_FS/tests/opt/long/10.linux-boot/x86/linux/pc-o3-timing warning: add_child('terminal'): child 'terminal' already has parent Global frequency set at 1000000000000 ticks per second -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: kernel located at: /dist/m5/system/binaries/x86_64-vmlinux-2.6.22.9 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 5161177988500 because m5_exit instruction encountered diff --git a/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt b/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt index e687ea7eb..c62526985 100644 --- a/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt +++ b/tests/long/10.linux-boot/ref/x86/linux/pc-o3-timing/stats.txt @@ -2,12 +2,23 @@ ---------- Begin Simulation Statistics ---------- sim_seconds 5.161178 # Number of seconds simulated sim_ticks 5161177988500 # Number of ticks simulated +final_tick 5161177988500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 384526 # Simulator instruction rate (inst/s) -host_tick_rate 2360358751 # Simulator tick rate (ticks/s) -host_mem_usage 386468 # Number of bytes of host memory used -host_seconds 2186.61 # Real time elapsed on the host +host_inst_rate 290092 # Simulator instruction rate (inst/s) +host_tick_rate 1780684720 # Simulator tick rate (ticks/s) +host_mem_usage 364016 # Number of bytes of host memory used +host_seconds 2898.42 # Real time elapsed on the host sim_insts 840808469 # Number of instructions simulated +system.physmem.bytes_read 16106624 # Number of bytes read from this memory +system.physmem.bytes_inst_read 1233856 # Number of instructions bytes read from this memory +system.physmem.bytes_written 12115136 # Number of bytes written to this memory +system.physmem.num_reads 251666 # Number of read requests responded to by this memory +system.physmem.num_writes 189299 # Number of write requests responded to by this memory +system.physmem.num_other 0 # Number of other requests responded to by this memory +system.physmem.bw_read 3120726 # Total read bandwidth from this memory (bytes/s) +system.physmem.bw_inst_read 239065 # Instruction read bandwidth from this memory (bytes/s) +system.physmem.bw_write 2347359 # Write bandwidth from this memory (bytes/s) +system.physmem.bw_total 5468085 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 169467 # number of replacements system.l2c.tagsinuse 38339.786444 # Cycle average of tags in use system.l2c.total_refs 3812924 # Total number of references to valid blocks. |