From a17dbdf8834b84f05a8f5154a74ac819fe8adc7c Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Wed, 25 Jan 2012 17:19:50 +0000 Subject: stats: Update stats for final tick and memory bandwidth patches --- .../linux/realview-simple-atomic-dual/config.ini | 78 +++++++++++----------- .../arm/linux/realview-simple-atomic-dual/simout | 8 +-- .../linux/realview-simple-atomic-dual/stats.txt | 28 ++++++-- .../arm/linux/realview-simple-atomic/config.ini | 76 ++++++++++----------- .../ref/arm/linux/realview-simple-atomic/simout | 8 +-- .../ref/arm/linux/realview-simple-atomic/stats.txt | 28 ++++++-- .../linux/realview-simple-timing-dual/config.ini | 78 +++++++++++----------- .../arm/linux/realview-simple-timing-dual/simout | 8 +-- .../linux/realview-simple-timing-dual/stats.txt | 28 ++++++-- .../arm/linux/realview-simple-timing/config.ini | 76 ++++++++++----------- .../ref/arm/linux/realview-simple-timing/simout | 8 +-- .../ref/arm/linux/realview-simple-timing/stats.txt | 28 ++++++-- 12 files changed, 266 insertions(+), 186 deletions(-) (limited to 'tests/quick/10.linux-boot/ref/arm/linux') diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini index 9933a8e22..84e5e8c3f 100644 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini @@ -9,18 +9,19 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver boot_cpu_frequency=500 -boot_loader=/chips/pd/randd/dist/binaries/boot.arm +boot_loader=/dist/m5/system/binaries/boot.arm boot_loader_mem=system.nvmem boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1 flags_addr=268435504 gic_cpu_addr=520093952 init_param=0 -kernel=/chips/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 load_addr_mask=268435455 machine_type=RealView_PBX mem_mode=atomic -memories=system.nvmem system.physmem +memories=system.physmem system.nvmem midr_regval=890224640 +num_work_ids=16 physmem=system.physmem readfile=tests/halt.sh symbolfile= @@ -31,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 @@ -63,7 +62,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage -image_file=/chips/pd/randd/dist/disks/linux-arm-ael.img +image_file=/dist/m5/system/disks/linux-arm-ael.img read_only=true [system.cpu0] @@ -332,7 +331,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 @@ -363,8 +362,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 @@ -396,7 +395,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 @@ -408,7 +407,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 @@ -470,7 +469,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 @@ -524,9 +523,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 @@ -541,7 +540,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] @@ -552,7 +551,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 @@ -569,7 +568,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 @@ -591,7 +590,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 @@ -601,7 +600,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 @@ -611,7 +610,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 @@ -625,7 +624,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 @@ -639,7 +638,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 @@ -678,7 +677,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 @@ -699,7 +698,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 @@ -709,7 +708,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 @@ -719,7 +718,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 @@ -729,7 +728,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 @@ -739,7 +738,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 @@ -790,7 +789,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 @@ -800,7 +799,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 @@ -810,7 +809,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 @@ -820,7 +819,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 @@ -841,6 +840,7 @@ port=system.l2c.cpu_side system.cpu0.icache.mem_side system.cpu0.dcache.mem_side [system.vncserver] type=VncServer +frame_capture=false number=0 port=5900 diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout index 38da5afa6..417579719 100755 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout @@ -1,12 +1,12 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Aug 18 2011 16:54:46 -gem5 started Aug 18 2011 17:16:56 -gem5 executing on u200439-lin.austin.arm.com +gem5 compiled Jan 23 2012 04:21:22 +gem5 started Jan 23 2012 04:25:02 +gem5 executing on zizzer command line: build/ARM_FS/gem5.opt -d build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-atomic-dual -re tests/run.py build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-atomic-dual Global frequency set at 1000000000000 ticks per second -info: kernel located at: /chips/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 info: Using bootloader at address 0x80000000 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 2411694099500 because m5_exit instruction encountered diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt index 7f6e2a888..2ca0aa5cb 100644 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt @@ -2,12 +2,32 @@ ---------- Begin Simulation Statistics ---------- sim_seconds 2.411694 # Number of seconds simulated sim_ticks 2411694099500 # Number of ticks simulated +final_tick 2411694099500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1186264 # Simulator instruction rate (inst/s) -host_tick_rate 35957520604 # Simulator tick rate (ticks/s) -host_mem_usage 417168 # Number of bytes of host memory used -host_seconds 67.07 # Real time elapsed on the host +host_inst_rate 2039542 # Simulator instruction rate (inst/s) +host_tick_rate 61821688958 # Simulator tick rate (ticks/s) +host_mem_usage 378872 # Number of bytes of host memory used +host_seconds 39.01 # Real time elapsed on the host sim_insts 79563488 # Number of instructions simulated +system.nvmem.bytes_read 68 # Number of bytes read from this memory +system.nvmem.bytes_inst_read 68 # Number of instructions bytes read from this memory +system.nvmem.bytes_written 0 # Number of bytes written to this memory +system.nvmem.num_reads 17 # 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 28 # Total read bandwidth from this memory (bytes/s) +system.nvmem.bw_inst_read 28 # Instruction read bandwidth from this memory (bytes/s) +system.nvmem.bw_total 28 # Total bandwidth to/from this memory (bytes/s) +system.physmem.bytes_read 123270308 # Number of bytes read from this memory +system.physmem.bytes_inst_read 1011392 # Number of instructions bytes read from this memory +system.physmem.bytes_written 10185232 # Number of bytes written to this memory +system.physmem.num_reads 14146769 # Number of read requests responded to by this memory +system.physmem.num_writes 869038 # 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 51113575 # Total read bandwidth from this memory (bytes/s) +system.physmem.bw_inst_read 419370 # Instruction read bandwidth from this memory (bytes/s) +system.physmem.bw_write 4223269 # Write bandwidth from this memory (bytes/s) +system.physmem.bw_total 55336844 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 127720 # number of replacements system.l2c.tagsinuse 25547.920863 # Cycle average of tags in use system.l2c.total_refs 1498989 # Total number of references to valid blocks. diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini index f7597645c..5b5bd9164 100644 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini @@ -9,18 +9,19 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 cpu intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver boot_cpu_frequency=500 -boot_loader=/chips/pd/randd/dist/binaries/boot.arm +boot_loader=/dist/m5/system/binaries/boot.arm boot_loader_mem=system.nvmem boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1 flags_addr=268435504 gic_cpu_addr=520093952 init_param=0 -kernel=/chips/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 load_addr_mask=268435455 machine_type=RealView_PBX mem_mode=atomic memories=system.nvmem system.physmem midr_regval=890224640 +num_work_ids=16 physmem=system.physmem readfile=tests/halt.sh symbolfile= @@ -31,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 @@ -63,7 +62,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage -image_file=/chips/pd/randd/dist/disks/linux-arm-ael.img +image_file=/dist/m5/system/disks/linux-arm-ael.img read_only=true [system.cpu] @@ -205,7 +204,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 @@ -236,8 +235,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 @@ -269,7 +268,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 @@ -281,7 +280,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 @@ -343,7 +342,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 @@ -397,9 +396,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 @@ -414,7 +413,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] @@ -425,7 +424,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 @@ -442,7 +441,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 @@ -464,7 +463,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 @@ -474,7 +473,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 @@ -484,7 +483,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 @@ -498,7 +497,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 @@ -512,7 +511,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 @@ -551,7 +550,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 @@ -572,7 +571,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 @@ -582,7 +581,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 @@ -592,7 +591,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 @@ -602,7 +601,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 @@ -612,7 +611,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 @@ -663,7 +662,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 @@ -673,7 +672,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 @@ -683,7 +682,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 @@ -693,7 +692,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 @@ -714,6 +713,7 @@ port=system.l2c.cpu_side system.cpu.icache.mem_side system.cpu.dcache.mem_side s [system.vncserver] type=VncServer +frame_capture=false number=0 port=5900 diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout index 832aec59f..e355498ce 100755 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout @@ -1,12 +1,12 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Aug 18 2011 16:54:46 -gem5 started Aug 18 2011 17:16:56 -gem5 executing on u200439-lin.austin.arm.com +gem5 compiled Jan 23 2012 04:21:22 +gem5 started Jan 23 2012 04:24:55 +gem5 executing on zizzer command line: build/ARM_FS/gem5.opt -d build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-atomic -re tests/run.py build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-atomic Global frequency set at 1000000000000 ticks per second -info: kernel located at: /chips/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 info: Using bootloader at address 0x80000000 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 2332316587000 because m5_exit instruction encountered diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt index c4ace942b..e3050fa31 100644 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt @@ -2,12 +2,32 @@ ---------- Begin Simulation Statistics ---------- sim_seconds 2.332317 # Number of seconds simulated sim_ticks 2332316587000 # Number of ticks simulated +final_tick 2332316587000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1407778 # Simulator instruction rate (inst/s) -host_tick_rate 42901571145 # Simulator tick rate (ticks/s) -host_mem_usage 417476 # Number of bytes of host memory used -host_seconds 54.36 # Real time elapsed on the host +host_inst_rate 2072038 # Simulator instruction rate (inst/s) +host_tick_rate 63144661085 # Simulator tick rate (ticks/s) +host_mem_usage 379208 # Number of bytes of host memory used +host_seconds 36.94 # Real time elapsed on the host sim_insts 76532931 # Number of instructions simulated +system.nvmem.bytes_read 20 # Number of bytes read from this memory +system.nvmem.bytes_inst_read 20 # Number of instructions bytes read from this memory +system.nvmem.bytes_written 0 # Number of bytes written to this memory +system.nvmem.num_reads 5 # 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 9 # Total read bandwidth from this memory (bytes/s) +system.nvmem.bw_inst_read 9 # Instruction read bandwidth from this memory (bytes/s) +system.nvmem.bw_total 9 # Total bandwidth to/from this memory (bytes/s) +system.physmem.bytes_read 122663536 # Number of bytes read from this memory +system.physmem.bytes_inst_read 941280 # Number of instructions bytes read from this memory +system.physmem.bytes_written 9577800 # Number of bytes written to this memory +system.physmem.num_reads 14137126 # Number of read requests responded to by this memory +system.physmem.num_writes 856485 # 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 52593004 # Total read bandwidth from this memory (bytes/s) +system.physmem.bw_inst_read 403582 # Instruction read bandwidth from this memory (bytes/s) +system.physmem.bw_write 4106561 # Write bandwidth from this memory (bytes/s) +system.physmem.bw_total 56699565 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 116822 # number of replacements system.l2c.tagsinuse 24240.388378 # Cycle average of tags in use system.l2c.total_refs 1520830 # Total number of references to valid blocks. diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini index 7186b34ef..82d6c82a5 100644 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini @@ -9,18 +9,19 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver boot_cpu_frequency=500 -boot_loader=/chips/pd/randd/dist/binaries/boot.arm +boot_loader=/dist/m5/system/binaries/boot.arm boot_loader_mem=system.nvmem boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1 flags_addr=268435504 gic_cpu_addr=520093952 init_param=0 -kernel=/chips/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 load_addr_mask=268435455 machine_type=RealView_PBX mem_mode=timing -memories=system.nvmem system.physmem +memories=system.physmem system.nvmem midr_regval=890224640 +num_work_ids=16 physmem=system.physmem readfile=tests/halt.sh symbolfile= @@ -31,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 @@ -63,7 +62,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage -image_file=/chips/pd/randd/dist/disks/linux-arm-ael.img +image_file=/dist/m5/system/disks/linux-arm-ael.img read_only=true [system.cpu0] @@ -326,7 +325,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 @@ -357,8 +356,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 @@ -390,7 +389,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 @@ -402,7 +401,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 @@ -464,7 +463,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 @@ -518,9 +517,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 @@ -535,7 +534,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] @@ -546,7 +545,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 @@ -563,7 +562,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 @@ -585,7 +584,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 @@ -595,7 +594,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 @@ -605,7 +604,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 @@ -619,7 +618,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 @@ -633,7 +632,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 @@ -672,7 +671,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 @@ -693,7 +692,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 @@ -703,7 +702,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 @@ -713,7 +712,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 @@ -723,7 +722,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 @@ -733,7 +732,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 @@ -784,7 +783,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 @@ -794,7 +793,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 @@ -804,7 +803,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 @@ -814,7 +813,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 @@ -835,6 +834,7 @@ port=system.l2c.cpu_side system.cpu0.icache.mem_side system.cpu0.dcache.mem_side [system.vncserver] type=VncServer +frame_capture=false number=0 port=5900 diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout index d4218de20..2f40c0e53 100755 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout @@ -1,12 +1,12 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Aug 18 2011 16:54:46 -gem5 started Aug 18 2011 17:16:56 -gem5 executing on u200439-lin.austin.arm.com +gem5 compiled Jan 23 2012 04:21:22 +gem5 started Jan 23 2012 04:25:02 +gem5 executing on zizzer command line: build/ARM_FS/gem5.opt -d build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-timing-dual -re tests/run.py build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-timing-dual Global frequency set at 1000000000000 ticks per second -info: kernel located at: /chips/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 info: Using bootloader at address 0x80000000 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 2669611225000 because m5_exit instruction encountered diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt index 4e104d3a4..6f6f084e3 100644 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt @@ -2,12 +2,32 @@ ---------- Begin Simulation Statistics ---------- sim_seconds 2.669611 # Number of seconds simulated sim_ticks 2669611225000 # Number of ticks simulated +final_tick 2669611225000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 491804 # Simulator instruction rate (inst/s) -host_tick_rate 16743499108 # Simulator tick rate (ticks/s) -host_mem_usage 418920 # Number of bytes of host memory used -host_seconds 159.44 # Real time elapsed on the host +host_inst_rate 842154 # Simulator instruction rate (inst/s) +host_tick_rate 28671225175 # Simulator tick rate (ticks/s) +host_mem_usage 380676 # Number of bytes of host memory used +host_seconds 93.11 # Real time elapsed on the host sim_insts 78413959 # Number of instructions simulated +system.nvmem.bytes_read 68 # Number of bytes read from this memory +system.nvmem.bytes_inst_read 68 # Number of instructions bytes read from this memory +system.nvmem.bytes_written 0 # Number of bytes written to this memory +system.nvmem.num_reads 17 # 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 25 # Total read bandwidth from this memory (bytes/s) +system.nvmem.bw_inst_read 25 # Instruction read bandwidth from this memory (bytes/s) +system.nvmem.bw_total 25 # Total bandwidth to/from this memory (bytes/s) +system.physmem.bytes_read 134334820 # Number of bytes read from this memory +system.physmem.bytes_inst_read 1003520 # Number of instructions bytes read from this memory +system.physmem.bytes_written 10194256 # Number of bytes written to this memory +system.physmem.num_reads 15523876 # Number of read requests responded to by this memory +system.physmem.num_writes 869239 # 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 50319994 # Total read bandwidth from this memory (bytes/s) +system.physmem.bw_inst_read 375905 # Instruction read bandwidth from this memory (bytes/s) +system.physmem.bw_write 3818629 # Write bandwidth from this memory (bytes/s) +system.physmem.bw_total 54138623 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 127749 # number of replacements system.l2c.tagsinuse 26172.513439 # Cycle average of tags in use system.l2c.total_refs 1540412 # Total number of references to valid blocks. diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini index 8c21a92dd..b4466ea53 100644 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini @@ -9,18 +9,19 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 cpu intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver boot_cpu_frequency=500 -boot_loader=/chips/pd/randd/dist/binaries/boot.arm +boot_loader=/dist/m5/system/binaries/boot.arm boot_loader_mem=system.nvmem boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1 flags_addr=268435504 gic_cpu_addr=520093952 init_param=0 -kernel=/chips/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 load_addr_mask=268435455 machine_type=RealView_PBX mem_mode=timing memories=system.nvmem system.physmem midr_regval=890224640 +num_work_ids=16 physmem=system.physmem readfile=tests/halt.sh symbolfile= @@ -31,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 @@ -63,7 +62,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage -image_file=/chips/pd/randd/dist/disks/linux-arm-ael.img +image_file=/dist/m5/system/disks/linux-arm-ael.img read_only=true [system.cpu] @@ -202,7 +201,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 @@ -233,8 +232,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 @@ -266,7 +265,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 @@ -278,7 +277,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 @@ -340,7 +339,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 @@ -394,9 +393,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 @@ -411,7 +410,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] @@ -422,7 +421,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 @@ -439,7 +438,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 @@ -461,7 +460,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 @@ -471,7 +470,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 @@ -481,7 +480,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 @@ -495,7 +494,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 @@ -509,7 +508,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 @@ -548,7 +547,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 @@ -569,7 +568,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 @@ -579,7 +578,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 @@ -589,7 +588,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 @@ -599,7 +598,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 @@ -609,7 +608,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 @@ -660,7 +659,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 @@ -670,7 +669,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 @@ -680,7 +679,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 @@ -690,7 +689,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 @@ -711,6 +710,7 @@ port=system.l2c.cpu_side system.cpu.icache.mem_side system.cpu.dcache.mem_side s [system.vncserver] type=VncServer +frame_capture=false number=0 port=5900 diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/simout b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/simout index 8eb08f81f..661533caf 100755 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/simout +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/simout @@ -1,12 +1,12 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Aug 18 2011 16:54:46 -gem5 started Aug 18 2011 17:16:56 -gem5 executing on u200439-lin.austin.arm.com +gem5 compiled Jan 23 2012 04:21:22 +gem5 started Jan 23 2012 04:25:02 +gem5 executing on zizzer command line: build/ARM_FS/gem5.opt -d build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-timing -re tests/run.py build/ARM_FS/tests/opt/quick/10.linux-boot/arm/linux/realview-simple-timing Global frequency set at 1000000000000 ticks per second -info: kernel located at: /chips/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 +info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 info: Using bootloader at address 0x80000000 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 2591441692000 because m5_exit instruction encountered diff --git a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt index 6e7850295..543720998 100644 --- a/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt +++ b/tests/quick/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt @@ -2,12 +2,32 @@ ---------- Begin Simulation Statistics ---------- sim_seconds 2.591442 # Number of seconds simulated sim_ticks 2591441692000 # Number of ticks simulated +final_tick 2591441692000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 610490 # Simulator instruction rate (inst/s) -host_tick_rate 20960550015 # Simulator tick rate (ticks/s) -host_mem_usage 417836 # Number of bytes of host memory used -host_seconds 123.63 # Real time elapsed on the host +host_inst_rate 852555 # Simulator instruction rate (inst/s) +host_tick_rate 29271571690 # Simulator tick rate (ticks/s) +host_mem_usage 379496 # Number of bytes of host memory used +host_seconds 88.53 # Real time elapsed on the host sim_insts 75477515 # Number of instructions simulated +system.nvmem.bytes_read 20 # Number of bytes read from this memory +system.nvmem.bytes_inst_read 20 # Number of instructions bytes read from this memory +system.nvmem.bytes_written 0 # Number of bytes written to this memory +system.nvmem.num_reads 5 # 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 8 # Total read bandwidth from this memory (bytes/s) +system.nvmem.bw_inst_read 8 # Instruction read bandwidth from this memory (bytes/s) +system.nvmem.bw_total 8 # Total bandwidth to/from this memory (bytes/s) +system.physmem.bytes_read 133655408 # Number of bytes read from this memory +system.physmem.bytes_inst_read 949920 # Number of instructions bytes read from this memory +system.physmem.bytes_written 9634312 # Number of bytes written to this memory +system.physmem.num_reads 15513098 # Number of read requests responded to by this memory +system.physmem.num_writes 857428 # 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 51575696 # Total read bandwidth from this memory (bytes/s) +system.physmem.bw_inst_read 366560 # Instruction read bandwidth from this memory (bytes/s) +system.physmem.bw_write 3717742 # Write bandwidth from this memory (bytes/s) +system.physmem.bw_total 55293438 # Total bandwidth to/from this memory (bytes/s) system.l2c.replacements 117809 # number of replacements system.l2c.tagsinuse 24928.376904 # Cycle average of tags in use system.l2c.total_refs 1535240 # Total number of references to valid blocks. -- cgit v1.2.3