From patchwork Thu Jan 10 19:18:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Law X-Patchwork-Id: 211123 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 9B2092C00D9 for ; Fri, 11 Jan 2013 06:18:36 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1358450317; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=0l+IZ2o0XU9jPPpg2bOaqCjCmWg=; b=UF1QqNOHx5FsveG PMxGLuqAKEe9Q4da0HHOjcLTje8rWQ7E2fg33xVZKNCDnkcGSF5I58pYgInPgNgg e5kgJGGtUJFECL3hBNV7Sv2yIYp2wG+JVT1O2FrTTXRDgrHGWpx4eqlXX/Acug1n wTCX+IPpZ+fepEGqDBh9BIMmft2M= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=JhjepCvyy9CJAQIoJjsiGFEeS3Tb6+A8zfR8qXBDYPEwSfqeTrJ+br9EfB+OHr QPR34vutDaMy2WPouyacBuXTEFd/0s451nMvJOQUuwSgNCL4iYsRbauiYMKg3sTm w/sE420PgwbvYOPWSYoEBXHUHNYK1/F4JLS8Xfjh83Cik=; Received: (qmail 3471 invoked by alias); 10 Jan 2013 19:18:22 -0000 Received: (qmail 3332 invoked by uid 22791); 10 Jan 2013 19:18:18 -0000 X-SWARE-Spam-Status: No, hits=-7.4 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS, TW_SV X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 10 Jan 2013 19:18:11 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0AJIB1a012301 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 10 Jan 2013 14:18:11 -0500 Received: from stumpy.slc.redhat.com (ovpn-113-50.phx2.redhat.com [10.3.113.50]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0AJIAbY026699; Thu, 10 Jan 2013 14:18:10 -0500 Message-ID: <50EF13F2.2060802@redhat.com> Date: Thu, 10 Jan 2013 12:18:10 -0700 From: Jeff Law User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Richard Biener CC: gcc-patches Subject: Re: Minor testsuite improvement References: <50EE4E5E.2060400@redhat.com> In-Reply-To: X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On 01/10/2013 03:13 AM, Richard Biener wrote: > On Thu, Jan 10, 2013 at 6:15 AM, Jeff Law wrote: >> >> Gary Funck noted that vrp06.c has two tests with the same output. After >> further investigation it was clear that expected output strings were too >> lenient and were in fact masking a missed optimization. >> >> This patch tightens the expected output from the vrp dump which has the side >> effect of making each test's string unique. Obviously the masked failure is >> xfailed. >> >> OK for the trunk? > > Hmm, but if the SSA versions are simply i_10 then i_.*0 will still match it > the same? I think you want the more elaborate 'i_\[0-9\]* . 0' here? Applied using Uros's regexp. The final patch is attached for historical purposes. Jeff commit 115e3f9b2615bbe7bce75e4d29638e977c10ac86 Author: law Date: Thu Jan 10 19:16:33 2013 +0000 * gcc/dg/tree-ssa/vrp06.c: Tighten expected output. Make each pass/fail message unique. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195093 138bc75d-0d04-0410-961f-82ee72b054a4 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 46bae82..6df9b9c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-01-10 Jeff Law + + * gcc/dg/tree-ssa/vrp06.c: Tighten expected output. Make each + pass/fail message unique. + + 2013-01-10 Jason Merrill * ada/.gitignore: New. diff --git a/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c b/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c index 1ef6c92..cb6df0d 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/vrp06.c @@ -25,7 +25,7 @@ foo (int i, int j, int a) return i + a + j; } -/* { dg-final { scan-tree-dump-times "Folding predicate i_.*to 0" 1 "vrp1" } } */ -/* { dg-final { scan-tree-dump-times "Folding predicate j_.*to 1" 1 "vrp1" } } */ -/* { dg-final { scan-tree-dump-times "Folding predicate i_.*to 0" 1 "vrp1" } } */ +/* { dg-final { scan-tree-dump-times "Folding predicate i_\[0-9\]+.*0 to 0" 1 "vrp1" } } */ +/* { dg-final { scan-tree-dump-times "Folding predicate j_\[0-9\]+.*0 to 1" 1 "vrp1" } } */ +/* { dg-final { scan-tree-dump-times "Folding predicate i_\[0-9]+.*j_\[0-9\]+.* to 0" 1 "vrp1" { xfail *-*-* } } } */ /* { dg-final { cleanup-tree-dump "vrp1" } } */