From patchwork Thu Feb 4 20:11:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Bergner X-Patchwork-Id: 1436286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=LLZL0s3N; dkim-atps=neutral Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DWqT35zfQz9sWd for ; Fri, 5 Feb 2021 07:11:51 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C464F3857823; Thu, 4 Feb 2021 20:11:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C464F3857823 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1612469508; bh=dz5mwGZ/oxkGAz4VO3vlmC7ThcTFZAr2RaN5gQTs/t4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=LLZL0s3N7FJrxwAHicxBRbItpGrNW793pXywkvUKyzxximij+qzU+fEQ5HPnX399P iHkFix/E2sNAPGRdQUT+l06R+W2f/27HGd5NoocnMeDjFrhC0BVBtW9J9qa5BXVZUJ JI3QoXmDvuxPj7WE4eIYb9KUvZbY/22Mf1qPkKMk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id A1A3D385781A for ; Thu, 4 Feb 2021 20:11:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A1A3D385781A Received: from pps.filterd (m0187473.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 114K2vtx017177; Thu, 4 Feb 2021 15:11:42 -0500 Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com with ESMTP id 36gq3e90cy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 04 Feb 2021 15:11:41 -0500 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 114K8PwR030073; Thu, 4 Feb 2021 20:11:40 GMT Received: from b01cxnp22036.gho.pok.ibm.com (b01cxnp22036.gho.pok.ibm.com [9.57.198.26]) by ppma01dal.us.ibm.com with ESMTP id 36eu8r4wdj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 04 Feb 2021 20:11:40 +0000 Received: from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com [9.57.199.107]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 114KBeUi8192862 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 4 Feb 2021 20:11:40 GMT Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 00CD9124054; Thu, 4 Feb 2021 20:11:40 +0000 (GMT) Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 61EB212405C; Thu, 4 Feb 2021 20:11:39 +0000 (GMT) Received: from [9.160.87.37] (unknown [9.160.87.37]) by b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP; Thu, 4 Feb 2021 20:11:39 +0000 (GMT) To: Segher Boessenkool , Richard Sandiford Subject: [PATCH, rs6000, expand, hooks]: Fix PR98872, handle uninitialized opaque mode variables Message-ID: Date: Thu, 4 Feb 2021 14:11:38 -0600 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.737 definitions=2021-02-04_10:2021-02-04, 2021-02-04 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 suspectscore=0 clxscore=1011 adultscore=0 impostorscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102040122 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Peter Bergner via Gcc-patches From: Peter Bergner Reply-To: Peter Bergner Cc: GCC Patches Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Adding Richard since he's reviewed the generic opaque mode code in the past and this patch contains some more eneric support. GCC handles pseudos that are used uninitialized, by emitting a (set (reg: ) CONST0_RTX(regmode)) before their uninitialized pseudo usage. Currently, CONST0_RTX(mode) is NULL for opaque modes, which leads to an ICE. The solution is to enhance init_emit_once() to add initialization of CONST0_RTX for opaque modes using a target hook, since CONST0_RTX probably are different for each opaque mode and each target. The default hook throws an error to force the target to think hard about what their CONST0_RTX values should be for each mode. This passed bootstrap and regtesting on x86_64-linux and powerpc64le-linux with no regressions. Ok for mainline? Peter gcc/ PR target/98872 * config/rs6000/mma.md (*movoo): Accept zero constraint. (mma_xxsetaccz): Use CONST0_RTX. * config/rs6000/predicates.md: Recognize OOmode CONST0_RTX. * config/rs6000/rs6000.c (TARGET_OPAQUE_CONST0_RTX): Define. (rs6000_split_multireg_move): Handle splitting an OOmode register set to CONST0_RTX. (rs6000_opaque_const0_rtx): New function. * emit-rtl.c (init_emit_once): Initialize CONST0_RTX for opaque modes. * hooks.c (hook_rtx_mode_unreachable): New function. * hooks.h (hook_rtx_mode_unreachable): Declare * target.def (opaque_const0_rtx): New target hook. * doc/tm.texi.in: Document it. * doc/tm.texi: Regenerate. gcc/testsuite/ * gcc.target/powerpc/pr98872.c: New test. diff --git a/gcc/config/rs6000/mma.md b/gcc/config/rs6000/mma.md index 87569f1c31d..fab849a4f12 100644 --- a/gcc/config/rs6000/mma.md +++ b/gcc/config/rs6000/mma.md @@ -272,7 +272,7 @@ (define_insn_and_split "*movoo" [(set (match_operand:OO 0 "nonimmediate_operand" "=wa,m,wa") - (match_operand:OO 1 "input_operand" "m,wa,wa"))] + (match_operand:OO 1 "input_operand" "m,wa,waO"))] "TARGET_MMA && (gpc_reg_operand (operands[0], OOmode) || gpc_reg_operand (operands[1], OOmode))" @@ -473,9 +473,7 @@ (const_int 0))] "TARGET_MMA" { - rtx xo0 = gen_rtx_UNSPEC (XOmode, gen_rtvec (1, const0_rtx), - UNSPEC_MMA_XXSETACCZ); - emit_insn (gen_rtx_SET (operands[0], xo0)); + emit_insn (gen_rtx_SET (operands[0], CONST0_RTX (XOmode))); DONE; }) diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md index 5d1952e59d3..30805ab0619 100644 --- a/gcc/config/rs6000/predicates.md +++ b/gcc/config/rs6000/predicates.md @@ -1081,6 +1081,10 @@ && easy_vector_constant (op, mode)) return 1; + /* For OOmode, zero is an easy constant. */ + if (mode == OOmode && op == CONST0_RTX (mode)) + return 1; + /* For floating-point or multi-word mode, the only remaining valid type is a register. */ if (SCALAR_FLOAT_MODE_P (mode) diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index f5565a1a253..c726aa09d26 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -1752,6 +1752,10 @@ static const struct attribute_spec rs6000_attribute_table[] = #undef TARGET_INVALID_CONVERSION #define TARGET_INVALID_CONVERSION rs6000_invalid_conversion + +#undef TARGET_OPAQUE_CONST0_RTX +#define TARGET_OPAQUE_CONST0_RTX rs6000_opaque_const0_rtx + /* Processor table. */ @@ -16624,6 +16628,19 @@ rs6000_split_multireg_move (rtx dst, rtx src) return; } + /* Split the clearing of an OOmode register pair into clearing + of its two constituent registers. */ + if (REG_P (dst) && mode == OOmode && src == CONST0_RTX (mode)) + { + int regno = REGNO (dst); + gcc_assert (VSX_REGNO_P (regno)); + emit_insn (gen_rtx_SET (gen_rtx_REG (reg_mode, regno), + CONST0_RTX (reg_mode))); + emit_insn (gen_rtx_SET (gen_rtx_REG (reg_mode, regno + 1), + CONST0_RTX (reg_mode))); + return; + } + /* Register -> register moves can use common code. */ } @@ -27477,6 +27494,25 @@ rs6000_output_addr_vec_elt (FILE *file, int value) fprintf (file, "\n"); } +/* Implement TARGET_OPAQUE_CONST0_RTX. */ + +rtx +rs6000_opaque_const0_rtx (machine_mode mode) +{ + gcc_assert (OPAQUE_MODE_P (mode)); + + switch (mode) + { + case E_OOmode: + return const0_rtx; + case E_XOmode: + return gen_rtx_UNSPEC (XOmode, gen_rtvec (1, const0_rtx), + UNSPEC_MMA_XXSETACCZ); + default: + gcc_unreachable (); + } +} + struct gcc_target targetm = TARGET_INITIALIZER; #include "gt-rs6000.h" diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index b23284e5e56..4ac26491481 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -6408,6 +6408,11 @@ init_emit_once (void) if (GET_MODE_CLASS ((machine_mode) i) == MODE_CC) const_tiny_rtx[0][i] = const0_rtx; + FOR_EACH_MODE_IN_CLASS (mode, MODE_OPAQUE) + { + const_tiny_rtx[0][(int) mode] = targetm.opaque_const0_rtx (mode); + } + pc_rtx = gen_rtx_fmt_ (PC, VOIDmode); ret_rtx = gen_rtx_fmt_ (RETURN, VOIDmode); simple_return_rtx = gen_rtx_fmt_ (SIMPLE_RETURN, VOIDmode); diff --git a/gcc/hooks.c b/gcc/hooks.c index 680271f76a4..8e71105265a 100644 --- a/gcc/hooks.c +++ b/gcc/hooks.c @@ -380,6 +380,12 @@ hook_bool_wint_wint_uint_bool_true (const widest_int &, const widest_int &, return true; } +rtx +hook_rtx_mode_unreachable (machine_mode mode ATTRIBUTE_UNUSED) +{ + gcc_unreachable (); +} + /* Generic hook that takes an rtx and returns it. */ rtx hook_rtx_rtx_identity (rtx x) diff --git a/gcc/hooks.h b/gcc/hooks.h index add9a742e41..ba9b6d9ff75 100644 --- a/gcc/hooks.h +++ b/gcc/hooks.h @@ -119,6 +119,7 @@ extern unsigned int hook_uint_mode_0 (machine_mode); extern bool default_can_output_mi_thunk_no_vcall (const_tree, HOST_WIDE_INT, HOST_WIDE_INT, const_tree); +extern rtx hook_rtx_mode_unreachable (machine_mode); extern rtx hook_rtx_rtx_identity (rtx); extern rtx hook_rtx_rtx_null (rtx); extern rtx hook_rtx_tree_int_null (tree, int); diff --git a/gcc/target.def b/gcc/target.def index be7fcde961a..c026e584c78 100644 --- a/gcc/target.def +++ b/gcc/target.def @@ -3362,6 +3362,13 @@ constants can be done inline. The function\n\ HOST_WIDE_INT, (const_tree constant, HOST_WIDE_INT basic_align), default_constant_alignment) +DEFHOOK +(opaque_const0_rtx, + "Return an RTX representing the value @code{0} for opaque mode @var{mode}.\n\ +The default version of this hook always throws an error.", +rtx, (machine_mode mode), +hook_rtx_mode_unreachable) + DEFHOOK (translate_mode_attribute, "Define this hook if during mode attribute processing, the port should\n\ diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in index 3b19e6f4281..74f6626112b 100644 --- a/gcc/doc/tm.texi.in +++ b/gcc/doc/tm.texi.in @@ -3361,6 +3361,8 @@ stack. @hook TARGET_REF_MAY_ALIAS_ERRNO +@hook TARGET_OPAQUE_CONST0_RTX + @hook TARGET_TRANSLATE_MODE_ATTRIBUTE @hook TARGET_SCALAR_MODE_SUPPORTED_P diff --git a/gcc/testsuite/gcc.target/powerpc/pr98872.c b/gcc/testsuite/gcc.target/powerpc/pr98872.c new file mode 100644 index 00000000000..580b90de7dc --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/pr98872.c @@ -0,0 +1,20 @@ +/* PR target/98872 */ +/* { dg-do compile } */ +/* { dg-require-effective-target power10_ok } */ +/* { dg-options "-O2 -mdejagnu-cpu=power10" } */ + +/* Verify we do not ICE on the tests below. */ + +void +foo (__vector_quad *dst) +{ + __vector_quad acc; + *dst = acc; +} + +void +bar (__vector_pair *dst) +{ + __vector_pair pair; + *dst = pair; +}