From: "Martin Liška" <mliska@suse.cz>
To: gcc-patches@gcc.gnu.org
Subject: [PATCH 1/3] lto-plugin: support LDPT_GET_SYMBOLS_V3
Date: Thu, 16 Jun 2022 08:59:34 +0200 [thread overview]
Message-ID: <53ccccfd-875d-8651-4e1e-283794b32ae7@suse.cz> (raw)
In-Reply-To: <803a0290-3909-b9c5-2461-b1740a00c63a@suse.cz>
That supports skipping of an object file (LDPS_NO_SYMS).
lto-plugin/ChangeLog:
* lto-plugin.c (struct plugin_file_info): Add skip_file flag.
(write_resolution): Write resolution only if get_symbols != LDPS_NO_SYMS.
(all_symbols_read_handler): Ignore file if skip_file is true.
(onload): Handle LDPT_GET_SYMBOLS_V3.
---
lto-plugin/lto-plugin.c | 42 ++++++++++++++++++++++++++++++++++-------
1 file changed, 35 insertions(+), 7 deletions(-)
diff --git a/lto-plugin/lto-plugin.c b/lto-plugin/lto-plugin.c
index 47378435612..00b760636dc 100644
--- a/lto-plugin/lto-plugin.c
+++ b/lto-plugin/lto-plugin.c
@@ -136,6 +136,7 @@ struct plugin_file_info
void *handle;
struct plugin_symtab symtab;
struct plugin_symtab conflicts;
+ bool skip_file;
};
/* List item with name of the file with offloading. */
@@ -159,7 +160,7 @@ enum symbol_style
static char *arguments_file_name;
static ld_plugin_register_claim_file register_claim_file;
static ld_plugin_register_all_symbols_read register_all_symbols_read;
-static ld_plugin_get_symbols get_symbols, get_symbols_v2;
+static ld_plugin_get_symbols get_symbols, get_symbols_v2, get_symbols_v3;
static ld_plugin_register_cleanup register_cleanup;
static ld_plugin_add_input_file add_input_file;
static ld_plugin_add_input_library add_input_library;
@@ -547,15 +548,13 @@ free_symtab (struct plugin_symtab *symtab)
static void
write_resolution (void)
{
- unsigned int i;
+ unsigned int i, included_files = 0;
FILE *f;
check (resolution_file, LDPL_FATAL, "resolution file not specified");
f = fopen (resolution_file, "w");
check (f, LDPL_FATAL, "could not open file");
- fprintf (f, "%d\n", num_claimed_files);
-
for (i = 0; i < num_claimed_files; i++)
{
struct plugin_file_info *info = &claimed_files[i];
@@ -563,13 +562,38 @@ write_resolution (void)
struct ld_plugin_symbol *syms = symtab->syms;
/* Version 2 of API supports IRONLY_EXP resolution that is
- accepted by GCC-4.7 and newer. */
- if (get_symbols_v2)
+ accepted by GCC-4.7 and newer.
+ Version 3 can return LDPS_NO_SYMS that means the object
+ will not be used at all. */
+ if (get_symbols_v3)
+ {
+ enum ld_plugin_status status
+ = get_symbols_v3 (info->handle, symtab->nsyms, syms);
+ if (status == LDPS_NO_SYMS)
+ {
+ info->skip_file = true;
+ continue;
+ }
+ }
+ else if (get_symbols_v2)
get_symbols_v2 (info->handle, symtab->nsyms, syms);
else
get_symbols (info->handle, symtab->nsyms, syms);
+ ++included_files;
+
finish_conflict_resolution (symtab, &info->conflicts);
+ }
+
+ fprintf (f, "%d\n", included_files);
+
+ for (i = 0; i < num_claimed_files; i++)
+ {
+ struct plugin_file_info *info = &claimed_files[i];
+ struct plugin_symtab *symtab = &info->symtab;
+
+ if (info->skip_file)
+ continue;
fprintf (f, "%s %d\n", info->name, symtab->nsyms + info->conflicts.nsyms);
dump_symtab (f, symtab);
@@ -833,7 +857,8 @@ all_symbols_read_handler (void)
{
struct plugin_file_info *info = &claimed_files[i];
- *lto_arg_ptr++ = info->name;
+ if (!info->skip_file)
+ *lto_arg_ptr++ = info->name;
}
*lto_arg_ptr++ = NULL;
@@ -1410,6 +1435,9 @@ onload (struct ld_plugin_tv *tv)
case LDPT_REGISTER_ALL_SYMBOLS_READ_HOOK:
register_all_symbols_read = p->tv_u.tv_register_all_symbols_read;
break;
+ case LDPT_GET_SYMBOLS_V3:
+ get_symbols_v3 = p->tv_u.tv_get_symbols;
+ break;
case LDPT_GET_SYMBOLS_V2:
get_symbols_v2 = p->tv_u.tv_get_symbols;
break;
--
2.36.1
next prev parent reply other threads:[~2022-06-16 6:59 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-02 7:51 [PATCH] Support LDPT_GET_SYMBOLS_V3 Martin Liška
2022-05-04 12:20 ` [PATCH] lto-plugin: add support for feature detection Martin Liška
2022-05-04 12:32 ` Alexander Monakov
2022-05-04 12:41 ` Martin Liška
2022-05-04 13:10 ` Alexander Monakov
2022-05-04 13:31 ` Martin Liška
2022-05-04 15:06 ` Bernhard Reutner-Fischer
2022-05-05 6:15 ` Richard Biener
2022-05-05 6:31 ` Richard Biener
2022-05-05 10:52 ` Alexander Monakov
2022-05-05 12:50 ` Martin Liška
2022-05-06 14:46 ` Alexander Monakov
2022-05-09 9:05 ` Martin Liška
2022-05-15 6:57 ` Rui Ueyama
2022-05-15 7:53 ` Alexander Monakov
2022-05-15 8:07 ` Rui Ueyama
2022-05-15 8:50 ` Alexander Monakov
2022-05-15 10:01 ` Rui Ueyama
2022-05-15 10:09 ` Alexander Monakov
2022-05-15 10:32 ` Rui Ueyama
2022-05-15 11:37 ` Alexander Monakov
2022-05-15 11:52 ` Rui Ueyama
2022-05-15 12:07 ` Alexander Monakov
2022-05-16 2:41 ` Rui Ueyama
2022-05-16 6:38 ` Alexander Monakov
2022-05-16 8:37 ` Rui Ueyama
2022-05-16 9:10 ` Richard Biener
2022-05-16 9:15 ` Alexander Monakov
2022-05-16 9:25 ` Jan Hubicka
2022-05-16 9:38 ` Martin Liška
2022-05-16 9:50 ` Jan Hubicka
2022-05-16 10:22 ` Richard Biener
2022-05-16 9:58 ` Rui Ueyama
2022-05-16 10:28 ` Richard Biener
2022-05-16 10:44 ` Rui Ueyama
2022-05-16 12:04 ` Martin Liška
2022-05-16 13:07 ` Rui Ueyama
2022-05-16 13:38 ` Alexander Monakov
2022-05-16 15:16 ` Alexander Monakov
2022-05-17 6:20 ` Richard Biener
2022-05-17 13:44 ` Martin Liška
2022-06-16 6:59 ` Martin Liška [this message]
2022-06-20 9:23 ` [PATCH 1/3] lto-plugin: support LDPT_GET_SYMBOLS_V3 Richard Biener
2022-06-16 7:01 ` [PATCH 2/3] lto-plugin: make claim_file_handler thread-safe Martin Liška
2022-06-20 9:32 ` Richard Biener
2022-06-20 10:20 ` Martin Liška
2022-06-21 7:56 ` Richard Biener
2022-06-21 8:43 ` Martin Liška
2022-06-24 8:37 ` Richard Biener
2022-06-16 7:01 ` [PATCH 3/3] lto-plugin: implement LDPT_GET_API_VERSION Martin Liška
2022-06-16 8:00 ` Alexander Monakov
2022-06-16 12:25 ` Martin Liška
2022-06-20 9:35 ` Richard Biener
2022-06-20 13:01 ` Martin Liška
2022-06-30 6:43 ` Rui Ueyama
2022-06-30 8:42 ` Martin Liška
2022-07-01 6:36 ` Richard Biener
2022-07-04 14:17 ` Martin Liška
2022-07-07 2:19 ` Rui Ueyama
2022-07-08 8:42 ` Martin Liška
2022-07-08 12:41 ` Alexander Monakov
2022-07-11 7:23 ` Rui Ueyama
2022-07-11 9:16 ` Alexander Monakov
2022-07-11 9:55 ` Richard Biener
2022-07-11 10:51 ` Martin Liška
2022-07-11 12:24 ` Rui Ueyama
2022-07-11 12:38 ` Alexander Monakov
2022-07-11 12:51 ` Martin Liška
2022-07-12 1:36 ` Rui Ueyama
2022-07-11 16:35 ` Alexander Monakov
2022-07-12 6:28 ` Richard Biener
2022-07-12 7:36 ` Martin Liška
2022-07-12 11:50 ` Rui Ueyama
2022-07-12 13:21 ` Richard Biener
2022-07-12 13:31 ` Martin Liška
2022-07-13 7:44 ` Rui Ueyama
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=53ccccfd-875d-8651-4e1e-283794b32ae7@suse.cz \
--to=mliska@suse.cz \
--cc=gcc-patches@gcc.gnu.org \
/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).