tests: new ref outputs for new cache model

--HG--
extra : convert_revision : 244749072f97e425c2ca1cf296f2b95f37e99eb6

4 files changed, 29 insertions, 21 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 c16d67687..4cbaaf71e 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=/Users/nate/work/m5/outgoing/configs/boot/netperf-server.rcS
+readfile=/z/stever/hg/m5.stever/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
+children=dtb itb tracer
 clock=1
 cpu_id=0
 defer_registration=false
@@ -55,6 +55,7 @@ profile=0
 progress_interval=0
 simulate_stalls=false
 system=drivesys
+tracer=drivesys.cpu.tracer
 width=1
 dcache_port=drivesys.membus.port[3]
 icache_port=drivesys.membus.port[2]
@@ -67,6 +68,9 @@ size=64
 type=AlphaITB
 size=48
 
+[drivesys.cpu.tracer]
+type=ExeTracer
+
 [drivesys.disk0]
 type=IdeDisk
 children=image
@@ -647,7 +651,7 @@ pio_addr=8804615847936
 pio_latency=1000
 platform=drivesys.tsunami
 system=drivesys
-time=2009 1 1 0 0 0 3 1
+time=Thu Jan  1 00:00:00 2009
 tsunami=drivesys.tsunami
 year_is_bcd=false
 pio=drivesys.iobus.port[23]
@@ -704,7 +708,7 @@ kernel=/dist/m5/system/binaries/vmlinux
 mem_mode=atomic
 pal=/dist/m5/system/binaries/ts_osfpal
 physmem=testsys.physmem
-readfile=/Users/nate/work/m5/outgoing/configs/boot/netperf-stream-client.rcS
+readfile=/z/stever/hg/m5.stever/configs/boot/netperf-stream-client.rcS
 symbolfile=
 system_rev=1024
 system_type=34
@@ -725,7 +729,7 @@ side_b=testsys.membus.port[0]
 
 [testsys.cpu]
 type=AtomicSimpleCPU
-children=dtb itb
+children=dtb itb tracer
 clock=1
 cpu_id=0
 defer_registration=false
@@ -745,6 +749,7 @@ profile=0
 progress_interval=0
 simulate_stalls=false
 system=testsys
+tracer=testsys.cpu.tracer
 width=1
 dcache_port=testsys.membus.port[3]
 icache_port=testsys.membus.port[2]
@@ -757,6 +762,9 @@ size=64
 type=AlphaITB
 size=48
 
+[testsys.cpu.tracer]
+type=ExeTracer
+
 [testsys.disk0]
 type=IdeDisk
 children=image
@@ -1337,7 +1345,7 @@ pio_addr=8804615847936
 pio_latency=1000
 platform=testsys.tsunami
 system=testsys
-time=2009 1 1 0 0 0 3 1
+time=Thu Jan  1 00:00:00 2009
 tsunami=testsys.tsunami
 year_is_bcd=false
 pio=testsys.iobus.port[23]
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 e6bc6fb19..719430102 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,9 +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                                6618724                       # Simulator instruction rate (inst/s)
-host_seconds                                    41.30                       # Real time elapsed on the host
-host_tick_rate                             4842704130                       # Simulator tick rate (ticks/s)
+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)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
 sim_insts                                   273348482                       # Number of instructions simulated
 sim_seconds                                  0.200001                       # Number of seconds simulated
@@ -380,9 +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                            65191624612                       # Simulator instruction rate (inst/s)
+host_inst_rate                            71036507796                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 406704                       # Number of bytes of host memory used
 host_seconds                                     0.00                       # Real time elapsed on the host
-host_tick_rate                              183725573                       # Simulator tick rate (ticks/s)
+host_tick_rate                              191282064                       # 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 8fb9590c3..4f6a93597 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 3456
-Listening for drivesys connection on port 3457
-0: testsys.remote_gdb.listener: listening for remote gdb #0 on port 7000
-0: drivesys.remote_gdb.listener: listening for remote gdb #1 on port 7001
+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
 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 08d7271d7..3b074da7f 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,11 +5,9 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Jun 10 2007 14:10:03
-M5 started Mon Jun 11 01:47:32 2007
-M5 executing on iceaxe
-command line: /Users/nate/build/outgoing/build/ALPHA_FS/m5.debug -d /Users/nate/build/outgoing/build/ALPHA_FS/tests/debug/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 Aug  3 2007 04:02:11
+M5 started Fri Aug  3 04:26:58 2007
+M5 executing on zizzer.eecs.umich.edu
+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
-      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