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 --- .../ref/arm/linux/realview-minor-dual/config.ini | 121 ++++++++++++++++++++- .../ref/arm/linux/realview-minor-dual/simout | 8 +- .../ref/arm/linux/realview-minor-dual/stats.txt | 20 +++- 3 files changed, 134 insertions(+), 15 deletions(-) (limited to 'tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual') diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini index 4e40ecf7a..1ce6d2d3e 100644 --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/config.ini @@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus 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 cache_line_size=64 clk_domain=system.clk_domain -dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb +dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb early_kernel_symbols=false enable_context_switch_stats_dump=false eventq_index=0 @@ -28,7 +28,7 @@ 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 @@ -42,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 @@ -85,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] @@ -2254,6 +2254,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 @@ -2264,6 +2265,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 diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout index 6375e36ce..7ec39e811 100755 --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/simout @@ -1,15 +1,13 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled May 6 2015 17:58:20 -gem5 started May 6 2015 20:43:49 +gem5 compiled Aug 7 2015 10:13:08 +gem5 started Aug 7 2015 10:47:25 gem5 executing on e104799-lin command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-minor-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-minor-dual Global frequency set at 1000000000000 ticks per second info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 - 0: system.cpu0.isa: ISA system set to: 0x50ed000 0x50ed000 - 0: system.cpu1.isa: ISA system set to: 0x50ed000 0x50ed000 info: Using bootloader at address 0x10 info: Using kernel entry physical address at 0x80008000 info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000 @@ -29,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 2846106511000 because m5_exit instruction encountered +Exiting @ tick 2846057099000 because m5_exit instruction encountered diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt index 5b4459bdf..934713496 100644 --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-minor-dual/stats.txt @@ -4,11 +4,11 @@ sim_seconds 2.846057 # Nu sim_ticks 2846057099000 # Number of ticks simulated final_tick 2846057099000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 155095 # Simulator instruction rate (inst/s) -host_op_rate 187821 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 3461671389 # Simulator tick rate (ticks/s) -host_mem_usage 654788 # Number of bytes of host memory used -host_seconds 822.16 # Real time elapsed on the host +host_inst_rate 157157 # Simulator instruction rate (inst/s) +host_op_rate 190318 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 3507683540 # Simulator tick rate (ticks/s) +host_mem_usage 605024 # Number of bytes of host memory used +host_seconds 811.38 # Real time elapsed on the host sim_insts 127513349 # Number of instructions simulated sim_ops 154419501 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -2933,6 +2933,16 @@ 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 system.toL2Bus.trans_dist::ReadReq 38668 # Transaction distribution system.toL2Bus.trans_dist::ReadResp 519865 # Transaction distribution system.toL2Bus.trans_dist::WriteReq 31161 # Transaction distribution -- cgit v1.2.3