changeset 5a07045d0af2 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=5a07045d0af2
description:
stats: only consider a formula initialized if there is a formula
diffstat:
src/arch/arm/tlb.cc
| 5 -
src/arch/arm/tlb.hh
| 1 -
src/arch/mips/tlb.cc
| 5 -
src/arch/mips/tlb.hh
| 1 -
src/arch/power/tlb.cc
| 5 -
src/arch/power/tlb.hh
| 1 -
src/base/statistics.cc
| 8 ++-
src/dev/etherdevice.cc
| 3 +-
src/dev/ide_disk.hh
| 4 -
src/mem/cache/base.hh
| 2 +
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
| 28 +++++-----
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
| 14 ++--
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
| 16 +++--
13 files changed, 40 insertions(+), 53 deletions(-)
diffs (truncated from 331 to 300 lines):
diff -r 41550bb10e08 -r 5a07045d0af2 src/arch/arm/tlb.cc
--- a/src/arch/arm/tlb.cc Mon Jun 14 23:24:46 2010 -0700
+++ b/src/arch/arm/tlb.cc Tue Jun 15 01:18:36 2010 -0700
@@ -282,11 +282,6 @@
.desc("DTB misses")
;
- invalids
- .name(name() + ".invalids")
- .desc("DTB access violations")
- ;
-
accesses
.name(name() + ".accesses")
.desc("DTB accesses")
diff -r 41550bb10e08 -r 5a07045d0af2 src/arch/arm/tlb.hh
--- a/src/arch/arm/tlb.hh Mon Jun 14 23:24:46 2010 -0700
+++ b/src/arch/arm/tlb.hh Tue Jun 15 01:18:36 2010 -0700
@@ -108,7 +108,6 @@
mutable Stats::Scalar write_accesses;
Stats::Formula hits;
Stats::Formula misses;
- Stats::Formula invalids;
Stats::Formula accesses;
diff -r 41550bb10e08 -r 5a07045d0af2 src/arch/mips/tlb.cc
--- a/src/arch/mips/tlb.cc Mon Jun 14 23:24:46 2010 -0700
+++ b/src/arch/mips/tlb.cc Tue Jun 15 01:18:36 2010 -0700
@@ -281,11 +281,6 @@
.desc("DTB misses")
;
- invalids
- .name(name() + ".invalids")
- .desc("DTB access violations")
- ;
-
accesses
.name(name() + ".accesses")
.desc("DTB accesses")
diff -r 41550bb10e08 -r 5a07045d0af2 src/arch/mips/tlb.hh
--- a/src/arch/mips/tlb.hh Mon Jun 14 23:24:46 2010 -0700
+++ b/src/arch/mips/tlb.hh Tue Jun 15 01:18:36 2010 -0700
@@ -105,7 +105,6 @@
mutable Stats::Scalar write_accesses;
Stats::Formula hits;
Stats::Formula misses;
- Stats::Formula invalids;
Stats::Formula accesses;
public:
diff -r 41550bb10e08 -r 5a07045d0af2 src/arch/power/tlb.cc
--- a/src/arch/power/tlb.cc Mon Jun 14 23:24:46 2010 -0700
+++ b/src/arch/power/tlb.cc Tue Jun 15 01:18:36 2010 -0700
@@ -265,11 +265,6 @@
.desc("DTB misses")
;
- invalids
- .name(name() + ".invalids")
- .desc("DTB access violations")
- ;
-
accesses
.name(name() + ".accesses")
.desc("DTB accesses")
diff -r 41550bb10e08 -r 5a07045d0af2 src/arch/power/tlb.hh
--- a/src/arch/power/tlb.hh Mon Jun 14 23:24:46 2010 -0700
+++ b/src/arch/power/tlb.hh Tue Jun 15 01:18:36 2010 -0700
@@ -123,7 +123,6 @@
mutable Stats::Scalar write_accesses;
Stats::Formula hits;
Stats::Formula misses;
- Stats::Formula invalids;
Stats::Formula accesses;
public:
diff -r 41550bb10e08 -r 5a07045d0af2 src/base/statistics.cc
--- a/src/base/statistics.cc Mon Jun 14 23:24:46 2010 -0700
+++ b/src/base/statistics.cc Tue Jun 15 01:18:36 2010 -0700
@@ -238,12 +238,12 @@
Formula::Formula()
{
- setInit();
}
Formula::Formula(Temp r)
{
root = r;
+ setInit();
assert(size());
}
@@ -252,6 +252,7 @@
{
assert(!root && "Can't change formulas");
root = r;
+ setInit();
assert(size());
return *this;
}
@@ -261,8 +262,11 @@
{
if (root)
root = NodePtr(new BinaryNode<std::plus<Result> >(root, r));
- else
+ else {
root = r;
+ setInit();
+ }
+
assert(size());
return *this;
}
diff -r 41550bb10e08 -r 5a07045d0af2 src/dev/etherdevice.cc
--- a/src/dev/etherdevice.cc Mon Jun 14 23:24:46 2010 -0700
+++ b/src/dev/etherdevice.cc Tue Jun 15 01:18:36 2010 -0700
@@ -119,7 +119,7 @@
.precision(0)
;
- descDmaWrBytes
+ descDmaWrBytes
.name(name() + ".descDmaWriteBytes")
.desc("number of descriptor bytes write w/ DMA")
.precision(0)
@@ -364,4 +364,5 @@
txPacketRate = txPackets / simSeconds;
rxPacketRate = rxPackets / simSeconds;
+ totPacketRate = totPackets / simSeconds;
}
diff -r 41550bb10e08 -r 5a07045d0af2 src/dev/ide_disk.hh
--- a/src/dev/ide_disk.hh Mon Jun 14 23:24:46 2010 -0700
+++ b/src/dev/ide_disk.hh Tue Jun 15 01:18:36 2010 -0700
@@ -244,10 +244,6 @@
Stats::Scalar dmaWriteFullPages;
Stats::Scalar dmaWriteBytes;
Stats::Scalar dmaWriteTxs;
- Stats::Formula rdBandwidth;
- Stats::Formula wrBandwidth;
- Stats::Formula totBandwidth;
- Stats::Formula totBytes;
public:
typedef IdeDiskParams Params;
diff -r 41550bb10e08 -r 5a07045d0af2 src/mem/cache/base.hh
--- a/src/mem/cache/base.hh Mon Jun 14 23:24:46 2010 -0700
+++ b/src/mem/cache/base.hh Tue Jun 15 01:18:36 2010 -0700
@@ -324,12 +324,14 @@
/** Total cycle latency of overall MSHR misses. */
Stats::Formula overallMshrUncacheableLatency;
+#if 0
/** The total number of MSHR accesses per command and thread. */
Stats::Formula mshrAccesses[MemCmd::NUM_MEM_CMDS];
/** The total number of demand MSHR accesses. */
Stats::Formula demandMshrAccesses;
/** The total number of MSHR accesses. */
Stats::Formula overallMshrAccesses;
+#endif
/** The miss rate in the MSHRs pre command and thread. */
Stats::Formula mshrMissRate[MemCmd::NUM_MEM_CMDS];
diff -r 41550bb10e08 -r 5a07045d0af2
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
---
a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
Mon Jun 14 23:24:46 2010 -0700
+++
b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini
Tue Jun 15 01:18:36 2010 -0700
@@ -8,13 +8,13 @@
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=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/binaries/console
+console=/dist/m5/system/binaries/console
init_param=0
-kernel=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/binaries/vmlinux
+kernel=/dist/m5/system/binaries/vmlinux
mem_mode=atomic
-pal=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/binaries/ts_osfpal
+pal=/dist/m5/system/binaries/ts_osfpal
physmem=drivesys.physmem
-readfile=/proj/aatl_perfmod_arch/users/lihsu/m5/m5/configs/boot/netperf-server.rcS
+readfile=/n/blue/z/binkert/work/m5/work/configs/boot/netperf-server.rcS
symbolfile=
system_rev=1024
system_type=34
@@ -95,7 +95,7 @@
[drivesys.disk0.image.child]
type=RawDiskImage
-image_file=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/disks/linux-latest.img
+image_file=/dist/m5/system/disks/linux-latest.img
read_only=true
[drivesys.disk2]
@@ -115,7 +115,7 @@
[drivesys.disk2.image.child]
type=RawDiskImage
-image_file=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/disks/linux-bigswap2.img
+image_file=/dist/m5/system/disks/linux-bigswap2.img
read_only=true
[drivesys.intrctrl]
@@ -179,7 +179,7 @@
[drivesys.simple_disk.disk]
type=RawDiskImage
-image_file=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/disks/linux-latest.img
+image_file=/dist/m5/system/disks/linux-latest.img
read_only=true
[drivesys.terminal]
@@ -712,13 +712,13 @@
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=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/binaries/console
+console=/dist/m5/system/binaries/console
init_param=0
-kernel=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/binaries/vmlinux
+kernel=/dist/m5/system/binaries/vmlinux
mem_mode=atomic
-pal=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/binaries/ts_osfpal
+pal=/dist/m5/system/binaries/ts_osfpal
physmem=testsys.physmem
-readfile=/proj/aatl_perfmod_arch/users/lihsu/m5/m5/configs/boot/netperf-stream-client.rcS
+readfile=/n/blue/z/binkert/work/m5/work/configs/boot/netperf-stream-client.rcS
symbolfile=
system_rev=1024
system_type=34
@@ -799,7 +799,7 @@
[testsys.disk0.image.child]
type=RawDiskImage
-image_file=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/disks/linux-latest.img
+image_file=/dist/m5/system/disks/linux-latest.img
read_only=true
[testsys.disk2]
@@ -819,7 +819,7 @@
[testsys.disk2.image.child]
type=RawDiskImage
-image_file=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/disks/linux-bigswap2.img
+image_file=/dist/m5/system/disks/linux-bigswap2.img
read_only=true
[testsys.intrctrl]
@@ -883,7 +883,7 @@
[testsys.simple_disk.disk]
type=RawDiskImage
-image_file=/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/disks/linux-latest.img
+image_file=/dist/m5/system/disks/linux-latest.img
read_only=true
[testsys.terminal]
diff -r 41550bb10e08 -r 5a07045d0af2
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
---
a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
Mon Jun 14 23:24:46 2010 -0700
+++
b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/simout
Tue Jun 15 01:18:36 2010 -0700
@@ -5,13 +5,13 @@
All Rights Reserved
-M5 compiled Feb 24 2010 23:13:04
-M5 revision 1a33ca29ec29 6980 default share-aware-test-update.patch tip qtip
-M5 started Feb 24 2010 23:13:12
-M5 executing on SC2B0619
-command line: build/ALPHA_FS/m5.fast -d
build/ALPHA_FS/tests/fast/quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic
-re tests/run.py
build/ALPHA_FS/tests/fast/quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic
+M5 compiled Jun 14 2010 18:16:48
+M5 revision 22c414a5ff89+ 7455+ default stats_funcinit.diff qtip tip
+M5 started Jun 14 2010 18:19:53
+M5 executing on maize
+command line: /n/blue/z/binkert/build/work/build/ALPHA_FS/m5.fast -d
/n/blue/z/binkert/build/work/build/ALPHA_FS/tests/fast/quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic
-re tests/run.py
/n/blue/z/binkert/build/work/build/ALPHA_FS/tests/fast/quick/80.netperf-stream/alpha/linux/twosys-tsunami-simple-atomic
Global frequency set at 1000000000000 ticks per second
-info: kernel located at:
/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/binaries/vmlinux
-info: kernel located at:
/proj/aatl_perfmod_arch/m5_system_files/m5_system_2.0b3/binaries/vmlinux
+info: kernel located at: /dist/m5/system/binaries/vmlinux
+info: kernel located at: /dist/m5/system/binaries/vmlinux
info: Entering event queue @ 0. Starting simulation...
Exiting @ tick 4300236804024 because checkpoint
diff -r 41550bb10e08 -r 5a07045d0af2
tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
---
a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
Mon Jun 14 23:24:46 2010 -0700
+++
b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt
Tue Jun 15 01:18:36 2010 -0700
@@ -139,6 +139,7 @@
drivesys.tsunami.ethernet.rxUdpChecksums 0 #
Number of rx UDP Checksums done by device
drivesys.tsunami.ethernet.totBandwidth 70320 #
Total Bandwidth (bits/s)
drivesys.tsunami.ethernet.totBytes 1758 #
Total Bytes
+drivesys.tsunami.ethernet.totPPS 65 #
Total Tranmission Rate (packets/s)
drivesys.tsunami.ethernet.totPackets 13 #
Total Packets
drivesys.tsunami.ethernet.totalRxDesc 8 #
total number of RxDesc written to ISR
drivesys.tsunami.ethernet.totalRxIdle 0 #
total number of RxIdle written to ISR
@@ -155,10 +156,10 @@
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 70382622 #
Simulator instruction rate (inst/s)
-host_mem_usage 464660 #
Number of bytes of host memory used
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
