stats: updates due to changes to ticksToCycles()

2 files changed, 115 insertions, 37 deletions

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 4246eb19f..196c32809 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
@@ -1,7 +1,9 @@
 [root]
 type=Root
 children=system
+eventq_index=0
 full_system=true
+sim_quantum=0
 time_sync_enable=false
 time_sync_period=100000000000
 time_sync_spin_threshold=100000000
@@ -10,17 +12,18 @@ time_sync_spin_threshold=100000000
 type=LinuxArmSystem
 children=bridge cf0 clk_domain cpu cpu_clk_domain intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
 atags_addr=256
-boot_loader=/dist/m5/system/binaries/boot.arm
+boot_loader=/scratch/nilay/GEM5/system/binaries/boot.arm
 boot_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
 cache_line_size=64
 clk_domain=system.clk_domain
-dtb_filename=False
+dtb_filename=
 early_kernel_symbols=false
 enable_context_switch_stats_dump=false
+eventq_index=0
 flags_addr=268435504
 gic_cpu_addr=520093952
 init_param=0
-kernel=/dist/m5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
+kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.arm.smp.fb.2.6.38.8
 load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=atomic
@@ -45,6 +48,7 @@ system_port=system.membus.slave[0]
 type=Bridge
 clk_domain=system.clk_domain
 delay=50000
+eventq_index=0
 ranges=268435456:520093695 1073741824:1610612735
 req_size=16
 resp_size=16
@@ -56,24 +60,28 @@ type=IdeDisk
 children=image
 delay=1000000
 driveID=master
+eventq_index=0
 image=system.cf0.image
 
 [system.cf0.image]
 type=CowDiskImage
 children=child
 child=system.cf0.image.child
+eventq_index=0
 image_file=
 read_only=false
 table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-arm-ael.img
+eventq_index=0
+image_file=/scratch/nilay/GEM5/system/disks/linux-arm-ael.img
 read_only=true
 
 [system.clk_domain]
 type=SrcClockDomain
 clock=1000
+eventq_index=0
 voltage_domain=system.voltage_domain
 
 [system.cpu]
@@ -86,6 +94,7 @@ do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
 dtb=system.cpu.dtb
+eventq_index=0
 fastmem=false
 function_trace=false
 function_trace_start=0
@@ -119,6 +128,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 forward_snoops=true
 hit_latency=2
 is_top_level=true
@@ -141,18 +151,21 @@ type=LRU
 assoc=4
 block_size=64
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 hit_latency=2
 size=32768
 
 [system.cpu.dtb]
 type=ArmTLB
 children=walker
+eventq_index=0
 size=64
 walker=system.cpu.dtb.walker
 
 [system.cpu.dtb.walker]
 type=ArmTableWalker
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 num_squash_per_cycle=2
 sys=system
 port=system.cpu.toL2Bus.slave[3]
@@ -163,6 +176,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=1
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 forward_snoops=true
 hit_latency=2
 is_top_level=true
@@ -185,14 +199,17 @@ type=LRU
 assoc=1
 block_size=64
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 hit_latency=2
 size=32768
 
 [system.cpu.interrupts]
 type=ArmInterrupts
+eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+eventq_index=0
 fpsid=1090793632
 id_isar0=34607377
 id_isar1=34677009
@@ -211,12 +228,14 @@ midr=890224640
 [system.cpu.itb]
 type=ArmTLB
 children=walker
+eventq_index=0
 size=64
 walker=system.cpu.itb.walker
 
 [system.cpu.itb.walker]
 type=ArmTableWalker
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 num_squash_per_cycle=2
 sys=system
 port=system.cpu.toL2Bus.slave[2]
@@ -227,6 +246,7 @@ children=tags
 addr_ranges=0:18446744073709551615
 assoc=8
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 forward_snoops=true
 hit_latency=20
 is_top_level=false
@@ -249,12 +269,14 @@ type=LRU
 assoc=8
 block_size=64
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 hit_latency=20
 size=4194304
 
 [system.cpu.toL2Bus]
 type=CoherentBus
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 header_cycles=1
 system=system
 use_default_range=false
@@ -264,19 +286,23 @@ slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walke
 
 [system.cpu.tracer]
 type=ExeTracer
+eventq_index=0
 
 [system.cpu_clk_domain]
 type=SrcClockDomain
 clock=500
+eventq_index=0
 voltage_domain=system.voltage_domain
 
 [system.intrctrl]
 type=IntrControl
+eventq_index=0
 sys=system
 
 [system.iobus]
 type=NoncoherentBus
 clk_domain=system.clk_domain
+eventq_index=0
 header_cycles=1
 use_default_range=false
 width=8
@@ -289,6 +315,7 @@ children=tags
 addr_ranges=0:134217727
 assoc=8
 clk_domain=system.clk_domain
+eventq_index=0
 forward_snoops=false
 hit_latency=50
 is_top_level=true
@@ -311,6 +338,7 @@ type=LRU
 assoc=8
 block_size=64
 clk_domain=system.clk_domain
+eventq_index=0
 hit_latency=50
 size=1024
 
@@ -318,6 +346,7 @@ size=1024
 type=CoherentBus
 children=badaddr_responder
 clk_domain=system.clk_domain
+eventq_index=0
 header_cycles=1
 system=system
 use_default_range=false
@@ -329,6 +358,7 @@ slave=system.system_port system.cpu.l2cache.mem_side system.iocache.mem_side
 [system.membus.badaddr_responder]
 type=IsaFake
 clk_domain=system.clk_domain
+eventq_index=0
 fake_mem=false
 pio_addr=0
 pio_latency=100000
@@ -344,41 +374,22 @@ warn_access=warn
 pio=system.membus.default
 
 [system.physmem]
-type=SimpleDRAM
-activation_limit=4
-addr_mapping=RaBaChCo
-banks_per_rank=8
-burst_length=8
-channels=1
+type=SimpleMemory
+bandwidth=73.000000
 clk_domain=system.clk_domain
 conf_table_reported=true
-device_bus_width=8
-device_rowbuffer_size=1024
-devices_per_rank=8
+eventq_index=0
 in_addr_map=true
-mem_sched_policy=frfcfs
+latency=30000
+latency_var=0
 null=false
-page_policy=open
 range=0:134217727
-ranks_per_channel=2
-read_buffer_size=32
-static_backend_latency=10000
-static_frontend_latency=10000
-tBURST=5000
-tCL=13750
-tRCD=13750
-tREFI=7800000
-tRFC=300000
-tRP=13750
-tWTR=7500
-tXAW=40000
-write_buffer_size=32
-write_thresh_perc=70
 port=system.membus.master[6]
 
 [system.realview]
 type=RealView
 children=a9scu aaci_fake cf_ctrl clcd dmac_fake flash_fake gic gpio0_fake gpio1_fake gpio2_fake kmi0 kmi1 l2x0_fake local_cpu_timer mmc_fake nvmem realview_io rtc sci_fake smc_fake sp810_fake ssp_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake watchdog_fake
+eventq_index=0
 intrctrl=system.intrctrl
 max_mem_size=268435456
 mem_start_addr=0
@@ -388,6 +399,7 @@ system=system
 [system.realview.a9scu]
 type=A9SCU
 clk_domain=system.clk_domain
+eventq_index=0
 pio_addr=520093696
 pio_latency=100000
 system=system
@@ -397,6 +409,7 @@ pio=system.membus.master[4]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268451840
 pio_latency=100000
@@ -425,6 +438,7 @@ BAR5LegacyIO=false
 BAR5Size=0
 BIST=0
 CacheLineSize=0
+CapabilityPtr=0
 CardbusCIS=0
 ClassCode=1
 Command=1
@@ -434,8 +448,40 @@ HeaderType=0
 InterruptLine=31
 InterruptPin=1
 LatencyTimer=0
+MSICAPBaseOffset=0
+MSICAPCapId=0
+MSICAPMaskBits=0
+MSICAPMsgAddr=0
+MSICAPMsgCtrl=0
+MSICAPMsgData=0
+MSICAPMsgUpperAddr=0
+MSICAPNextCapability=0
+MSICAPPendingBits=0
+MSIXCAPBaseOffset=0
+MSIXCAPCapId=0
+MSIXCAPNextCapability=0
+MSIXMsgCtrl=0
+MSIXPbaOffset=0
+MSIXTableOffset=0
 MaximumLatency=0
 MinimumGrant=0
+PMCAPBaseOffset=0
+PMCAPCapId=0
+PMCAPCapabilities=0
+PMCAPCtrlStatus=0
+PMCAPNextCapability=0
+PXCAPBaseOffset=0
+PXCAPCapId=0
+PXCAPCapabilities=0
+PXCAPDevCap2=0
+PXCAPDevCapabilities=0
+PXCAPDevCtrl=0
+PXCAPDevCtrl2=0
+PXCAPDevStatus=0
+PXCAPLinkCap=0
+PXCAPLinkCtrl=0
+PXCAPLinkStatus=0
+PXCAPNextCapability=0
 ProgIF=133
 Revision=0
 Status=640
@@ -447,6 +493,7 @@ clk_domain=system.clk_domain
 config_latency=20000
 ctrl_offset=2
 disks=system.cf0
+eventq_index=0
 io_shift=1
 pci_bus=2
 pci_dev=7
@@ -462,6 +509,8 @@ pio=system.iobus.master[7]
 type=Pl111
 amba_id=1315089
 clk_domain=system.clk_domain
+enable_capture=true
+eventq_index=0
 gic=system.realview.gic
 int_num=55
 pio_addr=268566528
@@ -476,6 +525,7 @@ pio=system.iobus.master[4]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268632064
 pio_latency=100000
@@ -485,6 +535,7 @@ pio=system.iobus.master[9]
 [system.realview.flash_fake]
 type=IsaFake
 clk_domain=system.clk_domain
+eventq_index=0
 fake_mem=true
 pio_addr=1073741824
 pio_latency=100000
@@ -506,8 +557,10 @@ cpu_addr=520093952
 cpu_pio_delay=10000
 dist_addr=520097792
 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]
@@ -516,6 +569,7 @@ pio=system.membus.master[2]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268513280
 pio_latency=100000
@@ -526,6 +580,7 @@ pio=system.iobus.master[16]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268517376
 pio_latency=100000
@@ -536,6 +591,7 @@ pio=system.iobus.master[17]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268521472
 pio_latency=100000
@@ -546,6 +602,7 @@ pio=system.iobus.master[18]
 type=Pl050
 amba_id=1314896
 clk_domain=system.clk_domain
+eventq_index=0
 gic=system.realview.gic
 int_delay=1000000
 int_num=52
@@ -560,6 +617,7 @@ pio=system.iobus.master[5]
 type=Pl050
 amba_id=1314896
 clk_domain=system.clk_domain
+eventq_index=0
 gic=system.realview.gic
 int_delay=1000000
 int_num=53
@@ -573,6 +631,7 @@ pio=system.iobus.master[6]
 [system.realview.l2x0_fake]
 type=IsaFake
 clk_domain=system.clk_domain
+eventq_index=0
 fake_mem=false
 pio_addr=520101888
 pio_latency=100000
@@ -590,6 +649,7 @@ pio=system.membus.master[3]
 [system.realview.local_cpu_timer]
 type=CpuLocalTimer
 clk_domain=system.clk_domain
+eventq_index=0
 gic=system.realview.gic
 int_num_timer=29
 int_num_watchdog=30
@@ -602,6 +662,7 @@ pio=system.membus.master[5]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268455936
 pio_latency=100000
@@ -613,6 +674,7 @@ type=SimpleMemory
 bandwidth=73.000000
 clk_domain=system.clk_domain
 conf_table_reported=false
+eventq_index=0
 in_addr_map=true
 latency=30000
 latency_var=0
@@ -623,6 +685,7 @@ port=system.membus.master[1]
 [system.realview.realview_io]
 type=RealViewCtrl
 clk_domain=system.clk_domain
+eventq_index=0
 idreg=0
 pio_addr=268435456
 pio_latency=100000
@@ -635,6 +698,7 @@ pio=system.iobus.master[1]
 type=PL031
 amba_id=3412017
 clk_domain=system.clk_domain
+eventq_index=0
 gic=system.realview.gic
 int_delay=100000
 int_num=42
@@ -648,6 +712,7 @@ pio=system.iobus.master[23]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268492800
 pio_latency=100000
@@ -658,6 +723,7 @@ pio=system.iobus.master[20]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=269357056
 pio_latency=100000
@@ -668,6 +734,7 @@ pio=system.iobus.master[13]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=true
 pio_addr=268439552
 pio_latency=100000
@@ -678,6 +745,7 @@ pio=system.iobus.master[14]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268488704
 pio_latency=100000
@@ -690,6 +758,7 @@ amba_id=1316868
 clk_domain=system.clk_domain
 clock0=1000000
 clock1=1000000
+eventq_index=0
 gic=system.realview.gic
 int_num0=36
 int_num1=36
@@ -704,6 +773,7 @@ amba_id=1316868
 clk_domain=system.clk_domain
 clock0=1000000
 clock1=1000000
+eventq_index=0
 gic=system.realview.gic
 int_num0=37
 int_num1=37
@@ -716,6 +786,7 @@ pio=system.iobus.master[3]
 type=Pl011
 clk_domain=system.clk_domain
 end_on_eot=false
+eventq_index=0
 gic=system.realview.gic
 int_delay=100000
 int_num=44
@@ -730,6 +801,7 @@ pio=system.iobus.master[0]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268476416
 pio_latency=100000
@@ -740,6 +812,7 @@ pio=system.iobus.master[10]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268480512
 pio_latency=100000
@@ -750,6 +823,7 @@ pio=system.iobus.master[11]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268484608
 pio_latency=100000
@@ -760,6 +834,7 @@ pio=system.iobus.master[12]
 type=AmbaFake
 amba_id=0
 clk_domain=system.clk_domain
+eventq_index=0
 ignore_access=false
 pio_addr=268500992
 pio_latency=100000
@@ -768,6 +843,7 @@ pio=system.iobus.master[15]
 
 [system.terminal]
 type=Terminal
+eventq_index=0
 intr_control=system.intrctrl
 number=0
 output=true
@@ -775,11 +851,13 @@ port=3456
 
 [system.vncserver]
 type=VncServer
+eventq_index=0
 frame_capture=false
 number=0
 port=5900
 
 [system.voltage_domain]
 type=VoltageDomain
+eventq_index=0
 voltage=1.000000
 
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 503d37a74..cb6c51df2 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.332810                       # Nu
 sim_ticks                                2332810264000                       # Number of ticks simulated
 final_tick                               2332810264000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1754227                       # Simulator instruction rate (inst/s)
-host_op_rate                                  2255827                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                            67743178392                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 394608                       # Number of bytes of host memory used
-host_seconds                                    34.44                       # Real time elapsed on the host
+host_inst_rate                                 993135                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1277110                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            38352024586                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 443324                       # Number of bytes of host memory used
+host_seconds                                    60.83                       # Real time elapsed on the host
 sim_insts                                    60408639                       # Number of instructions simulated
 sim_ops                                      77681819                       # Number of ops (including micro ops) simulated
 system.physmem.bytes_read::realview.clcd    111673344                       # Number of bytes read from this memory
@@ -114,7 +114,7 @@ system.cpu.itb.inst_accesses                 61436311                       # IT
 system.cpu.itb.hits                          61431840                       # DTB hits
 system.cpu.itb.misses                            4471                       # DTB misses
 system.cpu.itb.accesses                      61436311                       # DTB accesses
-system.cpu.numCycles                       4665543516                       # number of cpu cycles simulated
+system.cpu.numCycles                       4665620529                       # number of cpu cycles simulated
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started
 system.cpu.numWorkItemsCompleted                    0                       # number of work items this cpu completed
 system.cpu.committedInsts                    60408639                       # Number of instructions committed
@@ -132,8 +132,8 @@ system.cpu.num_fp_register_writes                2780                       # nu
 system.cpu.num_mem_refs                      27361637                       # number of memory refs
 system.cpu.num_load_insts                    15639527                       # Number of load instructions
 system.cpu.num_store_insts                   11722110                       # Number of store instructions
-system.cpu.num_idle_cycles               4586746360.692756                       # Number of idle cycles
-system.cpu.num_busy_cycles               78797155.307244                       # Number of busy cycles
+system.cpu.num_idle_cycles               4586822073.007144                       # Number of idle cycles
+system.cpu.num_busy_cycles               78798455.992855                       # Number of busy cycles
 system.cpu.not_idle_fraction                 0.016889                       # Percentage of non-idle cycles
 system.cpu.idle_fraction                     0.983111                       # Percentage of idle cycles
 system.cpu.kern.inst.arm                            0                       # number of arm instructions executed