From 9bc132e4738c53be2dd9c2fdf5e4dd8e73d8970b Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Thu, 24 Jan 2013 12:29:00 -0600
Subject: regressions: update stats due to branch predictor changes The actual
 statistical values are being updated for only two tests belonging to sparc
 architecture and inorder cpu: 00.hello and 02.insttest. For others the patch
 updates config.ini and name changes to statistical variables.

---
 .../arm/linux/realview-simple-atomic/config.ini    | 244 +++++++++++----------
 1 file changed, 129 insertions(+), 115 deletions(-)

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

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 20da648f5..687db2fa1 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
@@ -8,22 +8,23 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxArmSystem
-children=bridge cf0 cpu intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver
+children=bridge cf0 cpu intrctrl iobus iocache membus physmem realview terminal vncserver
 atags_addr=256
-boot_loader=/projects/pd/randd/dist/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
-clock=1
+clock=1000
 dtb_filename=
 early_kernel_symbols=false
+enable_context_switch_stats_dump=false
 flags_addr=268435504
 gic_cpu_addr=520093952
 init_param=0
-kernel=/projects/pd/randd/dist/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
-midr_regval=890224640
 multi_proc=true
 num_work_ids=16
 readfile=tests/halt.sh
@@ -39,7 +40,7 @@ system_port=system.membus.slave[0]
 
 [system.bridge]
 type=Bridge
-clock=1
+clock=1000
 delay=50000
 ranges=268435456:520093695 1073741824:1610612735
 req_size=16
@@ -64,16 +65,16 @@ table_size=65536
 
 [system.cf0.image.child]
 type=RawDiskImage
-image_file=/projects/pd/randd/dist/disks/linux-arm-ael.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-arm-ael.img
 read_only=true
 
 [system.cpu]
 type=AtomicSimpleCPU
-children=dcache dtb icache interrupts itb tracer
+children=dcache dtb icache interrupts isa itb l2cache toL2Bus tracer
+branchPred=Null
 checker=Null
 clock=500
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -82,6 +83,7 @@ fastmem=false
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -92,6 +94,7 @@ profile=0
 progress_interval=0
 simulate_data_stalls=false
 simulate_inst_stalls=false
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 width=1
@@ -104,27 +107,22 @@ type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
-clock=1
+clock=500
 forward_snoops=true
-hash_delay=1
-hit_latency=1000
+hit_latency=2
 is_top_level=true
 max_miss_count=0
 mshrs=4
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
-response_latency=1000
+response_latency=2
 size=32768
-subblock_size=0
 system=system
-tgts_per_mshr=8
-trace_addr=0
+tgts_per_mshr=20
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.dcache_port
-mem_side=system.toL2Bus.slave[1]
+mem_side=system.cpu.toL2Bus.slave[1]
 
 [system.cpu.dtb]
 type=ArmTLB
@@ -134,41 +132,53 @@ walker=system.cpu.dtb.walker
 
 [system.cpu.dtb.walker]
 type=ArmTableWalker
-clock=1
+clock=500
 num_squash_per_cycle=2
 sys=system
-port=system.toL2Bus.slave[3]
+port=system.cpu.toL2Bus.slave[3]
 
 [system.cpu.icache]
 type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
-clock=1
+clock=500
 forward_snoops=true
-hash_delay=1
-hit_latency=1000
+hit_latency=2
 is_top_level=true
 max_miss_count=0
 mshrs=4
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
-response_latency=1000
+response_latency=2
 size=32768
-subblock_size=0
 system=system
-tgts_per_mshr=8
-trace_addr=0
+tgts_per_mshr=20
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.icache_port
-mem_side=system.toL2Bus.slave[0]
+mem_side=system.cpu.toL2Bus.slave[0]
 
 [system.cpu.interrupts]
 type=ArmInterrupts
 
+[system.cpu.isa]
+type=ArmISA
+fpsid=1090793632
+id_isar0=34607377
+id_isar1=34677009
+id_isar2=555950401
+id_isar3=17899825
+id_isar4=268501314
+id_isar5=0
+id_mmfr0=3
+id_mmfr1=0
+id_mmfr2=19070976
+id_mmfr3=4027589137
+id_pfr0=49
+id_pfr1=1
+midr=890224640
+
 [system.cpu.itb]
 type=ArmTLB
 children=walker
@@ -177,10 +187,42 @@ walker=system.cpu.itb.walker
 
 [system.cpu.itb.walker]
 type=ArmTableWalker
-clock=1
+clock=500
 num_squash_per_cycle=2
 sys=system
-port=system.toL2Bus.slave[2]
+port=system.cpu.toL2Bus.slave[2]
+
+[system.cpu.l2cache]
+type=BaseCache
+addr_ranges=0:18446744073709551615
+assoc=8
+block_size=64
+clock=500
+forward_snoops=true
+hit_latency=20
+is_top_level=false
+max_miss_count=0
+mshrs=20
+prefetch_on_access=false
+prefetcher=Null
+response_latency=20
+size=4194304
+system=system
+tgts_per_mshr=12
+two_queue=false
+write_buffers=8
+cpu_side=system.cpu.toL2Bus.master[0]
+mem_side=system.membus.slave[1]
+
+[system.cpu.toL2Bus]
+type=CoherentBus
+block_size=64
+clock=500
+header_cycles=1
+use_default_range=false
+width=32
+master=system.cpu.l2cache.cpu_side
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
 
 [system.cpu.tracer]
 type=ExeTracer
@@ -201,56 +243,24 @@ slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma
 
 [system.iocache]
 type=BaseCache
-addr_ranges=0:268435455
+addr_ranges=0:134217727
 assoc=8
 block_size=64
-clock=1
+clock=1000
 forward_snoops=false
-hash_delay=1
-hit_latency=50000
-is_top_level=false
+hit_latency=50
+is_top_level=true
 max_miss_count=0
 mshrs=20
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
-response_latency=50000
+response_latency=50
 size=1024
-subblock_size=0
 system=system
 tgts_per_mshr=12
-trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.iobus.master[25]
-mem_side=system.membus.slave[1]
-
-[system.l2c]
-type=BaseCache
-addr_ranges=0:18446744073709551615
-assoc=8
-block_size=64
-clock=1
-forward_snoops=true
-hash_delay=1
-hit_latency=10000
-is_top_level=false
-max_miss_count=0
-mshrs=92
-prefetch_on_access=false
-prefetcher=Null
-prioritizeRequests=false
-repl=Null
-response_latency=10000
-size=4194304
-subblock_size=0
-system=system
-tgts_per_mshr=16
-trace_addr=0
-two_queue=false
-write_buffers=8
-cpu_side=system.toL2Bus.master[0]
 mem_side=system.membus.slave[2]
 
 [system.membus]
@@ -263,11 +273,11 @@ 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
-slave=system.system_port system.iocache.mem_side system.l2c.mem_side
+slave=system.system_port system.cpu.l2cache.mem_side system.iocache.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
-clock=1
+clock=1000
 fake_mem=false
 pio_addr=0
 pio_latency=100000
@@ -283,15 +293,28 @@ warn_access=warn
 pio=system.membus.default
 
 [system.physmem]
-type=SimpleMemory
-bandwidth=73.000000
-clock=1
+type=SimpleDRAM
+addr_mapping=openmap
+banks_per_rank=8
+clock=1000
 conf_table_reported=true
 in_addr_map=true
-latency=30000
-latency_var=0
+lines_per_rowbuffer=64
+mem_sched_policy=fcfs
 null=false
+page_policy=open
 range=0:134217727
+ranks_per_channel=2
+read_buffer_size=32
+tBURST=4000
+tCL=14000
+tRCD=14000
+tREFI=7800000
+tRFC=300000
+tRP=14000
+tWTR=1000
+write_buffer_size=32
+write_thresh_perc=70
 zero=false
 port=system.membus.master[2]
 
@@ -306,7 +329,7 @@ system=system
 
 [system.realview.a9scu]
 type=A9SCU
-clock=1
+clock=1000
 pio_addr=520093696
 pio_latency=100000
 system=system
@@ -315,7 +338,7 @@ pio=system.membus.master[5]
 [system.realview.aaci_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268451840
 pio_latency=100000
@@ -362,7 +385,7 @@ SubClassCode=1
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=32902
-clock=1
+clock=1000
 config_latency=20000
 ctrl_offset=2
 disks=system.cf0
@@ -380,11 +403,12 @@ pio=system.iobus.master[7]
 [system.realview.clcd]
 type=Pl111
 amba_id=1315089
-clock=41667
+clock=1000
 gic=system.realview.gic
 int_num=55
 pio_addr=268566528
 pio_latency=10000
+pixel_clock=41667
 system=system
 vnc=system.vncserver
 dma=system.iobus.slave[1]
@@ -393,7 +417,7 @@ pio=system.iobus.master[4]
 [system.realview.dmac_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268632064
 pio_latency=100000
@@ -402,7 +426,7 @@ pio=system.iobus.master[9]
 
 [system.realview.flash_fake]
 type=IsaFake
-clock=1
+clock=1000
 fake_mem=true
 pio_addr=1073741824
 pio_latency=100000
@@ -419,7 +443,7 @@ pio=system.iobus.master[24]
 
 [system.realview.gic]
 type=Gic
-clock=1
+clock=1000
 cpu_addr=520093952
 cpu_pio_delay=10000
 dist_addr=520097792
@@ -433,7 +457,7 @@ pio=system.membus.master[3]
 [system.realview.gpio0_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268513280
 pio_latency=100000
@@ -443,7 +467,7 @@ pio=system.iobus.master[16]
 [system.realview.gpio1_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268517376
 pio_latency=100000
@@ -453,7 +477,7 @@ pio=system.iobus.master[17]
 [system.realview.gpio2_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268521472
 pio_latency=100000
@@ -463,7 +487,7 @@ pio=system.iobus.master[18]
 [system.realview.kmi0]
 type=Pl050
 amba_id=1314896
-clock=1
+clock=1000
 gic=system.realview.gic
 int_delay=1000000
 int_num=52
@@ -477,7 +501,7 @@ pio=system.iobus.master[5]
 [system.realview.kmi1]
 type=Pl050
 amba_id=1314896
-clock=1
+clock=1000
 gic=system.realview.gic
 int_delay=1000000
 int_num=53
@@ -490,7 +514,7 @@ pio=system.iobus.master[6]
 
 [system.realview.l2x0_fake]
 type=IsaFake
-clock=1
+clock=1000
 fake_mem=false
 pio_addr=520101888
 pio_latency=100000
@@ -519,7 +543,7 @@ pio=system.membus.master[6]
 [system.realview.mmc_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268455936
 pio_latency=100000
@@ -529,7 +553,7 @@ pio=system.iobus.master[22]
 [system.realview.nvmem]
 type=SimpleMemory
 bandwidth=73.000000
-clock=1
+clock=1000
 conf_table_reported=false
 in_addr_map=true
 latency=30000
@@ -541,7 +565,7 @@ port=system.membus.master[1]
 
 [system.realview.realview_io]
 type=RealViewCtrl
-clock=1
+clock=1000
 idreg=0
 pio_addr=268435456
 pio_latency=100000
@@ -553,7 +577,7 @@ pio=system.iobus.master[1]
 [system.realview.rtc]
 type=PL031
 amba_id=3412017
-clock=1
+clock=1000
 gic=system.realview.gic
 int_delay=100000
 int_num=42
@@ -566,7 +590,7 @@ pio=system.iobus.master[23]
 [system.realview.sci_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268492800
 pio_latency=100000
@@ -576,7 +600,7 @@ pio=system.iobus.master[20]
 [system.realview.smc_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=269357056
 pio_latency=100000
@@ -586,7 +610,7 @@ pio=system.iobus.master[13]
 [system.realview.sp810_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=true
 pio_addr=268439552
 pio_latency=100000
@@ -596,7 +620,7 @@ pio=system.iobus.master[14]
 [system.realview.ssp_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268488704
 pio_latency=100000
@@ -606,7 +630,7 @@ pio=system.iobus.master[19]
 [system.realview.timer0]
 type=Sp804
 amba_id=1316868
-clock=1
+clock=1000
 clock0=1000000
 clock1=1000000
 gic=system.realview.gic
@@ -620,7 +644,7 @@ pio=system.iobus.master[2]
 [system.realview.timer1]
 type=Sp804
 amba_id=1316868
-clock=1
+clock=1000
 clock0=1000000
 clock1=1000000
 gic=system.realview.gic
@@ -633,7 +657,7 @@ pio=system.iobus.master[3]
 
 [system.realview.uart]
 type=Pl011
-clock=1
+clock=1000
 end_on_eot=false
 gic=system.realview.gic
 int_delay=100000
@@ -648,7 +672,7 @@ pio=system.iobus.master[0]
 [system.realview.uart1_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268476416
 pio_latency=100000
@@ -658,7 +682,7 @@ pio=system.iobus.master[10]
 [system.realview.uart2_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268480512
 pio_latency=100000
@@ -668,7 +692,7 @@ pio=system.iobus.master[11]
 [system.realview.uart3_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268484608
 pio_latency=100000
@@ -678,7 +702,7 @@ pio=system.iobus.master[12]
 [system.realview.watchdog_fake]
 type=AmbaFake
 amba_id=0
-clock=1
+clock=1000
 ignore_access=false
 pio_addr=268500992
 pio_latency=100000
@@ -692,16 +716,6 @@ number=0
 output=true
 port=3456
 
-[system.toL2Bus]
-type=CoherentBus
-block_size=64
-clock=1000
-header_cycles=1
-use_default_range=false
-width=8
-master=system.l2c.cpu_side
-slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb.walker.port system.cpu.dtb.walker.port
-
 [system.vncserver]
 type=VncServer
 frame_capture=false
-- 
cgit v1.2.3