From: "Martin Liška" <mliska@suse.cz>
To: Richard Biener <richard.guenther@gmail.com>
Cc: Jan Hubicka <hubicka@ucw.cz>,
Thomas Koenig <tkoenig@netcologne.de>,
Andrew Pinski <pinskia@gmail.com>, Jeff Law <law@redhat.com>,
GCC Development <gcc@gcc.gnu.org>,
GCC Patches <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH] Add .gnu.lto_.lto section.
Date: Mon, 01 Jul 2019 10:59:00 -0000 [thread overview]
Message-ID: <6444c812-8927-a6ca-ba7f-3ae2fe3e8e36@suse.cz> (raw)
In-Reply-To: <35e5f4a6-36a8-f529-81c5-20eecb6a189e@suse.cz>
[-- Attachment #1: Type: text/plain, Size: 122 bytes --]
Hi.
Ok, so there's a version with added ChangeLog that survives regression tests.
Ready to be installed?
Thanks,
Martin
[-- Attachment #2: 0001-Add-.gnu.lto_.lto-section.patch --]
[-- Type: text/x-patch, Size: 8463 bytes --]
From e6745583dc4b7f5543878c0a25498e818531f73e Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Fri, 21 Jun 2019 12:14:04 +0200
Subject: [PATCH 1/2] Add .gnu.lto_.lto section.
gcc/ChangeLog:
2019-07-01 Martin Liska <mliska@suse.cz>
* lto-section-in.c (lto_get_section_data): Add "lto" section.
* lto-section-out.c (lto_destroy_simple_output_block): Never
compress LTO_section_lto section.
* lto-streamer-out.c (produce_asm): Do not set major_version
and minor_version.
(lto_output_toplevel_asms): Likewise.
(produce_lto_section): New function.
(lto_output): Call produce_lto_section.
(lto_write_mode_table): Do not set major_version and
minor_version.
(produce_asm_for_decls): Likewise.
* lto-streamer.h (enum lto_section_type): Add LTO_section_lto
type.
(struct lto_header): Remove.
(struct lto_section): New struct.
(struct lto_simple_header): Do not inherit from lto_header.
(struct lto_file_decl_data): Add lto_section_header field.
gcc/lto/ChangeLog:
2019-07-01 Martin Liska <mliska@suse.cz>
* lto-common.c: Read LTO section and verify header.
---
gcc/lto-section-in.c | 9 +++------
gcc/lto-section-out.c | 2 --
gcc/lto-streamer-out.c | 40 +++++++++++++++++++++++++---------------
gcc/lto-streamer.h | 25 +++++++++++++++++++++----
gcc/lto/lto-common.c | 15 +++++++++++++++
5 files changed, 64 insertions(+), 27 deletions(-)
diff --git a/gcc/lto-section-in.c b/gcc/lto-section-in.c
index 4cfc0cad4be..4e7d1181f23 100644
--- a/gcc/lto-section-in.c
+++ b/gcc/lto-section-in.c
@@ -52,10 +52,10 @@ const char *lto_section_name[LTO_N_SECTION_TYPES] =
"icf",
"offload_table",
"mode_table",
- "hsa"
+ "hsa",
+ "lto"
};
-
/* Hooks so that the ipa passes can call into the lto front end to get
sections. */
@@ -146,7 +146,7 @@ lto_get_section_data (struct lto_file_decl_data *file_data,
/* WPA->ltrans streams are not compressed with exception of function bodies
and variable initializers that has been verbatim copied from earlier
compilations. */
- if (!flag_ltrans || decompress)
+ if ((!flag_ltrans || decompress) && section_type != LTO_section_lto)
{
/* Create a mapping header containing the underlying data and length,
and prepend this to the uncompression buffer. The uncompressed data
@@ -167,9 +167,6 @@ lto_get_section_data (struct lto_file_decl_data *file_data,
data = buffer.data + header_length;
}
- lto_check_version (((const lto_header *)data)->major_version,
- ((const lto_header *)data)->minor_version,
- file_data->file_name);
return data;
}
diff --git a/gcc/lto-section-out.c b/gcc/lto-section-out.c
index c91e58f0465..7ae102164ef 100644
--- a/gcc/lto-section-out.c
+++ b/gcc/lto-section-out.c
@@ -285,8 +285,6 @@ lto_destroy_simple_output_block (struct lto_simple_output_block *ob)
/* Write the header which says how to decode the pieces of the
t. */
memset (&header, 0, sizeof (struct lto_simple_header));
- header.major_version = LTO_major_version;
- header.minor_version = LTO_minor_version;
header.main_size = ob->main_stream->total_size;
lto_write_data (&header, sizeof header);
diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c
index dc68429303c..7dee770aa11 100644
--- a/gcc/lto-streamer-out.c
+++ b/gcc/lto-streamer-out.c
@@ -1974,10 +1974,6 @@ produce_asm (struct output_block *ob, tree fn)
/* The entire header is stream computed here. */
memset (&header, 0, sizeof (struct lto_function_header));
- /* Write the header. */
- header.major_version = LTO_major_version;
- header.minor_version = LTO_minor_version;
-
if (section_type == LTO_section_function_body)
header.cfg_size = ob->cfg_stream->total_size;
header.main_size = ob->main_stream->total_size;
@@ -2270,10 +2266,6 @@ lto_output_toplevel_asms (void)
/* The entire header stream is computed here. */
memset (&header, 0, sizeof (header));
- /* Write the header. */
- header.major_version = LTO_major_version;
- header.minor_version = LTO_minor_version;
-
header.main_size = ob->main_stream->total_size;
header.string_size = ob->string_stream->total_size;
lto_write_data (&header, sizeof header);
@@ -2390,6 +2382,29 @@ prune_offload_funcs (void)
DECL_PRESERVE_P (fn_decl) = 1;
}
+/* Produce LTO section that contains global information
+ about LTO bytecode. */
+
+static void
+produce_lto_section ()
+{
+ /* Stream LTO meta section. */
+ output_block *ob = create_output_block (LTO_section_lto);
+
+ char * section_name = lto_get_section_name (LTO_section_lto, NULL, NULL);
+ lto_begin_section (section_name, false);
+ free (section_name);
+
+ lto_compression compression = ZLIB;
+
+ bool slim_object = flag_generate_lto && !flag_fat_lto_objects;
+ lto_section s
+ = { LTO_major_version, LTO_minor_version, slim_object, compression, 0 };
+ lto_write_data (&s, sizeof s);
+ lto_end_section ();
+ destroy_output_block (ob);
+}
+
/* Main entry point from the pass manager. */
void
@@ -2412,6 +2427,8 @@ lto_output (void)
/* Initialize the streamer. */
lto_streamer_init ();
+ produce_lto_section ();
+
n_nodes = lto_symtab_encoder_size (encoder);
/* Process only the functions with bodies. */
for (i = 0; i < n_nodes; i++)
@@ -2827,10 +2844,6 @@ lto_write_mode_table (void)
struct lto_simple_header_with_strings header;
memset (&header, 0, sizeof (header));
- /* Write the header. */
- header.major_version = LTO_major_version;
- header.minor_version = LTO_minor_version;
-
header.main_size = ob->main_stream->total_size;
header.string_size = ob->string_stream->total_size;
lto_write_data (&header, sizeof header);
@@ -2901,9 +2914,6 @@ produce_asm_for_decls (void)
lto_output_decl_state_streams (ob, fn_out_state);
}
- header.major_version = LTO_major_version;
- header.minor_version = LTO_minor_version;
-
/* Currently not used. This field would allow us to preallocate
the globals vector, so that it need not be resized as it is extended. */
header.num_nodes = -1;
diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h
index 3b1e07b4bfc..f1593d64c71 100644
--- a/gcc/lto-streamer.h
+++ b/gcc/lto-streamer.h
@@ -234,6 +234,7 @@ enum lto_section_type
LTO_section_offload_table,
LTO_section_mode_table,
LTO_section_ipa_hsa,
+ LTO_section_lto,
LTO_N_SECTION_TYPES /* Must be last. */
};
@@ -378,18 +379,31 @@ public:
unsigned int len;
};
+/* Compression algorithm used for compression of LTO bytecode. */
-/* The is the first part of the record for a function or constructor
- in the .o file. */
-struct lto_header
+enum lto_compression
+{
+ ZLIB,
+ ZSTD
+};
+
+/* Structure that represents LTO ELF section with information
+ about the format. */
+
+struct lto_section
{
int16_t major_version;
int16_t minor_version;
+ unsigned char slim_object: 1;
+ lto_compression compression: 4;
+ int32_t reserved0: 27;
};
+STATIC_ASSERT (sizeof (lto_section) == 8);
+
/* The is the first part of the record in an LTO file for many of the
IPA passes. */
-struct lto_simple_header : lto_header
+struct lto_simple_header
{
/* Size of main gimple body of function. */
int32_t main_size;
@@ -589,6 +603,9 @@ struct GTY(()) lto_file_decl_data
/* Mode translation table. */
const unsigned char *mode_table;
+
+ /* Read LTO section. */
+ lto_section lto_section_header;
};
typedef struct lto_file_decl_data *lto_file_decl_data_ptr;
diff --git a/gcc/lto/lto-common.c b/gcc/lto/lto-common.c
index 0d38ee6b57b..1cfbda0f554 100644
--- a/gcc/lto/lto-common.c
+++ b/gcc/lto/lto-common.c
@@ -2060,6 +2060,21 @@ lto_file_finalize (struct lto_file_decl_data *file_data, lto_file *file)
#else
file_data->mode_table = lto_mode_identity_table;
#endif
+
+ /* Read and verify LTO section. */
+ data = lto_get_section_data (file_data, LTO_section_lto, NULL, &len, false);
+ if (data == NULL)
+ {
+ fatal_error (input_location, "bytecode stream in file %qs generated "
+ "with GCC compiler older than 10.0", file_data->file_name);
+ return;
+ }
+
+ file_data->lto_section_header = *(const lto_section *)data;
+ lto_check_version (file_data->lto_section_header.major_version,
+ file_data->lto_section_header.minor_version,
+ file_data->file_name);
+
data = lto_get_section_data (file_data, LTO_section_decls, NULL, &len);
if (data == NULL)
{
--
2.22.0
next prev parent reply other threads:[~2019-07-01 10:59 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 9:21 [RFC] zstd as a compression algorithm for LTO Martin Liška
2019-06-19 16:03 ` Jeff Law
2019-06-19 18:55 ` Richard Biener
2019-06-19 19:26 ` Andrew Pinski
2019-06-19 19:29 ` Jan Hubicka
2019-06-19 19:34 ` Andrew Pinski
2019-06-20 9:08 ` Martin Liška
2019-06-20 10:59 ` Thomas Koenig
2019-06-20 11:42 ` Martin Liška
2019-06-20 12:02 ` Jan Hubicka
2019-06-21 10:20 ` [PATCH] Add .gnu.lto_.meta section Martin Liška
2019-06-21 12:34 ` Richard Biener
2019-06-21 12:49 ` Martin Liška
2019-06-21 12:57 ` Jan Hubicka
2019-06-21 14:01 ` Martin Liška
2019-06-24 12:02 ` Richard Biener
2019-06-24 12:12 ` Martin Liška
2019-06-24 12:44 ` Richard Biener
2019-06-24 13:31 ` Martin Liška
2019-06-24 14:25 ` Iain Sandoe
2019-06-24 18:05 ` Richard Biener
2019-06-25 8:14 ` Martin Liška
2019-06-25 14:15 ` Richard Biener
2019-06-27 12:28 ` [PATCH] Add .gnu.lto_.lto section Martin Liška
2019-07-01 10:59 ` Martin Liška [this message]
2019-07-01 11:01 ` [PATCH 2/2] Add zstd support for LTO bytecode compression Martin Liška
2019-07-02 20:50 ` Jeff Law
2019-07-02 20:49 ` [PATCH] Add .gnu.lto_.lto section Jeff Law
2019-06-20 12:12 ` [RFC] zstd as a compression algorithm for LTO Thomas Koenig
2019-06-20 17:02 ` Joseph Myers
2019-06-20 10:46 ` Segher Boessenkool
2019-06-20 11:44 ` Martin Liška
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6444c812-8927-a6ca-ba7f-3ae2fe3e8e36@suse.cz \
--to=mliska@suse.cz \
--cc=gcc-patches@gcc.gnu.org \
--cc=gcc@gcc.gnu.org \
--cc=hubicka@ucw.cz \
--cc=law@redhat.com \
--cc=pinskia@gmail.com \
--cc=richard.guenther@gmail.com \
--cc=tkoenig@netcologne.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).