stats: Update ARM stats to include programmable oscillators

3 files changed, 130 insertions, 9 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini
index e73de7c57..fa71746e2 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/config.ini
@@ -42,7 +42,7 @@ num_work_ids=16
 panic_on_oops=true
 panic_on_panic=true
 phys_addr_range_64=40
-readfile=/work/gem5/outgoing/gem5_3/tests/halt.sh
+readfile=/work/gem5/outgoing/gem5/tests/halt.sh
 reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
@@ -2273,6 +2273,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
@@ -2283,6 +2284,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-switcheroo-full/simout b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout
index 6d0661457..5454319fd 100755
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/simout
@@ -1,9 +1,9 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Jul 31 2015 14:34:49
-gem5 started Jul 31 2015 14:34:58
+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-switcheroo-full -re /work/gem5/outgoing/gem5_3/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-full
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-full -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-full
 
 Global frequency set at 1000000000000 ticks per second
diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
index c5b3bbc72..19db0f3e8 100644
--- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
+++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-full/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.823474                       # Nu
 sim_ticks                                2823473696000                       # Number of ticks simulated
 final_tick                               2823473696000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 536168                       # Simulator instruction rate (inst/s)
-host_op_rate                                   650376                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            12315198448                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 577764                       # Number of bytes of host memory used
-host_seconds                                   229.27                       # Real time elapsed on the host
+host_inst_rate                                 253388                       # Simulator instruction rate (inst/s)
+host_op_rate                                   307362                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             5820051646                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 579664                       # Number of bytes of host memory used
+host_seconds                                   485.13                       # Real time elapsed on the host
 sim_insts                                   122925898                       # Number of instructions simulated
 sim_ops                                     149109939                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -2922,6 +2922,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             112246                       # Transaction distribution
 system.toL2Bus.trans_dist::ReadResp           2626935                       # Transaction distribution
 system.toL2Bus.trans_dist::WriteReq             27565                       # Transaction distribution