From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by sourceware.org (Postfix) with ESMTPS id 628F43858C27 for ; Sun, 8 May 2022 14:29:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 628F43858C27 Received: by mail-pl1-x631.google.com with SMTP id i1so11655675plg.7 for ; Sun, 08 May 2022 07:29:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:cc:to; bh=6FwgAEIm4h2W7vkWjjNO4R1bMKYEEPI9p+KBBJfjdTg=; b=TrHPvMG8zBfw4Ms6zohYtms0/ghlGHn6h1ffsq2WPGFMPXiKWAPg7BOO5MPrA7B6Uo 5vCrsdInoWGzB3JuJ/GOY4wKYVbbg5v3RP98crrd7IeJN6o/kCRUiZlLGwpw0sPcjqzh qvibuXjDmWGUvMVXwgXgn/2zPrpu/Nfo7dUBRlm75IMpykiIFVuVOJuA8vU+6kjWFUJw XxTfS/T9euzGBV1fOhV2fle6KUiWmZh/ckNVXnYxjwrWaL8JOSUOPBDhUUx4MR2UknZ8 FNlRTNQiJA8GDfZVEEbh+l2/acUumpi9wvUJPUcXkEV78mH86u9rfN7vpCuXmhoKJD/Z OwoQ== X-Gm-Message-State: AOAM532rcZmE9053XIFXqbZp6S9IQr4wK5NCCNJqiOSgyRKWIyzfGsBp LbFlAfJoWz5Ck+CA5bV2gfGwTclPrLY= X-Google-Smtp-Source: ABdhPJyIb28yhYtxBGy9peiHHeBD4IlrD92f3nQs7KtMpeOYw996fR5IWs1y2wZwbOIW9N/6t44Erg== X-Received: by 2002:a17:903:4093:b0:15c:e5eb:9545 with SMTP id z19-20020a170903409300b0015ce5eb9545mr12324381plc.62.1652020173917; Sun, 08 May 2022 07:29:33 -0700 (PDT) Received: from smtpclient.apple ([160.202.38.160]) by smtp.gmail.com with ESMTPSA id s5-20020a17090a948500b001dd01a5be02sm1989158pjo.41.2022.05.08.07.29.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 May 2022 07:29:33 -0700 (PDT) From: Ankur Saini Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 15.0 \(3693.60.0.1.1\)) Subject: Updating patch regarding bypassing assembler when generating LTO object files Message-Id: Date: Sun, 8 May 2022 19:59:28 +0530 Cc: hubicka@kam.mff.cuni.cz To: gcc@gcc.gnu.org X-Mailer: Apple Mail (2.3693.60.0.1.1) X-Spam-Status: No, score=-6.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 May 2022 14:29:43 -0000 Hi, I have been fiddling around with the patch regarding "bypassing = assmebler while generating slim lto files" and managed to make it build with the current trunk. Though the patch seems to be working on Linux machine, it causes an ICE on macOS (it crashes in langhooks.cc while executing `lhd_begin_section ()`). here is the patch ( not fully tested and is still a prototype ), I basically mimicked the entire previous patch ( https://gcc.gnu.org/legacy-ml/gcc/2014-09/msg00340.html ) but on current source. - Ankur ---=20 =46rom e5d72a73962c34dcd818c17d440eb98ddd94e624 Mon Sep 17 00:00:00 2001 From: Ankur Saini Date: Sun, 8 May 2022 07:03:51 +0530 Subject: [PATCH] bypass-asm prototype: 1 --- gcc/Makefile.in | 1 + gcc/common.opt | 3 +++ gcc/langhooks.cc | 29 +++++++++++++++++++++++++++- gcc/{lto =3D> }/lto-object.cc | 29 +++++++++++++++++++++------- gcc/lto-streamer.h | 35 ++++++++++++++++++++++++++++++++++ gcc/lto/Make-lang.in | 4 ++-- gcc/lto/lto-common.cc | 3 ++- gcc/lto/lto-lang.cc | 1 + gcc/lto/lto.h | 38 ------------------------------------- gcc/toplev.cc | 19 ++++++++++++++++--- 10 files changed, 110 insertions(+), 52 deletions(-) rename gcc/{lto =3D> }/lto-object.cc (94%) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 31ff95500c9..3d1241d5819 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1509,6 +1509,7 @@ OBJS =3D \ lto-section-out.o \ lto-opts.o \ lto-compress.o \ + lto-object.o \ mcf.o \ mode-switching.o \ modulo-sched.o \ diff --git a/gcc/common.opt b/gcc/common.opt index 8a0dafc522d..6348197380d 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -1158,6 +1158,9 @@ fbtr-bb-exclusive Common Ignore Does nothing. Preserved for backward compatibility. =20 +fbypass-asm=3D +Common Joined Var(flag_bypass_asm) + fcallgraph-info Common RejectNegative Var(flag_callgraph_info) Init(NO_CALLGRAPH_INFO); Output callgraph information on a per-file basis. diff --git a/gcc/langhooks.cc b/gcc/langhooks.cc index df970678a08..abfab7a27e0 100644 --- a/gcc/langhooks.cc +++ b/gcc/langhooks.cc @@ -38,6 +38,10 @@ along with GCC; see the file COPYING3. If not see #include "stor-layout.h" #include "cgraph.h" #include "debug.h" +#include "function.h" +#include "basic-block.h" +#include "gimple.h" +#include "lto-streamer.h" =20 /* Do nothing; in many cases the default hook. */ =20 @@ -820,6 +824,19 @@ lhd_begin_section (const char *name) { section *section; =20 + if (flag_bypass_asm) + { + static int initialized =3D false; + if (!initialized) + { + gcc_assert (asm_out_file =3D=3D NULL); + lto_set_current_out_file (lto_obj_file_open (asm_file_name, = true)); + initialized =3D true; + } + lto_obj_begin_section (name); + return; + } + /* Save the old section so we can restore it in lto_end_asm_section. = */ gcc_assert (!saved_section); saved_section =3D in_section; @@ -836,8 +853,13 @@ lhd_begin_section (const char *name) implementation just calls assemble_string. */ =20 void -lhd_append_data (const void *data, size_t len, void *) +lhd_append_data (const void *data, size_t len, void *v) { + if (flag_bypass_asm) + { + lto_obj_append_data (data, len, v); + return; + } if (data) { timevar_push (TV_IPA_LTO_OUTPUT); @@ -854,6 +876,11 @@ lhd_append_data (const void *data, size_t len, void = *) void lhd_end_section (void) { + if (flag_bypass_asm) + { + lto_obj_end_section (); + return; + } if (saved_section) { switch_to_section (saved_section); diff --git a/gcc/lto/lto-object.cc b/gcc/lto-object.cc similarity index 94% rename from gcc/lto/lto-object.cc rename to gcc/lto-object.cc index 329bbc71fd6..8ccc917a4eb 100644 --- a/gcc/lto/lto-object.cc +++ b/gcc/lto-object.cc @@ -21,9 +21,17 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" +#include "tree.h" +#include "basic-block.h" +#include "tree-ssa-alias.h" +#include "internal-fn.h" +#include "gimple-expr.h" +#include "is-a.h" +#include "function.h" +#include "gimple.h" #include "diagnostic-core.h" -#include "lto.h" +#include "tm.h" +#include "lto-streamer.h" #include "lto-section-names.h" #include "simple-object.h" =20 @@ -133,7 +141,13 @@ lto_obj_file_open (const char *filename, bool = writable) } else { - gcc_assert (saved_attributes !=3D NULL); + if (!saved_attributes) + { + lto_file *tmp =3D lto_obj_file_open (flag_bypass_asm, false); + if (!tmp) + goto fail; + lto_obj_file_close (tmp); + } lo->sobj_w =3D simple_object_start_write (saved_attributes, LTO_SEGMENT_NAME, &errmsg, &err); @@ -148,7 +162,8 @@ fail_errmsg: error ("%s: %s", fname, errmsg); else error ("%s: %s: %s", fname, errmsg, xstrerror (err)); - =20 + +fail: if (lo->fd !=3D -1) lto_obj_file_close ((lto_file *) lo); free (lo); @@ -255,15 +270,15 @@ lto_obj_add_section (void *data, const char *name, = off_t offset, the start and size of each section in the .o file. */ =20 htab_t -lto_obj_build_section_table (lto_file *lto_file, struct = lto_section_list *list) +lto_obj_build_section_table (lto_file *lto_file, struct = lto_section_list *list, + htab_t section_hash_table) { struct lto_simple_object *lo =3D (struct lto_simple_object *) = lto_file; - htab_t section_hash_table; + struct lto_obj_add_section_data loasd; const char *errmsg; int err; =20 - section_hash_table =3D lto_obj_create_section_hash_table (); =20 gcc_assert (lo->sobj_r !=3D NULL && lo->sobj_w =3D=3D NULL); loasd.section_hash_table =3D section_hash_table; diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h index 597e9e405ec..4556583a6a8 100644 --- a/gcc/lto-streamer.h +++ b/gcc/lto-streamer.h @@ -759,6 +759,30 @@ public: lto_location_cache location_cache; }; =20 +/* Hash table entry to hold the start offset and length of an LTO + section in a .o file. */ +struct lto_section_slot +{ + const char *name; + intptr_t start; + size_t len; + struct lto_section_slot *next; +}; + +/* A list of section slots */ +struct lto_section_list +{ + struct lto_section_slot *first, *last; +}; + +/* A file. */ +struct lto_file +{ + /* The name of the file. */ + const char *filename; + /* The offset for the object inside an ar archive file (or zero). */ + off_t offset; +}; =20 /* In lto-section-in.cc */ extern class lto_input_block * lto_create_simple_input_block ( @@ -898,6 +922,17 @@ void lto_output_location_and_block (struct = output_block *, struct bitpack_d *, void lto_output_init_mode_table (void); void lto_prepare_function_for_streaming (cgraph_node *); =20 +/* In lto-elf.c or lto-coff.c */ +extern lto_file *lto_obj_file_open (const char *filename, bool = writable); +extern void lto_obj_file_close (lto_file *file); +struct lto_section_list; +extern htab_t lto_obj_build_section_table (lto_file *file, struct = lto_section_list *list, htab_t section_hash_table); +extern htab_t lto_obj_create_section_hash_table (void); +extern void lto_obj_begin_section (const char *name); +extern void lto_obj_append_data (const void *data, size_t len, void = *block); +extern void lto_obj_end_section (void); +extern lto_file *lto_set_current_out_file (lto_file *file); +extern lto_file *lto_get_current_out_file (void); =20 /* In lto-cgraph.cc */ extern bool asm_nodes_output; diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in index a2dcf0dfc12..41a822a317e 100644 --- a/gcc/lto/Make-lang.in +++ b/gcc/lto/Make-lang.in @@ -24,9 +24,9 @@ LTO_EXE =3D lto1$(exeext) LTO_DUMP_EXE =3D lto-dump$(exeext) LTO_DUMP_INSTALL_NAME :=3D $(shell echo lto-dump|sed = '$(program_transform_name)') # The LTO-specific object files inclued in $(LTO_EXE). -LTO_OBJS =3D lto/lto-lang.o lto/lto.o lto/lto-object.o attribs.o = lto/lto-partition.o lto/lto-symtab.o lto/lto-common.o +LTO_OBJS =3D lto/lto-lang.o lto/lto.o attribs.o lto/lto-partition.o = lto/lto-symtab.o lto/lto-common.o lto_OBJS =3D $(LTO_OBJS) -LTO_DUMP_OBJS =3D lto/lto-lang.o lto/lto-object.o attribs.o = lto/lto-partition.o lto/lto-symtab.o lto/lto-dump.o lto/lto-common.o +LTO_DUMP_OBJS =3D lto/lto-lang.o attribs.o lto/lto-partition.o = lto/lto-symtab.o lto/lto-dump.o lto/lto-common.o lto_dump_OBJS =3D $(LTO_DUMP_OBJS) =20 # this is only useful in a LTO bootstrap, but this does not work right diff --git a/gcc/lto/lto-common.cc b/gcc/lto/lto-common.cc index ca28586a1e8..4a0c58cdbcd 100644 --- a/gcc/lto/lto-common.cc +++ b/gcc/lto/lto-common.cc @@ -2306,7 +2306,8 @@ lto_file_read (lto_file *file, FILE = *resolution_file, int *count) struct lto_section_list section_list; =20 memset (§ion_list, 0, sizeof (struct lto_section_list)); - section_hash_table =3D lto_obj_build_section_table (file, = §ion_list); + section_hash_table =3D lto_obj_create_section_hash_table (); + section_hash_table =3D lto_obj_build_section_table (file, = §ion_list, section_hash_table); =20 /* Dump the details of LTO objects. */ if (flag_lto_dump_objects) diff --git a/gcc/lto/lto-lang.cc b/gcc/lto/lto-lang.cc index 8d58d924dff..64446fc9085 100644 --- a/gcc/lto/lto-lang.cc +++ b/gcc/lto/lto-lang.cc @@ -35,6 +35,7 @@ along with GCC; see the file COPYING3. If not see #include "lto-tree.h" #include "lto.h" #include "lto-common.h" +#include "lto-streamer.h" #include "stringpool.h" #include "attribs.h" =20 diff --git a/gcc/lto/lto.h b/gcc/lto/lto.h index 9f7fae95bc4..bb0a2852250 100644 --- a/gcc/lto/lto.h +++ b/gcc/lto/lto.h @@ -21,16 +21,6 @@ along with GCC; see the file COPYING3. If not see #ifndef LTO_H #define LTO_H =20 - -/* A file. */ -struct lto_file -{ - /* The name of the file. */ - const char *filename; - /* The offset for the object inside an ar archive file (or zero). */ - off_t offset; -}; - /* In lto-lang.cc */ extern const char *resolution_file_name; =20 @@ -39,36 +29,8 @@ extern tree lto_eh_personality (void); extern void lto_main (void); extern void lto_read_all_file_options (void); =20 -/* In lto-elf.c or lto-coff.c */ -extern lto_file *lto_obj_file_open (const char *filename, bool = writable); -extern void lto_obj_file_close (lto_file *file); -struct lto_section_list; -extern htab_t lto_obj_build_section_table (lto_file *file, struct = lto_section_list *list); -extern htab_t lto_obj_create_section_hash_table (void); -extern void lto_obj_begin_section (const char *name); -extern void lto_obj_append_data (const void *data, size_t len, void = *block); -extern void lto_obj_end_section (void); -extern lto_file *lto_set_current_out_file (lto_file *file); -extern lto_file *lto_get_current_out_file (void); - extern int lto_link_dump_id, decl_merge_dump_id, partition_dump_id; =20 -/* Hash table entry to hold the start offset and length of an LTO - section in a .o file. */ -struct lto_section_slot -{ - const char *name; - intptr_t start; - size_t len; - struct lto_section_slot *next; -}; - -/* A list of section slots */ -struct lto_section_list -{ - struct lto_section_slot *first, *last; -}; - extern unsigned int lto_option_lang_mask (void); =20 #endif /* LTO_H */ diff --git a/gcc/toplev.cc b/gcc/toplev.cc index ed546b2cad8..4464c5d6773 100644 --- a/gcc/toplev.cc +++ b/gcc/toplev.cc @@ -88,6 +88,7 @@ along with GCC; see the file COPYING3. If not see #include "ipa-modref.h" #include "ipa-param-manipulation.h" #include "dbgcnt.h" +#include "lto-streamer.h" =20 #if defined(DBX_DEBUGGING_INFO) || defined(XCOFF_DEBUGGING_INFO) #include "dbxout.h" @@ -547,6 +548,12 @@ compile_file (void) even when user did not ask for it. */ if (flag_generate_lto && !flag_fat_lto_objects) { + if (flag_bypass_asm) + { + /* TODO */ + } + else + { #if defined ASM_OUTPUT_ALIGNED_DECL_COMMON ASM_OUTPUT_ALIGNED_DECL_COMMON (asm_out_file, NULL_TREE, = "__gnu_lto_slim", HOST_WIDE_INT_1U, 8); @@ -558,12 +565,13 @@ compile_file (void) HOST_WIDE_INT_1U, HOST_WIDE_INT_1U); #endif + } } =20 /* Attach a special .ident directive to the end of the file to = identify the version of GCC which compiled this code. The format of the = .ident string is patterned after the ones produced by native SVR4 = compilers. */ - if (!flag_no_ident) + if (!flag_no_ident && !flag_bypass_asm) { const char *pkg_version =3D "(GNU) "; char *ident_str; @@ -585,7 +593,11 @@ compile_file (void) /* This must be at the end. Some target ports emit end of file = directives into the assembly file here, and hence we cannot output anything = to the assembly file after this point. */ - targetm.asm_out.file_end (); + + if (flag_bypass_asm) + lto_obj_file_close (lto_get_current_out_file ()); + else + targetm.asm_out.file_end (); =20 timevar_stop (TV_PHASE_LATE_ASM); } @@ -1861,7 +1873,8 @@ lang_dependent_init (const char *name) =20 if (!flag_wpa) { - init_asm_output (name); + if (!flag_bypass_asm) + init_asm_output (name); =20 if (!flag_generate_lto && !flag_compare_debug) { --=20 2.35.0