Regression: Add an I/O Cache to the full system regressions that have a cache.

--HG--
extra : convert_revision : 8ba96e21be2f602eed8258d410038dbe998ef176

6 files changed, 51 insertions, 49 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 4cbaaf71e..3385f4fea 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
@@ -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/stever/hg/m5.stever/configs/boot/netperf-server.rcS
+readfile=/z/saidi/work/m5.bb/configs/boot/netperf-server.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -22,8 +22,8 @@ system_type=34
 [drivesys.bridge]
 type=Bridge
 delay=50000
-fix_partial_write_a=false
-fix_partial_write_b=true
+filter_ranges_a=
+filter_ranges_b=
 nack_delay=4000
 req_size_a=16
 req_size_b=16
@@ -708,7 +708,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 mem_mode=atomic
 pal=/dist/m5/system/binaries/ts_osfpal
 physmem=testsys.physmem
-readfile=/z/stever/hg/m5.stever/configs/boot/netperf-stream-client.rcS
+readfile=/z/saidi/work/m5.bb/configs/boot/netperf-stream-client.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -716,8 +716,8 @@ system_type=34
 [testsys.bridge]
 type=Bridge
 delay=50000
-fix_partial_write_a=false
-fix_partial_write_b=true
+filter_ranges_a=
+filter_ranges_b=
 nack_delay=4000
 req_size_a=16
 req_size_b=16
diff --git a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console
index aa129d6a7..89c68d228 100644
--- a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console
+++ b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.drivesys.sim_console
@@ -58,7 +58,7 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
 
eth0: ns83820.c: 0x22c: 00000000, subsystem: 0000:0000
 
eth0: enabling optical transceiver
 
eth0: using 64 bit addressing.
-
eth0: ns83820 v0.22: DP83820 v1.3: 00:90:00:00:00:02 io=0x09000000 irq=30 f=h,sg
+
eth0: ns83820 v0.22: DP83820 v1.3: 00:90:00:00:00:01 io=0x09000000 irq=30 f=h,sg
 
tun: Universal TUN/TAP device driver, 1.6
 
tun: (C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>
 
Uniform Multi-Platform E-IDE driver Revision: 7.00alpha2
@@ -72,7 +72,7 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
 
hdb: M5 IDE Disk, ATA DISK drive
 
ide0 at 0x8410-0x8417,0x8422 on irq 31
 
hda: max request size: 128KiB
-
hda: 511056 sectors (261 MB), CHS=507/16/63, UDMA(33)
+
hda: 101808 sectors (52 MB), CHS=101/16/63, UDMA(33)
 
hda: cache flushes not supported
 
 hda: hda1
 
hdb: max request size: 128KiB
@@ -99,13 +99,14 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
 
All bugs added by David S. Miller <davem@redhat.com>
 
VFS: Mounted root (ext2 filesystem) readonly.
 
Freeing unused kernel memory: 224k freed
-

init started:  BusyBox v1.1.0 (2006.08.17-02:54+0000) multi-call binary
-mounting filesystems...
-loading script...
-setting up network...
+

init started:  BusyBox v1.1.0 (2007.03.04-01:07+0000) multi-call binary

+mounting filesystems...

+EXT2-fs warning: checktime reached, running e2fsck is recommended
+
loading script...

+setting up network...

 eth0: link now 1000F mbps, full duplex and up.
-
running netserver...
-Starting netserver at port 12865
-signal client to begin...done.
-starting bash...
+
running netserver...

+Starting netserver at port 12865

+signal client to begin...done.

+starting bash...

 # 
\ No newline at end of file
diff --git a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console
index b8f1a6cae..c1cb6aad0 100644
--- a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console
+++ b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/console.testsys.sim_console
@@ -72,7 +72,7 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
 
hdb: M5 IDE Disk, ATA DISK drive
 
ide0 at 0x8410-0x8417,0x8422 on irq 31
 
hda: max request size: 128KiB
-
hda: 511056 sectors (261 MB), CHS=507/16/63, UDMA(33)
+
hda: 101808 sectors (52 MB), CHS=101/16/63, UDMA(33)
 
hda: cache flushes not supported
 
 hda: hda1
 
hdb: max request size: 128KiB
@@ -99,22 +99,23 @@ M5 console: m5AlphaAccess @ 0xFFFFFD0200000000
 
All bugs added by David S. Miller <davem@redhat.com>
 
VFS: Mounted root (ext2 filesystem) readonly.
 
Freeing unused kernel memory: 224k freed
-

init started:  BusyBox v1.1.0 (2006.08.17-02:54+0000) multi-call binary
-mounting filesystems...
-loading script...
-setting up network...
+

init started:  BusyBox v1.1.0 (2007.03.04-01:07+0000) multi-call binary

+mounting filesystems...

+EXT2-fs warning: checktime reached, running e2fsck is recommended
+
loading script...

+setting up network...

 eth0: link now 1000F mbps, full duplex and up.
-
waiting for server...server ready
-starting test...
-netperf warmup
-/benchmarks/netperf-bin/netperf -H 10.0.0.1 -t TCP_STREAM -l -100k
-TCP STREAM TEST to 10.0.0.1 : dirty data
-Recv   Send    Send                          
-Socket Socket  Message  Elapsed              
-Size   Size    Size     Time     Throughput  
-bytes  bytes   bytes    secs.    10^6bits/sec  
-
-5000000 5000000 5000000    1.29       30.91   
-netperf benchmark
-/benchmarks/netperf-bin/netperf -H 10.0.0.1 -t TCP_STREAM -k16384,0 -K16384,0 -- -m 65536 -M 65536 -s 262144 -S 262144
-TCP STREAM TEST to 10.0.0.1 : dirty data
+
waiting for server...server ready

+starting test...

+netperf warmup

+/benchmarks/netperf-bin/netperf -H 10.0.0.1 -t TCP_STREAM -l -100k

+TCP STREAM TEST to 10.0.0.1 : dirty data

+Recv   Send    Send                          

+Socket Socket  Message  Elapsed              

+Size   Size    Size     Time     Throughput  

+bytes  bytes   bytes    secs.    10^6bits/sec  

+

+5000000 5000000 5000000    1.29       30.91   

+netperf benchmark

+/benchmarks/netperf-bin/netperf -H 10.0.0.1 -t TCP_STREAM -k16384,0 -K16384,0 -- -m 65536 -M 65536 -s 262144 -S 262144

+TCP STREAM TEST to 10.0.0.1 : dirty data

diff --git a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt
index 719430102..c63520549 100644
--- a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt
+++ b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/m5stats.txt
@@ -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                               51081325                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 406704                       # Number of bytes of host memory used
-host_seconds                                     5.35                       # Real time elapsed on the host
-host_tick_rate                            37372483621                       # Simulator tick rate (ticks/s)
+host_inst_rate                              109126509                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 477016                       # Number of bytes of host memory used
+host_seconds                                     2.51                       # Real time elapsed on the host
+host_tick_rate                            79838467246                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                   273348482                       # Number of instructions simulated
 sim_seconds                                  0.200001                       # Number of seconds simulated
@@ -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                            71036507796                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 406704                       # Number of bytes of host memory used
+host_inst_rate                           139108642239                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 477016                       # Number of bytes of host memory used
 host_seconds                                     0.00                       # Real time elapsed on the host
-host_tick_rate                              191282064                       # Simulator tick rate (ticks/s)
+host_tick_rate                              375168496                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                   273348482                       # Number of instructions simulated
 sim_seconds                                  0.000001                       # Number of seconds simulated
diff --git a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr
index 4f6a93597..891b3e205 100644
--- a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr
+++ b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stderr
@@ -1,6 +1,6 @@
-Listening for testsys connection on port 3457
-Listening for drivesys connection on port 3458
-0: testsys.remote_gdb.listener: listening for remote gdb on port 7001
-0: drivesys.remote_gdb.listener: listening for remote gdb on port 7002
+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: Entering event queue @ 0.  Starting simulation...
 warn: Obsolete M5 instruction ivlb encountered.
diff --git a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout
index 3b074da7f..345be7558 100644
--- a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout
+++ b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stdout
@@ -5,9 +5,9 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Aug  3 2007 04:02:11
-M5 started Fri Aug  3 04:26:58 2007
-M5 executing on zizzer.eecs.umich.edu
+M5 compiled Aug 10 2007 16:03:34
+M5 started Fri Aug 10 16:06:35 2007
+M5 executing on zeep
 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
 Global frequency set at 1000000000000 ticks per second
 Exiting @ tick 4300235844056 because checkpoint