Stats: Update the stats.

--HG--
extra : convert_revision : 888b6e3bcd432a9318d4b8741a8b274c6f37f1a8

5 files changed, 70 insertions, 62 deletions

diff --git a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
index d0738b960..7369c8a0c 100644
--- a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
+++ b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
@@ -34,8 +34,8 @@ symbolfile=
 [system.bridge]
 type=Bridge
 delay=100
-fix_partial_write_a=false
-fix_partial_write_b=true
+filter_ranges_a=
+filter_ranges_b=
 nack_delay=8
 req_size_a=16
 req_size_b=16
@@ -47,7 +47,7 @@ side_b=system.membus.port[2]
 
 [system.cpu]
 type=AtomicSimpleCPU
-children=dtb itb
+children=dtb itb tracer
 clock=1
 cpu_id=0
 defer_registration=false
@@ -67,6 +67,7 @@ profile=0
 progress_interval=0
 simulate_stalls=false
 system=system
+tracer=system.cpu.tracer
 width=1
 dcache_port=system.membus.port[10]
 icache_port=system.membus.port[9]
@@ -79,6 +80,9 @@ size=64
 type=SparcITB
 size=64
 
+[system.cpu.tracer]
+type=ExeTracer
+
 [system.disk0]
 type=MmDisk
 children=image
@@ -149,7 +153,7 @@ clock=2
 responder_set=false
 width=64
 default=system.membus.responder.pio
-port=system.t1000.iob.pio system.t1000.htod.pio system.bridge.side_b system.physmem.port system.physmem2.port system.rom.port system.nvram.port system.hypervisor_desc.port system.partition_desc.port system.cpu.icache_port system.cpu.dcache_port
+port=system.t1000.iob.pio system.t1000.htod.pio system.bridge.side_b system.physmem.port[0] system.physmem2.port[0] system.rom.port[0] system.nvram.port[0] system.hypervisor_desc.port[0] system.partition_desc.port[0] system.cpu.icache_port system.cpu.dcache_port
 
 [system.membus.responder]
 type=IsaFake
@@ -419,7 +423,7 @@ pio_addr=1099255906296
 pio_latency=2
 platform=system.t1000
 system=system
-time=2009 1 1 0 0 0 3 1
+time=Thu Jan  1 00:00:00 2009
 pio=system.membus.port[1]
 
 [system.t1000.hvuart]
diff --git a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/console.system.t1000.pconsole b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/console.system.t1000.pconsole
index a31449664..f90a96e24 100644
--- a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/console.system.t1000.pconsole
+++ b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/console.system.t1000.pconsole
@@ -1,48 +1,48 @@
-cpu 
-
-Sun Fire T2000, No Keyboard
-Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-OpenBoot 4.23.0, 256 MB memory available, Serial #1122867.
-[saidi obp #30]
-Ethernet address 0:80:3:de:ad:3, Host ID: 80112233.
-
-
-
-Boot device: /virtual-devices/disk@0  File and args: -vV
-Loading ufs-file-system package 1.4 04 Aug 1995 13:02:54. 
-FCode UFS Reader 1.12 00/07/17 15:48:16. 
-Loading: /platform/SUNW,Sun-Fire-T2000/ufsboot
-Loading: /platform/sun4v/ufsboot
-device path '/virtual-devices@100/disk@0:a'
-The boot filesystem is logging.
-The ufs log is empty and will not be used.
-standalone = `kernel/sparcv9/unix', args = `-v'
-|Elf64 client
-Size: /-\|/-\|0x76e40+/-\|/-\|/-\|/-\0x1c872+|/-\0x3123a Bytes
-modpath: /platform/sun4v/kernel /kernel /usr/kernel
-|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-module /platform/sun4v/kernel/sparcv9/unix: text at [0x1000000, 0x1076e3f] data at 0x1800000
-module misc/sparcv9/krtld: text at [0x1076e40, 0x108f737] data at 0x184dab0
-module /platform/sun4v/kernel/sparcv9/genunix: text at [0x108f738, 0x11dd437] data at 0x18531c0
-module /platform/sun4v/kernel/misc/sparcv9/platmod: text at [0x11dd438, 0x11dd43f] data at 0x18a4be0
-module /platform/sun4v/kernel/cpu/sparcv9/SUNW,UltraSPARC-T1: text at [0x11dd440, 0x11e06ff] data at 0x18a5300
-\
SunOS Release 5.10 Version Generic_118822-23 64-bit
-Copyright 1983-2005 Sun Microsystems, Inc.  All rights reserved.
-Use is subject to license terms.
-|/-\|/-\|/-\|/-\|/-Ethernet address = 0:80:3:de:ad:3
-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/mem = 262144K (0x10000000)
-avail mem = 237879296
-root nexus = Sun Fire T2000
-pseudo0 at root
-pseudo0 is /pseudo
-scsi_vhci0 at root
-scsi_vhci0 is /scsi_vhci
-virtual-device: hsimd0
-hsimd0 is /virtual-devices@100/disk@0
-root on /virtual-devices@100/disk@0:a fstype ufs
-pseudo-device: dld0
-dld0 is /pseudo/dld@0
-cpu0: UltraSPARC-T1 (cpuid 0 clock 5 MHz)
-iscsi0 at root
-iscsi0 is /iscsi
-Hostname: unknown
-Loading M5 readfile script...
+cpu 

+

+Sun Fire T2000, No Keyboard

+Copyright 2006 Sun Microsystems, Inc.  All rights reserved.

+OpenBoot 4.23.0, 256 MB memory available, Serial #1122867.

+[saidi obp #30]

+Ethernet address 0:80:3:de:ad:3, Host ID: 80112233.

+

+

+

+Boot device: /virtual-devices/disk@0  File and args: -vV

+Loading ufs-file-system package 1.4 04 Aug 1995 13:02:54. 

+FCode UFS Reader 1.12 00/07/17 15:48:16. 

+Loading: /platform/SUNW,Sun-Fire-T2000/ufsboot

+Loading: /platform/sun4v/ufsboot

+device path '/virtual-devices@100/disk@0:a'

+The boot filesystem is logging.

+The ufs log is empty and will not be used.

+standalone = `kernel/sparcv9/unix', args = `-v'

+|Elf64 client

+Size: /-\|/-\|0x76e40+/-\|/-\|/-\|/-\0x1c872+|/-\0x3123a Bytes

+modpath: /platform/sun4v/kernel /kernel /usr/kernel

+|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-module /platform/sun4v/kernel/sparcv9/unix: text at [0x1000000, 0x1076e3f] data at 0x1800000

+module misc/sparcv9/krtld: text at [0x1076e40, 0x108f737] data at 0x184dab0

+module /platform/sun4v/kernel/sparcv9/genunix: text at [0x108f738, 0x11dd437] data at 0x18531c0

+module /platform/sun4v/kernel/misc/sparcv9/platmod: text at [0x11dd438, 0x11dd43f] data at 0x18a4be0

+module /platform/sun4v/kernel/cpu/sparcv9/SUNW,UltraSPARC-T1: text at [0x11dd440, 0x11e06ff] data at 0x18a5300

+\
SunOS Release 5.10 Version Generic_118822-23 64-bit

+Copyright 1983-2005 Sun Microsystems, Inc.  All rights reserved.

+Use is subject to license terms.

+|/-\|/-\|/-\|/-\|/-Ethernet address = 0:80:3:de:ad:3

+\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/-\|/mem = 262144K (0x10000000)

+avail mem = 237879296

+root nexus = Sun Fire T2000

+pseudo0 at root

+pseudo0 is /pseudo

+scsi_vhci0 at root

+scsi_vhci0 is /scsi_vhci

+virtual-device: hsimd0

+hsimd0 is /virtual-devices@100/disk@0

+root on /virtual-devices@100/disk@0:a fstype ufs

+pseudo-device: dld0

+dld0 is /pseudo/dld@0

+cpu0: UltraSPARC-T1 (cpuid 0 clock 5 MHz)

+iscsi0 at root

+iscsi0 is /iscsi

+Hostname: unknown

+Loading M5 readfile script...

diff --git a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/m5stats.txt b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/m5stats.txt
index 5229bd3a6..34b89818c 100644
--- a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/m5stats.txt
+++ b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/m5stats.txt
@@ -1,11 +1,11 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                 584673                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 374168                       # Number of bytes of host memory used
-host_seconds                                  3820.23                       # Real time elapsed on the host
-host_tick_rate                                 584723                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1839897                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 481416                       # Number of bytes of host memory used
+host_seconds                                  1211.57                       # Real time elapsed on the host
+host_tick_rate                                1843707                       # Simulator tick rate (ticks/s)
 sim_freq                                   2000000000                       # Frequency of simulated ticks
-sim_insts                                  2233583679                       # Number of instructions simulated
+sim_insts                                  2229160714                       # Number of instructions simulated
 sim_seconds                                  1.116889                       # Number of seconds simulated
 sim_ticks                                  2233777512                       # Number of ticks simulated
 system.cpu.idle_fraction                            0                       # Percentage of idle cycles
@@ -13,7 +13,7 @@ system.cpu.kern.inst.arm                            0                       # nu
 system.cpu.kern.inst.quiesce                        0                       # number of quiesce instructions executed
 system.cpu.not_idle_fraction                        1                       # Percentage of non-idle cycles
 system.cpu.numCycles                       2233777513                       # number of cpu cycles simulated
-system.cpu.num_insts                       2233583679                       # Number of instructions executed
+system.cpu.num_insts                       2229160714                       # Number of instructions executed
 system.cpu.num_refs                         547951940                       # Number of memory references
 
 ---------- End Simulation Statistics   ----------
diff --git a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stderr b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stderr
index cf3ec3bba..4c0b4aee0 100644
--- a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stderr
+++ b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stderr
@@ -3,8 +3,12 @@ Warning: rounding error > tolerance
 Warning: rounding error > tolerance
     0.002000 rounded to 0
 warn: No kernel set for full system simulation. Assuming you know what you're doing...
+Warning: rounding error > tolerance
+    0.002000 rounded to 0
 Listening for t1000 connection on port 3456
 Listening for t1000 connection on port 3457
+Warning: rounding error > tolerance
+    0.002000 rounded to 0
 0: system.remote_gdb.listener: listening for remote gdb on port 7000
 warn: Entering event queue @ 0.  Starting simulation...
 warn: Ignoring write to SPARC ERROR regsiter
diff --git a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stdout b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stdout
index ef048f157..4c8cf9392 100644
--- a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stdout
+++ b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stdout
@@ -5,9 +5,9 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled May 15 2007 17:08:10
-M5 started Tue May 15 17:08:12 2007
-M5 executing on zizzer.eecs.umich.edu
+M5 compiled Aug 21 2007 14:42:25
+M5 started Tue Aug 21 14:44:56 2007
+M5 executing on nacho
 command line: build/SPARC_FS/m5.fast -d build/SPARC_FS/tests/fast/long/80.solaris-boot/sparc/solaris/t1000-simple-atomic tests/run.py long/80.solaris-boot/sparc/solaris/t1000-simple-atomic
 Global frequency set at 2000000000 ticks per second
 Exiting @ tick 2233777512 because m5_exit instruction encountered