tests: update tests for slight changes in nsgige posted interrupts

1 files changed, 54 insertions, 48 deletions

diff --git a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
index 151c1ae57..8acd4fb85 100644
--- a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
+++ b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
@@ -5,7 +5,7 @@ dummy=0
 
 [drivesys]
 type=LinuxAlphaSystem
-children=bridge cpu disk0 disk2 intrctrl iobus membus physmem sim_console simple_disk tsunami
+children=bridge cpu disk0 disk2 intrctrl iobus membus physmem simple_disk terminal tsunami
 boot_cpu_frequency=1
 boot_osflags=root=/dev/hda1 console=ttyS0
 console=/dist/m5/system/binaries/console
@@ -14,7 +14,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 mem_mode=atomic
 pal=/dist/m5/system/binaries/ts_osfpal
 physmem=drivesys.physmem
-readfile=/z/saidi/work/m5.dev/configs/boot/netperf-server.rcS
+readfile=/.automount/zeep/y/binkertn/work/m5/work/configs/boot/netperf-server.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -118,10 +118,11 @@ type=Bus
 block_size=64
 bus_id=0
 clock=1000
+header_cycles=1
 responder_set=true
 width=64
 default=drivesys.tsunami.pciconfig.pio
-port=drivesys.bridge.side_a drivesys.tsunami.cchip.pio drivesys.tsunami.pchip.pio drivesys.tsunami.fake_sm_chip.pio drivesys.tsunami.fake_uart1.pio drivesys.tsunami.fake_uart2.pio drivesys.tsunami.fake_uart3.pio drivesys.tsunami.fake_uart4.pio drivesys.tsunami.fake_ppc.pio drivesys.tsunami.fake_OROM.pio drivesys.tsunami.fake_pnp_addr.pio drivesys.tsunami.fake_pnp_write.pio drivesys.tsunami.fake_pnp_read0.pio drivesys.tsunami.fake_pnp_read1.pio drivesys.tsunami.fake_pnp_read2.pio drivesys.tsunami.fake_pnp_read3.pio drivesys.tsunami.fake_pnp_read4.pio drivesys.tsunami.fake_pnp_read5.pio drivesys.tsunami.fake_pnp_read6.pio drivesys.tsunami.fake_pnp_read7.pio drivesys.tsunami.fake_ata0.pio drivesys.tsunami.fake_ata1.pio drivesys.tsunami.fb.pio drivesys.tsunami.io.pio drivesys.tsunami.uart.pio drivesys.tsunami.console.pio drivesys.tsunami.ide.pio drivesys.tsunami.ethernet.pio drivesys.tsunami.ethernet.config drivesys.tsunami.ethernet.dma drivesys.tsunami.ide.config drivesys.tsunami.ide.dma
+port=drivesys.bridge.side_a drivesys.tsunami.cchip.pio drivesys.tsunami.pchip.pio drivesys.tsunami.fake_sm_chip.pio drivesys.tsunami.fake_uart1.pio drivesys.tsunami.fake_uart2.pio drivesys.tsunami.fake_uart3.pio drivesys.tsunami.fake_uart4.pio drivesys.tsunami.fake_ppc.pio drivesys.tsunami.fake_OROM.pio drivesys.tsunami.fake_pnp_addr.pio drivesys.tsunami.fake_pnp_write.pio drivesys.tsunami.fake_pnp_read0.pio drivesys.tsunami.fake_pnp_read1.pio drivesys.tsunami.fake_pnp_read2.pio drivesys.tsunami.fake_pnp_read3.pio drivesys.tsunami.fake_pnp_read4.pio drivesys.tsunami.fake_pnp_read5.pio drivesys.tsunami.fake_pnp_read6.pio drivesys.tsunami.fake_pnp_read7.pio drivesys.tsunami.fake_ata0.pio drivesys.tsunami.fake_ata1.pio drivesys.tsunami.fb.pio drivesys.tsunami.io.pio drivesys.tsunami.uart.pio drivesys.tsunami.backdoor.pio drivesys.tsunami.ide.pio drivesys.tsunami.ethernet.pio drivesys.tsunami.ethernet.config drivesys.tsunami.ethernet.dma drivesys.tsunami.ide.config drivesys.tsunami.ide.dma
 
 [drivesys.membus]
 type=Bus
@@ -129,6 +130,7 @@ children=responder
 block_size=64
 bus_id=1
 clock=1000
+header_cycles=1
 responder_set=false
 width=64
 default=drivesys.membus.responder.pio
@@ -154,18 +156,12 @@ pio=drivesys.membus.default
 type=PhysicalMemory
 file=
 latency=1
+latency_var=0
+null=false
 range=0:134217727
 zero=false
 port=drivesys.membus.port[1]
 
-[drivesys.sim_console]
-type=SimConsole
-append_name=true
-intr_control=drivesys.intrctrl
-number=0
-output=console
-port=3456
-
 [drivesys.simple_disk]
 type=SimpleDisk
 children=disk
@@ -177,12 +173,30 @@ type=RawDiskImage
 image_file=/dist/m5/system/disks/linux-latest.img
 read_only=true
 
+[drivesys.terminal]
+type=Terminal
+intr_control=drivesys.intrctrl
+number=0
+output=true
+port=3456
+
 [drivesys.tsunami]
 type=Tsunami
-children=cchip console ethernet fake_OROM fake_ata0 fake_ata1 fake_pnp_addr fake_pnp_read0 fake_pnp_read1 fake_pnp_read2 fake_pnp_read3 fake_pnp_read4 fake_pnp_read5 fake_pnp_read6 fake_pnp_read7 fake_pnp_write fake_ppc fake_sm_chip fake_uart1 fake_uart2 fake_uart3 fake_uart4 fb ide io pchip pciconfig uart
+children=backdoor cchip ethernet fake_OROM fake_ata0 fake_ata1 fake_pnp_addr fake_pnp_read0 fake_pnp_read1 fake_pnp_read2 fake_pnp_read3 fake_pnp_read4 fake_pnp_read5 fake_pnp_read6 fake_pnp_read7 fake_pnp_write fake_ppc fake_sm_chip fake_uart1 fake_uart2 fake_uart3 fake_uart4 fb ide io pchip pciconfig uart
 intrctrl=drivesys.intrctrl
 system=drivesys
 
+[drivesys.tsunami.backdoor]
+type=AlphaBackdoor
+cpu=drivesys.cpu
+disk=drivesys.simple_disk
+pio_addr=8804682956800
+pio_latency=1000
+platform=drivesys.tsunami
+system=drivesys
+terminal=drivesys.terminal
+pio=drivesys.iobus.port[25]
+
 [drivesys.tsunami.cchip]
 type=TsunamiCChip
 pio_addr=8803072344064
@@ -192,17 +206,6 @@ system=drivesys
 tsunami=drivesys.tsunami
 pio=drivesys.iobus.port[1]
 
-[drivesys.tsunami.console]
-type=AlphaConsole
-cpu=drivesys.cpu
-disk=drivesys.simple_disk
-pio_addr=8804682956800
-pio_latency=1000
-platform=drivesys.tsunami
-sim_console=drivesys.sim_console
-system=drivesys
-pio=drivesys.iobus.port[25]
-
 [drivesys.tsunami.ethernet]
 type=NSGigE
 BAR0=1
@@ -665,8 +668,8 @@ type=Uart8250
 pio_addr=8804615848952
 pio_latency=1000
 platform=drivesys.tsunami
-sim_console=drivesys.sim_console
 system=drivesys
+terminal=drivesys.terminal
 pio=drivesys.iobus.port[24]
 
 [etherdump]
@@ -685,7 +688,7 @@ int1=drivesys.tsunami.ethernet.interface
 
 [testsys]
 type=LinuxAlphaSystem
-children=bridge cpu disk0 disk2 intrctrl iobus membus physmem sim_console simple_disk tsunami
+children=bridge cpu disk0 disk2 intrctrl iobus membus physmem simple_disk terminal tsunami
 boot_cpu_frequency=1
 boot_osflags=root=/dev/hda1 console=ttyS0
 console=/dist/m5/system/binaries/console
@@ -694,7 +697,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 mem_mode=atomic
 pal=/dist/m5/system/binaries/ts_osfpal
 physmem=testsys.physmem
-readfile=/z/saidi/work/m5.dev/configs/boot/netperf-stream-client.rcS
+readfile=/.automount/zeep/y/binkertn/work/m5/work/configs/boot/netperf-stream-client.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -798,10 +801,11 @@ type=Bus
 block_size=64
 bus_id=0
 clock=1000
+header_cycles=1
 responder_set=true
 width=64
 default=testsys.tsunami.pciconfig.pio
-port=testsys.bridge.side_a testsys.tsunami.cchip.pio testsys.tsunami.pchip.pio testsys.tsunami.fake_sm_chip.pio testsys.tsunami.fake_uart1.pio testsys.tsunami.fake_uart2.pio testsys.tsunami.fake_uart3.pio testsys.tsunami.fake_uart4.pio testsys.tsunami.fake_ppc.pio testsys.tsunami.fake_OROM.pio testsys.tsunami.fake_pnp_addr.pio testsys.tsunami.fake_pnp_write.pio testsys.tsunami.fake_pnp_read0.pio testsys.tsunami.fake_pnp_read1.pio testsys.tsunami.fake_pnp_read2.pio testsys.tsunami.fake_pnp_read3.pio testsys.tsunami.fake_pnp_read4.pio testsys.tsunami.fake_pnp_read5.pio testsys.tsunami.fake_pnp_read6.pio testsys.tsunami.fake_pnp_read7.pio testsys.tsunami.fake_ata0.pio testsys.tsunami.fake_ata1.pio testsys.tsunami.fb.pio testsys.tsunami.io.pio testsys.tsunami.uart.pio testsys.tsunami.console.pio testsys.tsunami.ide.pio testsys.tsunami.ethernet.pio testsys.tsunami.ethernet.config testsys.tsunami.ethernet.dma testsys.tsunami.ide.config testsys.tsunami.ide.dma
+port=testsys.bridge.side_a testsys.tsunami.cchip.pio testsys.tsunami.pchip.pio testsys.tsunami.fake_sm_chip.pio testsys.tsunami.fake_uart1.pio testsys.tsunami.fake_uart2.pio testsys.tsunami.fake_uart3.pio testsys.tsunami.fake_uart4.pio testsys.tsunami.fake_ppc.pio testsys.tsunami.fake_OROM.pio testsys.tsunami.fake_pnp_addr.pio testsys.tsunami.fake_pnp_write.pio testsys.tsunami.fake_pnp_read0.pio testsys.tsunami.fake_pnp_read1.pio testsys.tsunami.fake_pnp_read2.pio testsys.tsunami.fake_pnp_read3.pio testsys.tsunami.fake_pnp_read4.pio testsys.tsunami.fake_pnp_read5.pio testsys.tsunami.fake_pnp_read6.pio testsys.tsunami.fake_pnp_read7.pio testsys.tsunami.fake_ata0.pio testsys.tsunami.fake_ata1.pio testsys.tsunami.fb.pio testsys.tsunami.io.pio testsys.tsunami.uart.pio testsys.tsunami.backdoor.pio testsys.tsunami.ide.pio testsys.tsunami.ethernet.pio testsys.tsunami.ethernet.config testsys.tsunami.ethernet.dma testsys.tsunami.ide.config testsys.tsunami.ide.dma
 
 [testsys.membus]
 type=Bus
@@ -809,6 +813,7 @@ children=responder
 block_size=64
 bus_id=1
 clock=1000
+header_cycles=1
 responder_set=false
 width=64
 default=testsys.membus.responder.pio
@@ -834,18 +839,12 @@ pio=testsys.membus.default
 type=PhysicalMemory
 file=
 latency=1
+latency_var=0
+null=false
 range=0:134217727
 zero=false
 port=testsys.membus.port[1]
 
-[testsys.sim_console]
-type=SimConsole
-append_name=true
-intr_control=testsys.intrctrl
-number=0
-output=console
-port=3456
-
 [testsys.simple_disk]
 type=SimpleDisk
 children=disk
@@ -857,12 +856,30 @@ type=RawDiskImage
 image_file=/dist/m5/system/disks/linux-latest.img
 read_only=true
 
+[testsys.terminal]
+type=Terminal
+intr_control=testsys.intrctrl
+number=0
+output=true
+port=3456
+
 [testsys.tsunami]
 type=Tsunami
-children=cchip console ethernet fake_OROM fake_ata0 fake_ata1 fake_pnp_addr fake_pnp_read0 fake_pnp_read1 fake_pnp_read2 fake_pnp_read3 fake_pnp_read4 fake_pnp_read5 fake_pnp_read6 fake_pnp_read7 fake_pnp_write fake_ppc fake_sm_chip fake_uart1 fake_uart2 fake_uart3 fake_uart4 fb ide io pchip pciconfig uart
+children=backdoor cchip ethernet fake_OROM fake_ata0 fake_ata1 fake_pnp_addr fake_pnp_read0 fake_pnp_read1 fake_pnp_read2 fake_pnp_read3 fake_pnp_read4 fake_pnp_read5 fake_pnp_read6 fake_pnp_read7 fake_pnp_write fake_ppc fake_sm_chip fake_uart1 fake_uart2 fake_uart3 fake_uart4 fb ide io pchip pciconfig uart
 intrctrl=testsys.intrctrl
 system=testsys
 
+[testsys.tsunami.backdoor]
+type=AlphaBackdoor
+cpu=testsys.cpu
+disk=testsys.simple_disk
+pio_addr=8804682956800
+pio_latency=1000
+platform=testsys.tsunami
+system=testsys
+terminal=testsys.terminal
+pio=testsys.iobus.port[25]
+
 [testsys.tsunami.cchip]
 type=TsunamiCChip
 pio_addr=8803072344064
@@ -872,17 +889,6 @@ system=testsys
 tsunami=testsys.tsunami
 pio=testsys.iobus.port[1]
 
-[testsys.tsunami.console]
-type=AlphaConsole
-cpu=testsys.cpu
-disk=testsys.simple_disk
-pio_addr=8804682956800
-pio_latency=1000
-platform=testsys.tsunami
-sim_console=testsys.sim_console
-system=testsys
-pio=testsys.iobus.port[25]
-
 [testsys.tsunami.ethernet]
 type=NSGigE
 BAR0=1
@@ -1345,7 +1351,7 @@ type=Uart8250
 pio_addr=8804615848952
 pio_latency=1000
 platform=testsys.tsunami
-sim_console=testsys.sim_console
 system=testsys
+terminal=testsys.terminal
 pio=testsys.iobus.port[24]