From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 48804385842A for ; Thu, 4 Apr 2024 08:06:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 48804385842A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 48804385842A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712217980; cv=none; b=XpIcuDu899RIcMxHvedPWZ6F4LBAYPAp0Vm+kJlNw5c3GwAdsyO6RJHF+6fMvbmlTSA4tYHqI2D+Li3NI7t0el+g6fytDJIlqGrIQeFiZqz5klzK4VdXH7tEfLg2xJM2DWhRbTsRCqzhqyfsxeVyIiiQn+lKcBicEgTVWFCycFY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712217980; c=relaxed/simple; bh=lB6Cr4Af9hEaKmxjCHTpTb2nQEmwuwhmk0elv9RRvmk=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:Message-ID: MIME-Version; b=mAkG5BVM7l6Y2YeeuvXTgc2qAJdEQYL0omuVm00PUdkxVrozEGSBsqTmm9GMS/Fdg/8lcMbFzFg90SX2VkWYFSO5vUxJGAg4n8A7ImTQPxjv0PO2ORiH7nZfpUU2I0V6fs56VSC5vcQO4ejPv0blX2QlW2nYIv+RHT22OgtSTGE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.5.241] (unknown [10.168.5.241]) (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 smtp-out1.suse.de (Postfix) with ESMTPS id 4621F376EE; Thu, 4 Apr 2024 08:06:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712217973; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tSlbqG0K27X86feU0FUAUZx9iLryoLUj0PYXK7bBPXY=; b=PGil3KIjc2c9hSXloaCOVt3F1nrWI6g35wSm7FqW4ssgyk2kRDc6xgC8PZ91oDn5SvmIG7 BtCKhvZQ8GfLlM/g6lU9VmXKG6tFmRupAQio8YoLsfGNq0t26JVlMCNJ1shDFQsHIgPNFM MlQahMBNeAgkBPX8jid7xHUkuwUk2gU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712217973; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tSlbqG0K27X86feU0FUAUZx9iLryoLUj0PYXK7bBPXY=; b=+0z5zxRGryGiBbWQE3Mt3/EK2CKtjmvoveUTZQy7IMJ2eujhLgXMkmJUZi/x1myAdNJUxw wbArdGFDVTLHe5AA== Authentication-Results: smtp-out1.suse.de; none Date: Thu, 4 Apr 2024 10:06:13 +0200 (CEST) From: Richard Biener To: Jakub Jelinek cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] bitint: Handle m_bitfld_load cast in outer m_cast_conditional [PR114555] In-Reply-To: Message-ID: <03r63rop-n380-1nq9-861n-5rn4r9o58783@fhfr.qr> References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Score: -1.31 X-Spamd-Result: default: False [-1.31 / 50.00]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(2.79)[0.929]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-1.00)[-0.995]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FUZZY_BLOCKED(0.00)[rspamd.com] X-Spam-Level: X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, 4 Apr 2024, Jakub Jelinek wrote: > Hi! > > We ICE on the following testcase, because we use result of a PHI node > which is only conditional because of a m_cast_conditional on the outermost > loops PHI node argument and so is invalid SSA form. > > The following patch fixes it like similar cases elsewhere by adding > needed intervening PHI(s). > > Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? OK. Richard. > 2024-04-04 Jakub Jelinek > > PR tree-optimization/114555 > * gimple-lower-bitint.cc (bitint_large_huge::handle_cast): For > m_bitfld_load and save_cast_conditional add any needed PHIs > and adjust t4 accordingly. > > * gcc.dg/bitint-103.c: New test. > * gcc.dg/bitint-104.c: New test. > > --- gcc/gimple-lower-bitint.cc.jj 2024-03-23 11:19:53.000000000 +0100 > +++ gcc/gimple-lower-bitint.cc 2024-04-03 15:31:19.686583203 +0200 > @@ -1506,7 +1506,7 @@ bitint_large_huge::handle_cast (tree lhs > if (m_bitfld_load) > { > tree t4; > - if (!save_first) > + if (!save_first && !save_cast_conditional) > t4 = m_data[m_bitfld_load + 1]; > else > t4 = make_ssa_name (m_limb_type); > @@ -1519,6 +1519,24 @@ bitint_large_huge::handle_cast (tree lhs > if (edge_true_true) > add_phi_arg (phi, m_data[m_bitfld_load], edge_true_true, > UNKNOWN_LOCATION); > + if (save_cast_conditional) > + for (basic_block bb = gsi_bb (m_gsi);;) > + { > + edge e1 = single_succ_edge (bb); > + edge e2 = find_edge (e1->dest, m_bb), e3; > + tree t5 = ((e2 && !save_first) ? m_data[m_bitfld_load + 1] > + : make_ssa_name (m_limb_type)); > + phi = create_phi_node (t5, e1->dest); > + edge_iterator ei; > + FOR_EACH_EDGE (e3, ei, e1->dest->preds) > + add_phi_arg (phi, (e3 == e1 ? t4 > + : build_zero_cst (m_limb_type)), > + e3, UNKNOWN_LOCATION); > + t4 = t5; > + if (e2) > + break; > + bb = e1->dest; > + } > m_data[m_bitfld_load] = t4; > m_data[m_bitfld_load + 2] = t4; > m_bitfld_load = 0; > --- gcc/testsuite/gcc.dg/bitint-103.c.jj 2024-04-03 15:34:19.468113199 +0200 > +++ gcc/testsuite/gcc.dg/bitint-103.c 2024-04-03 15:34:05.805300917 +0200 > @@ -0,0 +1,16 @@ > +/* PR tree-optimization/114555 */ > +/* { dg-do compile { target bitint } } */ > +/* { dg-options "-std=c23 -O2" } */ > + > +#if __BITINT_MAXWIDTH__ >= 1225 > +struct S { _BitInt(512) : 98; _BitInt(1225) b : 509; } s; > +_BitInt(1225) a; > +#endif > + > +void > +foo (void) > +{ > +#if __BITINT_MAXWIDTH__ >= 1225 > + a ^= (unsigned _BitInt(1025)) s.b; > +#endif > +} > --- gcc/testsuite/gcc.dg/bitint-104.c.jj 2024-04-03 15:36:59.385916107 +0200 > +++ gcc/testsuite/gcc.dg/bitint-104.c 2024-04-03 15:36:28.034346850 +0200 > @@ -0,0 +1,17 @@ > +/* PR tree-optimization/114555 */ > +/* { dg-do compile { target bitint } } */ > +/* { dg-options "-std=c23 -O -fno-tree-forwprop" } */ > + > +#if __BITINT_MAXWIDTH__ >= 4139 > +struct S { _BitInt(31) : 6; _BitInt(513) b : 241; } s; > +_BitInt(4139) a; > +#endif > + > +void > +foo (void) > +{ > +#if __BITINT_MAXWIDTH__ >= 4139 > + int i = 0; > + a -= s.b << i; > +#endif > +} > > Jakub > > -- Richard Biener SUSE Software Solutions Germany GmbH, Frankenstrasse 146, 90461 Nuernberg, Germany; GF: Ivo Totev, Andrew McDonald, Werner Knoblich; (HRB 36809, AG Nuernberg)