From fbc1feb39ac19379983ca714f4c7fadcd9fdabf6 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@gmail.com>
Date: Sat, 28 Sep 2013 15:25:17 -0400
Subject: tests: update reference outputs

Apparently only stats.txt was updated the last time, so
this changeset updates other reference output files
(config.ini, simout, simerr, ruby.stats) so that
test output diffs should not be cluttered with irrelevant
changes.  There are a few stats.txt updates too, but
they are in the minority.
---
 .../linux/realview-switcheroo-atomic/config.ini    | 190 +++++++++++++--------
 1 file changed, 118 insertions(+), 72 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 7bfde3940..d251aac9e 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
@@ -8,11 +8,12 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxArmSystem
-children=bridge cf0 cpu0 cpu1 intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
+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_osflags=earlyprintk console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=128MB root=/dev/sda1
-clock=1000
+cache_line_size=64
+clk_domain=system.clk_domain
 dtb_filename=False
 early_kernel_symbols=false
 enable_context_switch_stats_dump=false
@@ -24,7 +25,7 @@ load_addr_mask=268435455
 machine_type=RealView_PBX
 mem_mode=atomic
 mem_ranges=0:134217727
-memories=system.realview.nvmem system.physmem
+memories=system.physmem system.realview.nvmem
 multi_proc=true
 num_work_ids=16
 panic_on_oops=true
@@ -42,7 +43,7 @@ system_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
-clock=1000
+clk_domain=system.clk_domain
 delay=50000
 ranges=268435456:520093695 1073741824:1610612735
 req_size=16
@@ -70,12 +71,16 @@ type=RawDiskImage
 image_file=/dist/m5/system/disks/linux-arm-ael.img
 read_only=true
 
+[system.clk_domain]
+type=SrcClockDomain
+clock=1000
+voltage_domain=system.voltage_domain
+
 [system.cpu0]
 type=AtomicSimpleCPU
 children=dcache dtb icache interrupts isa itb tracer
-branchPred=Null
 checker=Null
-clock=500
+clk_domain=system.cpu_clk_domain
 cpu_id=0
 do_checkpoint_insts=true
 do_quiesce=true
@@ -110,10 +115,10 @@ icache_port=system.cpu0.icache.cpu_side
 
 [system.cpu0.dcache]
 type=BaseCache
+children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
 forward_snoops=true
 hit_latency=2
 is_top_level=true
@@ -124,12 +129,21 @@ prefetcher=Null
 response_latency=2
 size=32768
 system=system
+tags=system.cpu0.dcache.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu0.dcache_port
 mem_side=system.toL2Bus.slave[1]
 
+[system.cpu0.dcache.tags]
+type=LRU
+assoc=4
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
+
 [system.cpu0.dtb]
 type=ArmTLB
 children=walker
@@ -138,17 +152,17 @@ walker=system.cpu0.dtb.walker
 
 [system.cpu0.dtb.walker]
 type=ArmTableWalker
-clock=500
+clk_domain=system.cpu_clk_domain
 num_squash_per_cycle=2
 sys=system
 port=system.toL2Bus.slave[3]
 
 [system.cpu0.icache]
 type=BaseCache
+children=tags
 addr_ranges=0:18446744073709551615
 assoc=1
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
 forward_snoops=true
 hit_latency=2
 is_top_level=true
@@ -159,12 +173,21 @@ prefetcher=Null
 response_latency=2
 size=32768
 system=system
+tags=system.cpu0.icache.tags
 tgts_per_mshr=20
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu0.icache_port
 mem_side=system.toL2Bus.slave[0]
 
+[system.cpu0.icache.tags]
+type=LRU
+assoc=1
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
+
 [system.cpu0.interrupts]
 type=ArmInterrupts
 
@@ -193,7 +216,7 @@ walker=system.cpu0.itb.walker
 
 [system.cpu0.itb.walker]
 type=ArmTableWalker
-clock=500
+clk_domain=system.cpu_clk_domain
 num_squash_per_cycle=2
 sys=system
 port=system.toL2Bus.slave[2]
@@ -203,10 +226,9 @@ type=ExeTracer
 
 [system.cpu1]
 type=AtomicSimpleCPU
-children=dtb interrupts isa itb tracer
-branchPred=Null
+children=dtb isa itb tracer
 checker=Null
-clock=500
+clk_domain=system.cpu_clk_domain
 cpu_id=0
 do_checkpoint_insts=true
 do_quiesce=true
@@ -215,7 +237,7 @@ dtb=system.cpu1.dtb
 fastmem=false
 function_trace=false
 function_trace_start=0
-interrupts=system.cpu1.interrupts
+interrupts=Null
 isa=system.cpu1.isa
 itb=system.cpu1.itb
 max_insts_all_threads=0
@@ -245,13 +267,10 @@ walker=system.cpu1.dtb.walker
 
 [system.cpu1.dtb.walker]
 type=ArmTableWalker
-clock=500
+clk_domain=system.cpu_clk_domain
 num_squash_per_cycle=2
 sys=system
 
-[system.cpu1.interrupts]
-type=ArmInterrupts
-
 [system.cpu1.isa]
 type=ArmISA
 fpsid=1090793632
@@ -277,21 +296,25 @@ walker=system.cpu1.itb.walker
 
 [system.cpu1.itb.walker]
 type=ArmTableWalker
-clock=500
+clk_domain=system.cpu_clk_domain
 num_squash_per_cycle=2
 sys=system
 
 [system.cpu1.tracer]
 type=ExeTracer
 
+[system.cpu_clk_domain]
+type=SrcClockDomain
+clock=500
+voltage_domain=system.voltage_domain
+
 [system.intrctrl]
 type=IntrControl
 sys=system
 
 [system.iobus]
 type=NoncoherentBus
-block_size=64
-clock=1000
+clk_domain=system.clk_domain
 header_cycles=1
 use_default_range=false
 width=8
@@ -300,10 +323,10 @@ slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
 
 [system.iocache]
 type=BaseCache
+children=tags
 addr_ranges=0:134217727
 assoc=8
-block_size=64
-clock=1000
+clk_domain=system.clk_domain
 forward_snoops=false
 hit_latency=50
 is_top_level=true
@@ -314,18 +337,27 @@ prefetcher=Null
 response_latency=50
 size=1024
 system=system
+tags=system.iocache.tags
 tgts_per_mshr=12
 two_queue=false
 write_buffers=8
 cpu_side=system.iobus.master[25]
 mem_side=system.membus.slave[2]
 
+[system.iocache.tags]
+type=LRU
+assoc=8
+block_size=64
+clk_domain=system.clk_domain
+hit_latency=50
+size=1024
+
 [system.l2c]
 type=BaseCache
+children=tags
 addr_ranges=0:18446744073709551615
 assoc=8
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
 forward_snoops=true
 hit_latency=20
 is_top_level=false
@@ -336,28 +368,36 @@ prefetcher=Null
 response_latency=20
 size=4194304
 system=system
+tags=system.l2c.tags
 tgts_per_mshr=12
 two_queue=false
 write_buffers=8
 cpu_side=system.toL2Bus.master[0]
 mem_side=system.membus.slave[1]
 
+[system.l2c.tags]
+type=LRU
+assoc=8
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=20
+size=4194304
+
 [system.membus]
 type=CoherentBus
 children=badaddr_responder
-block_size=64
-clock=1000
+clk_domain=system.clk_domain
 header_cycles=1
 system=system
 use_default_range=false
 width=8
 default=system.membus.badaddr_responder.pio
-master=system.bridge.slave system.realview.nvmem.port system.physmem.port system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio
+master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.l2x0_fake.pio system.realview.a9scu.pio system.realview.local_cpu_timer.pio system.physmem.port
 slave=system.system_port system.l2c.mem_side system.iocache.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
-clock=1000
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=0
 pio_latency=100000
@@ -375,19 +415,24 @@ pio=system.membus.default
 [system.physmem]
 type=SimpleDRAM
 activation_limit=4
-addr_mapping=openmap
+addr_mapping=RaBaChCo
 banks_per_rank=8
+burst_length=8
 channels=1
-clock=1000
+clk_domain=system.clk_domain
 conf_table_reported=true
+device_bus_width=8
+device_rowbuffer_size=1024
+devices_per_rank=8
 in_addr_map=true
-lines_per_rowbuffer=32
 mem_sched_policy=frfcfs
 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
@@ -398,8 +443,7 @@ tWTR=7500
 tXAW=40000
 write_buffer_size=32
 write_thresh_perc=70
-zero=false
-port=system.membus.master[2]
+port=system.membus.master[6]
 
 [system.realview]
 type=RealView
@@ -412,16 +456,16 @@ system=system
 
 [system.realview.a9scu]
 type=A9SCU
-clock=1000
+clk_domain=system.clk_domain
 pio_addr=520093696
 pio_latency=100000
 system=system
-pio=system.membus.master[5]
+pio=system.membus.master[4]
 
 [system.realview.aaci_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268451840
 pio_latency=100000
@@ -468,7 +512,7 @@ SubClassCode=1
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=32902
-clock=1000
+clk_domain=system.clk_domain
 config_latency=20000
 ctrl_offset=2
 disks=system.cf0
@@ -486,7 +530,7 @@ pio=system.iobus.master[7]
 [system.realview.clcd]
 type=Pl111
 amba_id=1315089
-clock=1000
+clk_domain=system.clk_domain
 gic=system.realview.gic
 int_num=55
 pio_addr=268566528
@@ -500,7 +544,7 @@ pio=system.iobus.master[4]
 [system.realview.dmac_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268632064
 pio_latency=100000
@@ -509,7 +553,7 @@ pio=system.iobus.master[9]
 
 [system.realview.flash_fake]
 type=IsaFake
-clock=1000
+clk_domain=system.clk_domain
 fake_mem=true
 pio_addr=1073741824
 pio_latency=100000
@@ -526,7 +570,7 @@ pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Pl390
-clock=1000
+clk_domain=system.clk_domain
 cpu_addr=520093952
 cpu_pio_delay=10000
 dist_addr=520097792
@@ -535,12 +579,12 @@ int_latency=10000
 it_lines=128
 platform=system.realview
 system=system
-pio=system.membus.master[3]
+pio=system.membus.master[2]
 
 [system.realview.gpio0_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268513280
 pio_latency=100000
@@ -550,7 +594,7 @@ pio=system.iobus.master[16]
 [system.realview.gpio1_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268517376
 pio_latency=100000
@@ -560,7 +604,7 @@ pio=system.iobus.master[17]
 [system.realview.gpio2_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268521472
 pio_latency=100000
@@ -570,7 +614,7 @@ pio=system.iobus.master[18]
 [system.realview.kmi0]
 type=Pl050
 amba_id=1314896
-clock=1000
+clk_domain=system.clk_domain
 gic=system.realview.gic
 int_delay=1000000
 int_num=52
@@ -584,7 +628,7 @@ pio=system.iobus.master[5]
 [system.realview.kmi1]
 type=Pl050
 amba_id=1314896
-clock=1000
+clk_domain=system.clk_domain
 gic=system.realview.gic
 int_delay=1000000
 int_num=53
@@ -597,7 +641,7 @@ pio=system.iobus.master[6]
 
 [system.realview.l2x0_fake]
 type=IsaFake
-clock=1000
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=520101888
 pio_latency=100000
@@ -610,23 +654,23 @@ ret_data8=255
 system=system
 update_data=false
 warn_access=
-pio=system.membus.master[4]
+pio=system.membus.master[3]
 
 [system.realview.local_cpu_timer]
 type=CpuLocalTimer
-clock=1000
+clk_domain=system.clk_domain
 gic=system.realview.gic
 int_num_timer=29
 int_num_watchdog=30
 pio_addr=520095232
 pio_latency=100000
 system=system
-pio=system.membus.master[6]
+pio=system.membus.master[5]
 
 [system.realview.mmc_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268455936
 pio_latency=100000
@@ -636,19 +680,18 @@ pio=system.iobus.master[22]
 [system.realview.nvmem]
 type=SimpleMemory
 bandwidth=73.000000
-clock=1000
+clk_domain=system.clk_domain
 conf_table_reported=false
 in_addr_map=true
 latency=30000
 latency_var=0
 null=false
 range=2147483648:2214592511
-zero=true
 port=system.membus.master[1]
 
 [system.realview.realview_io]
 type=RealViewCtrl
-clock=1000
+clk_domain=system.clk_domain
 idreg=0
 pio_addr=268435456
 pio_latency=100000
@@ -660,7 +703,7 @@ pio=system.iobus.master[1]
 [system.realview.rtc]
 type=PL031
 amba_id=3412017
-clock=1000
+clk_domain=system.clk_domain
 gic=system.realview.gic
 int_delay=100000
 int_num=42
@@ -673,7 +716,7 @@ pio=system.iobus.master[23]
 [system.realview.sci_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268492800
 pio_latency=100000
@@ -683,7 +726,7 @@ pio=system.iobus.master[20]
 [system.realview.smc_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=269357056
 pio_latency=100000
@@ -693,7 +736,7 @@ pio=system.iobus.master[13]
 [system.realview.sp810_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=true
 pio_addr=268439552
 pio_latency=100000
@@ -703,7 +746,7 @@ pio=system.iobus.master[14]
 [system.realview.ssp_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268488704
 pio_latency=100000
@@ -713,7 +756,7 @@ pio=system.iobus.master[19]
 [system.realview.timer0]
 type=Sp804
 amba_id=1316868
-clock=1000
+clk_domain=system.clk_domain
 clock0=1000000
 clock1=1000000
 gic=system.realview.gic
@@ -727,7 +770,7 @@ pio=system.iobus.master[2]
 [system.realview.timer1]
 type=Sp804
 amba_id=1316868
-clock=1000
+clk_domain=system.clk_domain
 clock0=1000000
 clock1=1000000
 gic=system.realview.gic
@@ -740,7 +783,7 @@ pio=system.iobus.master[3]
 
 [system.realview.uart]
 type=Pl011
-clock=1000
+clk_domain=system.clk_domain
 end_on_eot=false
 gic=system.realview.gic
 int_delay=100000
@@ -755,7 +798,7 @@ pio=system.iobus.master[0]
 [system.realview.uart1_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268476416
 pio_latency=100000
@@ -765,7 +808,7 @@ pio=system.iobus.master[10]
 [system.realview.uart2_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268480512
 pio_latency=100000
@@ -775,7 +818,7 @@ pio=system.iobus.master[11]
 [system.realview.uart3_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268484608
 pio_latency=100000
@@ -785,7 +828,7 @@ pio=system.iobus.master[12]
 [system.realview.watchdog_fake]
 type=AmbaFake
 amba_id=0
-clock=1000
+clk_domain=system.clk_domain
 ignore_access=false
 pio_addr=268500992
 pio_latency=100000
@@ -801,8 +844,7 @@ port=3456
 
 [system.toL2Bus]
 type=CoherentBus
-block_size=64
-clock=500
+clk_domain=system.cpu_clk_domain
 header_cycles=1
 system=system
 use_default_range=false
@@ -816,3 +858,7 @@ frame_capture=false
 number=0
 port=5900
 
+[system.voltage_domain]
+type=VoltageDomain
+voltage=1.000000
+
-- 
cgit v1.2.3