diff options
| author | Andrew MacLeod <amacleod@redhat.com> | 2021-10-26 13:19:05 -0400 |
|---|---|---|
| committer | Andrew MacLeod <amacleod@redhat.com> | 2021-10-28 10:48:39 -0400 |
| commit | a6bbf1cc9f2847115543d720a99152d7dc2c4892 (patch) | |
| tree | d989e1d3eeebed718912c94028d6d7ec819e9099 | |
| parent | d46aeb5906b8ed7ee255cfbacc5cf9d2f56b850c (diff) | |
| download | gcc-a6bbf1cc9f2847115543d720a99152d7dc2c4892.zip gcc-a6bbf1cc9f2847115543d720a99152d7dc2c4892.tar.gz gcc-a6bbf1cc9f2847115543d720a99152d7dc2c4892.tar.bz2 | |
Unify EVRP and VRP folding predicate message.
EVRP issues a message fior folding predicates in a different format than
VRP does, this patch unifies the messaging.
gcc/
* vr-values.c (simplify_using_ranges::fold_cond): Change fold message.
gcc/testsuite/
* gcc.dg/tree-ssa/evrp9.c: Adjust message scanned for.
* gcc.dg/tree-ssa/pr21458-2.c: Ditto.
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-ssa/evrp9.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-ssa/pr21458-2.c | 2 | ||||
| -rw-r--r-- | gcc/vr-values.c | 14 |
3 files changed, 15 insertions, 7 deletions
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/evrp9.c b/gcc/testsuite/gcc.dg/tree-ssa/evrp9.c index 6e7828e..fb7c319 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/evrp9.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/evrp9.c @@ -24,5 +24,7 @@ foo (unsigned int x, unsigned int y) bar (); } -/* { dg-final { scan-tree-dump-not "== 5" "evrp" } } */ -/* { dg-final { scan-tree-dump-not "== 6" "evrp" } } */ +/* { dg-final { scan-tree-dump-times "Folding predicate minv_.* == 5 to 0" 1 "evrp" } } */ +/* { dg-final { scan-tree-dump-times "Folding predicate minv_.* == 6 to 0" 1 "evrp" } } */ +/* { dg-final { scan-tree-dump-times "Folding predicate maxv_.* == 5 to 0" 1 "evrp" } } */ +/* { dg-final { scan-tree-dump-times "Folding predicate maxv_.* == 6 to 0" 1 "evrp" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr21458-2.c b/gcc/testsuite/gcc.dg/tree-ssa/pr21458-2.c index f8d7353..9610570 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr21458-2.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr21458-2.c @@ -16,4 +16,4 @@ foo (int a) } } -/* { dg-final { scan-tree-dump-times "Predicate evaluates to: 1" 1 "evrp" } } */ +/* { dg-final { scan-tree-dump-times "Folding predicate.* to 1" 1 "evrp" } } */ diff --git a/gcc/vr-values.c b/gcc/vr-values.c index 00246c9..ea925f7 100644 --- a/gcc/vr-values.c +++ b/gcc/vr-values.c @@ -3495,12 +3495,18 @@ simplify_using_ranges::fold_cond (gcond *cond) if (TREE_CODE (gimple_cond_lhs (cond)) != SSA_NAME && TREE_CODE (gimple_cond_rhs (cond)) != SSA_NAME) return false; + if (dump_file) + { + fprintf (dump_file, "Folding predicate "); + print_gimple_expr (dump_file, cond, 0); + fprintf (dump_file, " to "); + } edge e0 = EDGE_SUCC (gimple_bb (cond), 0); edge e1 = EDGE_SUCC (gimple_bb (cond), 1); if (r.zero_p ()) { - if (dump_file && (dump_flags & TDF_DETAILS)) - fprintf (dump_file, "\nPredicate evaluates to: 0\n"); + if (dump_file) + fprintf (dump_file, "0\n"); gimple_cond_make_false (cond); if (e0->flags & EDGE_TRUE_VALUE) set_and_propagate_unexecutable (e0); @@ -3509,8 +3515,8 @@ simplify_using_ranges::fold_cond (gcond *cond) } else { - if (dump_file && (dump_flags & TDF_DETAILS)) - fprintf (dump_file, "\nPredicate evaluates to: 1\n"); + if (dump_file) + fprintf (dump_file, "1\n"); gimple_cond_make_true (cond); if (e0->flags & EDGE_FALSE_VALUE) set_and_propagate_unexecutable (e0); |