Update stderr filters so that regtests pass on machines with 3-level caches.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11411

diff --git a/cachegrind/tests/filter_stderr b/cachegrind/tests/filter_stderr
index 6a14e344a985795401ab3404644c25c8156d7117..af898d46f60a530637e8cf3021856765522859d7 100755 (executable)
--- a/cachegrind/tests/filter_stderr
+++ b/cachegrind/tests/filter_stderr
@@ -16,5 +16,5 @@ perl -p -e 's/((I1|D1|LL|LLi|LLd) *(misses|miss rate):)[ 0-9,()+rdw%\.]*$/\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: 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"

diff --git a/callgrind/tests/filter_stderr b/callgrind/tests/filter_stderr
index 26bc3c04e333d85d16b34b5a8d7a16312cb90cfd..4a7326af60bc1e5e6e452f34e459c3393b04043f 100755 (executable)
--- a/callgrind/tests/filter_stderr
+++ b/callgrind/tests/filter_stderr
@@ -25,5 +25,5 @@ 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: 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"