stats: Update to reflect changes to PCI handling

3 files changed, 36 insertions, 45 deletions

diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
index 540fdcdef..6a7585bd4 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini
@@ -43,7 +43,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=/work/gem5/outgoing/gem5_2/tests/halt.sh
 reset_addr_64=0
 symbolfile=
 work_begin_ckpt_count=0
@@ -763,10 +763,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]
@@ -793,7 +792,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]
@@ -893,12 +892,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]
@@ -991,16 +987,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
@@ -1016,7 +1011,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
@@ -1179,13 +1174,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
@@ -1195,9 +1190,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
@@ -1239,7 +1233,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
@@ -1320,14 +1314,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]
 
@@ -1344,7 +1337,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
@@ -1359,7 +1352,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
@@ -1482,17 +1475,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
@@ -1544,7 +1539,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
@@ -1559,7 +1554,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
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
index d22933e16..581036fd9 100755
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout
@@ -1,10 +1,10 @@
 gem5 Simulator System.  http://gem5.org
 gem5 is copyrighted software; use the --copyright option for details.
 
-gem5 compiled Dec  3 2015 15:48:05
-gem5 started Dec  3 2015 15:54:29
-gem5 executing on e104799-lin, pid 1782
-command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual
+gem5 compiled Dec  4 2015 11:13:17
+gem5 started Dec  4 2015 11:24:30
+gem5 executing on e104799-lin, pid 30065
+command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re /work/gem5/outgoing/gem5_2/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual
 
 Global frequency set at 1000000000000 ticks per second
 info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
index 5ccc65a5c..583c12b60 100644
--- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
+++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  2.802895                       # Nu
 sim_ticks                                2802894699500                       # Number of ticks simulated
 final_tick                               2802894699500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 515393                       # Simulator instruction rate (inst/s)
-host_op_rate                                   627998                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                             9838648327                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 594196                       # Number of bytes of host memory used
-host_seconds                                   284.89                       # Real time elapsed on the host
+host_inst_rate                                 917511                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1117974                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                            17514936450                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 594132                       # Number of bytes of host memory used
+host_seconds                                   160.03                       # Real time elapsed on the host
 sim_insts                                   146828240                       # Number of instructions simulated
 sim_ops                                     178908039                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -1116,6 +1116,7 @@ system.iobus.trans_dist::WriteReq               59419                       # Tr
 system.iobus.trans_dist::WriteResp              59419                       # Transaction distribution
 system.iobus.pkt_count_system.bridge.master::system.realview.uart.pio        56582                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.realview_io.pio          122                       # Packet count per connected master and slave (bytes)
+system.iobus.pkt_count_system.bridge.master::system.realview.pci_host.pio          434                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.timer0.pio           34                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.timer1.pio           20                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.kmi0.pio          120                       # Packet count per connected master and slave (bytes)
@@ -1131,16 +1132,14 @@ system.iobus.pkt_count_system.bridge.master::system.realview.lan_fake.pio
 system.iobus.pkt_count_system.bridge.master::system.realview.usb_fake.pio           10                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.mmc_fake.pio           16                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.ide.pio         7244                       # Packet count per connected master and slave (bytes)
-system.iobus.pkt_count_system.bridge.master::system.realview.ide-pciconf          210                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::system.realview.ethernet.pio        42268                       # Packet count per connected master and slave (bytes)
-system.iobus.pkt_count_system.bridge.master::system.realview.ethernet-pciconf          164                       # Packet count per connected master and slave (bytes)
-system.iobus.pkt_count_system.bridge.master::system.realview.pciconfig.pio           60                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.bridge.master::total       107876                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.realview.ide.dma::system.iocache.cpu_side        72952                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count_system.realview.ide.dma::total        72952                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_count::total                  180828                       # Packet count per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.uart.pio        71526                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.realview_io.pio          244                       # Cumulative packet size per connected master and slave (bytes)
+system.iobus.pkt_size_system.bridge.master::system.realview.pci_host.pio          638                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.timer0.pio           68                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.timer1.pio           40                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.kmi0.pio           84                       # Cumulative packet size per connected master and slave (bytes)
@@ -1156,10 +1155,7 @@ system.iobus.pkt_size_system.bridge.master::system.realview.lan_fake.pio
 system.iobus.pkt_size_system.bridge.master::system.realview.usb_fake.pio           20                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.mmc_fake.pio           32                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.ide.pio         4753                       # Cumulative packet size per connected master and slave (bytes)
-system.iobus.pkt_size_system.bridge.master::system.realview.ide-pciconf          265                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::system.realview.ethernet.pio        84536                       # Cumulative packet size per connected master and slave (bytes)
-system.iobus.pkt_size_system.bridge.master::system.realview.ethernet-pciconf          253                       # Cumulative packet size per connected master and slave (bytes)
-system.iobus.pkt_size_system.bridge.master::system.realview.pciconfig.pio          120                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.bridge.master::total       162766                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.realview.ide.dma::system.iocache.cpu_side      2321248                       # Cumulative packet size per connected master and slave (bytes)
 system.iobus.pkt_size_system.realview.ide.dma::total      2321248                       # Cumulative packet size per connected master and slave (bytes)