From patchwork Thu Mar 2 11:20:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 63359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4176724wrd; Thu, 2 Mar 2023 03:21:38 -0800 (PST) X-Google-Smtp-Source: AK7set9gwwI72SgquwS0sckgsvUHeYSSpsq2RfpLge8l1TlAa0h0569zsH7ULf+leOzSJvdrTh2B X-Received: by 2002:a17:906:4a08:b0:8b1:88aa:46da with SMTP id w8-20020a1709064a0800b008b188aa46damr9554338eju.48.1677756098525; Thu, 02 Mar 2023 03:21:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677756098; cv=none; d=google.com; s=arc-20160816; b=rSL6RfrFmKjQ9tzyHadD6HMMdtNOLrIZnKoT5axDtMr6M1oI6BmhV84DC4dNgq7HPG BCMaDeH7H8oQJhLEPXRC9+1xp8UMNnfulAqetY1oIE0w6mCzEgDonOuOacCx6K3LwC0I khmliBErThvUH3olmTJkSn7Tz0655kkSPFOC5jvu06Ok4Tz2zPIblxOq3j66QxSdgP4L cTPUgS6hr5nVsmOyPDW1VQeHpRhAga2tzt8Xo98izOZdtW4OhjBIUSxLZGhTlP993dHk qqw1+DmfoxC5FxxRZrkPBRGeyVJN+CDdHdNBDNP2MvAwwrir3Xa0bS4KEAyeUKACC2D/ yx3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:in-reply-to:mime-version:references:message-id :subject:cc:to:date:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=vG8iCLoBqzk/ZC1ERcTDC4Ik9JTdzGJPk4JuNBE06rc=; b=GUDt6K/c4Ya/u7eGGYDpsxYuJvQB0hRym1GoO/kzJ3rWyGYaRP9s84kw8GHyoxJdf/ 1YD3ht7pBxhv7sH4cYZDJTEQDsFWEnudNPl2Y2GBF1S4sQuiJztKL2yiaR5peAhMZ1En SN7HWz0y92ZIegU86K4ePz77bswnkihUcZK+426EaF/mfia+ISo3hl8yv8qXxb+Alc8y 8Leli+Gh3Rzbx0vH4z0UMMCoji7CW6/05DlETUhMKXbwyu8vynpE+aq0cw5GqHTNN7ir JBR6rZKp+XNXuVi26DmEJ4tAlvEM3XLnP/eOGUjf56JUK8safD5Ye9LY6aqMl/xOJodO vvfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=XhXOF5J6; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id qa20-20020a170907869400b00907613ba5e6si2796230ejc.67.2023.03.02.03.21.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 03:21:38 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=XhXOF5J6; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3AC65385841A for ; Thu, 2 Mar 2023 11:21:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3AC65385841A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677756097; bh=vG8iCLoBqzk/ZC1ERcTDC4Ik9JTdzGJPk4JuNBE06rc=; h=Date:To:Cc:Subject:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=XhXOF5J6HbrSZEiQsn5H6soLjsMZse9GqfbNWfx/lrjAZXIT9v+S8zjIF1yGCuQ+Z cJnx/iQ7UavQsV4Aa8SeWvCC/rF1bk7Ydt6TbTZGoDHxTzdH7t8wwsxPlHY93V771S V7lPqG3eAlF952r7KU4+gPg3T2RgOTMgBl87wYw4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 7C28E3858D33 for ; Thu, 2 Mar 2023 11:20:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7C28E3858D33 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-620-OrdL0tGMPWGq-bTZnL1uNA-1; Thu, 02 Mar 2023 06:20:47 -0500 X-MC-Unique: OrdL0tGMPWGq-bTZnL1uNA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DD19C3C0CD42 for ; Thu, 2 Mar 2023 11:20:46 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8060F492C14; Thu, 2 Mar 2023 11:20:46 +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 322BKhsl3825070 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 2 Mar 2023 12:20:44 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 322BKh6h3825069; Thu, 2 Mar 2023 12:20:43 +0100 Date: Thu, 2 Mar 2023 12:20:43 +0100 To: Jason Merrill Cc: Jonathan Wakely , gcc-patches@gcc.gnu.org Subject: [PATCH] c++, v3: Emit fundamental tinfos for _Float16/decltype(0.0bf16) types on ia32 with -mno-sse2 [PR108883] Message-ID: References: <7163c5db-3025-01cb-c0ad-5526e46eff8c@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-15.0 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759254778484216401?= X-GMAIL-MSGID: =?utf-8?q?1759254778484216401?= Hi! On Wed, Mar 01, 2023 at 05:50:47PM -0500, Jason Merrill wrote: > > And then there is a question whether we want to emit rtti for > > _Float{16,32,64,128}, _Float{32,64,128}x and decltype(0.0bf16) regardless > > of whether the target supports them at all or not. > > Emitting them always would have an advantage, if say bfloat16_t support > > isn't added for aarch64 for GCC 13 (it is still pending review), we wouldn't > > need to deal with symbol versioning for it in GCC 14 or later. > > On the other side, on some arches some types are very unlikely to be > > supported. And e.g. _Float128x isn't supported on any arch right now. > > A good point. Incidentally, it seems problematic for embedded users that > all the fundamental type_infos are emitted in the same .o, making it hard to > link in only the ones you care about. And new floating-point variants add > to that problem. So perhaps until that is addressed, it's better to avoid > adding a bunch more on targets that don't support them. Ok, so here is a variant of the patch which still drops the fallback_* stuff, but for float*_type_node doesn't do the automatic fallback in generic code and leaves those to a target hook. So far lightly tested on x86_64-linux -m32/-m64: 2023-03-02 Jakub Jelinek PR target/108883 gcc/ * target.h (emit_support_tinfos_callback): New typedef. * targhooks.h (default_emit_support_tinfos): Declare. * targhooks.cc (default_emit_support_tinfos): New function. * target.def (emit_support_tinfos): New target hook. * doc/tm.texi.in (emit_support_tinfos): Document it. * doc/tm.texi: Regenerated. * config/i386/i386.cc (ix86_emit_support_tinfos): New function. (TARGET_EMIT_SUPPORT_TINFOS): Redefine. gcc/cp/ * cp-tree.h (enum cp_tree_index): Remove CPTI_FALLBACK_DFLOAT*_TYPE enumerators. (fallback_dfloat32_type, fallback_dfloat64_type, fallback_dfloat128_type): Remove. * rtti.cc (emit_support_tinfo_1): If not emitted already, call emit_tinfo_decl and remove from unemitted_tinfo_decls right away. (emit_support_tinfos): Move &dfloat*_type_node from fundamentals array into new fundamentals_with_fallback array. Call emit_support_tinfo_1 on elements of that array too, with the difference that if the type is NULL, use a fallback REAL_TYPE for it temporarily. Drop the !targetm.decimal_float_supported_p () handling. Call targetm.emit_support_tinfos at the end. * mangle.cc (write_builtin_type): Remove references to fallback_dfloat*_type. Handle bfloat16_type_node mangling. Jakub --- gcc/target.h.jj 2023-02-17 12:45:08.056638510 +0100 +++ gcc/target.h 2023-03-02 12:06:59.248146213 +0100 @@ -260,6 +260,8 @@ enum poly_value_estimate_kind POLY_VALUE_LIKELY }; +typedef void (*emit_support_tinfos_callback) (tree); + extern bool verify_type_context (location_t, type_context_kind, const_tree, bool = false); --- gcc/targhooks.h.jj 2023-01-02 09:32:50.422880177 +0100 +++ gcc/targhooks.h 2023-03-02 12:06:22.559686384 +0100 @@ -98,6 +98,8 @@ extern int default_builtin_vectorization extern tree default_builtin_reciprocal (tree); +extern void default_emit_support_tinfos (emit_support_tinfos_callback); + extern HOST_WIDE_INT default_static_rtx_alignment (machine_mode); extern HOST_WIDE_INT default_constant_alignment (const_tree, HOST_WIDE_INT); extern HOST_WIDE_INT constant_alignment_word_strings (const_tree, --- gcc/targhooks.cc.jj 2023-01-02 09:32:52.591848839 +0100 +++ gcc/targhooks.cc 2023-03-02 12:01:39.576868114 +0100 @@ -752,6 +752,11 @@ default_builtin_reciprocal (tree) return NULL_TREE; } +void +default_emit_support_tinfos (emit_support_tinfos_callback) +{ +} + bool hook_bool_CUMULATIVE_ARGS_arg_info_false (cumulative_args_t, const function_arg_info &) --- gcc/target.def.jj 2023-02-22 15:58:50.252996452 +0100 +++ gcc/target.def 2023-03-02 12:01:52.002684436 +0100 @@ -2606,6 +2606,19 @@ types.", const char *, (const_tree type), hook_constcharptr_const_tree_null) +/* Temporarily add conditional target specific types for the purpose of + emitting C++ fundamental type tinfos. */ +DEFHOOK +(emit_support_tinfos, + "If your target defines any fundamental types which depend on ISA flags,\n\ +they might need C++ tinfo symbols in libsupc++/libstdc++ regardless of\n\ +ISA flags the library is compiled with.\n\ +This hook allows creating tinfo symbols even for those cases, by temporarily\n\ +creating corresponding fundamental type trees, calling the @var{callback}\n\ +function on it and setting the type back to @code{nullptr}.", + void, (emit_support_tinfos_callback callback), + default_emit_support_tinfos) + /* Make any adjustments to libfunc names needed for this target. */ DEFHOOK (init_libfuncs, --- gcc/doc/tm.texi.in.jj 2023-02-24 09:58:39.963508685 +0100 +++ gcc/doc/tm.texi.in 2023-03-02 11:47:50.044125831 +0100 @@ -1286,6 +1286,8 @@ pattern needs to support both a 32- and @hook TARGET_MANGLE_TYPE +@hook TARGET_EMIT_SUPPORT_TINFOS + @node Type Layout @section Layout of Source Language Data Types --- gcc/doc/tm.texi.jj 2023-02-24 09:58:39.951508859 +0100 +++ gcc/doc/tm.texi 2023-03-02 12:02:18.312295512 +0100 @@ -1525,6 +1525,15 @@ appropriate for a target that does not d types. @end deftypefn +@deftypefn {Target Hook} void TARGET_EMIT_SUPPORT_TINFOS (emit_support_tinfos_callback @var{callback}) +If your target defines any fundamental types which depend on ISA flags, +they might need C++ tinfo symbols in libsupc++/libstdc++ regardless of +ISA flags the library is compiled with. +This hook allows creating tinfo symbols even for those cases, by temporarily +creating corresponding fundamental type trees, calling the @var{callback} +function on it and setting the type back to @code{nullptr}. +@end deftypefn + @node Type Layout @section Layout of Source Language Data Types --- gcc/config/i386/i386.cc.jj 2023-02-22 15:58:50.109998489 +0100 +++ gcc/config/i386/i386.cc 2023-03-02 12:02:13.193371183 +0100 @@ -22775,6 +22775,27 @@ ix86_mangle_type (const_tree type) } } +/* Create C++ tinfo symbols for only conditionally available fundamental + types. */ + +static void +ix86_emit_support_tinfos (emit_support_tinfos_callback callback) +{ + extern tree ix86_float16_type_node; + extern tree ix86_bf16_type_node; + + if (!TARGET_SSE2) + { + gcc_checking_assert (!float16_type_node && !bfloat16_type_node); + float16_type_node = ix86_float16_type_node; + bfloat16_type_node = ix86_bf16_type_node; + callback (float16_type_node); + callback (bfloat16_type_node); + float16_type_node = NULL_TREE; + bfloat16_type_node = NULL_TREE; + } +} + static GTY(()) tree ix86_tls_stack_chk_guard_decl; static tree @@ -24954,6 +24975,9 @@ ix86_libgcc_floating_mode_supported_p #undef TARGET_MANGLE_TYPE #define TARGET_MANGLE_TYPE ix86_mangle_type +#undef TARGET_EMIT_SUPPORT_TINFOS +#define TARGET_EMIT_SUPPORT_TINFOS ix86_emit_support_tinfos + #undef TARGET_STACK_PROTECT_GUARD #define TARGET_STACK_PROTECT_GUARD ix86_stack_protect_guard --- gcc/cp/cp-tree.h.jj 2023-03-02 08:49:09.569844225 +0100 +++ gcc/cp/cp-tree.h 2023-03-02 11:45:41.972008622 +0100 @@ -235,10 +235,6 @@ enum cp_tree_index CPTI_PSEUDO_CONTRACT_VIOLATION, - CPTI_FALLBACK_DFLOAT32_TYPE, - CPTI_FALLBACK_DFLOAT64_TYPE, - CPTI_FALLBACK_DFLOAT128_TYPE, - CPTI_MAX }; @@ -397,13 +393,6 @@ extern GTY(()) tree cp_global_trees[CPTI access nodes in tree.h. */ #define access_default_node null_node - -/* Variant of dfloat{32,64,128}_type_node only used for fundamental - rtti purposes if DFP is disabled. */ -#define fallback_dfloat32_type cp_global_trees[CPTI_FALLBACK_DFLOAT32_TYPE] -#define fallback_dfloat64_type cp_global_trees[CPTI_FALLBACK_DFLOAT64_TYPE] -#define fallback_dfloat128_type cp_global_trees[CPTI_FALLBACK_DFLOAT128_TYPE] - #include "name-lookup.h" --- gcc/cp/rtti.cc.jj 2023-02-28 11:28:56.579180090 +0100 +++ gcc/cp/rtti.cc 2023-03-02 11:49:41.380484925 +0100 @@ -1577,6 +1577,15 @@ emit_support_tinfo_1 (tree bltn) gcc_assert (TREE_PUBLIC (tinfo) && !DECL_COMDAT (tinfo)); DECL_INTERFACE_KNOWN (tinfo) = 1; } + + /* Emit it right away if not emitted already. */ + if (DECL_INITIAL (tinfo) == NULL_TREE) + { + gcc_assert (unemitted_tinfo_decls->last () == tinfo); + bool ok = emit_tinfo_decl (tinfo); + gcc_assert (ok); + unemitted_tinfo_decls->pop (); + } } } @@ -1602,12 +1611,18 @@ emit_support_tinfos (void) &long_integer_type_node, &long_unsigned_type_node, &long_long_integer_type_node, &long_long_unsigned_type_node, &float_type_node, &double_type_node, &long_double_type_node, - &dfloat32_type_node, &dfloat64_type_node, &dfloat128_type_node, &bfloat16_type_node, &float16_type_node, &float32_type_node, &float64_type_node, &float128_type_node, &float32x_type_node, &float64x_type_node, &float128x_type_node, &nullptr_type_node, 0 }; + /* Similar, but for floating point types only which should get type info + regardless whether they are non-NULL or NULL. */ + static tree *const fundamentals_with_fallback[] = + { + &dfloat32_type_node, &dfloat64_type_node, &dfloat128_type_node, + 0 + }; int ix; /* Look for a defined class. */ @@ -1627,8 +1642,20 @@ emit_support_tinfos (void) location_t saved_loc = input_location; input_location = BUILTINS_LOCATION; doing_runtime = 1; + tree fallback = NULL_TREE; for (ix = 0; fundamentals[ix]; ix++) emit_support_tinfo_1 (*fundamentals[ix]); + for (ix = 0; fundamentals_with_fallback[ix]; ix++) + if (*fundamentals_with_fallback[ix]) + emit_support_tinfo_1 (*fundamentals_with_fallback[ix]); + else + { + if (fallback == NULL_TREE) + fallback = make_node (REAL_TYPE); + *fundamentals_with_fallback[ix] = fallback; + emit_support_tinfo_1 (fallback); + *fundamentals_with_fallback[ix] = NULL_TREE; + } for (ix = 0; ix < NUM_INT_N_ENTS; ix ++) if (int_n_enabled_p[ix]) { @@ -1637,20 +1664,10 @@ emit_support_tinfos (void) } for (tree t = registered_builtin_types; t; t = TREE_CHAIN (t)) emit_support_tinfo_1 (TREE_VALUE (t)); - /* For compatibility, emit DFP typeinfos even when DFP isn't enabled, - because we've emitted that in the past. */ - if (!targetm.decimal_float_supported_p ()) - { - gcc_assert (dfloat32_type_node == NULL_TREE - && dfloat64_type_node == NULL_TREE - && dfloat128_type_node == NULL_TREE); - fallback_dfloat32_type = make_node (REAL_TYPE); - fallback_dfloat64_type = make_node (REAL_TYPE); - fallback_dfloat128_type = make_node (REAL_TYPE); - emit_support_tinfo_1 (fallback_dfloat32_type); - emit_support_tinfo_1 (fallback_dfloat64_type); - emit_support_tinfo_1 (fallback_dfloat128_type); - } + + /* Emit additional typeinfos as requested by target. */ + targetm.emit_support_tinfos (emit_support_tinfo_1); + input_location = saved_loc; } --- gcc/cp/mangle.cc.jj 2023-02-28 11:28:56.532180773 +0100 +++ gcc/cp/mangle.cc 2023-03-02 11:45:41.973008607 +0100 @@ -2732,11 +2732,11 @@ write_builtin_type (tree type) write_char ('d'); else if (type == long_double_type_node) write_char ('e'); - else if (type == dfloat32_type_node || type == fallback_dfloat32_type) + else if (type == dfloat32_type_node) write_string ("Df"); - else if (type == dfloat64_type_node || type == fallback_dfloat64_type) + else if (type == dfloat64_type_node) write_string ("Dd"); - else if (type == dfloat128_type_node || type == fallback_dfloat128_type) + else if (type == dfloat128_type_node) write_string ("De"); else if (type == float16_type_node) write_string ("DF16_"); @@ -2752,6 +2752,8 @@ write_builtin_type (tree type) write_string ("DF64x"); else if (type == float128x_type_node) write_string ("DF128x"); + else if (type == bfloat16_type_node) + write_string ("DF16b"); else gcc_unreachable (); break;