diff options
| author | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2005-08-16 02:30:24 +0000 |
|---|---|---|
| committer | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2005-08-16 02:30:24 +0000 |
| commit | 4fe49435ec00c44349004fe6312b3b0d6af3751c (patch) | |
| tree | b993636ea4a74991134f586cc8684fd59c03c61c /cachegrind | |
| parent | 5655958331f295fdb28f6257b2105c847b1bd23d (diff) | |
Fixes for #110657, based on Jakub Jelinek's patch:
- filter out L3 warning messages so they don't break Cachegrind's regtests
- handle lack of mq support gracefully in mq.c
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4429 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'cachegrind')
| -rw-r--r-- | cachegrind/cg-x86.c | 3 | ||||
| -rwxr-xr-x | cachegrind/tests/filter_stderr | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cachegrind/cg-x86.c b/cachegrind/cg-x86.c index b0bd3af4..a76ea7f9 100644 --- a/cachegrind/cg-x86.c +++ b/cachegrind/cg-x86.c @@ -108,8 +108,7 @@ Int Intel_cache_info(Int level, cache_t* I1c, cache_t* D1c, cache_t* L2c) VG_(tool_panic)("IA-64 cache detected?!"); case 0x22: case 0x23: case 0x25: case 0x29: - VG_(message)(Vg_DebugMsg, - "warning: L3 cache detected but ignored\n"); + VG_(message)(Vg_DebugMsg, "warning: L3 cache detected but ignored"); break; /* These are sectored, whatever that means */ diff --git a/cachegrind/tests/filter_stderr b/cachegrind/tests/filter_stderr index 318c8ca1..81fc8486 100755 --- a/cachegrind/tests/filter_stderr +++ b/cachegrind/tests/filter_stderr @@ -13,7 +13,7 @@ sed "s/\(\(I\|D\|L2\) *refs:\)[ 0-9,()+rdw]*$/\1/" | # Remove numbers from I1/D1/L2/L2i/L2d "misses:" and "miss rates:" lines sed "s/\(\(I1\|D1\|L2\|L2i\|L2d\) *\(misses\|miss rate\):\)[ 0-9,()+rdw%\.]*$/\1/" | -# Remove warnings lines for P4s: +# Remove CPUID warnings lines for P4s and other machines sed "/warning: Pentium with 12 K micro-op instruction trace cache/d" | -sed "/Simulating a 16 KB cache with 32 B lines/d" - +sed "/Simulating a 16 KB cache with 32 B lines/d" | +sed "/warning: L3 cache detected but ignored/d" |