From patchwork Fri Nov 4 17:18:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 123674 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 5CE84B70ED for ; Sat, 5 Nov 2011 04:20:21 +1100 (EST) Received: (qmail 16119 invoked by alias); 4 Nov 2011 17:20:15 -0000 Received: (qmail 16101 invoked by uid 22791); 4 Nov 2011 17:20:14 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 04 Nov 2011 17:19:51 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1RMNQk-00011m-RK from Tom_deVries@mentor.com ; Fri, 04 Nov 2011 10:19:50 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Fri, 4 Nov 2011 10:19:50 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.1.289.1; Fri, 4 Nov 2011 17:19:47 +0000 Message-ID: <4EB41E71.6080603@mentor.com> Date: Fri, 4 Nov 2011 18:18:41 +0100 From: Tom de Vries User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.23) Gecko/20110922 Lightning/1.0b2 Thunderbird/3.1.15 MIME-Version: 1.0 To: Richard Guenther CC: "gcc-patches@gcc.gnu.org" Subject: Re: [PATCH,PR50763] Follow-up patch to fix i686 bootstrap failure References: <4EA6A861.9090107@mentor.com> <4EB185AD.5010402@mentor.com> In-Reply-To: <4EB185AD.5010402@mentor.com> 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 11/02/2011 07:02 PM, Tom de Vries wrote: > On 10/26/2011 10:38 AM, Richard Guenther wrote: >> On Tue, Oct 25, 2011 at 2:15 PM, Tom de Vries wrote: >>> Richard, >>> >>> I have a patch for the i686 bootstrap problem reported in PR50763 comment 10. >>> >>> pr50763-2.c looks like this before tail_merge_optimize: >>> ... >>> std_canonical_va_list_type (union tree_node * typeD.1608) >>> { >>> _BoolD.1576 pretmp.6D.2739; >>> union tree_node * pretmp.5D.2738; >>> _BoolD.1576 pretmp.4D.2737; >>> union tree_node * pretmp.3D.2736; >>> intD.6 D.2734; >>> _BoolD.1576 D.2733; >>> union tree_node * D.2725; >>> intD.6 D.2722; >>> intD.6 D.2717; >>> >>> # BLOCK 2 freq:10000 >>> # PRED: ENTRY [100.0%] (fallthru,exec) >>> # VUSE <.MEMD.2730_12(D)> >>> D.2717_4 = typeD.1608_3(D)->baseD.1605.codeD.1597; >>> if (D.2717_4 != 0) >>> goto ; >>> else >>> goto ; >>> # SUCC: 3 [50.0%] (true,exec) 4 [50.0%] (false,exec) >>> >>> # BLOCK 3 freq:5000 >>> # PRED: 2 [50.0%] (true,exec) >>> # VUSE <.MEMD.2730_12(D)> >>> # PT = anything >>> typeD.1608_5 = typeD.1608_3(D)->typedD.1606.typeD.1600; >>> goto ; >>> # SUCC: 6 [100.0%] (fallthru,exec) >>> >>> # BLOCK 4 freq:5000 >>> # PRED: 2 [50.0%] (false,exec) >>> # VUSE <.MEMD.2730_12(D)> >>> # PT = anything >>> typeD.1608_6 = typeD.1608_3(D)->typedD.1606.typeD.1600; >>> # VUSE <.MEMD.2730_12(D)> >>> D.2722_7 = typeD.1608_6->baseD.1605.codeD.1597; >>> if (D.2722_7 != 0) >>> goto ; >>> else >>> goto ; >>> # SUCC: 5 [50.0%] (true,exec) 7 [50.0%] (false,exec) >>> >>> # BLOCK 7 freq:2500 >>> # PRED: 4 [50.0%] (false,exec) >>> goto ; >>> # SUCC: 6 [100.0%] (fallthru) >>> >>> # BLOCK 5 freq:2500 >>> # PRED: 4 [50.0%] (true,exec) >>> # SUCC: 6 [100.0%] (fallthru,exec) >>> >>> # BLOCK 6 freq:10000 >>> # PRED: 3 [100.0%] (fallthru,exec) 7 [100.0%] (fallthru) 5 [100.0%] >>> (fallthru,exec) >>> # PT = anything >>> >>> # typeD.1608_1 = PHI >>> # VUSE <.MEMD.2730_12(D)> >>> # PT = anything >>> D.2725_9 = typeD.1608_1->type_commonD.1607.main_variantD.1604; >>> D.2733_15 = D.2725_9 != 0B; >>> D.2734_14 = (intD.6) D.2733_15; >>> # VUSE <.MEMD.2730_12(D)> >>> return D.2734_14; >>> # SUCC: EXIT [100.0%] >>> >>> } >>> ... >>> >>> tail_merge_optimize discovers that block 3 and 5 are identical, and removes block 5. >>> In replace_block_by, we end up with phi_vuse1 == NULL_TREE and >>> phi_vuse2 == .MEMD.2730_12(D). >>> >>> After the original fix to PR50763, this forces us to update the vuses, while >>> that is not necessary. >>> >>> Attached patch fixes this problem by determining more precisely when the vuses >>> need to be updated. >>> >>> bootstrapped and reg-tested on x86_64 and i686. >>> >>> OK for trunk? >> >> Ok. >> > > Committed additional testcase from duplicate PR50854. > Committed 2 additional test-cases. Thanks, - Tom 2011-11-04 Tom de Vries PR tree-optimization/50763 * g++.dg/pr50763-4.C: New test. * gcc.dg/pr50763-5.c: New test. Index: gcc/testsuite/gcc.dg/pr50763-5.c =================================================================== --- /dev/null (new file) +++ gcc/testsuite/gcc.dg/pr50763-5.c (revision 0) @@ -0,0 +1,23 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -ftree-tail-merge" } */ + +struct inode +{ + unsigned short i_mode; + unsigned int i_flags; +}; + +static inline int +is_sxid (unsigned int mode) +{ + return (mode & 0004000) || ((mode & 0002000) && (mode & 00010)); +}; + +void +gfs2_set_inode_flags (int ip, struct inode *inode) +{ + unsigned int flags = inode->i_flags; + if ((ip == 0) && !is_sxid (inode->i_mode)) + inode->i_flags |= 4096; + inode->i_flags = flags; +}