From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 1E260398B83F; Wed, 16 Sep 2020 19:22:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E260398B83F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1600284131; bh=MpJsYk+svggK1ccb4+N6UOy8ChPSXOgmldfLWN3sWdo=; h=From:To:Subject:Date:From; b=tOBXamwaovvcVSSGI5v1etMVR8Dl9nAWYWsnSH8dNp9DVlUVPMYBnnGWPLhVSqhpv tOm7llXEOFxlmtjGdmI4NK3+yA7230oaEgNREbdk+mvggA8VXR5Js4fZE7I7ZPWKDu uL6MauMYBfkYZXIParm2UkB1uZyxbKBo+HkDpPes= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r9-8899] openmp: Fix placement of 2nd+ preparation statement for PHIs in simd clone lowering [PR95108] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: 9d01f91514f627590adc408ac9a35a7153123119 X-Git-Newrev: b78ea59edbd354fed914d0f8eb78109db7316ce8 Message-Id: <20200916192211.1E260398B83F@sourceware.org> Date: Wed, 16 Sep 2020 19:22:11 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Sep 2020 19:22:11 -0000 https://gcc.gnu.org/g:b78ea59edbd354fed914d0f8eb78109db7316ce8 commit r9-8899-gb78ea59edbd354fed914d0f8eb78109db7316ce8 Author: Jakub Jelinek Date: Thu May 14 09:51:05 2020 +0200 openmp: Fix placement of 2nd+ preparation statement for PHIs in simd clone lowering [PR95108] For normal stmts, preparation statements are inserted before the stmt, so if we need multiple, they are in the correct order, but for PHIs we emit them after labels in the entry successor bb, and we used to emit them in the reverse order that way. 2020-05-14 Jakub Jelinek PR middle-end/95108 * omp-simd-clone.c (struct modify_stmt_info): Add after_stmt member. (ipa_simd_modify_stmt_ops): For PHIs, only add before first stmt in entry block if info->after_stmt is NULL, otherwise add after that stmt and update it after adding each stmt. (ipa_simd_modify_function_body): Initialize info.after_stmt. * gcc.dg/gomp/pr95108.c: New test. (cherry picked from commit d0fb9ffc1b8f3b86bbdf0e915cec2136141b329b) Diff: --- gcc/omp-simd-clone.c | 15 +++++++++++++-- gcc/testsuite/gcc.dg/gomp/pr95108.c | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/gcc/omp-simd-clone.c b/gcc/omp-simd-clone.c index e865828f569..f403c0a2b9c 100644 --- a/gcc/omp-simd-clone.c +++ b/gcc/omp-simd-clone.c @@ -812,6 +812,7 @@ simd_clone_init_simd_arrays (struct cgraph_node *node, struct modify_stmt_info { ipa_parm_adjustment_vec adjustments; gimple *stmt; + gimple *after_stmt; /* True if the parent statement was modified by ipa_simd_modify_stmt_ops. */ bool modified; @@ -892,7 +893,10 @@ ipa_simd_modify_stmt_ops (tree *tp, int *walk_subtrees, void *data) gimple_stmt_iterator gsi; if (gimple_code (info->stmt) == GIMPLE_PHI) { - gsi = gsi_after_labels (single_succ (ENTRY_BLOCK_PTR_FOR_FN (cfun))); + if (info->after_stmt) + gsi = gsi_for_stmt (info->after_stmt); + else + gsi = gsi_after_labels (single_succ (ENTRY_BLOCK_PTR_FOR_FN (cfun))); /* Cache SSA_NAME for next time. */ if (cand && TREE_CODE (*orig_tp) == ADDR_EXPR @@ -901,7 +905,12 @@ ipa_simd_modify_stmt_ops (tree *tp, int *walk_subtrees, void *data) } else gsi = gsi_for_stmt (info->stmt); - gsi_insert_before (&gsi, stmt, GSI_SAME_STMT); + if (info->after_stmt) + gsi_insert_after (&gsi, stmt, GSI_SAME_STMT); + else + gsi_insert_before (&gsi, stmt, GSI_SAME_STMT); + if (gimple_code (info->stmt) == GIMPLE_PHI) + info->after_stmt = stmt; *orig_tp = repl; } else if (!useless_type_conversion_p (TREE_TYPE (*tp), TREE_TYPE (repl))) @@ -1006,6 +1015,7 @@ ipa_simd_modify_function_body (struct cgraph_node *node, gphi *phi = as_a (gsi_stmt (gsi)); int i, n = gimple_phi_num_args (phi); info.stmt = phi; + info.after_stmt = NULL; struct walk_stmt_info wi; memset (&wi, 0, sizeof (wi)); info.modified = false; @@ -1031,6 +1041,7 @@ ipa_simd_modify_function_body (struct cgraph_node *node, { gimple *stmt = gsi_stmt (gsi); info.stmt = stmt; + info.after_stmt = NULL; struct walk_stmt_info wi; memset (&wi, 0, sizeof (wi)); diff --git a/gcc/testsuite/gcc.dg/gomp/pr95108.c b/gcc/testsuite/gcc.dg/gomp/pr95108.c new file mode 100644 index 00000000000..b492333686b --- /dev/null +++ b/gcc/testsuite/gcc.dg/gomp/pr95108.c @@ -0,0 +1,18 @@ +/* PR middle-end/95108 */ +/* { dg-do compile { target vect_simd_clones } } */ +/* { dg-options "-O2 -fopenmp-simd -w" } */ + +int *v; + +#pragma omp declare simd +void +foo (int x) +{ + int *a = &x + 1; + + for (;;) + { + *v = *a; + a = v; + } +}