From: Michal Jires <mjires@suse.cz>
To: gcc-patches@gcc.gnu.org
Subject: [PATCH 7/7] lto: partition specific lto_clone_numbers
Date: Fri, 17 Nov 2023 21:17:34 +0100 [thread overview]
Message-ID: <7c76f258995c20eb0b44eb021f44039718dc45ce.1700222403.git.mjires@suse.cz> (raw)
In-Reply-To: <18cc1c3980551ac1881eea6e78811a629c7baa82.1700222403.git.mjires@suse.cz>
Replaces "lto_priv.$clone_number" by
"lto_priv.$partition_hash.$partition_specific_clone_number".
To reduce divergence for incremental LTO.
Bootstrapped/regtested on x86_64-pc-linux-gnu
gcc/lto/ChangeLog:
* lto-partition.cc (set_clone_partition_name_checksum): New.
(CHECKSUM_STRING): New.
(privatize_symbol_name_1): Use partition hash for lto_priv.
(lto_promote_cross_file_statics): Use set_clone_partition_name_checksum.
(lto_promote_statics_nonwpa): Changed clone_map type.
---
gcc/lto/lto-partition.cc | 49 +++++++++++++++++++++++++++++++++++-----
1 file changed, 43 insertions(+), 6 deletions(-)
diff --git a/gcc/lto/lto-partition.cc b/gcc/lto/lto-partition.cc
index eb31ecba0d3..a2ce24eea23 100644
--- a/gcc/lto/lto-partition.cc
+++ b/gcc/lto/lto-partition.cc
@@ -35,6 +35,7 @@ along with GCC; see the file COPYING3. If not see
#include "ipa-fnsummary.h"
#include "lto-partition.h"
#include "sreal.h"
+#include "md5.h"
#include <limits>
#include <vector>
@@ -1516,8 +1517,36 @@ validize_symbol_for_target (symtab_node *node)
}
}
-/* Maps symbol names to unique lto clone counters. */
-static hash_map<const char *, unsigned> *lto_clone_numbers;
+/* Maps symbol names with partition checksum to unique lto clone counters. */
+using clone_map = hash_map<pair_hash<nofree_string_hash,
+ int_hash_base<uint64_t>>, unsigned>;
+static clone_map *lto_clone_numbers;
+uint64_t current_partition_checksum = 0;
+
+/* Computes a quick checksum to distinguish partitions of clone numbers. */
+void
+set_clone_partition_name_checksum (ltrans_partition part)
+{
+#define CHECKSUM_STRING(FOO) md5_process_bytes ((FOO), strlen (FOO), &ctx)
+ struct md5_ctx ctx;
+ md5_init_ctx (&ctx);
+
+ CHECKSUM_STRING (part->name);
+
+ lto_symtab_encoder_iterator lsei;
+ lto_symtab_encoder_t encoder = part->encoder;
+
+ for (lsei = lsei_start (encoder); !lsei_end_p (lsei); lsei_next (&lsei))
+ {
+ symtab_node *node = lsei_node (lsei);
+ CHECKSUM_STRING (node->name ());
+ }
+
+ uint64_t checksum[2];
+ md5_finish_ctx (&ctx, checksum);
+ current_partition_checksum = checksum[0];
+#undef CHECKSUM_STRING
+}
/* Helper for privatize_symbol_name. Mangle NODE symbol name
represented by DECL. */
@@ -1531,10 +1560,16 @@ privatize_symbol_name_1 (symtab_node *node, tree decl)
return false;
const char *name = maybe_rewrite_identifier (name0);
- unsigned &clone_number = lto_clone_numbers->get_or_insert (name);
+
+ unsigned &clone_number = lto_clone_numbers->get_or_insert (
+ std::pair<const char*, uint64_t> {name, current_partition_checksum});
+
+ char lto_priv[32];
+ sprintf (lto_priv, "lto_priv.%lu", current_partition_checksum);
+
symtab->change_decl_assembler_name (decl,
clone_function_name (
- name, "lto_priv", clone_number));
+ name, lto_priv, clone_number));
clone_number++;
if (node->lto_file_data)
@@ -1735,11 +1770,13 @@ lto_promote_cross_file_statics (void)
part->encoder = compute_ltrans_boundary (part->encoder);
}
- lto_clone_numbers = new hash_map<const char *, unsigned>;
+ lto_clone_numbers = new clone_map;
/* Look at boundaries and promote symbols as needed. */
for (i = 0; i < n_sets; i++)
{
+ set_clone_partition_name_checksum (ltrans_partitions[i]);
+
lto_symtab_encoder_iterator lsei;
lto_symtab_encoder_t encoder = ltrans_partitions[i]->encoder;
@@ -1778,7 +1815,7 @@ lto_promote_statics_nonwpa (void)
{
symtab_node *node;
- lto_clone_numbers = new hash_map<const char *, unsigned>;
+ lto_clone_numbers = new clone_map;
FOR_EACH_SYMBOL (node)
{
rename_statics (NULL, node);
--
2.42.1
next prev parent reply other threads:[~2023-11-17 20:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-17 20:16 [PATCH 0/7] lto: Incremental LTO Michal Jires
2023-11-17 20:16 ` [PATCH 1/7] lto: Skip flag OPT_fltrans_output_list_ Michal Jires
2023-12-29 21:16 ` Jan Hubicka
2023-11-17 20:16 ` [PATCH 2/7] lto: Remove random_seed from section name Michal Jires
2023-12-29 21:17 ` Jan Hubicka
2024-01-09 16:49 ` [PATCH 2/7 v2] " Michal Jires
[not found] ` <c480760c-f167-4e60-a27e-52bebdd1351b@suse.cz>
2024-05-14 11:28 ` Fwd: " Jan Hubicka
2023-11-17 20:17 ` [PATCH 3/7] Lockfile Michal Jires
2023-12-29 21:23 ` Jan Hubicka
2024-01-09 17:10 ` Michal Jires
2024-06-20 11:24 ` [PATCH 3/7 v2] Lockfile Michal Jires
2024-06-20 12:36 ` Richard Biener
2023-11-17 20:17 ` [PATCH 4/7] lto: Implement ltrans cache Michal Jires
2024-05-14 11:51 ` Jan Hubicka
2024-06-20 11:31 ` [PATCH 4/7 v2] " Michal Jires
2024-06-20 17:45 ` Andi Kleen
2024-06-21 11:12 ` Jan Hubicka
2024-06-21 19:07 ` Andi Kleen
2024-06-21 19:16 ` Sam James
2024-06-21 16:59 ` Michal Jireš
2024-06-21 19:09 ` Andi Kleen
2023-11-17 20:17 ` [PATCH 5/7] lto: Implement cache partitioning Michal Jires
2024-05-14 12:10 ` Jan Hubicka
2023-11-17 20:17 ` [PATCH 6/7] lto: squash order of symbols in partitions Michal Jires
2024-05-14 12:20 ` Jan Hubicka
2023-11-17 20:17 ` Michal Jires [this message]
2024-05-14 12:11 ` [PATCH 7/7] lto: partition specific lto_clone_numbers Jan Hubicka
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=7c76f258995c20eb0b44eb021f44039718dc45ce.1700222403.git.mjires@suse.cz \
--to=mjires@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).