From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 29EE2386F435 for ; Tue, 24 Nov 2020 09:47:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 29EE2386F435 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Thomas_Schwinge@mentor.com IronPort-SDR: ggY5uQtQ6QTF1RLk3XrgbZJbhPwu8ymbzV17QQjlXvZPr/ho/+KFdjMCozRvrgQNqfjRinQRdV gDCP1+IiGC9WANJo1x6VTyvxDze5zUDsMHVQ2Z0frnko9xuK1kkfdO5+VlgZr4TCax3vKQtfUn IM9uIUtIwPWLAKEGVPJo3s7huiBsyfp01bAc/pKFKJviNjAhhjbFTSMxShJvdenvn7w1UVp+8V 7uJe5TXt6HbkFISWFuAjF+j2Xqed/l9FvRGCDO4QKrzRdOAvFOLeg2hLvkbwbQv926xR0SSjUb 50o= X-IronPort-AV: E=Sophos;i="5.78,365,1599552000"; d="scan'208,223";a="55408061" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 24 Nov 2020 01:47:03 -0800 IronPort-SDR: WLnMRmO7T1zsWbvxEpzPyon/8rK4AtlGFUQ3fjJdPSSfG1hOBOeEyHBnBgLaAFBNftfPrhcQHJ STaoIVy/0ZHNiwDSvzkDJm6gXi0boHB9BRFgfUctr+NW7JW7HtkxvgC+Q7bbQMHwqO67HkMWnz 2905ZF+BiNl2yNb5D1/MMRAM0ACxUJfEeXW0QXgEV6/q9FjR+PfYTXY4vKzhsrS196jtcFBink XS6vN7QuhTYT1p2P7s3Z/2OSOnifGgcQS1MnGA7WvnvFbyBEUX+GapjxAGzAEqOHXK7vARqo0f F2s= From: Thomas Schwinge To: Jeff Law , David Malcolm , Subject: Re: [PATCH] dumpfile.c: use prefixes other that 'note: ' for MSG_{OPTIMIZED_LOCATIONS|MISSED_OPTIMIZATION} In-Reply-To: References: <1537905614-44303-1-git-send-email-dmalcolm@redhat.com> <87r1p6ev7q.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.1+93~g67ed7df (https://notmuchmail.org) Emacs/25.2.2 (x86_64-pc-linux-gnu) Date: Tue, 24 Nov 2020 10:46:55 +0100 Message-ID: <87360z9je8.fsf@dem-tschwing-1.ger.mentorg.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-09.mgc.mentorg.com (139.181.222.9) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_LOTSOFHASH, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2020 09:47:06 -0000 --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi! On 2020-11-13T15:06:24-0700, Jeff Law wrote: > On 11/6/20 1:38 AM, Thomas Schwinge wrote: >> Subject: [PATCH] [testsuite] Enable column location checking for >> 'dg-optimized', 'dg-missed' > OK Thanks, pushed "[testsuite] Enable column location checking for 'dg-optimized', 'dg-missed'" to master branch in commit 24b553d0f73ffea2551a77c67859ad6fe44110a6, and backported to releases/gcc-10 branch in commit f696775c43cc38233b037bf677f72b9b9c0b2cba, and releases/gcc-9 branch in commit c71d97549d4dca17d452b4a47e406c5f6b2a1a56, see attached. (Functionality not present in releases/gcc-8 branch.) Gr=C3=BC=C3=9Fe Thomas ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstra=C3=9Fe 201, 80634 M=C3=BCnch= en / Germany Registergericht M=C3=BCnchen HRB 106955, Gesch=C3=A4ftsf=C3=BChrer: Thomas = Heurung, Alexander Walter --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0001-testsuite-Enable-column-location-checking-for-dg-opt.patch" >From 24b553d0f73ffea2551a77c67859ad6fe44110a6 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 6 Nov 2020 09:18:06 +0100 Subject: [PATCH] [testsuite] Enable column location checking for 'dg-optimized', 'dg-missed' 'process-message' would like the 'msgprefix' argument without trailing space. This is a small bug-fix for commit ed2d9d3720adef3a260b8a55e17e744352a901fc "dumpfile.c: use prefixes other than 'note: ' for MSG_{OPTIMIZED_LOCATIONS|MISSED_OPTIMIZATION}", which added 'dg-optimized', 'dg-missed'. gcc/testsuite/ * lib/gcc-dg.exp (dg-optimized, dg-missed): Fix 'process-message' call. * gcc.dg/vect/nodump-vect-opt-info-1.c: Demonstrate. * gcc.dg/vect/nodump-vect-opt-info-2.c: Likewise. --- gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c | 4 ++-- gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c | 4 ++-- gcc/testsuite/lib/gcc-dg.exp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c index 3bfe498ef0a..6834b9a9d0b 100644 --- a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c +++ b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c @@ -5,8 +5,8 @@ void vadd (int *dst, int *op1, int *op2, int count) { /* { dg-prune-output " version\[^\n\r]* alignment" } */ -/* { dg-optimized "loop vectorized" "" { target *-*-* } .+2 } */ -/* { dg-optimized "loop versioned for vectorization because of possible aliasing" "" { target *-*-* } .+1 } */ +/* { dg-optimized "21: loop vectorized" "" { target *-*-* } .+2 } */ +/* { dg-optimized "21: loop versioned for vectorization because of possible aliasing" "" { target *-*-* } .+1 } */ for (int i = 0; i < count; ++i) dst[i] = op1[i] + op2[i]; } diff --git a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c index 94c55a92bb4..23a3b39fbb3 100644 --- a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c +++ b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c @@ -6,7 +6,7 @@ extern void accumulate (int x, int *a); int test_missing_function_defn (int *arr, int n) /* { dg-message "vectorized 0 loops in function" } */ { int sum = 0; - for (int i = 0; i < n; ++i) /* { dg-missed "couldn't vectorize loop" } */ - accumulate (arr[i], &sum); /* { dg-missed "statement clobbers memory: accumulate \\(.*\\);" } */ + for (int i = 0; i < n; ++i) /* { dg-missed "21: couldn't vectorize loop" } */ + accumulate (arr[i], &sum); /* { dg-missed "5: statement clobbers memory: accumulate \\(.*\\);" } */ return sum; } diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index e8ad3052657..0e1aafec82f 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -1232,7 +1232,7 @@ proc dg-optimized { args } { # Make this variable available here and to the saved proc. upvar dg-messages dg-messages - process-message saved-dg-error "optimized: " "$args" + process-message saved-dg-error "optimized:" "$args" } # Handle output from -fopt-info for MSG_MISSED_OPTIMIZATION: @@ -1242,7 +1242,7 @@ proc dg-missed { args } { # Make this variable available here and to the saved proc. upvar dg-messages dg-messages - process-message saved-dg-error "missed: " "$args" + process-message saved-dg-error "missed:" "$args" } # Check the existence of a gdb in the path, and return true if there -- 2.17.1 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0001-testsuite-Enable-column-location-checking-for-dg.g10.patch" >From f696775c43cc38233b037bf677f72b9b9c0b2cba Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 6 Nov 2020 09:18:06 +0100 Subject: [PATCH] [testsuite] Enable column location checking for 'dg-optimized', 'dg-missed' 'process-message' would like the 'msgprefix' argument without trailing space. This is a small bug-fix for commit ed2d9d3720adef3a260b8a55e17e744352a901fc "dumpfile.c: use prefixes other than 'note: ' for MSG_{OPTIMIZED_LOCATIONS|MISSED_OPTIMIZATION}", which added 'dg-optimized', 'dg-missed'. gcc/testsuite/ * lib/gcc-dg.exp (dg-optimized, dg-missed): Fix 'process-message' call. * gcc.dg/vect/nodump-vect-opt-info-1.c: Demonstrate. * gcc.dg/vect/nodump-vect-opt-info-2.c: Likewise. (cherry picked from commit 24b553d0f73ffea2551a77c67859ad6fe44110a6) --- gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c | 4 ++-- gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c | 4 ++-- gcc/testsuite/lib/gcc-dg.exp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c index 3bfe498ef0a..1bc35d9ec5f 100644 --- a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c +++ b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c @@ -5,8 +5,8 @@ void vadd (int *dst, int *op1, int *op2, int count) { /* { dg-prune-output " version\[^\n\r]* alignment" } */ -/* { dg-optimized "loop vectorized" "" { target *-*-* } .+2 } */ -/* { dg-optimized "loop versioned for vectorization because of possible aliasing" "" { target *-*-* } .+1 } */ +/* { dg-optimized "3: loop vectorized" "" { target *-*-* } .+2 } */ +/* { dg-optimized "3: loop versioned for vectorization because of possible aliasing" "" { target *-*-* } .+1 } */ for (int i = 0; i < count; ++i) dst[i] = op1[i] + op2[i]; } diff --git a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c index 94c55a92bb4..c426d19eb41 100644 --- a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c +++ b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c @@ -6,7 +6,7 @@ extern void accumulate (int x, int *a); int test_missing_function_defn (int *arr, int n) /* { dg-message "vectorized 0 loops in function" } */ { int sum = 0; - for (int i = 0; i < n; ++i) /* { dg-missed "couldn't vectorize loop" } */ - accumulate (arr[i], &sum); /* { dg-missed "statement clobbers memory: accumulate \\(.*\\);" } */ + for (int i = 0; i < n; ++i) /* { dg-missed "3: couldn't vectorize loop" } */ + accumulate (arr[i], &sum); /* { dg-missed "5: statement clobbers memory: accumulate \\(.*\\);" } */ return sum; } diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 45d97024883..cc331214a1f 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -1216,7 +1216,7 @@ proc dg-optimized { args } { # Make this variable available here and to the saved proc. upvar dg-messages dg-messages - process-message saved-dg-error "optimized: " "$args" + process-message saved-dg-error "optimized:" "$args" } # Handle output from -fopt-info for MSG_MISSED_OPTIMIZATION: @@ -1226,7 +1226,7 @@ proc dg-missed { args } { # Make this variable available here and to the saved proc. upvar dg-messages dg-messages - process-message saved-dg-error "missed: " "$args" + process-message saved-dg-error "missed:" "$args" } # Check the existence of a gdb in the path, and return true if there -- 2.17.1 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename="0001-testsuite-Enable-column-location-checking-for-dg-.g9.patch" >From c71d97549d4dca17d452b4a47e406c5f6b2a1a56 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 6 Nov 2020 09:18:06 +0100 Subject: [PATCH] [testsuite] Enable column location checking for 'dg-optimized', 'dg-missed' 'process-message' would like the 'msgprefix' argument without trailing space. This is a small bug-fix for commit ed2d9d3720adef3a260b8a55e17e744352a901fc "dumpfile.c: use prefixes other than 'note: ' for MSG_{OPTIMIZED_LOCATIONS|MISSED_OPTIMIZATION}", which added 'dg-optimized', 'dg-missed'. gcc/testsuite/ * lib/gcc-dg.exp (dg-optimized, dg-missed): Fix 'process-message' call. * gcc.dg/vect/nodump-vect-opt-info-1.c: Demonstrate. * gcc.dg/vect/nodump-vect-opt-info-2.c: Likewise. (cherry picked from commit 24b553d0f73ffea2551a77c67859ad6fe44110a6) --- gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c | 4 ++-- gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c | 4 ++-- gcc/testsuite/lib/gcc-dg.exp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c index 3bfe498ef0a..1bc35d9ec5f 100644 --- a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c +++ b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-1.c @@ -5,8 +5,8 @@ void vadd (int *dst, int *op1, int *op2, int count) { /* { dg-prune-output " version\[^\n\r]* alignment" } */ -/* { dg-optimized "loop vectorized" "" { target *-*-* } .+2 } */ -/* { dg-optimized "loop versioned for vectorization because of possible aliasing" "" { target *-*-* } .+1 } */ +/* { dg-optimized "3: loop vectorized" "" { target *-*-* } .+2 } */ +/* { dg-optimized "3: loop versioned for vectorization because of possible aliasing" "" { target *-*-* } .+1 } */ for (int i = 0; i < count; ++i) dst[i] = op1[i] + op2[i]; } diff --git a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c index 94c55a92bb4..c426d19eb41 100644 --- a/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c +++ b/gcc/testsuite/gcc.dg/vect/nodump-vect-opt-info-2.c @@ -6,7 +6,7 @@ extern void accumulate (int x, int *a); int test_missing_function_defn (int *arr, int n) /* { dg-message "vectorized 0 loops in function" } */ { int sum = 0; - for (int i = 0; i < n; ++i) /* { dg-missed "couldn't vectorize loop" } */ - accumulate (arr[i], &sum); /* { dg-missed "statement clobbers memory: accumulate \\(.*\\);" } */ + for (int i = 0; i < n; ++i) /* { dg-missed "3: couldn't vectorize loop" } */ + accumulate (arr[i], &sum); /* { dg-missed "5: statement clobbers memory: accumulate \\(.*\\);" } */ return sum; } diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 547b6465d74..c2600f2b746 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -1225,7 +1225,7 @@ proc dg-optimized { args } { # Make this variable available here and to the saved proc. upvar dg-messages dg-messages - process-message saved-dg-error "optimized: " "$args" + process-message saved-dg-error "optimized:" "$args" } # Handle output from -fopt-info for MSG_MISSED_OPTIMIZATION: @@ -1235,7 +1235,7 @@ proc dg-missed { args } { # Make this variable available here and to the saved proc. upvar dg-messages dg-messages - process-message saved-dg-error "missed: " "$args" + process-message saved-dg-error "missed:" "$args" } # Check the existence of a gdb in the path, and return true if there -- 2.17.1 --=-=-=--