public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/aoliva/heads/testme)] [PR105455] Set edge probabilities when hardening conditionals
@ 2022-05-11 9:36 Alexandre Oliva
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Oliva @ 2022-05-11 9:36 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:bd8212013e1f74d7c84add7cfa70c6d79a84e02a
commit bd8212013e1f74d7c84add7cfa70c6d79a84e02a
Author: Alexandre Oliva <oliva@adacore.com>
Date: Wed May 11 04:27:42 2022 -0300
[PR105455] Set edge probabilities when hardening conditionals
When turning unconditional edges into conditional, as in
gimple-harden-conditionals.cc:insert_check_and_trap, the newly-created
edge's probability comes out uninitialized, while the previously
unconditional edge's probability is presumably
profile_probability::always.
Mixing initialized and uninitialized probabilities before expand
breaks predict.cc:force_edge_cold: the initialized probability may end
up copied to a REG_BR_PROB note in a conditional branch insn, but if
force_edge_cold is called on that edge, it will find another edge with
uninitialized probability and assume the note is absent. Later on,
rtl_verify_edges complains that the note does not match the
probability modified by force_edge_cold in the edge.
This patch sets probabilities for edges affected by hardening of
conditionals, both the newly-created edges to trap blocks and the
previously-unconditional edges, so that the former are considered
never taken, while the latter are confirmed as always taken.
for gcc/ChangeLog
PR rtl-optimization/105455
* gimple-harden-conditionals.cc (insert_check_and_trap): Set
probabilities for newly-conditional edges.
for gcc/testsuite/ChangeLog
PR rtl-optimization/105455
* gcc.dg/pr105455.c: New.
Diff:
---
gcc/gimple-harden-conditionals.cc | 2 ++
gcc/testsuite/gcc.dg/pr105455.c | 17 +++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/gcc/gimple-harden-conditionals.cc b/gcc/gimple-harden-conditionals.cc
index 28c4810f0a7..240d0e5acd8 100644
--- a/gcc/gimple-harden-conditionals.cc
+++ b/gcc/gimple-harden-conditionals.cc
@@ -254,8 +254,10 @@ insert_check_and_trap (location_t loc, gimple_stmt_iterator *gsip,
equality. */
single_succ_edge (chk)->flags &= ~EDGE_FALLTHRU;
single_succ_edge (chk)->flags |= neg_true_false_flag;
+ single_succ_edge (chk)->probability = profile_probability::always ();
edge e = make_edge (chk, trp, true_false_flag);
e->goto_locus = loc;
+ e->probability = profile_probability::never ();
if (dom_info_available_p (CDI_DOMINATORS))
set_immediate_dominator (CDI_DOMINATORS, trp, chk);
diff --git a/gcc/testsuite/gcc.dg/pr105455.c b/gcc/testsuite/gcc.dg/pr105455.c
new file mode 100644
index 00000000000..81e9154baa1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr105455.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -fharden-conditional-branches -funroll-loops --param max-loop-header-insns=1" } */
+
+__attribute__ ((cold)) void
+bar (void);
+
+void
+foo (int x)
+{
+ if (x)
+ {
+ int i;
+
+ for (i = 0; i < 101; ++i)
+ bar ();
+ }
+}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gcc(refs/users/aoliva/heads/testme)] [PR105455] Set edge probabilities when hardening conditionals
@ 2022-05-11 7:32 Alexandre Oliva
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Oliva @ 2022-05-11 7:32 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:9165f59c421366497a6d96f00ca657fd370e146d
commit 9165f59c421366497a6d96f00ca657fd370e146d
Author: Alexandre Oliva <oliva@adacore.com>
Date: Wed May 11 04:27:42 2022 -0300
[PR105455] Set edge probabilities when hardening conditionals
Diff:
---
gcc/gimple-harden-conditionals.cc | 2 ++
gcc/testsuite/gcc.dg/pr105455.c | 17 +++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/gcc/gimple-harden-conditionals.cc b/gcc/gimple-harden-conditionals.cc
index 28c4810f0a7..240d0e5acd8 100644
--- a/gcc/gimple-harden-conditionals.cc
+++ b/gcc/gimple-harden-conditionals.cc
@@ -254,8 +254,10 @@ insert_check_and_trap (location_t loc, gimple_stmt_iterator *gsip,
equality. */
single_succ_edge (chk)->flags &= ~EDGE_FALLTHRU;
single_succ_edge (chk)->flags |= neg_true_false_flag;
+ single_succ_edge (chk)->probability = profile_probability::always ();
edge e = make_edge (chk, trp, true_false_flag);
e->goto_locus = loc;
+ e->probability = profile_probability::never ();
if (dom_info_available_p (CDI_DOMINATORS))
set_immediate_dominator (CDI_DOMINATORS, trp, chk);
diff --git a/gcc/testsuite/gcc.dg/pr105455.c b/gcc/testsuite/gcc.dg/pr105455.c
new file mode 100644
index 00000000000..81e9154baa1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr105455.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -fharden-conditional-branches -funroll-loops --param max-loop-header-insns=1" } */
+
+__attribute__ ((cold)) void
+bar (void);
+
+void
+foo (int x)
+{
+ if (x)
+ {
+ int i;
+
+ for (i = 0; i < 101; ++i)
+ bar ();
+ }
+}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-11 9:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-11 9:36 [gcc(refs/users/aoliva/heads/testme)] [PR105455] Set edge probabilities when hardening conditionals Alexandre Oliva
-- strict thread matches above, loose matches on Subject: below --
2022-05-11 7:32 Alexandre Oliva
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).