From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id EEC713858C20 for ; Thu, 23 Nov 2023 11:55:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EEC713858C20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EEC713858C20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700740507; cv=none; b=SHtQUKeV+087f4v6x4lbOH+1aytBBNeKDgMHy50veDNMzlk1C+gMLgBCZlfTeqie5EDm3i4VCVhlBuoBlfF+ikbi8QOr5YNwy79Tcr3vH+MYScVxSuNvqaIiXW6kk5EEiwtyQWzz3fbRVmr7zDQsdqThUW2xKFJDKVtjf+oWEME= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700740507; c=relaxed/simple; bh=dDrsCfCDYQLkLcQhI+W5IlB5Ixx5NTXKJAt26q6NM5w=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=PD1pUcUXZZULpwHrwAfXMwJpgWSqkFKSYd75G8MxYPwj+U9WAcSnu6TDzgVT61OFIIKPdY/ECnuERiWAfHqfTIN0gpJwNQHFY3y6Wzn10oA0taPfYZCJKVo+zAlI07VS1u+/CIXl5Y+je+SblME5Unt+zvxsNmdtXyY6NHsuVIw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700740505; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=33aHsJdk1WSthi+B0NJwrR3MhqROF1EczTOuYkFRO8w=; b=JBFfO9bOSr9XeVT5zGUpvi6j6qIpEUdmEECePlfRujxTBwSsiTDNHo09Q6483OJy5mPVHX 9gRDAb1cL6DkHjsgnxi26sATmFB2bGT6fGWEyYtqvsqM2Li5v6iHVKU2JgyvmU6liqOEBU MTgxjz2yHTmmpUz+znXdAE4BhhcpKdA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-372-gtHqacf3PVqPL-q7gr-Pnw-1; Thu, 23 Nov 2023 06:55:02 -0500 X-MC-Unique: gtHqacf3PVqPL-q7gr-Pnw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E7C98811E7B; Thu, 23 Nov 2023 11:55:01 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.194.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AAAFC2166B26; Thu, 23 Nov 2023 11:55:01 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 3ANBsw7P907030 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 23 Nov 2023 12:54:59 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 3ANBsvk2907029; Thu, 23 Nov 2023 12:54:57 +0100 Date: Thu, 23 Nov 2023 12:54:57 +0100 From: Jakub Jelinek To: Richard Biener , Richard Biener , gcc-patches@gcc.gnu.org Subject: Re: [PATCH] lower-bitint: Fix up -fnon-call-exceptions bit-field load lowering [PR112668] Message-ID: Reply-To: Jakub Jelinek References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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, Nov 23, 2023 at 11:56:33AM +0100, Jakub Jelinek wrote: > Now, regarding m_init_gsi, I think I'll need to play around, maybe > I should have in the end insert after and update behavior rather than > insert after, and that could be achieved by adding > m_init_gsi = m_gsi; > gsi_prev (&m_init_gsi); > before the > m_gsi = save_gsi; > restore in all the 3 places and then no other updates of m_init_gsi would be > needed. Except gsi_prev likely won't like the gsi_end_p (m_gsi) case, > so maybe > m_init_gsi = m_gsi; > if (gsi_end_p (m_init_gsi)) > m_init_gsi = gsi_last_bb (gsi_bb (m_init_gsi)); > else > gsi_prev (&m_init_gsi); > m_gsi = save_gsi; That seems to work and I think it is the right thing to do. Here is an updated patch to do that. Passed make check-gcc -j32 -k GCC_TEST_RUN_EXPENSIVE=1 RUNTESTFLAGS='GCC_TEST_RUN_EXPENSIVE=1 dg.exp=*bitint* dg-torture.exp=*bitint*' so far. 2023-11-23 Jakub Jelinek PR middle-end/112668 * gimple-lower-bitint.cc (bitint_large_huge::handle_cast): After temporarily adding statements after m_init_gsi, update m_init_gsi such that later additions after it will be after the added statements. (bitint_large_huge::handle_load): Likewise. When splitting gsi_bb (m_init_gsi) basic block, update m_preheader_bb if needed and update saved m_gsi as well if needed. * gcc.dg/bitint-40.c: New test. --- gcc/gimple-lower-bitint.cc.jj 2023-11-22 22:55:14.260164718 +0100 +++ gcc/gimple-lower-bitint.cc 2023-11-23 12:39:35.030364243 +0100 @@ -1294,6 +1294,11 @@ bitint_large_huge::handle_cast (tree lhs g = gimple_build_assign (n, RSHIFT_EXPR, t, lpm1); insert_before (g); m_data[save_data_cnt + 1] = add_cast (m_limb_type, n); + m_init_gsi = m_gsi; + if (gsi_end_p (m_init_gsi)) + m_init_gsi = gsi_last_bb (gsi_bb (m_init_gsi)); + else + gsi_prev (&m_init_gsi); m_gsi = save_gsi; } else if (m_upwards_2limb * limb_prec < TYPE_PRECISION (rhs_type)) @@ -1523,6 +1528,11 @@ bitint_large_huge::handle_cast (tree lhs insert_before (g); rext = add_cast (m_limb_type, gimple_assign_lhs (g)); } + m_init_gsi = m_gsi; + if (gsi_end_p (m_init_gsi)) + m_init_gsi = gsi_last_bb (gsi_bb (m_init_gsi)); + else + gsi_prev (&m_init_gsi); m_gsi = save_gsi; } tree t; @@ -1687,9 +1697,27 @@ bitint_large_huge::handle_load (gimple * edge e = split_block (gsi_bb (m_gsi), g); make_edge (e->src, eh_edge->dest, EDGE_EH)->probability = profile_probability::very_unlikely (); - m_init_gsi.bb = e->dest; + m_gsi = gsi_after_labels (e->dest); + if (gsi_bb (save_gsi) == e->src) + { + if (gsi_end_p (save_gsi)) + { + save_gsi = gsi_last_bb (e->dest); + if (!gsi_end_p (save_gsi)) + gsi_next (&save_gsi); + } + else + save_gsi = gsi_for_stmt (gsi_stmt (save_gsi)); + } + if (m_preheader_bb == e->src) + m_preheader_bb = e->dest; } } + m_init_gsi = m_gsi; + if (gsi_end_p (m_init_gsi)) + m_init_gsi = gsi_last_bb (gsi_bb (m_init_gsi)); + else + gsi_prev (&m_init_gsi); m_gsi = save_gsi; tree out; prepare_data_in_out (iv, idx, &out); --- gcc/testsuite/gcc.dg/bitint-40.c.jj 2023-11-22 13:47:12.380580107 +0100 +++ gcc/testsuite/gcc.dg/bitint-40.c 2023-11-22 14:35:50.225842768 +0100 @@ -0,0 +1,29 @@ +/* PR middle-end/112668 */ +/* { dg-do compile { target bitint } } */ +/* { dg-options "-std=c23 -fnon-call-exceptions" } */ + +#if __BITINT_MAXWIDTH__ >= 156 +struct T156 { _BitInt(156) a : 2; unsigned _BitInt(156) b : 135; _BitInt(156) c : 2; }; +extern void foo156 (struct T156 *); + +unsigned _BitInt(156) +bar156 (int i) +{ + struct T156 r156[12]; + foo156 (&r156[0]); + return r156[i].b; +} +#endif + +#if __BITINT_MAXWIDTH__ >= 495 +struct T495 { _BitInt(495) a : 2; unsigned _BitInt(495) b : 471; _BitInt(495) c : 2; }; +extern void foo495 (struct T495 *r495); + +unsigned _BitInt(495) +bar495 (int i) +{ + struct T495 r495[12]; + foo495 (r495); + return r495[i].b; +} +#endif Jakub