From patchwork Mon Jul 1 17:55:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iyer, Balaji V" X-Patchwork-Id: 256195 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 4FD672C0087 for ; Tue, 2 Jul 2013 04:01:03 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:references:in-reply-to :content-type:mime-version; q=dns; s=default; b=kJLl33QVQ6Ih9Whl Ptk7ut0kUIsAZcdyKlldSIHAVzvF6hJjSE8QSGN/XpLWu3oh+MJVkva1fSMN3qPK OJ+NbQYNccraiHPcMIJPIMRWviGlLfEIJMqkBFR2kOpxtbsMUuBvPadhuVUtANYB g1D7eWYfrD/B6he3faa7d91PrHY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:references:in-reply-to :content-type:mime-version; s=default; bh=px3lqLIxbqoe0HwPmtkK32 w4Pik=; b=OY7bdriLlPjZxBFVu4DX8+CRVXMJ9rv5m9vKgdWN2/BFNnuTXDtk2S eiQX8nVhPtTAubPMCyMq2Gr5ItY+KJzifiM58bvnrVhl0/jE+csUV/LaEMcJEsRv /WuK6UBCZ40WgNCS/fQeH2IwaHjKwFxLXLBwlEh8YtIkA+Y1w2lhQ= Received: (qmail 30402 invoked by alias); 1 Jul 2013 18:00:56 -0000 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 Received: (qmail 30386 invoked by uid 89); 1 Jul 2013 18:00:55 -0000 X-Spam-SWARE-Status: No, score=-5.9 required=5.0 tests=AWL, BAYES_00, KHOP_THREADED, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.1 Received: from mga14.intel.com (HELO mga14.intel.com) (143.182.124.37) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 01 Jul 2013 18:00:54 +0000 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 01 Jul 2013 11:00:49 -0700 X-ExtLoop1: 1 Received: from fmsmsx107.amr.corp.intel.com ([10.19.9.54]) by azsmga001.ch.intel.com with ESMTP; 01 Jul 2013 10:55:48 -0700 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by FMSMSX107.amr.corp.intel.com (10.19.9.54) with Microsoft SMTP Server (TLS) id 14.3.123.3; Mon, 1 Jul 2013 10:55:48 -0700 Received: from fmsmsx101.amr.corp.intel.com ([169.254.1.114]) by FMSMSX155.amr.corp.intel.com ([169.254.5.176]) with mapi id 14.03.0123.003; Mon, 1 Jul 2013 10:55:48 -0700 From: "Iyer, Balaji V" To: Jakub Jelinek CC: "gcc-patches@gcc.gnu.org" , Rainer Orth , "Marek Polacek (polacek@redhat.com)" Subject: RE: [PATCH] Fix for PR c/57490 Date: Mon, 1 Jul 2013 17:55:47 +0000 Message-ID: References: <20130701162401.GY2336@tucnak.redhat.com> <20130701170926.GB2336@tucnak.redhat.com> In-Reply-To: <20130701170926.GB2336@tucnak.redhat.com> MIME-Version: 1.0 X-Virus-Found: No > -----Original Message----- > From: Jakub Jelinek [mailto:jakub@redhat.com] > Sent: Monday, July 01, 2013 1:09 PM > To: Iyer, Balaji V > Cc: gcc-patches@gcc.gnu.org; Rainer Orth > Subject: Re: [PATCH] Fix for PR c/57490 > > On Mon, Jul 01, 2013 at 05:02:57PM +0000, Iyer, Balaji V wrote: > > OK. The fixed patch is attached. Here are the ChangeLog entries: > > > > gcc/cp/ChangeLog > > 2013-07-01 Balaji V. Iyer > > > > Still > PR c/57490 > hasn't been added to cp/ChangeLog and c/ChangeLog entries. > > --- /dev/null > > +++ b/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57490.c > > @@ -0,0 +1,25 @@ > Fixed as you suggested. Here is the fixed Changelogs and patch is attached. gcc/cp/ChangeLog 2013-07-01 Balaji V. Iyer PR c/57490 * cp-array-notation.c (cp_expand_cond_array_notations): Added a check for truth values. (expand_array_notation_exprs): Added truth values case. Removed an unwanted else. Added for-loop to walk through subtrees in default case. gcc/c/ChangeLog 2013-07-01 Balaji V. Iyer PR c/57490 * c-array-notation.c (fix_conditional_array_notations_1): Added a check for truth values. (expand_array_notation_exprs): Added truth values case. Removed an unwanted else. Added for-loop to walk through subtrees in default case. gcc/testsuite/ChangeLog 2013-07-01 Balaji V. Iyer PR c/57490 * c-c++-common/cilk-plus/AN/pr57490.c: New test. > Do you want the testcase just as a compile time test (dunno what is the default > for cilk-plus.exp)? If it would be usable as a runtime test, it would be better to > just convert it into a runtime test (then of course you can't use __assert, but do > something like: > #define assert(x) do { if (!(x)) __builtin_abort () } while (0) and use assert > (__sec_reduce_add(x[0:n]) == 3.0f * n); etc. in the testcase, or just write the > conditionals plus __builtin_abort etc. And add /* { dg-do run } */. > > > +extern void __assert(const char *, const char *, int); const int n = > > +8; float x[8], y[8], z[8]; int main() { > > + int i = 0; > > + float x_sum =0; > > + for(i=1; i<=5; i+=4 ) { > > + x[0:n] = 3; > > + y[0:n] = i; > > + z[0:n] = 0; > > + (void)((__sec_reduce_add(x[0:n])==(float)3*n) || > (__assert("__sec_reduce_add(x[0:n])==3*n", "an-if.c", 28), 0)); > > + (void)((__sec_reduce_add(y[0:n])==(float)i*n) || > (__assert("__sec_reduce_add(y[0:n])==i*n", "an-if.c", 29), 0)); > > + (void)((__sec_reduce_add(z[0:n])==(float)0) || > > +(__assert("__sec_reduce_add(z[0:n])==0", "an-if.c", 30), 0)); > > + > > + if (x[0:n] >= y[0:n]) { > > + z[0:n] = x[0:n] - y[0:n]; > > + } else { > > + z[0:n] = x[0:n] + y[0:n]; > > + } > > + (void)((__sec_reduce_add(x[0:n])==(float)3*n) || > (__assert("__sec_reduce_add(x[0:n])==3*n", "an-if.c", 43), 0)); > > + (void)((__sec_reduce_add(y[0:n])==(float)i*n) || > (__assert("__sec_reduce_add(y[0:n])==i*n", "an-if.c", 44), 0)); > > + (void)((__sec_reduce_add(z[0:n])==(float)(3>=i?3-i:3+i)*n) || > (__assert("__sec_reduce_add(z[0:n])==(3>=i?3-i:3+i)*n", "an-if.c", 45), 0)); > > + } > > + return 0; > > +} > I want it to be a runtime assert. This is fixed as you suggested also. -Balaji V. Iyer. > Jakub diff --git a/gcc/c/c-array-notation.c b/gcc/c/c-array-notation.c index 7788f7b..5747bcb 100644 --- a/gcc/c/c-array-notation.c +++ b/gcc/c/c-array-notation.c @@ -906,6 +906,8 @@ fix_conditional_array_notations_1 (tree stmt) cond = COND_EXPR_COND (stmt); else if (TREE_CODE (stmt) == SWITCH_EXPR) cond = SWITCH_COND (stmt); + else if (truth_value_p (TREE_CODE (stmt))) + cond = TREE_OPERAND (stmt, 0); else /* Otherwise dont even touch the statement. */ return stmt; @@ -1232,6 +1234,12 @@ expand_array_notation_exprs (tree t) case BIND_EXPR: t = expand_array_notation_exprs (BIND_EXPR_BODY (t)); return t; + case TRUTH_ORIF_EXPR: + case TRUTH_ANDIF_EXPR: + case TRUTH_OR_EXPR: + case TRUTH_AND_EXPR: + case TRUTH_XOR_EXPR: + case TRUTH_NOT_EXPR: case COND_EXPR: t = fix_conditional_array_notations (t); @@ -1246,8 +1254,6 @@ expand_array_notation_exprs (tree t) COND_EXPR_ELSE (t) = expand_array_notation_exprs (COND_EXPR_ELSE (t)); } - else - t = expand_array_notation_exprs (t); return t; case STATEMENT_LIST: { @@ -1284,6 +1290,10 @@ expand_array_notation_exprs (tree t) Replace those with just void zero node. */ t = void_zero_node; default: + for (int ii = 0; ii < TREE_CODE_LENGTH (TREE_CODE (t)); ii++) + if (contains_array_notation_expr (TREE_OPERAND (t, ii))) + TREE_OPERAND (t, ii) = + expand_array_notation_exprs (TREE_OPERAND (t, ii)); return t; } return t; diff --git a/gcc/cp/cp-array-notation.c b/gcc/cp/cp-array-notation.c index d279ddd..164106f 100644 --- a/gcc/cp/cp-array-notation.c +++ b/gcc/cp/cp-array-notation.c @@ -857,6 +857,19 @@ cp_expand_cond_array_notations (tree orig_stmt) return error_mark_node; } } + else if (truth_value_p (TREE_CODE (orig_stmt))) + { + size_t left_rank = 0, right_rank = 0; + tree left_expr = TREE_OPERAND (orig_stmt, 0); + tree right_expr = TREE_OPERAND (orig_stmt, 1); + if (!find_rank (EXPR_LOCATION (left_expr), left_expr, left_expr, true, + &left_rank) + || !find_rank (EXPR_LOCATION (right_expr), right_expr, right_expr, + true, &right_rank)) + return error_mark_node; + if (right_rank == 0 && left_rank == 0) + return orig_stmt; + } if (!find_rank (EXPR_LOCATION (orig_stmt), orig_stmt, orig_stmt, true, &rank)) @@ -1213,6 +1226,12 @@ expand_array_notation_exprs (tree t) if (TREE_OPERAND (t, 0) == error_mark_node) return TREE_OPERAND (t, 0); return t; + case TRUTH_ANDIF_EXPR: + case TRUTH_ORIF_EXPR: + case TRUTH_AND_EXPR: + case TRUTH_OR_EXPR: + case TRUTH_XOR_EXPR: + case TRUTH_NOT_EXPR: case COND_EXPR: t = cp_expand_cond_array_notations (t); if (TREE_CODE (t) == COND_EXPR) @@ -1222,8 +1241,6 @@ expand_array_notation_exprs (tree t) COND_EXPR_ELSE (t) = expand_array_notation_exprs (COND_EXPR_ELSE (t)); } - else - t = expand_array_notation_exprs (t); return t; case FOR_STMT: if (contains_array_notation_expr (FOR_COND (t))) diff --git a/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57490.c b/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57490.c new file mode 100644 index 0000000..fbbd918 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57490.c @@ -0,0 +1,33 @@ +/* { dg-do run } */ +/* { dg-options "-fcilkplus" } */ + +const int n = 8; +float x[8], y[8], z[8]; +int main() { + int i = 0; + float x_sum =0; + for(i=1; i<=5; i+=4 ) { + x[0:n] = 3; + y[0:n] = i; + z[0:n] = 0; + (void)((__sec_reduce_add(x[0:n])==(float)3*n) + || (__builtin_abort (), 0)); + (void)((__sec_reduce_add(y[0:n])==(float)i*n) + || (__builtin_abort (), 0)); + (void)((__sec_reduce_add(z[0:n])==(float)0) + || (__builtin_abort (), 0)); + + if (x[0:n] >= y[0:n]) { + z[0:n] = x[0:n] - y[0:n]; + } else { + z[0:n] = x[0:n] + y[0:n]; + } + (void)((__sec_reduce_add(x[0:n])==(float)3*n) + || (__builtin_abort (), 0)); + (void)((__sec_reduce_add(y[0:n])==(float)i*n) + || (__builtin_abort (), 0)); + (void)((__sec_reduce_add(z[0:n])==(float)(3>=i?3-i:3+i)*n) + || (__builtin_abort (), 0)); + } + return 0; +}