From 5a249e03a4efa79d5513a5e2ebdd27159a14dbb9 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 4 Dec 2015 00:19:05 +0000 Subject: stats: Update to reflect changes to RealView platform code --- .../arm/linux/realview-switcheroo-o3/config.ini | 268 ++++++++++++--------- 1 file changed, 148 insertions(+), 120 deletions(-) (limited to 'tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini') diff --git a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini index c1c48178d..6ed4cac0e 100644 --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-o3/config.ini @@ -12,11 +12,11 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain atags_addr=134217728 -boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm +boot_loader=/work/gem5/dist/binaries/boot_emm.arm boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1 cache_line_size=64 clk_domain=system.clk_domain -dtb_filename=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb +dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb early_kernel_symbols=false enable_context_switch_stats_dump=false eventq_index=0 @@ -28,7 +28,7 @@ have_security=false have_virtualization=false highest_el_is_64=false init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5 +kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 kernel_addr_check=true load_addr_mask=268435455 load_offset=2147483648 @@ -38,11 +38,12 @@ mem_ranges=2147483648:2415919103 memories=system.physmem system.realview.nvmem system.realview.vram mmap_using_noreserve=false multi_proc=true +multi_thread=false num_work_ids=16 panic_on_oops=true panic_on_panic=true phys_addr_range_64=40 -readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh +readfile=/work/gem5/outgoing/gem5/tests/halt.sh reset_addr_64=0 symbolfile= work_begin_ckpt_count=0 @@ -85,7 +86,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage eventq_index=0 -image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img +image_file=/work/gem5/dist/disks/linux-aarch32-ael.img read_only=true [system.clk_domain] @@ -209,6 +210,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=4 clk_domain=system.cpu_clk_domain +clusivity=mostly_incl demand_mshr_reserve=1 eventq_index=0 forward_snoops=true @@ -225,6 +227,7 @@ system=system tags=system.cpu0.dcache.tags tgts_per_mshr=20 write_buffers=8 +writeback_clean=false cpu_side=system.cpu0.dcache_port mem_side=system.toL2Bus.slave[1] @@ -592,6 +595,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=1 clk_domain=system.cpu_clk_domain +clusivity=mostly_incl demand_mshr_reserve=1 eventq_index=0 forward_snoops=true @@ -608,6 +612,7 @@ system=system tags=system.cpu0.icache.tags tgts_per_mshr=20 write_buffers=8 +writeback_clean=true cpu_side=system.cpu0.icache_port mem_side=system.toL2Bus.slave[0] @@ -627,6 +632,7 @@ eventq_index=0 [system.cpu0.isa] type=ArmISA +decoderFlavour=Generic eventq_index=0 fpsid=1090793632 id_aa64afr0_el1=0 @@ -744,7 +750,7 @@ iewToCommitDelay=1 iewToDecodeDelay=1 iewToFetchDelay=1 iewToRenameDelay=1 -interrupts=Null +interrupts= isa=system.cpu1.isa issueToExecuteDelay=1 issueWidth=8 @@ -1154,6 +1160,7 @@ pipelined=false [system.cpu1.isa] type=ArmISA +decoderFlavour=Generic eventq_index=0 fpsid=1090793632 id_aa64afr0_el1=0 @@ -1266,6 +1273,7 @@ children=tags addr_ranges=2147483648:2415919103 assoc=8 clk_domain=system.clk_domain +clusivity=mostly_incl demand_mshr_reserve=1 eventq_index=0 forward_snoops=false @@ -1282,6 +1290,7 @@ system=system tags=system.iocache.tags tgts_per_mshr=12 write_buffers=8 +writeback_clean=false cpu_side=system.iobus.master[27] mem_side=system.membus.slave[3] @@ -1301,6 +1310,7 @@ children=tags addr_ranges=0:18446744073709551615 assoc=8 clk_domain=system.cpu_clk_domain +clusivity=mostly_incl demand_mshr_reserve=1 eventq_index=0 forward_snoops=true @@ -1317,6 +1327,7 @@ system=system tags=system.l2c.tags tgts_per_mshr=12 write_buffers=8 +writeback_clean=false cpu_side=system.toL2Bus.master[0] mem_side=system.membus.slave[2] @@ -1444,7 +1455,7 @@ port=system.membus.master[5] [system.realview] type=RealView -children=aaci_fake cf_ctrl clcd energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake +children=aaci_fake cf_ctrl clcd dcc energy_ctrl ethernet generic_timer gic hdlcd ide kmi0 kmi1 l2x0_fake lan_fake local_cpu_timer mcc mmc_fake nvmem pciconfig realview_io rtc sp810_fake timer0 timer1 uart uart1_fake uart2_fake uart3_fake usb_fake vgic vram watchdog_fake eventq_index=0 intrctrl=system.intrctrl pci_cfg_base=805306368 @@ -1569,6 +1580,77 @@ vnc=system.vncserver dma=system.iobus.slave[1] pio=system.iobus.master[4] +[system.realview.dcc] +type=SubSystem +children=osc_cpu osc_ddr osc_hsbm osc_pxl osc_smb osc_sys +eventq_index=0 + +[system.realview.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.dcc.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.energy_ctrl] type=EnergyCtrl clk_domain=system.clk_domain @@ -1713,7 +1795,7 @@ pio_addr=721420288 pio_latency=10000 pixel_buffer_size=2048 pixel_chunk=32 -pxl_clk=system.realview.realview_io.osc_pxl +pxl_clk=system.realview.dcc.osc_pxl system=system vnc=system.vncserver workaround_dma_line_count=true @@ -1889,6 +1971,55 @@ pio_latency=100000 system=system pio=system.membus.master[4] +[system.realview.mcc] +type=SubSystem +children=osc_clcd osc_mcc osc_peripheral osc_system_bus +eventq_index=0 + +[system.realview.mcc.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.mcc.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.mcc.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.mcc.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.mmc_fake] type=AmbaFake amba_id=0 @@ -1927,7 +2058,6 @@ 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 @@ -1938,116 +2068,6 @@ 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 @@ -2216,12 +2236,13 @@ port=3456 [system.toL2Bus] type=CoherentXBar +children=snoop_filter clk_domain=system.cpu_clk_domain eventq_index=0 forward_latency=0 frontend_latency=1 response_latency=1 -snoop_filter=Null +snoop_filter=system.toL2Bus.snoop_filter snoop_response_latency=1 system=system use_default_range=false @@ -2229,6 +2250,13 @@ width=32 master=system.l2c.cpu_side slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port +[system.toL2Bus.snoop_filter] +type=SnoopFilter +eventq_index=0 +lookup_latency=0 +max_capacity=8388608 +system=system + [system.vncserver] type=VncServer eventq_index=0 -- cgit v1.2.3