diff options
| author | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2010-10-12 10:14:43 +0000 |
|---|---|---|
| committer | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2010-10-12 10:14:43 +0000 |
| commit | 62622f4329f3414e97a462d9121be53726c0b815 (patch) | |
| tree | 2852f610f42207e56de83814b662aacf94cbfdfd /cachegrind | |
| parent | 807725e486eb1f284767dd3cab9b15bf341b456e (diff) | |
Fix up printing of the can't-autodetect-params message and the
filtering out thereof, so as to make Cachegrind and Callgrind
pass their regressiont tests on ARM-Linux.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11433 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'cachegrind')
| -rw-r--r-- | cachegrind/cg-arm.c | 2 | ||||
| -rw-r--r-- | cachegrind/cg-ppc32.c | 2 | ||||
| -rw-r--r-- | cachegrind/cg-ppc64.c | 2 | ||||
| -rwxr-xr-x | cachegrind/tests/filter_stderr | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/cachegrind/cg-arm.c b/cachegrind/cg-arm.c index e37d0c0a..28edb576 100644 --- a/cachegrind/cg-arm.c +++ b/cachegrind/cg-arm.c @@ -48,7 +48,7 @@ void VG_(configure_caches)(cache_t* I1c, cache_t* D1c, cache_t* LLc, if (!all_caches_clo_defined) { VG_(message)(Vg_DebugMsg, "Warning: Cannot auto-detect cache config on ARM, using one " - "or more defaults "); + "or more defaults\n"); } } diff --git a/cachegrind/cg-ppc32.c b/cachegrind/cg-ppc32.c index 5920c050..ea6d2cd2 100644 --- a/cachegrind/cg-ppc32.c +++ b/cachegrind/cg-ppc32.c @@ -57,7 +57,7 @@ void VG_(configure_caches)(cache_t* I1c, cache_t* D1c, cache_t* LLc, // if (!all_caches_clo_defined) { VG_(dmsg)("Warning: Cannot auto-detect cache config on PPC32, using one " - "or more defaults \n"); + "or more defaults\n"); } } diff --git a/cachegrind/cg-ppc64.c b/cachegrind/cg-ppc64.c index 973664b2..bb05ceee 100644 --- a/cachegrind/cg-ppc64.c +++ b/cachegrind/cg-ppc64.c @@ -57,7 +57,7 @@ void VG_(configure_caches)(cache_t* I1c, cache_t* D1c, cache_t* LLc, // if (!all_caches_clo_defined) { VG_(dmsg)("Warning: Cannot auto-detect cache config on PPC64, using one " - "or more defaults \n"); + "or more defaults\n"); } } diff --git a/cachegrind/tests/filter_stderr b/cachegrind/tests/filter_stderr index af898d46..9209dd57 100755 --- a/cachegrind/tests/filter_stderr +++ b/cachegrind/tests/filter_stderr @@ -17,4 +17,5 @@ perl -p -e 's/((I1|D1|LL|LLi|LLd) *(misses|miss rate):)[ 0-9,()+rdw%\.]*$/\1/' | 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 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 PPC.., using one or more defaults/d" | +sed "/Warning: Cannot auto-detect cache config on ARM, using one or more defaults/d" |