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 51CED3858D32 for ; Mon, 27 Feb 2023 23:26:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 51CED3858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677540368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vwtXM/LM6/aiMJQJNG0ILdpiw6Us5ubyvjkMeHzItV8=; b=Y5LUhKz6zQ4aU2xom+bBOZWSM5JhvT1YwGEURMHqpoXpU6wwXpN+hbK2fjyar9Q2w+qaHn wx3kypf71B+4iWaurAFgwlP0UibRH8U0PF1WP0V1fCl8KR0kDW2mZb3pfmqZpsiFlDrF5u JNiA5JI+SfKVKL+bmeiKkdsBTH6SLyE= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-86-OLIdR7CUM1KA0jnFIR7J7Q-1; Mon, 27 Feb 2023 18:26:07 -0500 X-MC-Unique: OLIdR7CUM1KA0jnFIR7J7Q-1 Received: by mail-qv1-f69.google.com with SMTP id px25-20020a056214051900b0056f0794632bso4197574qvb.18 for ; Mon, 27 Feb 2023 15:26:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vwtXM/LM6/aiMJQJNG0ILdpiw6Us5ubyvjkMeHzItV8=; b=7OiLlp/J4Hn9BL3Qopnz94eG+mnPbPIzfRwNMcTj8HwCKGfAOY+xViLVMgKavSZ9FY TGanF2hPNy7vqZ1I/bOSz+KseOD7/K96nrVmjzzoSCGi7v4WpG9M6V6nfQ7D7D/Msfc2 jd+mBIuCXPmVeq+yejxRa+/B1yWjX2TdG9IRbUVRxptWxgp6J8W7KgGuT1R+JCNMRK4P UFww138SdOrTwAp+7ld/HX5jABV0UY2/iU7Al/9xusI4ZtXZd2IUnn7FSSwuxXPXn/OL lbEUiMXmQ+rTHI61KtJa99cucn97LyE0QgtRSsr1DEpwf7hQIwUUIQXBG4ExfLmyxQl1 iedw== X-Gm-Message-State: AO0yUKU8VLHFa4Q0h2521VZxXd1/yERBtZJU8o+CFtUiuaqTUgyi/uzW F1x1/LJHDdaYAiJcWlHvvyS4+FLq/u0HrbsEpIzKCXzK4TRnSxk6jHsx2/sSszxwudz/NKZXnEj Gpgs5Z/ooVlBwa0mcEAcIDvs= X-Received: by 2002:a05:622a:1106:b0:3bf:cc1a:f0bf with SMTP id e6-20020a05622a110600b003bfcc1af0bfmr2148978qty.24.1677540366182; Mon, 27 Feb 2023 15:26:06 -0800 (PST) X-Google-Smtp-Source: AK7set+yK/fT9qI2yc2Um1uKQRkKjFoD4+M5+wxc7FEJO8liUSBIOqOAd1aV7OVrc9ah9eYBlNHuIA== X-Received: by 2002:a05:622a:1106:b0:3bf:cc1a:f0bf with SMTP id e6-20020a05622a110600b003bfcc1af0bfmr2148946qty.24.1677540365778; Mon, 27 Feb 2023 15:26:05 -0800 (PST) Received: from [192.168.1.108] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id o9-20020ac841c9000000b003b6382f66b1sm5434408qtm.29.2023.02.27.15.26.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Feb 2023 15:26:05 -0800 (PST) Message-ID: <7163c5db-3025-01cb-c0ad-5526e46eff8c@redhat.com> Date: Mon, 27 Feb 2023 18:26:04 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH] c++: Add target hook for emit_support_tinfos [PR108883] To: Jakub Jelinek , Jonathan Wakely Cc: gcc-patches@gcc.gnu.org References: From: Jason Merrill In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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 2/23/23 05:23, Jakub Jelinek wrote: > Hi! > > _Float16 and decltype(0.0bf16) types are on x86 supported only with > -msse2. On x86_64 that is the default, but on ia32 it is not. > We should still emit fundamental type tinfo for those types in > libsupc++.a/libstdc++.*, regardless of whether libsupc++/libstdc++ > is compiled with -msse2 or not, as user programs can be compiled > with different ISA flags from libsupc++/libstdc++ and if they > are compiled with -msse2 and use std::float16_t or std::bfloat16_t > and need RTTI for it, it should work out of the box. Furthermore, > libstdc++ ABI on ia32 shouldn't depend on whether the library > is compiled with -mno-sse or -msse2. > > Unfortunately, just hacking up libsupc++ Makefile/configure so that > a single source is compiled with -msse2 isn't appropriate, because > that TU emits also code and the code should be able to run on CPUs > which libstdc++ supports. We could add [[gnu::attribute ("no-sse2")]] > there perhaps conditionally, but it all gets quite ugly. > > The following patch instead adds a target hook which allows the backend > to temporarily tweak registered types such that emit_support_tinfos > emits whatever is needed. Why handle these types differently from the DFP handling at the end of emit_support_tinfos? > Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? > > 2023-02-23 Jakub Jelinek > > PR target/108883 > * hooks.h (hook_void_bool): Declare. > * hooks.cc (hook_void_bool): 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. > > * rtti.cc (emit_support_tinfos): Call targetm.emit_support_tinfos > before and after emit_support_tinfo_1 calls. > > --- gcc/hooks.h.jj 2023-01-02 09:32:29.418183667 +0100 > +++ gcc/hooks.h 2023-02-22 12:34:32.144973558 +0100 > @@ -77,6 +77,7 @@ extern bool hook_bool_wint_wint_uint_boo > unsigned int, bool); > > extern void hook_void_void (void); > +extern void hook_void_bool (bool); > extern void hook_void_constcharptr (const char *); > extern void hook_void_rtx_insn_int (rtx_insn *, int); > extern void hook_void_FILEptr_constcharptr (FILE *, const char *); > --- gcc/hooks.cc.jj 2023-01-02 09:32:49.675890970 +0100 > +++ gcc/hooks.cc 2023-02-22 12:36:46.241035355 +0100 > @@ -271,6 +271,11 @@ hook_hwi_void_0 (void) > } > > void > +hook_void_bool (bool) > +{ > +} > + > +void > hook_void_tree (tree) > { > } > --- gcc/target.def.jj 2023-01-04 10:45:50.117881714 +0100 > +++ gcc/target.def 2023-02-22 12:33:39.715731356 +0100 > @@ -2606,6 +2606,20 @@ 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\ > +The hook is called with @var{add} @code{true} at the start of C++ FE\n\ > +@code{emit_support_tinfos} and with @var{add} @code{false} at the end of it\n\ > +and can temporarily create fundamental types that are not supposed to be\n\ > +otherwise created due to the ISA options.", > + void, (bool add), > + hook_void_bool) > + > /* Make any adjustments to libfunc names needed for this target. */ > DEFHOOK > (init_libfuncs, > --- gcc/doc/tm.texi.in.jj 2023-01-16 11:52:16.124733460 +0100 > +++ gcc/doc/tm.texi.in 2023-02-22 12:46:37.951482849 +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-01-16 11:52:16.123733475 +0100 > +++ gcc/doc/tm.texi 2023-02-22 12:46:41.741428081 +0100 > @@ -1525,6 +1525,16 @@ appropriate for a target that does not d > types. > @end deftypefn > > +@deftypefn {Target Hook} void TARGET_EMIT_SUPPORT_TINFOS (bool @var{add}) > +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. > +The hook is called with @var{add} @code{true} at the start of C++ FE > +@code{emit_support_tinfos} and with @var{add} @code{false} at the end of it > +and can temporarily create fundamental types that are not supposed to be > +otherwise created due to the ISA options. > +@end deftypefn > + > @node Type Layout > @section Layout of Source Language Data Types > > --- gcc/config/i386/i386.cc.jj 2023-02-16 10:13:23.701210667 +0100 > +++ gcc/config/i386/i386.cc 2023-02-22 12:59:55.110960505 +0100 > @@ -22775,6 +22775,30 @@ ix86_mangle_type (const_tree type) > } > } > > +/* Temporarily tweak the set of fundamental types for C++ > + emit_support_tinfos purposes. */ > + > +static void > +ix86_emit_support_tinfos (bool add) > +{ > + extern tree ix86_float16_type_node; > + extern tree ix86_bf16_type_node; > + > + if (TARGET_SSE2) > + return; > + if (add) > + { > + gcc_checking_assert (!float16_type_node && !bfloat16_type_node); > + float16_type_node = ix86_float16_type_node; > + bfloat16_type_node = ix86_bf16_type_node; > + } > + else > + { > + float16_type_node = NULL_TREE; > + bfloat16_type_node = NULL_TREE; > + } > +} > + > static GTY(()) tree ix86_tls_stack_chk_guard_decl; > > static tree > @@ -24954,6 +24978,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/rtti.cc.jj 2023-01-16 11:52:16.090733961 +0100 > +++ gcc/cp/rtti.cc 2023-02-22 12:40:10.078089124 +0100 > @@ -1623,6 +1623,9 @@ emit_support_tinfos (void) > if (!dtor || DECL_EXTERNAL (dtor)) > return; > > + /* Tell target code that support tinfos are about to be emitted. */ > + targetm.emit_support_tinfos (true); > + > /* All these are really builtins. So set the location. */ > location_t saved_loc = input_location; > input_location = BUILTINS_LOCATION; > @@ -1652,6 +1655,9 @@ emit_support_tinfos (void) > emit_support_tinfo_1 (fallback_dfloat128_type); > } > input_location = saved_loc; > + > + /* Tell target code that support tinfos have been emitted. */ > + targetm.emit_support_tinfos (false); > } > > /* Finish a type info decl. DECL_PTR is a pointer to an unemitted > > Jakub >