Reference updates. Since split cache is gone, a lot of config.ini changes, and minor changes to stats that are likely due to the decoupling of insertions/evictions in the cache.

4 files changed, 26 insertions, 17 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 2dc579fd2..c935ec207 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=/n/iceaxe/Users/nate/work/m5/work/configs/boot/netperf-server.rcS
+readfile=/z/hsul/work/m5/m5/configs/boot/netperf-server.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -35,7 +35,7 @@ side_b=drivesys.membus.port[0]
 
 [drivesys.cpu]
 type=AtomicSimpleCPU
-children=dtb itb tracer
+children=dtb interrupts itb tracer
 clock=1
 cpu_id=0
 defer_registration=false
@@ -45,6 +45,7 @@ do_statistics_insts=true
 dtb=drivesys.cpu.dtb
 function_trace=false
 function_trace_start=0
+interrupts=drivesys.cpu.interrupts
 itb=drivesys.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -66,6 +67,9 @@ icache_port=drivesys.membus.port[2]
 type=AlphaDTB
 size=64
 
+[drivesys.cpu.interrupts]
+type=AlphaInterrupts
+
 [drivesys.cpu.itb]
 type=AlphaITB
 size=48
@@ -699,7 +703,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 mem_mode=atomic
 pal=/dist/m5/system/binaries/ts_osfpal
 physmem=testsys.physmem
-readfile=/n/iceaxe/Users/nate/work/m5/work/configs/boot/netperf-stream-client.rcS
+readfile=/z/hsul/work/m5/m5/configs/boot/netperf-stream-client.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -720,7 +724,7 @@ side_b=testsys.membus.port[0]
 
 [testsys.cpu]
 type=AtomicSimpleCPU
-children=dtb itb tracer
+children=dtb interrupts itb tracer
 clock=1
 cpu_id=0
 defer_registration=false
@@ -730,6 +734,7 @@ do_statistics_insts=true
 dtb=testsys.cpu.dtb
 function_trace=false
 function_trace_start=0
+interrupts=testsys.cpu.interrupts
 itb=testsys.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
@@ -751,6 +756,9 @@ icache_port=testsys.membus.port[2]
 type=AlphaDTB
 size=64
 
+[testsys.cpu.interrupts]
+type=AlphaInterrupts
+
 [testsys.cpu.itb]
 type=AlphaITB
 size=48
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 6315d7b3d..11d12fd63 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                              162488534                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 477336                       # Number of bytes of host memory used
-host_seconds                                     1.68                       # Real time elapsed on the host
-host_tick_rate                           118897556170                       # Simulator tick rate (ticks/s)
+host_inst_rate                              161007148                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 478492                       # Number of bytes of host memory used
+host_seconds                                     1.70                       # Real time elapsed on the host
+host_tick_rate                           117815722486                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                   273294177                       # 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                           147646773096                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 477336                       # Number of bytes of host memory used
+host_inst_rate                           142489143379                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 478492                       # Number of bytes of host memory used
 host_seconds                                     0.00                       # Real time elapsed on the host
-host_tick_rate                              399988804                       # Simulator tick rate (ticks/s)
+host_tick_rate                              385850761                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                   273294177                       # 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 c0d2c6cc2..73103c03f 100755
--- 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
@@ -2,5 +2,5 @@ warn: kernel located at: /dist/m5/system/binaries/vmlinux
 warn: Sockets disabled, not accepting terminal connections
 warn: kernel located at: /dist/m5/system/binaries/vmlinux
 warn: Sockets disabled, not accepting gdb connections
-warn: Entering event queue @ 0.  Starting simulation...
 warn: Obsolete M5 ivlb instruction encountered.
+warn: be nice to actually delete the event here
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 3d3f5d1b8..487c48aa8 100755
--- 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,11 +5,12 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Sep 27 2008 21:08:15
-M5 revision 5571:7f81bb1690686883c5b93e8343068a001faf5083
-M5 commit date Sat Sep 27 21:03:50 2008 -0700
-M5 started Sep 27 2008 21:08:17
-M5 executing on piton
+M5 compiled Nov  5 2008 22:27:11
+M5 revision 5719:c9056088f1516d097f7e73673f990175ad238d69
+M5 commit date Wed Nov 05 16:19:17 2008 -0500
+M5 started Nov  5 2008 22:28:13
+M5 executing on zizzer
 command line: build/ALPHA_FS/m5.fast -d build/ALPHA_FS/tests/fast/quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic -re --stdout-file stdout --stderr-file stderr tests/run.py quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic
 Global frequency set at 1000000000000 ticks per second
+info: Entering event queue @ 0.  Starting simulation...
 Exiting @ tick 4300236804024 because checkpoint