From: Alexandre Oliva <oliva@adacore.com>
To: Richard Biener <richard.guenther@gmail.com>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>,
Bin Cheng <bin.cheng@linux.alibaba.com>
Subject: Re: [PATCH] [PR105665] ivopts: check defs of names in base for undefs
Date: Thu, 02 Jun 2022 04:10:16 -0300 [thread overview]
Message-ID: <or1qw75ynb.fsf@lxoliva.fsfla.org> (raw)
In-Reply-To: <orczfs5fae.fsf@lxoliva.fsfla.org> (Alexandre Oliva's message of "Wed, 01 Jun 2022 16:56:09 -0300")
On Jun 1, 2022, Alexandre Oliva <oliva@adacore.com> wrote:
> Now I'm thinking we can go for an even stricter predicate to disable
> the optimization: if a non-PHI use of a maybe-undefined dominates the
> loop, then we can still perform the optimization:
Here it is.
[PR105665] ivopts: check defs of names in base for undefs
From: Alexandre Oliva <oliva@adacore.com>
The patch for PR 100810 tested for undefined SSA_NAMEs appearing
directly in the base expression of the potential IV candidate, but
that's not enough. The testcase for PR105665 shows an undefined
SSA_NAME has the same ill effect if it's referenced as an PHI_NODE arg
in the referenced SSA_NAME. The variant of that test shows it can be
further removed from the referenced SSA_NAME.
To avoid deep recursion, precompute maybe-undefined SSA_NAMEs: start
from known-undefined nonvirtual default defs, and propagate them to
any PHI nodes reached by a maybe-undefined arg, as long as there
aren't intervening non-PHI uses, that would imply the maybe-undefined
name must be defined at that point, otherwise it would invoke
undefined behavior. Also test for intervening non-PHI uses of DEFs in
the base expr.
The test for intervening uses implemented herein relies on dominance;
this could be further extended, regarding conditional uses in every
path leading to a point as an unconditional use dominating that point,
but I haven't implemented that.
for gcc/ChangeLog
PR tree-optimization/105665
PR tree-optimization/100810
* tree-ssa-loop-ivopts.cc
(ssa_name_maybe_undef_p, ssa_name_set_maybe_undef): New.
(ssa_name_any_use_dominates_bb_p, mark_ssa_maybe_undefs): New.
(find_ssa_undef): Check precomputed flag and intervening uses.
(tree_ssa_iv_optimize): Call mark_ssa_maybe_undefs.
for gcc/testsuite/ChangeLog
PR tree-optimization/105665
PR tree-optimization/100810
* gcc.dg/torture/pr105665.c: New.
---
gcc/testsuite/gcc.dg/torture/pr105665.c | 20 +++++
gcc/tree-ssa-loop-ivopts.cc | 124 ++++++++++++++++++++++++++++++-
2 files changed, 140 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/torture/pr105665.c
diff --git a/gcc/testsuite/gcc.dg/torture/pr105665.c b/gcc/testsuite/gcc.dg/torture/pr105665.c
new file mode 100644
index 0000000000000..34cfc65843495
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr105665.c
@@ -0,0 +1,20 @@
+/* { dg-do run } */
+
+int a, b, c[1], d[2], *e = c;
+int main() {
+ int f = 0;
+ for (; b < 2; b++) {
+ int g;
+ if (f)
+ g++, b = 40;
+ a = d[b * b];
+ for (f = 0; f < 3; f++) {
+ if (e)
+ break;
+ g--;
+ if (a)
+ a = g;
+ }
+ }
+ return 0;
+}
diff --git a/gcc/tree-ssa-loop-ivopts.cc b/gcc/tree-ssa-loop-ivopts.cc
index 81b536f930415..f20a985d7ca22 100644
--- a/gcc/tree-ssa-loop-ivopts.cc
+++ b/gcc/tree-ssa-loop-ivopts.cc
@@ -3071,13 +3071,128 @@ get_loop_invariant_expr (struct ivopts_data *data, tree inv_expr)
return *slot;
}
-/* Find the first undefined SSA name in *TP. */
+/* Return TRUE iff VAR is marked as maybe-undefined. See
+ mark_ssa_maybe_undefs. */
+
+static inline bool
+ssa_name_maybe_undef_p (tree var)
+{
+ gcc_checking_assert (TREE_CODE (var) == SSA_NAME);
+ return TREE_VISITED (var);
+}
+
+/* Set (or clear, depending on VALUE) VAR's maybe-undefined mark. */
+
+static inline void
+ssa_name_set_maybe_undef (tree var, bool value = true)
+{
+ gcc_checking_assert (TREE_CODE (var) == SSA_NAME);
+ TREE_VISITED (var) = value;
+}
+
+/* Return TRUE iff there are any non-PHI uses of VAR that dominate the
+ end of BB. If we return TRUE and BB is a loop header, then VAR we
+ be assumed to be defined within the loop, even if it is marked as
+ maybe-undefined. */
+
+static inline bool
+ssa_name_any_use_dominates_bb_p (tree var, basic_block bb)
+{
+ imm_use_iterator iter;
+ use_operand_p use_p;
+ FOR_EACH_IMM_USE_FAST (use_p, iter, var)
+ {
+ if (is_a <gphi *> (USE_STMT (use_p)))
+ continue;
+ basic_block dombb = gimple_bb (USE_STMT (use_p));
+ if (dominated_by_p (CDI_DOMINATORS, bb, dombb))
+ return true;
+ }
+
+ return false;
+}
+
+/* Mark as maybe_undef any SSA_NAMEs that are unsuitable as ivopts
+ candidates for potentially involving undefined behavior. */
+
+static void
+mark_ssa_maybe_undefs (void)
+{
+ auto_vec<tree> queue;
+
+ /* Scan all SSA_NAMEs, marking the definitely-undefined ones as
+ maybe-undefined and queuing them for propagation, while clearing
+ the mark on others. */
+ unsigned int i;
+ tree var;
+ FOR_EACH_SSA_NAME (i, var, cfun)
+ {
+ if (SSA_NAME_IS_VIRTUAL_OPERAND (var)
+ || !ssa_undefined_value_p (var, false))
+ ssa_name_set_maybe_undef (var, false);
+ else
+ {
+ ssa_name_set_maybe_undef (var);
+ queue.safe_push (var);
+ if (dump_file)
+ fprintf (dump_file, "marking _%i as maybe-undef\n",
+ SSA_NAME_VERSION (var));
+ }
+ }
+
+ /* Now propagate maybe-undefined from a DEF to any other PHI that
+ uses it, as long as there isn't any intervening use of DEF. */
+ while (!queue.is_empty ())
+ {
+ var = queue.pop ();
+ imm_use_iterator iter;
+ use_operand_p use_p;
+ FOR_EACH_IMM_USE_FAST (use_p, iter, var)
+ {
+ /* Any uses of VAR that aren't PHI args imply VAR must be
+ defined, otherwise undefined behavior would have been
+ definitely invoked. Only PHI args may hold
+ maybe-undefined values without invoking undefined
+ behavior for that reason alone. */
+ if (!is_a <gphi *> (USE_STMT (use_p)))
+ continue;
+ gphi *phi = as_a <gphi *> (USE_STMT (use_p));
+
+ tree def = gimple_phi_result (phi);
+ if (ssa_name_maybe_undef_p (def))
+ continue;
+
+ /* Look for any uses of the maybe-unused SSA_NAME that
+ dominates the block that reaches the incoming block
+ corresponding to the PHI arg in which it is mentioned.
+ That means we can assume the SSA_NAME is defined in that
+ path, so we only mark a PHI result as maybe-undef if we
+ find an unused reaching SSA_NAME. */
+ int idx = phi_arg_index_from_use (use_p);
+ basic_block bb = gimple_phi_arg_edge (phi, idx)->src;
+ if (ssa_name_any_use_dominates_bb_p (var, bb))
+ continue;
+
+ ssa_name_set_maybe_undef (def);
+ queue.safe_push (def);
+ if (dump_file)
+ fprintf (dump_file, "marking _%i as maybe-undef because of _%i\n",
+ SSA_NAME_VERSION (def), SSA_NAME_VERSION (var));
+ }
+ }
+}
+
+/* Return *TP if it is an SSA_NAME marked with TREE_VISITED, i.e., as
+ unsuitable as ivopts candidates for potentially involving undefined
+ behavior. */
static tree
-find_ssa_undef (tree *tp, int *walk_subtrees, void *)
+find_ssa_undef (tree *tp, int *walk_subtrees, void *bb_)
{
+ basic_block bb = (basic_block) bb_;
if (TREE_CODE (*tp) == SSA_NAME
- && ssa_undefined_value_p (*tp, false))
+ && ssa_name_maybe_undef_p (*tp)
+ && !ssa_name_any_use_dominates_bb_p (*tp, bb))
return *tp;
if (!EXPR_P (*tp))
*walk_subtrees = 0;
@@ -3114,7 +3229,7 @@ add_candidate_1 (struct ivopts_data *data, tree base, tree step, bool important,
/* If BASE contains undefined SSA names make sure we only record
the original IV. */
bool involves_undefs = false;
- if (walk_tree (&base, find_ssa_undef, NULL, NULL))
+ if (walk_tree (&base, find_ssa_undef, data->current_loop->header, NULL))
{
if (pos != IP_ORIGINAL)
return NULL;
@@ -8192,6 +8307,7 @@ tree_ssa_iv_optimize (void)
auto_bitmap toremove;
tree_ssa_iv_optimize_init (&data);
+ mark_ssa_maybe_undefs ();
/* Optimize the loops starting with the innermost ones. */
for (auto loop : loops_list (cfun, LI_FROM_INNERMOST))
--
Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/
Free Software Activist GNU Toolchain Engineer
Disinformation flourishes because many people care deeply about injustice
but very few check the facts. Ask me about <https://stallmansupport.org>
next prev parent reply other threads:[~2022-06-02 7:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-28 5:51 Alexandre Oliva
2022-05-30 12:21 ` Richard Biener
2022-05-31 13:27 ` Alexandre Oliva
2022-06-01 9:42 ` Richard Biener
2022-06-01 19:56 ` Alexandre Oliva
2022-06-02 7:10 ` Alexandre Oliva [this message]
2022-06-02 9:23 ` Richard Biener
2022-06-03 7:01 ` Alexandre Oliva
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=or1qw75ynb.fsf@lxoliva.fsfla.org \
--to=oliva@adacore.com \
--cc=bin.cheng@linux.alibaba.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=richard.guenther@gmail.com \
/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).