public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH v1] [RFC] Improve folding for comparisons with zero in tree-ssa-forwprop.
@ 2023-03-16 15:27 Manolis Tsamis
  2023-03-16 16:41 ` Jeff Law
  2023-03-17  8:31 ` Richard Biener
  0 siblings, 2 replies; 20+ messages in thread
From: Manolis Tsamis @ 2023-03-16 15:27 UTC (permalink / raw)
  To: gcc-patches; +Cc: Philipp Tomsich, Richard Biener, Manolis Tsamis

For this C testcase:

void g();
void f(unsigned int *a)
{
  if (++*a == 1)
    g();
}

GCC will currently emit a comparison with 1 by using the value
of *a after the increment. This can be improved by comparing
against 0 and using the value before the increment. As a result
there is a potentially shorter dependancy chain (no need to wait
for the result of +1) and on targets with compare zero instructions
the generated code is one instruction shorter.

Example from Aarch64:

Before
        ldr     w1, [x0]
        add     w1, w1, 1
        str     w1, [x0]
        cmp     w1, 1
        beq     .L4
        ret

After
        ldr     w1, [x0]
        add     w2, w1, 1
        str     w2, [x0]
        cbz     w1, .L4
        ret

gcc/ChangeLog:

        * tree-ssa-forwprop.cc (combine_cond_expr_cond):
        (forward_propagate_into_comparison_1): Optimize
        for zero comparisons.

Signed-off-by: Manolis Tsamis <manolis.tsamis@vrull.eu>
---

 gcc/tree-ssa-forwprop.cc | 41 +++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/gcc/tree-ssa-forwprop.cc b/gcc/tree-ssa-forwprop.cc
index e34f0888954..93d5043821b 100644
--- a/gcc/tree-ssa-forwprop.cc
+++ b/gcc/tree-ssa-forwprop.cc
@@ -373,12 +373,13 @@ rhs_to_tree (tree type, gimple *stmt)
 /* Combine OP0 CODE OP1 in the context of a COND_EXPR.  Returns
    the folded result in a form suitable for COND_EXPR_COND or
    NULL_TREE, if there is no suitable simplified form.  If
-   INVARIANT_ONLY is true only gimple_min_invariant results are
-   considered simplified.  */
+   ALWAYS_COMBINE is false then only combine it the resulting
+   expression is gimple_min_invariant or considered simplified
+   compared to the original.  */
 
 static tree
 combine_cond_expr_cond (gimple *stmt, enum tree_code code, tree type,
-			tree op0, tree op1, bool invariant_only)
+			tree op0, tree op1, bool always_combine)
 {
   tree t;
 
@@ -398,17 +399,31 @@ combine_cond_expr_cond (gimple *stmt, enum tree_code code, tree type,
   /* Canonicalize the combined condition for use in a COND_EXPR.  */
   t = canonicalize_cond_expr_cond (t);
 
-  /* Bail out if we required an invariant but didn't get one.  */
-  if (!t || (invariant_only && !is_gimple_min_invariant (t)))
+  if (!t)
     {
       fold_undefer_overflow_warnings (false, NULL, 0);
       return NULL_TREE;
     }
 
-  bool nowarn = warning_suppressed_p (stmt, OPT_Wstrict_overflow);
-  fold_undefer_overflow_warnings (!nowarn, stmt, 0);
+  if (always_combine || is_gimple_min_invariant (t))
+    {
+      bool nowarn = warning_suppressed_p (stmt, OPT_Wstrict_overflow);
+      fold_undefer_overflow_warnings (!nowarn, stmt, 0);
+      return t;
+    }
 
-  return t;
+  /* If the result of folding is a zero comparison treat it preferentially.  */
+  if (TREE_CODE_CLASS (TREE_CODE (t)) == tcc_comparison
+      && integer_zerop (TREE_OPERAND (t, 1))
+      && !integer_zerop (op1))
+    {
+      bool nowarn = warning_suppressed_p (stmt, OPT_Wstrict_overflow);
+      fold_undefer_overflow_warnings (!nowarn, stmt, 0);
+      return t;
+    }
+
+  fold_undefer_overflow_warnings (false, NULL, 0);
+  return NULL_TREE;
 }
 
 /* Combine the comparison OP0 CODE OP1 at LOC with the defining statements
@@ -432,7 +447,7 @@ forward_propagate_into_comparison_1 (gimple *stmt,
       if (def_stmt && can_propagate_from (def_stmt))
 	{
 	  enum tree_code def_code = gimple_assign_rhs_code (def_stmt);
-	  bool invariant_only_p = !single_use0_p;
+	  bool always_combine = single_use0_p;
 
 	  rhs0 = rhs_to_tree (TREE_TYPE (op1), def_stmt);
 
@@ -442,10 +457,10 @@ forward_propagate_into_comparison_1 (gimple *stmt,
 		   && TREE_CODE (TREE_TYPE (TREE_OPERAND (rhs0, 0)))
 		      == BOOLEAN_TYPE)
 		  || TREE_CODE_CLASS (def_code) == tcc_comparison))
-	    invariant_only_p = false;
+	    always_combine = true;
 
 	  tmp = combine_cond_expr_cond (stmt, code, type,
-					rhs0, op1, invariant_only_p);
+					rhs0, op1, always_combine);
 	  if (tmp)
 	    return tmp;
 	}
@@ -459,7 +474,7 @@ forward_propagate_into_comparison_1 (gimple *stmt,
 	{
 	  rhs1 = rhs_to_tree (TREE_TYPE (op0), def_stmt);
 	  tmp = combine_cond_expr_cond (stmt, code, type,
-					op0, rhs1, !single_use1_p);
+					op0, rhs1, single_use1_p);
 	  if (tmp)
 	    return tmp;
 	}
@@ -470,7 +485,7 @@ forward_propagate_into_comparison_1 (gimple *stmt,
       && rhs1 != NULL_TREE)
     tmp = combine_cond_expr_cond (stmt, code, type,
 				  rhs0, rhs1,
-				  !(single_use0_p && single_use1_p));
+				  single_use0_p && single_use1_p);
 
   return tmp;
 }
-- 
2.34.1


^ permalink raw reply	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2023-08-04  6:37 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-16 15:27 [PATCH v1] [RFC] Improve folding for comparisons with zero in tree-ssa-forwprop Manolis Tsamis
2023-03-16 16:41 ` Jeff Law
2023-03-16 20:32   ` Philipp Tomsich
2023-03-17  8:31 ` Richard Biener
2023-03-17 13:15   ` Philipp Tomsich
2023-03-17 14:03     ` Richard Biener
2023-03-17 20:43     ` Andrew Waterman
2023-03-17 14:12   ` Andrew MacLeod
2023-03-20 14:01   ` Manolis Tsamis
2023-03-23 23:27     ` Jeff Law
2023-04-21 21:01     ` Philipp Tomsich
2023-04-24  8:06       ` Richard Biener
2023-04-24 23:05         ` Jeff Law
2023-04-25  7:21           ` Richard Biener
2023-04-26  2:30             ` Jeff Law
2023-04-26  6:41               ` Richard Biener
2023-08-02 14:07                 ` Manolis Tsamis
2023-08-03  7:04                   ` Richard Biener
2023-08-03 15:21                     ` Jeff Law
2023-08-04  6:37                       ` Richard Biener

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).