From patchwork Fri Sep 8 12:02:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1831513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rhvrp4Bfwz1yh5 for ; Fri, 8 Sep 2023 22:03:19 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BFF903857724 for ; Fri, 8 Sep 2023 12:03:13 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 0F9C03858D1E for ; Fri, 8 Sep 2023 12:02:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0F9C03858D1E 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: MqdFDLtSQCmlLEG3rlPsQA== X-CSE-MsgGUID: aymxK6eLSDW0Nh3+yCyJgw== X-IronPort-AV: E=Sophos;i="6.02,237,1688457600"; d="scan'208,223";a="16445290" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 08 Sep 2023 04:02:58 -0800 IronPort-SDR: 2NVjibrdN40V9ODNiWiDndgrX+d/cnvHLJftJPdb0h91TDhAr849CLhqHyFWhs2A1jlxZ2Ndj2 Frt5jAokLCBf7M+7wMGaEHQ7ktA2WvEh+wUQ+cOB+GniGzUQ2svDlo+kVGurU1xVUuwVCEHnou fArFp373yVOE9765OmEhsPRBSge19i4Vf/OUZxrP34hPuZVytVqNfdUOKu9gvn/QeG3WG0Qas2 Wp35ZaO2yl6McfPMFwZfG0OOlrrWBUWagOXoJUg+wZMrOGAsQw/4LbWgATG+FCge5G9Xw+VqZQ q+s= From: Thomas Schwinge To: Jan Hubicka , Subject: More '#ifdef ASM_OUTPUT_DEF' -> 'if (TARGET_SUPPORTS_ALIASES)' etc. (was: [PATCH][v2] Introduce TARGET_SUPPORTS_ALIASES) In-Reply-To: <20170810134213.GB65902@kam.mff.cuni.cz> 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> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Fri, 8 Sep 2023 14:02:50 +0200 Message-ID: <87ledgzxcl.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-15.mgc.mentorg.com (139.181.222.15) 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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