From 2823982a3cbd60a1b21db1a73b78440468df158a Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Tue, 26 Nov 2013 17:05:25 -0600
Subject: stats: updates due to changes to ticksToCycles()

---
 .../linux/realview-switcheroo-atomic/config.ini    | 145 ++++++++++++++++-----
 1 file changed, 115 insertions(+), 30 deletions(-)

(limited to 'tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini')

diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini
index d251aac9e..44d2483e8 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-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,22 +12,23 @@ time_sync_spin_threshold=100000000
 type=LinuxArmSystem
 children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus 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
 mem_ranges=0:134217727
-memories=system.physmem system.realview.nvmem
+memories=system.realview.nvmem system.physmem
 multi_proc=true
 num_work_ids=16
 panic_on_oops=true
@@ -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.cpu0]
@@ -86,6 +94,7 @@ do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
 dtb=system.cpu0.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.cpu0.dtb]
 type=ArmTLB
 children=walker
+eventq_index=0
 size=64
 walker=system.cpu0.dtb.walker
 
 [system.cpu0.dtb.walker]
 type=ArmTableWalker
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 num_squash_per_cycle=2
 sys=system
 port=system.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.cpu0.interrupts]
 type=ArmInterrupts
+eventq_index=0
 
 [system.cpu0.isa]
 type=ArmISA
+eventq_index=0
 fpsid=1090793632
 id_isar0=34607377
 id_isar1=34677009
@@ -211,18 +228,21 @@ midr=890224640
 [system.cpu0.itb]
 type=ArmTLB
 children=walker
+eventq_index=0
 size=64
 walker=system.cpu0.itb.walker
 
 [system.cpu0.itb.walker]
 type=ArmTableWalker
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 num_squash_per_cycle=2
 sys=system
 port=system.toL2Bus.slave[2]
 
 [system.cpu0.tracer]
 type=ExeTracer
+eventq_index=0
 
 [system.cpu1]
 type=AtomicSimpleCPU
@@ -234,6 +254,7 @@ do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
 dtb=system.cpu1.dtb
+eventq_index=0
 fastmem=false
 function_trace=false
 function_trace_start=0
@@ -262,17 +283,20 @@ workload=
 [system.cpu1.dtb]
 type=ArmTLB
 children=walker
+eventq_index=0
 size=64
 walker=system.cpu1.dtb.walker
 
 [system.cpu1.dtb.walker]
 type=ArmTableWalker
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 num_squash_per_cycle=2
 sys=system
 
 [system.cpu1.isa]
 type=ArmISA
+eventq_index=0
 fpsid=1090793632
 id_isar0=34607377
 id_isar1=34677009
@@ -291,30 +315,36 @@ midr=890224640
 [system.cpu1.itb]
 type=ArmTLB
 children=walker
+eventq_index=0
 size=64
 walker=system.cpu1.itb.walker
 
 [system.cpu1.itb.walker]
 type=ArmTableWalker
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 num_squash_per_cycle=2
 sys=system
 
 [system.cpu1.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
@@ -327,6 +357,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
@@ -349,6 +380,7 @@ type=LRU
 assoc=8
 block_size=64
 clk_domain=system.clk_domain
+eventq_index=0
 hit_latency=50
 size=1024
 
@@ -358,6 +390,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
@@ -380,6 +413,7 @@ type=LRU
 assoc=8
 block_size=64
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 hit_latency=20
 size=4194304
 
@@ -387,6 +421,7 @@ size=4194304
 type=CoherentBus
 children=badaddr_responder
 clk_domain=system.clk_domain
+eventq_index=0
 header_cycles=1
 system=system
 use_default_range=false
@@ -398,6 +433,7 @@ slave=system.system_port system.l2c.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
@@ -413,41 +449,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
@@ -457,6 +474,7 @@ system=system
 [system.realview.a9scu]
 type=A9SCU
 clk_domain=system.clk_domain
+eventq_index=0
 pio_addr=520093696
 pio_latency=100000
 system=system
@@ -466,6 +484,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
@@ -494,6 +513,7 @@ BAR5LegacyIO=false
 BAR5Size=0
 BIST=0
 CacheLineSize=0
+CapabilityPtr=0
 CardbusCIS=0
 ClassCode=1
 Command=1
@@ -503,8 +523,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
@@ -516,6 +568,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
@@ -531,6 +584,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
@@ -545,6 +600,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
@@ -554,6 +610,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
@@ -575,8 +632,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]
@@ -585,6 +644,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
@@ -595,6 +655,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
@@ -605,6 +666,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
@@ -615,6 +677,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
@@ -629,6 +692,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
@@ -642,6 +706,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
@@ -659,6 +724,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
@@ -671,6 +737,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
@@ -682,6 +749,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
@@ -692,6 +760,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
@@ -704,6 +773,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
@@ -717,6 +787,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
@@ -727,6 +798,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
@@ -737,6 +809,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
@@ -747,6 +820,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
@@ -759,6 +833,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
@@ -773,6 +848,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
@@ -785,6 +861,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
@@ -799,6 +876,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
@@ -809,6 +887,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
@@ -819,6 +898,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
@@ -829,6 +909,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
@@ -837,6 +918,7 @@ pio=system.iobus.master[15]
 
 [system.terminal]
 type=Terminal
+eventq_index=0
 intr_control=system.intrctrl
 number=0
 output=true
@@ -845,6 +927,7 @@ port=3456
 [system.toL2Bus]
 type=CoherentBus
 clk_domain=system.cpu_clk_domain
+eventq_index=0
 header_cycles=1
 system=system
 use_default_range=false
@@ -854,11 +937,13 @@ slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.wa
 
 [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
 
-- 
cgit v1.2.3