From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1464) id 156B13857C69; Mon, 14 Jun 2021 21:57:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 156B13857C69 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Peter Bergner To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1439] rs6000: MMA builtin usage ICEs when used in a #pragma omp parallel and using -fopenmp [PR100777] X-Act-Checkin: gcc X-Git-Author: Peter Bergner X-Git-Refname: refs/heads/master X-Git-Oldrev: ecc5644fa3bc7f37eada2a3e9c627cd1918922e0 X-Git-Newrev: 20073534c0ccca0a4e079c053ee0874af10b2ea0 Message-Id: <20210614215757.156B13857C69@sourceware.org> Date: Mon, 14 Jun 2021 21:57:57 +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: Mon, 14 Jun 2021 21:57:57 -0000 https://gcc.gnu.org/g:20073534c0ccca0a4e079c053ee0874af10b2ea0 commit r12-1439-g20073534c0ccca0a4e079c053ee0874af10b2ea0 Author: Peter Bergner Date: Mon Jun 14 16:55:18 2021 -0500 rs6000: MMA builtin usage ICEs when used in a #pragma omp parallel and using -fopenmp [PR100777] Using an MMA builtin within an openmp parallel code block, leads to an SSA verification ICE on the temporaries we create while expanding the MMA builtins at gimple time. The solution is to use create_tmp_reg_or_ssa_name(), which knows when to create either an SSA or register temporary. 2021-06-14 Peter Bergner gcc/ PR target/100777 * config/rs6000/rs6000-call.c (rs6000_gimple_fold_mma_builtin): Use create_tmp_reg_or_ssa_name(). gcc/testsuite/ PR target/100777 * gcc.target/powerpc/pr100777.c: New test. Diff: --- gcc/config/rs6000/rs6000-call.c | 12 ++++++------ gcc/testsuite/gcc.target/powerpc/pr100777.c | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/gcc/config/rs6000/rs6000-call.c b/gcc/config/rs6000/rs6000-call.c index 0ac6b6ef1bc..b67789845a5 100644 --- a/gcc/config/rs6000/rs6000-call.c +++ b/gcc/config/rs6000/rs6000-call.c @@ -11863,7 +11863,7 @@ rs6000_gimple_fold_mma_builtin (gimple_stmt_iterator *gsi) tree dst_ptr = gimple_call_arg (stmt, 0); tree src_ptr = gimple_call_arg (stmt, 1); tree src_type = TREE_TYPE (src_ptr); - tree src = make_ssa_name (TREE_TYPE (src_type)); + tree src = create_tmp_reg_or_ssa_name (TREE_TYPE (src_type)); gimplify_assign (src, build_simple_mem_ref (src_ptr), &new_seq); /* If we are not disassembling an accumulator/pair or our destination is @@ -11887,7 +11887,7 @@ rs6000_gimple_fold_mma_builtin (gimple_stmt_iterator *gsi) { new_decl = rs6000_builtin_decls[MMA_BUILTIN_XXMFACC_INTERNAL]; new_call = gimple_build_call (new_decl, 1, src); - src = make_ssa_name (vector_quad_type_node); + src = create_tmp_reg_or_ssa_name (vector_quad_type_node); gimple_call_set_lhs (new_call, src); gimple_seq_add_stmt (&new_seq, new_call); } @@ -11902,7 +11902,7 @@ rs6000_gimple_fold_mma_builtin (gimple_stmt_iterator *gsi) unsigned index = WORDS_BIG_ENDIAN ? i : nvec - 1 - i; tree dst = build2 (MEM_REF, unsigned_V16QI_type_node, dst_base, build_int_cst (dst_type, index * 16)); - tree dstssa = make_ssa_name (unsigned_V16QI_type_node); + tree dstssa = create_tmp_reg_or_ssa_name (unsigned_V16QI_type_node); new_call = gimple_build_call (new_decl, 2, src, build_int_cstu (uint16_type_node, i)); gimple_call_set_lhs (new_call, dstssa); @@ -11925,7 +11925,7 @@ rs6000_gimple_fold_mma_builtin (gimple_stmt_iterator *gsi) { /* This built-in has a pass-by-reference accumulator input, so load it into a temporary accumulator for use as a pass-by-value input. */ - op[0] = make_ssa_name (vector_quad_type_node); + op[0] = create_tmp_reg_or_ssa_name (vector_quad_type_node); for (unsigned i = 1; i < nopnds; i++) op[i] = gimple_call_arg (stmt, i); gimplify_assign (op[0], build_simple_mem_ref (acc), &new_seq); @@ -11973,9 +11973,9 @@ rs6000_gimple_fold_mma_builtin (gimple_stmt_iterator *gsi) } if (fncode == VSX_BUILTIN_BUILD_PAIR || fncode == VSX_BUILTIN_ASSEMBLE_PAIR) - lhs = make_ssa_name (vector_pair_type_node); + lhs = create_tmp_reg_or_ssa_name (vector_pair_type_node); else - lhs = make_ssa_name (vector_quad_type_node); + lhs = create_tmp_reg_or_ssa_name (vector_quad_type_node); gimple_call_set_lhs (new_call, lhs); gimple_seq_add_stmt (&new_seq, new_call); gimplify_assign (build_simple_mem_ref (acc), lhs, &new_seq); diff --git a/gcc/testsuite/gcc.target/powerpc/pr100777.c b/gcc/testsuite/gcc.target/powerpc/pr100777.c new file mode 100644 index 00000000000..15742f67d8c --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr100777.c @@ -0,0 +1,24 @@ +/* PR target/100777 */ +/* { dg-require-effective-target power10_ok } */ +/* { dg-require-effective-target fopenmp } */ +/* { dg-options "-O1 -mdejagnu-cpu=power10 -fopenmp" } */ + +/* Verify we do not ICE on the following. */ + +void +foo (__vector_quad *dst) +{ +#pragma omp parallel + { + __builtin_mma_xxsetaccz (dst); + } +} + +void +bar (__vector_quad *dst, __vector_quad *src) +{ +#pragma omp parallel + { + __builtin_mma_disassemble_acc (dst, src); + } +}