From 023f6eb0f2093ea8ccd706353db6c3afa34c3a4d Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 7 Aug 2015 15:39:17 +0100 Subject: stats: Update ARM stats to include programmable oscillators --- .../arm/linux/realview-simple-atomic/config.ini | 146 ++++++++++++++++++--- .../ref/arm/linux/realview-simple-atomic/simout | 17 ++- .../ref/arm/linux/realview-simple-atomic/stats.txt | 20 ++- .../linux/realview-simple-atomic/system.terminal | 6 +- 4 files changed, 152 insertions(+), 37 deletions(-) (limited to 'tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic') diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini index 089dbf6ee..92530cc80 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini @@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain atags_addr=134217728 -boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm +boot_loader=/work/gem5/dist/binaries/boot_emm.arm boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1 -boot_release_addr=65528 cache_line_size=64 clk_domain=system.clk_domain -dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb +dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb early_kernel_symbols=false enable_context_switch_stats_dump=false eventq_index=0 flags_addr=469827632 gic_cpu_addr=738205696 -have_generic_timer=false have_large_asid_64=false have_lpae=false have_security=false have_virtualization=false highest_el_is_64=false init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5 +kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 kernel_addr_check=true load_addr_mask=268435455 load_offset=2147483648 @@ -44,7 +42,7 @@ num_work_ids=16 panic_on_oops=true panic_on_panic=true phys_addr_range_64=40 -readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh +readfile=/work/gem5/outgoing/gem5/tests/halt.sh reset_addr_64=0 symbolfile= work_begin_ckpt_count=0 @@ -87,7 +85,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage eventq_index=0 -image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img +image_file=/work/gem5/dist/disks/linux-aarch32-ael.img read_only=true [system.clk_domain] @@ -147,7 +145,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=2 -is_top_level=true +is_read_only=false max_miss_count=0 mshrs=4 prefetch_on_access=false @@ -158,7 +156,6 @@ size=32768 system=system tags=system.cpu.dcache.tags tgts_per_mshr=20 -two_queue=false write_buffers=8 cpu_side=system.cpu.dcache_port mem_side=system.cpu.toL2Bus.slave[1] @@ -224,7 +221,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=2 -is_top_level=true +is_read_only=true max_miss_count=0 mshrs=4 prefetch_on_access=false @@ -235,7 +232,6 @@ size=32768 system=system tags=system.cpu.icache.tags tgts_per_mshr=20 -two_queue=false write_buffers=8 cpu_side=system.cpu.icache_port mem_side=system.cpu.toL2Bus.slave[0] @@ -335,7 +331,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=20 -is_top_level=false +is_read_only=false max_miss_count=0 mshrs=20 prefetch_on_access=false @@ -346,7 +342,6 @@ size=4194304 system=system tags=system.cpu.l2cache.tags tgts_per_mshr=12 -two_queue=false write_buffers=8 cpu_side=system.cpu.toL2Bus.master[0] mem_side=system.membus.slave[2] @@ -424,7 +419,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=false hit_latency=50 -is_top_level=true +is_read_only=false max_miss_count=0 mshrs=20 prefetch_on_access=false @@ -435,7 +430,6 @@ size=1024 system=system tags=system.iocache.tags tgts_per_mshr=12 -two_queue=false write_buffers=8 cpu_side=system.iobus.master[27] mem_side=system.membus.slave[3] @@ -464,7 +458,7 @@ system=system use_default_range=false width=16 default=system.membus.badaddr_responder.pio -master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port +master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port slave=system.realview.hdlcd.dma system.system_port system.cpu.l2cache.mem_side system.iocache.mem_side [system.membus.badaddr_responder] @@ -739,7 +733,8 @@ pio=system.iobus.master[25] type=GenericTimer eventq_index=0 gic=system.realview.gic -int_num=29 +int_phys=29 +int_virt=27 system=system [system.realview.gic] @@ -752,7 +747,6 @@ dist_pio_delay=10000 eventq_index=0 int_latency=10000 it_lines=128 -msix_addr=0 platform=system.realview system=system pio=system.membus.master[2] @@ -770,6 +764,7 @@ pio_latency=10000 pixel_clock=7299 system=system vnc=system.vncserver +workaround_swap_rb=true dma=system.membus.slave[0] pio=system.iobus.master[5] @@ -939,7 +934,7 @@ int_num_watchdog=30 pio_addr=738721792 pio_latency=100000 system=system -pio=system.membus.master[3] +pio=system.membus.master[4] [system.realview.mmc_fake] type=AmbaFake @@ -979,6 +974,7 @@ pio=system.iobus.default [system.realview.realview_io] type=RealViewCtrl +children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus clk_domain=system.clk_domain eventq_index=0 idreg=35979264 @@ -989,6 +985,116 @@ proc_id1=335544320 system=system pio=system.iobus.master[1] +[system.realview.realview_io.osc_clcd] +type=RealViewOsc +dcc=0 +device=1 +eventq_index=0 +freq=42105 +parent=system.realview.realview_io +position=0 +site=0 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_cpu] +type=RealViewOsc +dcc=0 +device=0 +eventq_index=0 +freq=16667 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_ddr] +type=RealViewOsc +dcc=0 +device=8 +eventq_index=0 +freq=25000 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_hsbm] +type=RealViewOsc +dcc=0 +device=4 +eventq_index=0 +freq=25000 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_mcc] +type=RealViewOsc +dcc=0 +device=0 +eventq_index=0 +freq=20000 +parent=system.realview.realview_io +position=0 +site=0 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_peripheral] +type=RealViewOsc +dcc=0 +device=2 +eventq_index=0 +freq=41667 +parent=system.realview.realview_io +position=0 +site=0 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_pxl] +type=RealViewOsc +dcc=0 +device=5 +eventq_index=0 +freq=42105 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_smb] +type=RealViewOsc +dcc=0 +device=6 +eventq_index=0 +freq=20000 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_sys] +type=RealViewOsc +dcc=0 +device=7 +eventq_index=0 +freq=16667 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_system_bus] +type=RealViewOsc +dcc=0 +device=4 +eventq_index=0 +freq=41667 +parent=system.realview.realview_io +position=0 +site=0 +voltage_domain=system.voltage_domain + [system.realview.rtc] type=PL031 amba_id=3412017 @@ -1121,7 +1227,7 @@ platform=system.realview ppint=25 system=system vcpu_addr=738222080 -pio=system.membus.master[4] +pio=system.membus.master[3] [system.realview.vram] type=SimpleMemory diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout index f25d6db4c..cc8e1e24f 100755 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout @@ -1,18 +1,17 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Oct 31 2014 10:01:44 -gem5 started Oct 31 2014 11:25:21 -gem5 executing on u200540-lin -command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic +gem5 compiled Aug 7 2015 10:13:08 +gem5 started Aug 7 2015 10:13:29 +gem5 executing on e104799-lin +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic + Global frequency set at 1000000000000 ticks per second -info: kernel located at: /dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 - 0: system.cpu.isa: ISA system set to: 0x5299680 0x5299680 +info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 info: Using bootloader at address 0x10 info: Using kernel entry physical address at 0x80008000 -info: Loading DTB file: /dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000 +info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000 info: Entering event queue @ 0. Starting simulation... -info: Read CNTFREQ_EL0 frequency info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 @@ -28,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 -Exiting @ tick 2783854177000 because m5_exit instruction encountered +Exiting @ tick 2783867052000 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt index 19a0730a6..33ede6cdf 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt @@ -4,11 +4,11 @@ sim_seconds 2.783867 # Nu sim_ticks 2783867052000 # Number of ticks simulated final_tick 2783867052000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1280569 # Simulator instruction rate (inst/s) -host_op_rate 1558887 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 24969250003 # Simulator tick rate (ticks/s) -host_mem_usage 621096 # Number of bytes of host memory used -host_seconds 111.49 # Real time elapsed on the host +host_inst_rate 1188421 # Simulator instruction rate (inst/s) +host_op_rate 1446712 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 23172506899 # Simulator tick rate (ticks/s) +host_mem_usage 571472 # Number of bytes of host memory used +host_seconds 120.14 # Real time elapsed on the host sim_insts 142772879 # Number of instructions simulated sim_ops 173803124 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -746,5 +746,15 @@ system.realview.ethernet.totalRxOrn 0 # to system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post system.realview.ethernet.postedInterrupts 0 # number of posts to CPU system.realview.ethernet.droppedPackets 0 # number of packets dropped +system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks +system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks +system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks +system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks +system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks +system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks +system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks +system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks +system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks +system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks ---------- End Simulation Statistics ---------- diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal index b3be0ec54..ad91d76dd 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal @@ -193,7 +193,7 @@ oprofile: using timer interrupt. TCP: cubic registered NET: Registered protocol family 10 NET: Registered protocol family 17 -rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200) +rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000) ALSA device list: No soundcards found. input: AT Raw Set 2 keyboard as /devices/smb.14/motherboard.15/iofpga.17/1c060000.kmi/serio0/input/input0 @@ -203,6 +203,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000) init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST) starting pid 673, tty '': '/etc/rc.d/rc.local' warning: can't open /etc/mtab: No such file or directory -Thu Jan 1 12:00:02 UTC 2009 +Thu Jan 1 00:00:02 UTC 2009 S: devpts -Thu Jan 1 12:00:02 UTC 2009 +Thu Jan 1 00:00:02 UTC 2009 -- cgit v1.2.3