changeset b4249e884de4 in /z/repo/gem5 details: http://repo.gem5.org/gem5?cmd=changeset;node=b4249e884de4 description: ARM: Update stats for valgrind fix and replace config.inis which are out of date.
diffstat: tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini | 6 +- tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout | 10 +- tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt | 10 +- tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini | 156 +++++---- tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/simout | 13 +- tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt | 14 +- tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/status | 2 +- tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/system.terminal | 0 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/config.ini | 144 ++++---- tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/simout | 13 +- tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt | 14 +- tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/system.terminal | 0 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini | 156 +++++---- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout | 13 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt | 10 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/status | 2 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini | 144 ++++---- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout | 13 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt | 10 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/status | 2 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini | 156 +++++---- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout | 13 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt | 10 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/status | 2 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini | 144 ++++---- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout | 13 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt | 10 +- tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/status | 2 +- 28 files changed, 568 insertions(+), 514 deletions(-) diffs (truncated from 3412 to 300 lines): diff -r 9cf2327b7f5d -r b4249e884de4 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini Fri Mar 09 09:59:28 2012 -0500 +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/config.ini Fri Mar 09 09:59:29 2012 -0500 @@ -10,13 +10,13 @@ type=LinuxArmSystem children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver atags_addr=256 -boot_loader=/dist/m5/system/binaries/boot.arm +boot_loader=/projects/pd/randd/dist/binaries/boot.arm boot_loader_mem=system.realview.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=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 +kernel=/projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 load_addr_mask=268435455 machine_type=RealView_PBX mem_mode=timing @@ -63,7 +63,7 @@ [system.cf0.image.child] type=RawDiskImage -image_file=/dist/m5/system/disks/linux-arm-ael.img +image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img read_only=true [system.cpu] diff -r 9cf2327b7f5d -r b4249e884de4 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout Fri Mar 09 09:59:28 2012 -0500 +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/simout Fri Mar 09 09:59:29 2012 -0500 @@ -1,15 +1,15 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Mar 7 2012 20:12:09 -gem5 started Mar 7 2012 20:48:24 -gem5 executing on zizzer -command line: build/ARM/gem5.fast -d build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-checker -re tests/run.py build/ARM/tests/fast/long/fs/10.linux-boot/arm/linux/realview-o3-checker +gem5 compiled Mar 9 2012 08:32:03 +gem5 started Mar 9 2012 08:34:27 +gem5 executing on u200540-lin +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-checker -re tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-o3-checker The currently selected ARM platforms doesn't support the amount of DRAM you've selected. Please try another platform Global frequency set at 1000000000000 ticks per second -info: kernel located at: /dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 +info: kernel located at: /projects/pd/randd/dist/binaries/vmlinux.arm.smp.fb.2.6.38.8 info: Using bootloader at address 0x80000000 info: Entering event queue @ 0. Starting simulation... Exiting @ tick 2503289265500 because m5_exit instruction encountered diff -r 9cf2327b7f5d -r b4249e884de4 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt Fri Mar 09 09:59:28 2012 -0500 +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt Fri Mar 09 09:59:29 2012 -0500 @@ -4,11 +4,11 @@ sim_ticks 2503289265500 # Number of ticks simulated final_tick 2503289265500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 68005 # Simulator instruction rate (inst/s) -host_op_rate 87841 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 2863403297 # Simulator tick rate (ticks/s) -host_mem_usage 387312 # Number of bytes of host memory used -host_seconds 874.24 # Real time elapsed on the host +host_inst_rate 55466 # Simulator instruction rate (inst/s) +host_op_rate 71644 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 2335415954 # Simulator tick rate (ticks/s) +host_mem_usage 389340 # Number of bytes of host memory used +host_seconds 1071.88 # Real time elapsed on the host sim_insts 59452703 # Number of instructions simulated sim_ops 76793713 # Number of ops (including micro ops) simulated system.realview.nvmem.bytes_read 64 # Number of bytes read from this memory diff -r 9cf2327b7f5d -r b4249e884de4 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini Fri Mar 09 09:59:28 2012 -0500 +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/config.ini Fri Mar 09 09:59:29 2012 -0500 @@ -8,18 +8,19 @@ [system] type=LinuxArmSystem -children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus nvmem physmem realview terminal toL2Bus vncserver -boot_loader=/dist/m5/system/binaries/boot.arm -boot_loader_mem=system.nvmem +children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver +atags_addr=256 +boot_loader=/projects/pd/randd/dist/binaries/boot.arm +boot_loader_mem=system.realview.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=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8 +kernel=/projects/pd/randd/dist/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.realview.nvmem midr_regval=890224640 num_work_ids=16 physmem=system.physmem @@ -32,18 +33,18 @@ work_end_ckpt_count=0 work_end_exit_count=0 work_item_id=-1 -system_port=system.membus.port[7] +system_port=system.membus.slave[0] [system.bridge] type=Bridge delay=50000 nack_delay=4000 -ranges=268435456:520093695 1073741824:18446744073709551615 +ranges=268435456:520093695 1073741824:1610612735 req_size=16 resp_size=16 write_ack=false -master=system.iobus.port[0] -slave=system.membus.port[0] +master=system.iobus.slave[0] +slave=system.membus.master[0] [system.cf0] type=IdeDisk @@ -62,7 +63,7 @@ [system.cf0.image.child] type=RawDiskImage -image_file=/dist/m5/system/disks/linux-arm-ael.img +image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img read_only=true [system.cpu0] @@ -164,7 +165,7 @@ [system.cpu0.dcache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=4 block_size=64 forward_snoops=true @@ -185,7 +186,7 @@ two_queue=false write_buffers=8 cpu_side=system.cpu0.dcache_port -mem_side=system.toL2Bus.port[2] +mem_side=system.toL2Bus.slave[1] [system.cpu0.dtb] type=ArmTLB @@ -198,7 +199,7 @@ max_backoff=100000 min_backoff=0 sys=system -port=system.toL2Bus.port[4] +port=system.toL2Bus.slave[3] [system.cpu0.fuPool] type=FUPool @@ -465,7 +466,7 @@ [system.cpu0.icache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=1 block_size=64 forward_snoops=true @@ -486,7 +487,7 @@ two_queue=false write_buffers=8 cpu_side=system.cpu0.icache_port -mem_side=system.toL2Bus.port[1] +mem_side=system.toL2Bus.slave[0] [system.cpu0.interrupts] type=ArmInterrupts @@ -502,7 +503,7 @@ max_backoff=100000 min_backoff=0 sys=system -port=system.toL2Bus.port[3] +port=system.toL2Bus.slave[2] [system.cpu0.tracer] type=ExeTracer @@ -606,7 +607,7 @@ [system.cpu1.dcache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=4 block_size=64 forward_snoops=true @@ -627,7 +628,7 @@ two_queue=false write_buffers=8 cpu_side=system.cpu1.dcache_port -mem_side=system.toL2Bus.port[6] +mem_side=system.toL2Bus.slave[5] [system.cpu1.dtb] type=ArmTLB @@ -640,7 +641,7 @@ max_backoff=100000 min_backoff=0 sys=system -port=system.toL2Bus.port[8] +port=system.toL2Bus.slave[7] [system.cpu1.fuPool] type=FUPool @@ -907,7 +908,7 @@ [system.cpu1.icache] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=1 block_size=64 forward_snoops=true @@ -928,7 +929,7 @@ two_queue=false write_buffers=8 cpu_side=system.cpu1.icache_port -mem_side=system.toL2Bus.port[5] +mem_side=system.toL2Bus.slave[4] [system.cpu1.interrupts] type=ArmInterrupts @@ -944,7 +945,7 @@ max_backoff=100000 min_backoff=0 sys=system -port=system.toL2Bus.port[7] +port=system.toL2Bus.slave[6] [system.cpu1.tracer] type=ExeTracer @@ -961,11 +962,12 @@ header_cycles=1 use_default_range=false width=64 -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 +master=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.cf_ctrl.config 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 +slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma [system.iocache] type=BaseCache -addr_range=0:268435455 +addr_ranges=0:268435455 assoc=8 block_size=64 forward_snoops=false @@ -985,12 +987,12 @@ trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.iobus.port[28] -mem_side=system.membus.port[8] +cpu_side=system.iobus.master[25] +mem_side=system.membus.slave[1] [system.l2c] type=BaseCache -addr_range=0:18446744073709551615 +addr_ranges=0:18446744073709551615 assoc=8 block_size=64 forward_snoops=true @@ -1010,8 +1012,8 @@ trace_addr=0 two_queue=false write_buffers=8 -cpu_side=system.toL2Bus.port[0] -mem_side=system.membus.port[9] +cpu_side=system.toL2Bus.master[0] +mem_side=system.membus.slave[2] [system.membus] type=Bus @@ -1023,7 +1025,8 @@ use_default_range=false width=64 default=system.membus.badaddr_responder.pio -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 +master=system.bridge.slave system.realview.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 +slave=system.system_port system.iocache.mem_side system.l2c.mem_side [system.membus.badaddr_responder] type=IsaFake @@ -1041,16 +1044,6 @@ warn_access=warn pio=system.membus.default -[system.nvmem] -type=PhysicalMemory -file= -latency=30000 _______________________________________________ gem5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/gem5-dev
