update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / callgrind / tests / filter_stderr

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/callgrind/tests/filter_stderr b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/callgrind/tests/filter_stderr
index d2d754456b5cb188ddcfda2a21a19241f20d866c..c791b6495b91f45a03bd0df1e7ff270dcd259ea5 100755 (executable)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/callgrind/tests/filter_stderr
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/callgrind/tests/filter_stderr
@@ -13,11 +13,11 @@ sed "/^For interactive control,.*$/d" |
 # Remove numbers from "Collected" line
 sed "s/^\(Collected *:\)[ 0-9]*$/\1/" |
 
-# Remove numbers from I/D/L2 "refs:" lines
-perl -p -e 's/((I|D|L2) *refs:)[ 0-9,()+rdw]*$/\1/'  |
+# Remove numbers from I/D/LL "refs:" lines
+perl -p -e 's/((I|D|LL) *refs:)[ 0-9,()+rdw]*$/\1/'  |
 
-# Remove numbers from I1/D1/L2/L2i/L2d "misses:" and "miss rates:" lines
-perl -p -e 's/((I1|D1|L2|L2i|L2d) *(misses|miss rate):)[ 0-9,()+rdw%\.]*$/\1/' |
+# Remove numbers from I1/D1/LL/LLi/LLd "misses:" and "miss rates:" lines
+perl -p -e 's/((I1|D1|LL|LLi|LLd) *(misses|miss rate):)[ 0-9,()+rdw%\.]*$/\1/' |
 
 # Remove numbers from "Branches:", "Mispredicts:, and "Mispred rate:" lines
 perl -p -e 's/((Branches|Mispredicts|Mispred rate):)[ 0-9,()+condi%\.]*$/\1/' |
@@ -25,5 +25,7 @@ perl -p -e 's/((Branches|Mispredicts|Mispred rate):)[ 0-9,()+condi%\.]*$/\1/' |
 # Remove CPUID warnings lines for P4s and other machines
 sed "/warning: Pentium 4 with 12 KB micro-op instruction trace cache/d" |
 sed "/Simulating a 16 KB I-cache with 32 B lines/d"   |
-sed "/warning: L3 cache detected but ignored/d" |
-sed "/Warning: Cannot auto-detect cache config on PPC.., using one or more defaults/d"
+sed "/warning: L3 cache found, using its data for the LL simulation./d" |
+sed "/Warning: Cannot auto-detect cache config on PPC.., using one or more defaults/d" |
+sed "/Warning: Cannot auto-detect cache config on ARM, using one or more defaults/d" |
+sed "/Warning: Cannot auto-detect cache config on s390x, using one or more defaults/d"