update callgrind and cachegrind filtering logic following rev 14469

rev 14469 gives better description of the tweak done to the
simulated cache. Update filtering logic to filter this (variable) tweaking
msg.

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

diff --git a/cachegrind/tests/filter_stderr b/cachegrind/tests/filter_stderr
index 8f48d2b5c1ed80e44f2c0ec98d4d6d42b9d2815e..a0ae89968bdd0a401c2e33bff4fa19a365543a19 100755 (executable)
--- a/cachegrind/tests/filter_stderr
+++ b/cachegrind/tests/filter_stderr
@@ -20,4 +20,6 @@ sed "/warning: L3 cache found, using its data for the LL simulation./d" |
 sed "/warning: L4 cache found, using its data for the LL simulation./d" |
 sed "/Warning: Cannot auto-detect cache config, using defaults./d" |
 sed "/Run with -v to see./d" |
-sed "/warning: pretending that LL cache has associativity .*$/d"
+sed "/warning: specified LL cache: line_size .*$/d" |
+sed "/warning: simulated LL cache: line_size .*$/d"
+

diff --git a/callgrind/tests/filter_stderr b/callgrind/tests/filter_stderr
index e11afcf65b4afb38437e270506c25709cab8afb0..fbaca9b1dbe9486ee3f0ca2f3929328aa03d9373 100755 (executable)
--- a/callgrind/tests/filter_stderr
+++ b/callgrind/tests/filter_stderr
@@ -29,4 +29,5 @@ sed "/warning: L3 cache found, using its data for the LL simulation./d" |
 sed "/warning: L4 cache found, using its data for the LL simulation./d" |
 sed "/Warning: Cannot auto-detect cache config, using defaults./d" |
 sed "/Run with -v to see./d" |
-sed "/warning: pretending that LL cache has associativity .*$/d"
+sed "/warning: specified LL cache: line_size .*$/d" |
+sed "/warning: simulated LL cache: line_size .*$/d"