|
From: <sv...@va...> - 2005-08-16 02:30:30
|
Author: njn
Date: 2005-08-16 03:30:24 +0100 (Tue, 16 Aug 2005)
New Revision: 4429
Log:
Fixes for #110657, based on Jakub Jelinek's patch:
- filter out L3 warning messages so they don't break Cachegrind's regtest=
s
- handle lack of mq support gracefully in mq.c
Modified:
trunk/cachegrind/cg-x86.c
trunk/cachegrind/tests/filter_stderr
trunk/none/tests/mq.c
Modified: trunk/cachegrind/cg-x86.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cachegrind/cg-x86.c 2005-08-16 02:21:13 UTC (rev 4428)
+++ trunk/cachegrind/cg-x86.c 2005-08-16 02:30:24 UTC (rev 4429)
@@ -108,8 +108,7 @@
VG_(tool_panic)("IA-64 cache detected?!");
=20
case 0x22: case 0x23: case 0x25: case 0x29:=20
- VG_(message)(Vg_DebugMsg,=20
- "warning: L3 cache detected but ignored\n");
+ VG_(message)(Vg_DebugMsg, "warning: L3 cache detected but igno=
red");
break;
=20
/* These are sectored, whatever that means */
Modified: trunk/cachegrind/tests/filter_stderr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cachegrind/tests/filter_stderr 2005-08-16 02:21:13 UTC (rev 442=
8)
+++ trunk/cachegrind/tests/filter_stderr 2005-08-16 02:30:24 UTC (rev 442=
9)
@@ -13,7 +13,7 @@
# 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/" |
=20
-# 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"
Modified: trunk/none/tests/mq.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/mq.c 2005-08-16 02:21:13 UTC (rev 4428)
+++ trunk/none/tests/mq.c 2005-08-16 02:30:24 UTC (rev 4429)
@@ -24,6 +24,8 @@
=20
if ((mqdw =3D mq_open("/valgrind-mqueue", O_CREAT|O_EXCL|O_WRONLY, 060=
0, &mqa)) < 0)
{
+ if (errno =3D=3D ENOSYS)
+ exit(0);
perror("mq_open");
exit(1);
}
|