tests: update tests for slight changes in nsgige posted interrupts
authorNathan Binkert <nate@binkert.org>
Wed, 18 Jun 2008 15:00:53 +0000 (11:00 -0400)
committerNathan Binkert <nate@binkert.org>
Wed, 18 Jun 2008 15:00:53 +0000 (11:00 -0400)
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout

index 151c1ae57d728b5fca4bdaa7b69880ae69c33943..8acd4fb85b64218149607dd06616182236ba5727 100644 (file)
@@ -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]
 
index 9f3e96104e70f06a1a4eefc81492d42bede1ee2b..03c1ec15e3354830447aedf89c6a569dfcb9b6ce 100644 (file)
@@ -91,7 +91,7 @@ drivesys.disk2.dma_read_txs                         0                       # Nu
 drivesys.disk2.dma_write_bytes                      0                       # Number of bytes transfered via DMA writes.
 drivesys.disk2.dma_write_full_pages                 0                       # Number of full page size DMA writes.
 drivesys.disk2.dma_write_txs                        0                       # Number of DMA write transactions.
-drivesys.tsunami.ethernet.coalescedRxDesc            1                       # average number of RxDesc's coalesced into each post
+drivesys.tsunami.ethernet.coalescedRxDesc            0                       # average number of RxDesc's coalesced into each post
 drivesys.tsunami.ethernet.coalescedRxIdle            0                       # average number of RxIdle's coalesced into each post
 drivesys.tsunami.ethernet.coalescedRxOk             0                       # average number of RxOk's coalesced into each post
 drivesys.tsunami.ethernet.coalescedRxOrn            0                       # average number of RxOrn's coalesced into each post
@@ -105,7 +105,7 @@ drivesys.tsunami.ethernet.descDMAWrites            13                       # Nu
 drivesys.tsunami.ethernet.descDmaReadBytes           96                       # number of descriptor bytes read w/ DMA
 drivesys.tsunami.ethernet.descDmaWriteBytes          104                       # number of descriptor bytes write w/ DMA
 drivesys.tsunami.ethernet.droppedPackets            0                       # number of packets dropped
-drivesys.tsunami.ethernet.postedInterrupts           10                       # number of posts to CPU
+drivesys.tsunami.ethernet.postedInterrupts           16                       # number of posts to CPU
 drivesys.tsunami.ethernet.postedRxDesc              6                       # number of RxDesc interrupts posted to CPU
 drivesys.tsunami.ethernet.postedRxIdle              0                       # number of rxIdle interrupts posted to CPU
 drivesys.tsunami.ethernet.postedRxOk                0                       # number of RxOk interrupts posted to CPU
@@ -139,10 +139,10 @@ drivesys.tsunami.ethernet.txPPS                    25                       # Pa
 drivesys.tsunami.ethernet.txPackets                 5                       # Number of Packets Transmitted
 drivesys.tsunami.ethernet.txTcpChecksums            2                       # Number of tx TCP Checksums done by device
 drivesys.tsunami.ethernet.txUdpChecksums            0                       # Number of tx UDP Checksums done by device
-host_inst_rate                              129173906                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 476620                       # Number of bytes of host memory used
-host_seconds                                     2.12                       # Real time elapsed on the host
-host_tick_rate                            94522664540                       # Simulator tick rate (ticks/s)
+host_inst_rate                              222632706                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 479796                       # Number of bytes of host memory used
+host_seconds                                     1.23                       # Real time elapsed on the host
+host_tick_rate                           162907421274                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                   273294782                       # Number of instructions simulated
 sim_seconds                                  0.200001                       # Number of seconds simulated
@@ -255,14 +255,14 @@ testsys.tsunami.ethernet.coalescedRxOrn             0                       # av
 testsys.tsunami.ethernet.coalescedSwi               0                       # average number of Swi's coalesced into each post
 testsys.tsunami.ethernet.coalescedTotal             1                       # average number of interrupts coalesced into each post
 testsys.tsunami.ethernet.coalescedTxDesc            0                       # average number of TxDesc's coalesced into each post
-testsys.tsunami.ethernet.coalescedTxIdle            1                       # average number of TxIdle's coalesced into each post
+testsys.tsunami.ethernet.coalescedTxIdle            0                       # average number of TxIdle's coalesced into each post
 testsys.tsunami.ethernet.coalescedTxOk              0                       # average number of TxOk's coalesced into each post
 testsys.tsunami.ethernet.descDMAReads               6                       # Number of descriptors the device read w/ DMA
 testsys.tsunami.ethernet.descDMAWrites             13                       # Number of descriptors the device wrote w/ DMA
 testsys.tsunami.ethernet.descDmaReadBytes          144                       # number of descriptor bytes read w/ DMA
 testsys.tsunami.ethernet.descDmaWriteBytes          104                       # number of descriptor bytes write w/ DMA
 testsys.tsunami.ethernet.droppedPackets             0                       # number of packets dropped
-testsys.tsunami.ethernet.postedInterrupts           10                       # number of posts to CPU
+testsys.tsunami.ethernet.postedInterrupts           15                       # number of posts to CPU
 testsys.tsunami.ethernet.postedRxDesc               4                       # number of RxDesc interrupts posted to CPU
 testsys.tsunami.ethernet.postedRxIdle               0                       # number of rxIdle interrupts posted to CPU
 testsys.tsunami.ethernet.postedRxOk                 0                       # number of RxOk interrupts posted to CPU
@@ -381,10 +381,10 @@ drivesys.tsunami.ethernet.totalSwi                  0                       # to
 drivesys.tsunami.ethernet.totalTxDesc               0                       # total number of TxDesc written to ISR
 drivesys.tsunami.ethernet.totalTxIdle               0                       # total number of TxIdle written to ISR
 drivesys.tsunami.ethernet.totalTxOk                 0                       # total number of TxOk written to ISR
-host_inst_rate                           134363216323                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 476620                       # Number of bytes of host memory used
+host_inst_rate                           225676946325                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 479796                       # Number of bytes of host memory used
 host_seconds                                     0.00                       # Real time elapsed on the host
-host_tick_rate                              362870729                       # Simulator tick rate (ticks/s)
+host_tick_rate                              612132399                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                   273294782                       # Number of instructions simulated
 sim_seconds                                  0.000001                       # Number of seconds simulated
index 891b3e2058986d7cfe480488bfd36d809de25c35..66e5a984cc540cb7d154eefd54d1f12e67a7b0b9 100644 (file)
@@ -1,6 +1,8 @@
-Listening for testsys connection on port 3456
-Listening for drivesys connection on port 3457
-0: testsys.remote_gdb.listener: listening for remote gdb on port 7000
-0: drivesys.remote_gdb.listener: listening for remote gdb on port 7001
+warn: kernel located at: /dist/m5/system/binaries/vmlinux
+Listening for testsys connection on port 3457
+warn: kernel located at: /dist/m5/system/binaries/vmlinux
+Listening for drivesys connection on port 3461
+0: testsys.remote_gdb.listener: listening for remote gdb #0 on port 7006
+0: drivesys.remote_gdb.listener: listening for remote gdb #1 on port 7007
 warn: Entering event queue @ 0.  Starting simulation...
 warn: Obsolete M5 instruction ivlb encountered.
index 324ab7868d933b3397d0bcdfeed3dd73038084f8..bc3aa034b64bc26e88deb80d4df750290019d738 100644 (file)
@@ -1,13 +1,17 @@
 M5 Simulator System
 
-Copyright (c) 2001-2006
+Copyright (c) 2001-2008
 The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Aug 21 2007 15:42:55
-M5 started Tue Aug 21 15:45:44 2007
-M5 executing on nacho
-command line: build/ALPHA_FS/m5.fast -d build/ALPHA_FS/tests/fast/quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic tests/run.py quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic
+M5 compiled Jun 18 2008 01:24:58
+M5 started Wed Jun 18 09:39:49 2008
+M5 executing on zizzer
+M5 revision 5485:840f91d062a9bd9c980e5959005329c3ed1bc82e
+M5 commit date Tue Jun 17 22:22:44 2008 -0700
+command line: /n/zeep/y/binkertn/build/work/build/ALPHA_FS/m5.opt -d /n/zeep/y/binkertn/build/work/build/ALPHA_FS/tests/opt/quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic tests/run.py quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic
 Global frequency set at 1000000000000 ticks per second
+      0: testsys.tsunami.io.rtc: Real-time clock set to Thu Jan  1 00:00:00 2009
+      0: drivesys.tsunami.io.rtc: Real-time clock set to Thu Jan  1 00:00:00 2009
 Exiting @ tick 4300235844056 because checkpoint