From patchwork Mon Sep 18 14:46:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1836176 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 4Rq70z1TXxz1yhy for ; Tue, 19 Sep 2023 00:46:59 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3611D3857438 for ; Mon, 18 Sep 2023 14:46:57 +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 E8AEF3858C78 for ; Mon, 18 Sep 2023 14:46:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E8AEF3858C78 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: gj0ThJuHTb6PokNneCBW6A== X-CSE-MsgGUID: iSEB+4q5Sw2mqUqpc95c9A== X-IronPort-AV: E=Sophos;i="6.02,156,1688457600"; d="scan'208,223";a="17183990" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 18 Sep 2023 06:46:38 -0800 IronPort-SDR: SZGlY3fCfdCnsttJV7PsGFHN5cO6ppcFxeN3KMq6/GQwsuykH3qnzfYC20ogrcwc269JA21tNd XQTQ38NkqEXFF/L1bAZXo7NiKUvsDjovk6GGD7OQbXVbglFhkCf/l4B44UVftCHc10VDQmSL+B VXnQMEh8Nc0Qss0m3O8gLjbdCRBxymOclJ7TvahgEfhbDYkT2K3HmaPZGjHoMtCEMAmPOlv5DS Lhum2Pf8SXpU3pp340B+XluAJgEnHtT4S6wxwuMZGqeMx9pUGzyaTEH2vsWx7Xgkz5zMMEj7Lw 4tg= From: Thomas Schwinge To: , Robin Dapp , , Richard Biener , "Jakub Jelinek" CC: , , Jeff Law , , Subject: LTO: Get rid of 'lto_mode_identity_table' (was: Machine Mode ICE in RISC-V when LTO) In-Reply-To: <8c55be5d-3a6a-18bd-a054-072ecb28b949@gmail.com> References: <87o7kxuq9s.fsf@euler.schwinge.homeip.net> <878rajuj3a.fsf@dem-tschwing-1.ger.mentorg.com> <8c55be5d-3a6a-18bd-a054-072ecb28b949@gmail.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Mon, 18 Sep 2023 16:46:29 +0200 Message-ID: <87il87bku2.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 2023-09-15T15:33:59+0200, Robin Dapp wrote: > is there anything we can do to assist from the riscv side in order to help > with this? I haven't really been involved with it but was wondering > what's missing. If I understand correctly Thomas has a major cleanup > operation in plan Not really major, but indeed non-trivial -- but WIP already. ;-) > but might not get to it soon. Right. > The fix he proposed > helps for the riscv case, however, even without the rework? Right, and no harm done for my work. > If so, I'd kindly ping Jakub to check if the fix is reasonable. I'll push the attached "LTO: Get rid of 'lto_mode_identity_table'" mid-week, unless any objections raised. 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 f88a923d7e3e26c29630f1b20624fa54032f8e96 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 10 Aug 2023 15:23:37 +0200 Subject: [PATCH] LTO: Get rid of 'lto_mode_identity_table' This, in particular, resolves LTO ICEs with big 'machine_mode's, as for RISC-V. ('mode_table' in 'lto_file_decl_data' still is 'unsigned char'; changing that is still to be done (for use in offloading compilation), but is not trivial.) For now, get rid of 'lto_mode_identity_table' to resolve the RISC-V LTO ICEs; we don't need an actual table for a 1-to-1 mapping. gcc/lto/ * lto-common.cc (lto_mode_identity_table): Remove. (lto_file_finalize) [!ACCEL_COMPILER]: 'NULL'-intialize 'file_data->mode_table'. (lto_fe_init): Don't initialize 'lto_mode_identity_table'. * lto-common.h (lto_mode_identity_table): Remove. gcc/ * tree-streamer.h (bp_unpack_machine_mode): If 'ib->file_data->mode_table' not available, apply 1-to-1 mapping. Co-authored-by: Pan Li --- gcc/lto/lto-common.cc | 11 +---------- gcc/lto/lto-common.h | 1 - gcc/tree-streamer.h | 5 ++++- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gcc/lto/lto-common.cc b/gcc/lto/lto-common.cc index 703e665b698..ad6e7fde5ce 100644 --- a/gcc/lto/lto-common.cc +++ b/gcc/lto/lto-common.cc @@ -64,8 +64,6 @@ static bool type_streaming_finished = false; GTY(()) tree first_personality_decl; -GTY(()) const unsigned char *lto_mode_identity_table; - /* Returns a hash code for P. */ static hashval_t @@ -2277,7 +2275,7 @@ lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file, #ifdef ACCEL_COMPILER lto_input_mode_table (file_data); #else - file_data->mode_table = lto_mode_identity_table; + file_data->mode_table = NULL; file_data->mode_bits = ceil_log2 (MAX_MACHINE_MODE); #endif @@ -3118,13 +3116,6 @@ lto_fe_init (void) memset (<o_stats, 0, sizeof (lto_stats)); bitmap_obstack_initialize (NULL); gimple_register_cfg_hooks (); -#ifndef ACCEL_COMPILER - unsigned char *table - = ggc_vec_alloc (MAX_MACHINE_MODE); - for (int m = 0; m < MAX_MACHINE_MODE; m++) - table[m] = m; - lto_mode_identity_table = table; -#endif } #include "gt-lto-lto-common.h" diff --git a/gcc/lto/lto-common.h b/gcc/lto/lto-common.h index 24b2445673b..b9faa72e5cb 100644 --- a/gcc/lto/lto-common.h +++ b/gcc/lto/lto-common.h @@ -26,7 +26,6 @@ void print_lto_report_1 (void); extern tree lto_eh_personality_decl; extern GTY(()) vec *tree_with_vars; -extern const unsigned char *lto_mode_identity_table; extern tree first_personality_decl; #endif diff --git a/gcc/tree-streamer.h b/gcc/tree-streamer.h index ff49d1ba637..886ee6ac754 100644 --- a/gcc/tree-streamer.h +++ b/gcc/tree-streamer.h @@ -118,7 +118,10 @@ bp_unpack_machine_mode (struct bitpack_d *bp) lto_input_block *ib = (class lto_input_block *) bp->stream; int last = 1 << ib->file_data->mode_bits; unsigned ix = bp_unpack_enum (bp, machine_mode, last); - return (machine_mode) ib->file_data->mode_table[ix]; + if (ib->file_data->mode_table) + return (machine_mode) ib->file_data->mode_table[ix]; + else + return (machine_mode) ix; } #endif /* GCC_TREE_STREAMER_H */ -- 2.34.1