stats: update stats to after GPU checkin

[gem5.git] / tests / quick / fs / 10.linux-boot / ref / arm / linux / realview-simple-atomic-checkpoint / config.ini

diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
index 2db2ddc0e4bb061f3b212c056cad8c39ddf278ef..c979f027514610379f1288a0d11402704920fa3e 100644 (file)
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini
@@ -12,14 +12,15 @@ time_sync_spin_threshold=100000000
 type=LinuxArmSystem
 children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain
 atags_addr=134217728
-boot_loader=/work/gem5/dist/binaries/boot_emm.arm
+boot_loader=/dist/m5/system/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=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
+dtb_filename=/dist/m5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb
 early_kernel_symbols=false
 enable_context_switch_stats_dump=false
 eventq_index=0
+exit_on_work_items=false
 flags_addr=469827632
 gic_cpu_addr=738205696
 have_large_asid_64=false
@@ -28,7 +29,7 @@ have_security=false
 have_virtualization=false
 highest_el_is_64=false
 init_param=0
-kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
+kernel=/dist/m5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5
 kernel_addr_check=true
 load_addr_mask=268435455
 load_offset=2147483648
@@ -43,7 +44,7 @@ num_work_ids=16
 panic_on_oops=true
 panic_on_panic=true
 phys_addr_range_64=40
-readfile=/work/gem5/outgoing/gem5/tests/halt.sh
+readfile=/z/atgutier/gem5/gem5-commit/tests/halt.sh
 reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
@@ -86,7 +87,7 @@ table_size=65536
 [system.cf0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/work/gem5/dist/disks/linux-aarch32-ael.img
+image_file=/dist/m5/system/disks/linux-aarch32-ael.img
 read_only=true
 
 [system.clk_domain]
@@ -419,10 +420,9 @@ eventq_index=0
 forward_latency=1
 frontend_latency=2
 response_latency=2
-use_default_range=true
+use_default_range=false
 width=16
-default=system.realview.pciconfig.pio
-master=system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.hdlcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.rtc.pio system.realview.vram.port system.realview.l2x0_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.aaci_fake.pio system.realview.lan_fake.pio system.realview.usb_fake.pio system.realview.mmc_fake.pio system.realview.energy_ctrl.pio system.realview.ide.pio system.realview.ide.config system.realview.ethernet.pio system.realview.ethernet.config system.iocache.cpu_side
+master=system.realview.uart.pio system.realview.realview_io.pio system.realview.pci_host.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.hdlcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.rtc.pio system.realview.vram.port system.realview.l2x0_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.aaci_fake.pio system.realview.lan_fake.pio system.realview.usb_fake.pio system.realview.mmc_fake.pio system.realview.energy_ctrl.pio system.realview.ide.pio system.realview.ethernet.pio system.iocache.cpu_side
 slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma system.realview.ide.dma system.realview.ethernet.dma
 
 [system.iocache]
@@ -449,7 +449,7 @@ tags=system.iocache.tags
 tgts_per_mshr=12
 write_buffers=8
 writeback_clean=false
-cpu_side=system.iobus.master[27]
+cpu_side=system.iobus.master[25]
 mem_side=system.membus.slave[3]
 
 [system.iocache.tags]
@@ -512,12 +512,9 @@ port=system.membus.master[5]
 
 [system.realview]
 type=RealView
-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
+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 pci_host 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
-pci_cfg_gen_offsets=false
-pci_io_base=0
 system=system
 
 [system.realview.aaci_fake]
@@ -610,16 +607,15 @@ config_latency=20000
 ctrl_offset=2
 disks=
 eventq_index=0
+host=system.realview.pci_host
 io_shift=2
 pci_bus=2
 pci_dev=0
 pci_func=0
 pio_latency=30000
-platform=system.realview
 system=system
-config=system.iobus.master[9]
 dma=system.iobus.slave[2]
-pio=system.iobus.master[8]
+pio=system.iobus.master[9]
 
 [system.realview.clcd]
 type=Pl111
@@ -635,7 +631,7 @@ pixel_clock=41667
 system=system
 vnc=system.vncserver
 dma=system.iobus.slave[1]
-pio=system.iobus.master[4]
+pio=system.iobus.master[5]
 
 [system.realview.dcc]
 type=SubSystem
@@ -798,13 +794,13 @@ eventq_index=0
 fetch_comp_delay=10000
 fetch_delay=10000
 hardware_address=00:90:00:00:00:01
+host=system.realview.pci_host
 pci_bus=0
 pci_dev=0
 pci_func=0
 phy_epid=896
 phy_pid=680
 pio_latency=30000
-platform=system.realview
 rx_desc_cache_size=64
 rx_fifo_size=393216
 rx_write_delay=0
@@ -814,9 +810,8 @@ tx_fifo_size=393216
 tx_read_delay=0
 wb_comp_delay=10000
 wb_delay=10000
-config=system.iobus.master[26]
 dma=system.iobus.slave[4]
-pio=system.iobus.master[25]
+pio=system.iobus.master[24]
 
 [system.realview.generic_timer]
 type=GenericTimer
@@ -858,7 +853,7 @@ vnc=system.vncserver
 workaround_dma_line_count=true
 workaround_swap_rb=true
 dma=system.membus.slave[0]
-pio=system.iobus.master[5]
+pio=system.iobus.master[6]
 
 [system.realview.ide]
 type=IdeController
@@ -939,14 +934,13 @@ config_latency=20000
 ctrl_offset=0
 disks=system.cf0
 eventq_index=0
+host=system.realview.pci_host
 io_shift=0
 pci_bus=0
 pci_dev=1
 pci_func=0
 pio_latency=30000
-platform=system.realview
 system=system
-config=system.iobus.master[24]
 dma=system.iobus.slave[3]
 pio=system.iobus.master[23]
 
@@ -963,7 +957,7 @@ pio_addr=470155264
 pio_latency=100000
 system=system
 vnc=system.vncserver
-pio=system.iobus.master[6]
+pio=system.iobus.master[7]
 
 [system.realview.kmi1]
 type=Pl050
@@ -978,7 +972,7 @@ pio_addr=470220800
 pio_latency=100000
 system=system
 vnc=system.vncserver
-pio=system.iobus.master[7]
+pio=system.iobus.master[8]
 
 [system.realview.l2x0_fake]
 type=IsaFake
@@ -1101,17 +1095,19 @@ null=false
 range=0:67108863
 port=system.membus.master[1]
 
-[system.realview.pciconfig]
-type=PciConfigAll
-bus=0
+[system.realview.pci_host]
+type=GenericPciHost
 clk_domain=system.clk_domain
+conf_base=805306368
+conf_device_bits=16
+conf_size=268435456
 eventq_index=0
-pio_addr=0
-pio_latency=30000
+pci_dma_base=0
+pci_mem_base=0
+pci_pio_base=0
 platform=system.realview
-size=268435456
 system=system
-pio=system.iobus.default
+pio=system.iobus.master[2]
 
 [system.realview.realview_io]
 type=RealViewCtrl
@@ -1163,7 +1159,7 @@ int_num1=34
 pio_addr=470876160
 pio_latency=100000
 system=system
-pio=system.iobus.master[2]
+pio=system.iobus.master[3]
 
 [system.realview.timer1]
 type=Sp804
@@ -1178,7 +1174,7 @@ int_num1=35
 pio_addr=470941696
 pio_latency=100000
 system=system
-pio=system.iobus.master[3]
+pio=system.iobus.master[4]
 
 [system.realview.uart]
 type=Pl011