From patchwork Tue Sep 19 08:47:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 141744 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3226647vqi; Tue, 19 Sep 2023 01:49:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzXaQFnGV/SUOuhl9koMoA0A3XgG8gJ2qWOSJbcG06c0xkSADVjO9wVwV/p15zmPuHNq6y X-Received: by 2002:a2e:98d7:0:b0:2bc:c3ad:f418 with SMTP id s23-20020a2e98d7000000b002bcc3adf418mr11067028ljj.20.1695113340109; Tue, 19 Sep 2023 01:49:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695113340; cv=none; d=google.com; s=arc-20160816; b=n13saGadKIdMY/638KBqA1/WhJfiMtmK8QMVoH8v/415ShZosT2pfTgFNXaqT052bV 42WrlloXGEGa8jrtVnfBGhZxCr3wrL3xVKNGhR3teqln/300oQdPdDUfJ9VTshiD9ogw W0BorFDaBS/bbgw0cjNeFDBj9e+Rv0FpsFhXK9d61OuCpqaEResRabRMEgEDjeKz1U4U wJIAo44vj6b2D/BVLwzRNucyfGstSKscUmS1yDEeoz28P9E9f3lbUPwBeAREQd+epyjC Qi2OR77IncYzNvXj3YZv1eol2br6zy8GtJps9jXjJM0HA72oTD2W84dPl2VSVIhZGtc+ 86IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:message-id:date :user-agent:references:in-reply-to:subject:to:from:ironport-sdr :dmarc-filter:delivered-to; bh=r9M6V9OM7FLv4ZZJAfcfI8cMQaK0YBbBetU1S9YHQY0=; fh=eFkiSZLWwt6NUk89P52s4KbBpZ86lKHrs6ztijECvfM=; b=t7MPXGwRVK3GCSj+4cHr9UwRKO8WaMvxgLM2VuyoB08zcOpC91+mV0RAvCNEUYlmwz wGplN6PN8ZhvK0fpuqFWKK/xKSVTDqXjc322Q+6xf53r1RuwelZSeMbgtEXEMGjkbAVT i25fbIimaJE9G8APS2yHD76TXO8byHSl/ky/v+YhqaCKik0s4DqOSBN/tuGmPBVgv+Ci sAgqcYfC1uBjmaHm+phQKipT/bIgn1BCZXxJQ2HOhm+RMtkZ8rNzbZZ4l7ZtxjMn0lX5 WNuCCvHBxW3N5bRlzjP3J20yk5JNVOXxEhCMDk7TfmHYnHfhI6Lgqhec3xMB4GXtDBbS lBLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id e10-20020a170906248a00b009adb4af7939si9835633ejb.84.2023.09.19.01.48.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 01:49:00 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ED1F5385C41F for ; Tue, 19 Sep 2023 08:48:41 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com [68.232.137.252]) by sourceware.org (Postfix) with ESMTPS id 530693858D32 for ; Tue, 19 Sep 2023 08:48:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 530693858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-CSE-ConnectionGUID: 4j2FBr3BTIKMhhLDZMjZyg== X-CSE-MsgGUID: pu5S7tIPSA2sKpKykbSYHQ== X-IronPort-AV: E=Sophos;i="6.02,159,1688457600"; d="scan'208,223";a="17226065" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 19 Sep 2023 00:48:02 -0800 IronPort-SDR: u0ncIU66AGlXIHdlhmVR5ohHEaH9ghNxhFrzM+NeOZuabJ/o/qLS8Bytf6LnzGKulyTeoZTSwx MgVHjExOFLfH6BDevCzwl8Fi2Y/xHeaDlbiTjVtPVwURSLyQvBVYVBSSaJG3pugUU6BgyNBai5 wO+XnFNJuvQDXf1UZca8h86SxnTuL0tyY4PinsHD+bRp5xsnADYI318y7sZ3gZ+R2vY6G3V3Ev h6FY6JckOe2hWPFEMXh+d4H6W2Ope+iCZJV9sQevpLkntnU5WiNu8FpIvIH4MVqA5NaBry6Byc 3hw= From: Thomas Schwinge To: Jan Hubicka , Subject: [PING] More '#ifdef ASM_OUTPUT_DEF' -> 'if (TARGET_SUPPORTS_ALIASES)' etc. (was: [PATCH][v2] Introduce TARGET_SUPPORTS_ALIASES) In-Reply-To: <87ledgzxcl.fsf@euler.schwinge.homeip.net> References: <20170717092719.GB33905@kam.mff.cuni.cz> <20170724140622.GB90943@kam.mff.cuni.cz> <927a43eb-4cfb-8e1c-7d31-b54410ddd30a@suse.cz> <92d3a985-f28d-e2dd-3df3-a50130131787@suse.cz> <20170810134213.GB65902@kam.mff.cuni.cz> <87ledgzxcl.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Tue, 19 Sep 2023 10:47:56 +0200 Message-ID: <875y46y2f7.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-11.mgc.mentorg.com (139.181.222.11) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776470841932025370 X-GMAIL-MSGID: 1777455165936453981 Hi! Ping. Grüße Thomas On 2023-09-08T14:02:50+0200, I wrote: > Hi! > > On 2017-08-10T15:42:13+0200, Jan Hubicka wrote: >>> On 07/31/2017 11:57 AM, Yuri Gribov wrote: >>> > On Mon, Jul 31, 2017 at 9:04 AM, Martin Liška wrote: >>> >> Doing the transformation suggested by Honza. > > ... which was: > > | On 2017-07-24T16:06:22+0200, Jan Hubicka wrote: > | > we probably should turn ASM_OUTPUT_DEF ifdefs into a conditional compilation > | > incrementally. > >>> >From 78ee08b25d22125cb1fa248bac98ef1e84504761 Mon Sep 17 00:00:00 2001 >>> From: marxin >>> Date: Tue, 25 Jul 2017 13:11:28 +0200 >>> Subject: [PATCH] Introduce TARGET_SUPPORTS_ALIASES > > ..., and got pushed as commit a8b522b483ebb8c972ecfde8779a7a6ec16aecd6 > (Subversion r251048) "Introduce TARGET_SUPPORTS_ALIASES". > > I don't know if that was actually intentional here, or just an > "accident", but such changes actually allow that a back end may or may > not provide symbol aliasing support ('TARGET_SUPPORTS_ALIASES') > independent of '#ifdef ASM_OUTPUT_DEF', and in particular, depending not > just on static but instead on dynamic (run-time) configuration. This is > relevant for the nvptx back end's '-malias' flag. > > There did remain a few instances where we currently still assume that > from '#ifdef ASM_OUTPUT_DEF' follows 'TARGET_SUPPORTS_ALIASES', which I'm > adjusting in the attached (with '--ignore-space-change', for easy review) > "More '#ifdef ASM_OUTPUT_DEF' -> 'if (TARGET_SUPPORTS_ALIASES)' etc.". > OK to push? > > These changes are necessary to cure nvptx regressions raised in > > "[nvptx] Use .alias directive for mptx >= 6.3", addressing the comment: > "[...] remains to be analyzed". > > > Grüße > Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From 4c725226c3657adb775af274876de5077b8fbf45 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 7 Sep 2023 22:15:08 +0200 Subject: [PATCH] More '#ifdef ASM_OUTPUT_DEF' -> 'if (TARGET_SUPPORTS_ALIASES)' etc. Per commit a8b522b483ebb8c972ecfde8779a7a6ec16aecd6 (Subversion r251048) "Introduce TARGET_SUPPORTS_ALIASES", there is the idea that a back end may or may not provide symbol aliasing support ('TARGET_SUPPORTS_ALIASES') independent of '#ifdef ASM_OUTPUT_DEF', and in particular, depending not just on static but instead on dynamic (run-time) configuration. There did remain a few instances where we currently still assume that from '#ifdef ASM_OUTPUT_DEF' follows 'TARGET_SUPPORTS_ALIASES'. Change these to 'if (TARGET_SUPPORTS_ALIASES)', similarly, or 'gcc_checking_assert (TARGET_SUPPORTS_ALIASES);'. gcc/ * ipa-icf.cc (sem_item::target_supports_symbol_aliases_p): 'gcc_checking_assert (TARGET_SUPPORTS_ALIASES);' before 'return true;'. * ipa-visibility.cc (function_and_variable_visibility): Change '#ifdef ASM_OUTPUT_DEF' to 'if (TARGET_SUPPORTS_ALIASES)'. * varasm.cc (output_constant_pool_contents) [#ifdef ASM_OUTPUT_DEF]: 'gcc_checking_assert (TARGET_SUPPORTS_ALIASES);'. (do_assemble_alias) [#ifdef ASM_OUTPUT_DEF]: 'if (!TARGET_SUPPORTS_ALIASES)', 'gcc_checking_assert (seen_error ());'. (assemble_alias): Change '#if !defined (ASM_OUTPUT_DEF)' to 'if (!TARGET_SUPPORTS_ALIASES)'. (default_asm_output_anchor): 'gcc_checking_assert (TARGET_SUPPORTS_ALIASES);'. --- gcc/ipa-icf.cc | 1 + gcc/ipa-visibility.cc | 8 +++++--- gcc/varasm.cc | 13 ++++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gcc/ipa-icf.cc b/gcc/ipa-icf.cc index 836d0914ded..bbdfd445397 100644 --- a/gcc/ipa-icf.cc +++ b/gcc/ipa-icf.cc @@ -218,6 +218,7 @@ sem_item::target_supports_symbol_aliases_p (void) #if !defined (ASM_OUTPUT_DEF) || (!defined(ASM_OUTPUT_WEAK_ALIAS) && !defined (ASM_WEAKEN_DECL)) return false; #else + gcc_checking_assert (TARGET_SUPPORTS_ALIASES); return true; #endif } diff --git a/gcc/ipa-visibility.cc b/gcc/ipa-visibility.cc index 8ec82bb333e..8ce56114ee3 100644 --- a/gcc/ipa-visibility.cc +++ b/gcc/ipa-visibility.cc @@ -622,7 +622,8 @@ function_and_variable_visibility (bool whole_program) /* All aliases should be processed at this point. */ gcc_checking_assert (!alias_pairs || !alias_pairs->length ()); -#ifdef ASM_OUTPUT_DEF + if (TARGET_SUPPORTS_ALIASES) + { FOR_EACH_DEFINED_FUNCTION (node) { if (node->get_availability () != AVAIL_INTERPOSABLE @@ -643,7 +644,8 @@ function_and_variable_visibility (bool whole_program) if (!alias) { - alias = dyn_cast (node->noninterposable_alias ()); + alias + = dyn_cast (node->noninterposable_alias ()); gcc_assert (alias && alias != node); } @@ -656,7 +658,7 @@ function_and_variable_visibility (bool whole_program) } } } -#endif + } FOR_EACH_FUNCTION (node) { diff --git a/gcc/varasm.cc b/gcc/varasm.cc index 53f0cc61922..40d6081a3fa 100644 --- a/gcc/varasm.cc +++ b/gcc/varasm.cc @@ -4300,6 +4300,8 @@ output_constant_pool_contents (struct rtx_constant_pool *pool) if (desc->mark < 0) { #ifdef ASM_OUTPUT_DEF + gcc_checking_assert (TARGET_SUPPORTS_ALIASES); + const char *name = XSTR (desc->sym, 0); char label[256]; char buffer[256 + 32]; @@ -6225,6 +6227,10 @@ do_assemble_alias (tree decl, tree target) IDENTIFIER_POINTER (id), IDENTIFIER_POINTER (target)); # endif + /* If symbol aliases aren't actually supported... */ + if (!TARGET_SUPPORTS_ALIASES) + /* ..., 'ASM_OUTPUT_DEF{,_FROM_DECLS}' better have raised an error. */ + gcc_checking_assert (seen_error ()); #elif defined (ASM_OUTPUT_WEAK_ALIAS) || defined (ASM_WEAKEN_DECL) { const char *name; @@ -6294,9 +6300,8 @@ assemble_alias (tree decl, tree target) if (TREE_PUBLIC (decl)) error ("%qs symbol %q+D must have static linkage", "weakref", decl); } - else + else if (!TARGET_SUPPORTS_ALIASES) { -#if !defined (ASM_OUTPUT_DEF) # if !defined(ASM_OUTPUT_WEAK_ALIAS) && !defined (ASM_WEAKEN_DECL) error_at (DECL_SOURCE_LOCATION (decl), "alias definitions not supported in this configuration"); @@ -6317,7 +6322,7 @@ assemble_alias (tree decl, tree target) return; } # endif -#endif + gcc_unreachable (); } TREE_USED (decl) = 1; @@ -7406,6 +7411,8 @@ default_strip_name_encoding (const char *str) void default_asm_output_anchor (rtx symbol) { + gcc_checking_assert (TARGET_SUPPORTS_ALIASES); + char buffer[100]; sprintf (buffer, "*. + " HOST_WIDE_INT_PRINT_DEC, -- 2.34.1