From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4879 invoked by alias); 15 Apr 2013 14:44:05 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 4868 invoked by uid 89); 15 Apr 2013 14:44:05 -0000 X-Spam-SWARE-Status: No, score=-6.0 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD,TW_TM autolearn=ham version=3.3.1 Received: from e28smtp09.in.ibm.com (HELO e28smtp09.in.ibm.com) (122.248.162.9) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 15 Apr 2013 14:44:04 +0000 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 15 Apr 2013 20:10:54 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 15 Apr 2013 20:10:52 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 99654394002D for ; Mon, 15 Apr 2013 20:13:57 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3FEhpYL11534652 for ; Mon, 15 Apr 2013 20:13:51 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3FEhuUX013184 for ; Tue, 16 Apr 2013 00:43:56 +1000 Received: from [9.80.16.12] ([9.80.16.12]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3FEhrQX013071; Tue, 16 Apr 2013 00:43:54 +1000 Message-ID: <1366037040.3460.102.camel@gnopaine> Subject: Re: [PATCH] Fix SLSR wrong-code (PR tree-optimization/56962) From: Bill Schmidt To: Jakub Jelinek Cc: Richard Biener , gcc-patches@gcc.gnu.org Date: Mon, 15 Apr 2013 16:10:00 -0000 In-Reply-To: <20130415142832.GI12880@tucnak.redhat.com> References: <20130415142832.GI12880@tucnak.redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Mime-Version: 1.0 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13041514-2674-0000-0000-0000089AC7EF X-SW-Source: 2013-04/txt/msg00935.txt.bz2 FWIW, I agree with Jakub's fix. Thanks! Bill On Mon, 2013-04-15 at 16:28 +0200, Jakub Jelinek wrote: > Hi! > > record_increment failed to verify that initializer is usable, which it is > only if cand_stmt is an addition (CAND_ADD can be e.g. even on a cast of > addition to some type of the same precision etc.) and one of the operands is > c->base_expr (because then the other operand necessarily has to be the rest, > but the code was only checking one of the operands, but cand_stmt e.g. can > be a sum of two SSA_NAMEs where each of those adds some multiply of one of > base_expr operands and some multiply of the c->stride. If we set > initializer to randomly chosen operand of such stmt, while we'll have the > right multiply of c->stride, the base_expr might be wrong. > > Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux, ok for > trunk/4.8? > > 2013-04-15 Jakub Jelinek > > PR tree-optimization/56962 > * gimple-ssa-strength-reduction.c (record_increment): Only set > initializer if gimple_assign_rhs_code is {,POINTER_}PLUS_EXPR and > either rhs1 or rhs2 is equal to c->base_expr. > > * gcc.c-torture/execute/pr56962.c: New test. > > --- gcc/gimple-ssa-strength-reduction.c.jj 2013-01-11 09:02:50.000000000 +0100 > +++ gcc/gimple-ssa-strength-reduction.c 2013-04-15 11:59:46.668463873 +0200 > @@ -1829,16 +1829,20 @@ record_increment (slsr_cand_t c, double_ > if (c->kind == CAND_ADD > && c->index == increment > && (increment.sgt (double_int_one) > - || increment.slt (double_int_minus_one))) > + || increment.slt (double_int_minus_one)) > + && (gimple_assign_rhs_code (c->cand_stmt) == PLUS_EXPR > + || gimple_assign_rhs_code (c->cand_stmt) == POINTER_PLUS_EXPR)) > { > - tree t0; > + tree t0 = NULL_TREE; > tree rhs1 = gimple_assign_rhs1 (c->cand_stmt); > tree rhs2 = gimple_assign_rhs2 (c->cand_stmt); > if (operand_equal_p (rhs1, c->base_expr, 0)) > t0 = rhs2; > - else > + else if (operand_equal_p (rhs2, c->base_expr, 0)) > t0 = rhs1; > - if (SSA_NAME_DEF_STMT (t0) && gimple_bb (SSA_NAME_DEF_STMT (t0))) > + if (t0 > + && SSA_NAME_DEF_STMT (t0) > + && gimple_bb (SSA_NAME_DEF_STMT (t0))) > { > incr_vec[incr_vec_len].initializer = t0; > incr_vec[incr_vec_len++].init_bb > --- gcc/testsuite/gcc.c-torture/execute/pr56962.c.jj 2013-04-15 12:09:24.781355085 +0200 > +++ gcc/testsuite/gcc.c-torture/execute/pr56962.c 2013-04-15 12:09:19.985381802 +0200 > @@ -0,0 +1,30 @@ > +/* PR tree-optimization/56962 */ > + > +extern void abort (void); > +long long v[144]; > + > +__attribute__((noinline, noclone)) void > +bar (long long *x) > +{ > + if (x != &v[29]) > + abort (); > +} > + > +__attribute__((noinline, noclone)) void > +foo (long long *x, long y, long z) > +{ > + long long a, b, c; > + a = x[z * 4 + y * 3]; > + b = x[z * 5 + y * 3]; > + c = x[z * 5 + y * 4]; > + x[y * 4] = a; > + bar (&x[z * 5 + y]); > + x[z * 5 + y * 5] = b + c; > +} > + > +int > +main () > +{ > + foo (v, 24, 1); > + return 0; > +} > > Jakub >