* [PATCH 1/2] Move copy_phi_arg_into_existing_phi to common location and use it
@ 2023-05-03 23:12 Andrew Pinski
2023-05-03 23:12 ` [PATCHv2 2/2] PHIOPT: Improve replace_phi_edge_with_variable for diamond shapped bb Andrew Pinski
2023-05-04 9:42 ` [PATCH 1/2] Move copy_phi_arg_into_existing_phi to common location and use it Richard Biener
0 siblings, 2 replies; 4+ messages in thread
From: Andrew Pinski @ 2023-05-03 23:12 UTC (permalink / raw)
To: gcc-patches; +Cc: Andrew Pinski
While improving replace_phi_edge_with_variable for the diamond formed bb
case, I need a way to copy phi entries from one edge to another as I am
removing a forwarding bb inbetween. I was pointed out that jump threading
code had copy_phi_arg_into_existing_phi which I can use.
I also noticed that both gimple_duplicate_sese_tail and
remove_forwarder_block have similar code so it makes sense to use that function
in those two locations too.
OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.
gcc/ChangeLog:
* tree-cfg.cc (copy_phi_args): New function
(gimple_duplicate_sese_tail): Use it instead of
doing it inline.
* tree-cfg.h (copy_phi_args): New declaration.
* tree-cfgcleanup.cc (remove_forwarder_block): Use
copy_phi_args instead of implementing it inline.
gcc/ChangeLog:
* tree-ssa-threadupdate.cc (copy_phi_arg_into_existing_phi): Move to ...
* tree-cfg.cc (copy_phi_arg_into_existing_phi): Here and remove static.
(gimple_duplicate_sese_tail): Use copy_phi_arg_into_existing_phi instead
of an inline version of it.
* tree-cfgcleanup.cc (remove_forwarder_block): Likewise.
* tree-cfg.h (copy_phi_arg_into_existing_phi): New declaration.
---
gcc/tree-cfg.cc | 38 +++++++++++++++++++++++++-----------
gcc/tree-cfg.h | 1 +
gcc/tree-cfgcleanup.cc | 12 ++----------
gcc/tree-ssa-threadupdate.cc | 25 ------------------------
4 files changed, 30 insertions(+), 46 deletions(-)
diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc
index 4927fc0a8d9..a94dc3c2eea 100644
--- a/gcc/tree-cfg.cc
+++ b/gcc/tree-cfg.cc
@@ -6802,6 +6802,32 @@ bb_part_of_region_p (basic_block bb, basic_block* bbs, unsigned n_region)
return false;
}
+
+/* For each PHI in BB, copy the argument associated with SRC_E to TGT_E.
+ Assuming the argument exists, just does not have a value. */
+
+void
+copy_phi_arg_into_existing_phi (edge src_e, edge tgt_e)
+{
+ int src_idx = src_e->dest_idx;
+ int tgt_idx = tgt_e->dest_idx;
+
+ /* Iterate over each PHI in e->dest. */
+ for (gphi_iterator gsi = gsi_start_phis (src_e->dest),
+ gsi2 = gsi_start_phis (tgt_e->dest);
+ !gsi_end_p (gsi);
+ gsi_next (&gsi), gsi_next (&gsi2))
+ {
+ gphi *src_phi = gsi.phi ();
+ gphi *dest_phi = gsi2.phi ();
+ tree val = gimple_phi_arg_def (src_phi, src_idx);
+ location_t locus = gimple_phi_arg_location (src_phi, src_idx);
+
+ SET_PHI_ARG_DEF (dest_phi, tgt_idx, val);
+ gimple_phi_arg_set_location (dest_phi, tgt_idx, locus);
+ }
+}
+
/* Duplicates REGION consisting of N_REGION blocks. The new blocks
are stored to REGION_COPY in the same order in that they appear
in REGION, if REGION_COPY is not NULL. ENTRY is the entry to
@@ -6847,9 +6873,6 @@ gimple_duplicate_sese_tail (edge entry, edge exit,
gimple_stmt_iterator gsi;
edge sorig, snew;
basic_block exit_bb;
- gphi_iterator psi;
- gphi *phi;
- tree def;
class loop *target, *aloop, *cloop;
gcc_assert (EDGE_COUNT (exit->src->succs) == 2);
@@ -6947,14 +6970,7 @@ gimple_duplicate_sese_tail (edge entry, edge exit,
gcc_assert (single_succ_edge (region_copy[i]));
e = redirect_edge_and_branch (single_succ_edge (region_copy[i]), exit_bb);
PENDING_STMT (e) = NULL;
- for (psi = gsi_start_phis (exit_bb);
- !gsi_end_p (psi);
- gsi_next (&psi))
- {
- phi = psi.phi ();
- def = PHI_ARG_DEF (phi, nexits[0]->dest_idx);
- add_phi_arg (phi, def, e, gimple_phi_arg_location_from_edge (phi, e));
- }
+ copy_phi_arg_into_existing_phi (nexits[0], e);
}
e = redirect_edge_and_branch (nexits[1], nexits[0]->dest);
PENDING_STMT (e) = NULL;
diff --git a/gcc/tree-cfg.h b/gcc/tree-cfg.h
index 9b56a68fe9d..9a1605be305 100644
--- a/gcc/tree-cfg.h
+++ b/gcc/tree-cfg.h
@@ -113,6 +113,7 @@ extern basic_block gimple_switch_default_bb (function *, gswitch *);
extern edge gimple_switch_edge (function *, gswitch *, unsigned);
extern edge gimple_switch_default_edge (function *, gswitch *);
extern bool cond_only_block_p (basic_block);
+extern void copy_phi_arg_into_existing_phi (edge, edge);
/* Return true if the LHS of a call should be removed. */
diff --git a/gcc/tree-cfgcleanup.cc b/gcc/tree-cfgcleanup.cc
index 42b25312122..193d87e3278 100644
--- a/gcc/tree-cfgcleanup.cc
+++ b/gcc/tree-cfgcleanup.cc
@@ -610,17 +610,9 @@ remove_forwarder_block (basic_block bb)
if (s == e)
{
- /* Create arguments for the phi nodes, since the edge was not
+ /* Copy arguments for the phi nodes, since the edge was not
here before. */
- for (gphi_iterator psi = gsi_start_phis (dest);
- !gsi_end_p (psi);
- gsi_next (&psi))
- {
- gphi *phi = psi.phi ();
- location_t l = gimple_phi_arg_location_from_edge (phi, succ);
- tree def = gimple_phi_arg_def (phi, succ->dest_idx);
- add_phi_arg (phi, unshare_expr (def), s, l);
- }
+ copy_phi_arg_into_existing_phi (succ, s);
}
}
diff --git a/gcc/tree-ssa-threadupdate.cc b/gcc/tree-ssa-threadupdate.cc
index 33a91063638..d5416b21a78 100644
--- a/gcc/tree-ssa-threadupdate.cc
+++ b/gcc/tree-ssa-threadupdate.cc
@@ -511,31 +511,6 @@ fwd_jt_path_registry::lookup_redirection_data (edge e, insert_option insert)
}
}
-/* Similar to copy_phi_args, except that the PHI arg exists, it just
- does not have a value associated with it. */
-
-static void
-copy_phi_arg_into_existing_phi (edge src_e, edge tgt_e)
-{
- int src_idx = src_e->dest_idx;
- int tgt_idx = tgt_e->dest_idx;
-
- /* Iterate over each PHI in e->dest. */
- for (gphi_iterator gsi = gsi_start_phis (src_e->dest),
- gsi2 = gsi_start_phis (tgt_e->dest);
- !gsi_end_p (gsi);
- gsi_next (&gsi), gsi_next (&gsi2))
- {
- gphi *src_phi = gsi.phi ();
- gphi *dest_phi = gsi2.phi ();
- tree val = gimple_phi_arg_def (src_phi, src_idx);
- location_t locus = gimple_phi_arg_location (src_phi, src_idx);
-
- SET_PHI_ARG_DEF (dest_phi, tgt_idx, val);
- gimple_phi_arg_set_location (dest_phi, tgt_idx, locus);
- }
-}
-
/* Given ssa_name DEF, backtrack jump threading PATH from node IDX
to see if it has constant value in a flow sensitive manner. Set
LOCUS to location of the constant phi arg and return the value.
--
2.31.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCHv2 2/2] PHIOPT: Improve replace_phi_edge_with_variable for diamond shapped bb
2023-05-03 23:12 [PATCH 1/2] Move copy_phi_arg_into_existing_phi to common location and use it Andrew Pinski
@ 2023-05-03 23:12 ` Andrew Pinski
2023-05-04 9:43 ` Richard Biener
2023-05-04 9:42 ` [PATCH 1/2] Move copy_phi_arg_into_existing_phi to common location and use it Richard Biener
1 sibling, 1 reply; 4+ messages in thread
From: Andrew Pinski @ 2023-05-03 23:12 UTC (permalink / raw)
To: gcc-patches; +Cc: Andrew Pinski
While looking at differences between what minmax_replacement
and match_simplify_replacement does. I noticed that they sometimes
chose different edges to remove. I decided we should be able to do
better and be able to remove both empty basic blocks in the
case of match_simplify_replacement as that moves the statements.
This also updates the testcases as now match_simplify_replacement
will remove the unused MIN/MAX_EXPR and they were checking for
those.
OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.
gcc/ChangeLog:
* tree-ssa-phiopt.cc (replace_phi_edge_with_variable): Handle
diamond form bb with forwarder only empty blocks better.
gcc/testsuite/ChangeLog:
* gcc.dg/tree-ssa/minmax-15.c: Update test.
* gcc.dg/tree-ssa/minmax-16.c: Update test.
* gcc.dg/tree-ssa/minmax-3.c: Update test.
* gcc.dg/tree-ssa/minmax-4.c: Update test.
* gcc.dg/tree-ssa/minmax-5.c: Update test.
* gcc.dg/tree-ssa/minmax-8.c: Update test.
---
gcc/testsuite/gcc.dg/tree-ssa/minmax-15.c | 3 +-
gcc/testsuite/gcc.dg/tree-ssa/minmax-16.c | 9 ++----
gcc/testsuite/gcc.dg/tree-ssa/minmax-3.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/minmax-4.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/minmax-5.c | 2 +-
gcc/testsuite/gcc.dg/tree-ssa/minmax-8.c | 2 +-
gcc/tree-ssa-phiopt.cc | 35 ++++++++++++++++++++++-
7 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-15.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-15.c
index 8a39871c938..6731f91e6c3 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-15.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-15.c
@@ -30,5 +30,6 @@ main (void)
return 0;
}
-/* { dg-final { scan-tree-dump-times "MIN_EXPR" 3 "phiopt1" } } */
+/* There should only be two MIN_EXPR left, the 3rd one was removed. */
+/* { dg-final { scan-tree-dump-times "MIN_EXPR" 2 "phiopt1" } } */
/* { dg-final { scan-tree-dump-times "MAX_EXPR" 0 "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-16.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-16.c
index 623b12b3f74..094364e6424 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-16.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-16.c
@@ -25,11 +25,8 @@ main (void)
return 0;
}
-/* After phiopt1, there really should be only 3 MIN_EXPR in the IR (including debug statements).
- But the way phiopt does not cleanup the CFG all the time, the PHI might still reference the
- alternative bb's moved statement.
- Note in the end, we do dce the statement and other debug statements to end up with only 2 MIN_EXPR.
- So check that too. */
-/* { dg-final { scan-tree-dump-times "MIN_EXPR" 4 "phiopt1" } } */
+/* After phiopt1, will be only 2 MIN_EXPR in the IR (including debug statements). */
+/* xk will only have the final result so the extra debug info does not change anything. */
+/* { dg-final { scan-tree-dump-times "MIN_EXPR" 2 "phiopt1" } } */
/* { dg-final { scan-tree-dump-times "MIN_EXPR" 2 "optimized" } } */
/* { dg-final { scan-tree-dump-times "MAX_EXPR" 0 "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-3.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-3.c
index 2af10776346..521afe3e4d9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-3.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-3.c
@@ -25,5 +25,5 @@ main (void)
return 0;
}
-/* { dg-final { scan-tree-dump-times "MIN_EXPR" 3 "phiopt1" } } */
+/* { dg-final { scan-tree-dump-times "MIN_EXPR" 2 "phiopt1" } } */
/* { dg-final { scan-tree-dump-times "MAX_EXPR" 0 "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-4.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-4.c
index 973f39bfed3..49e27185b5e 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-4.c
@@ -26,4 +26,4 @@ main (void)
}
/* { dg-final { scan-tree-dump-times "MIN_EXPR" 0 "phiopt1" } } */
-/* { dg-final { scan-tree-dump-times "MAX_EXPR" 3 "phiopt1" } } */
+/* { dg-final { scan-tree-dump-times "MAX_EXPR" 2 "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-5.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-5.c
index 34e4e720511..194c881cc98 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-5.c
@@ -25,5 +25,5 @@ main (void)
return 0;
}
-/* { dg-final { scan-tree-dump-times "MIN_EXPR" 2 "phiopt1" } } */
+/* { dg-final { scan-tree-dump-times "MIN_EXPR" 1 "phiopt1" } } */
/* { dg-final { scan-tree-dump-times "MAX_EXPR" 1 "phiopt1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-8.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-8.c
index 0160e573fef..d5cb53145ea 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-8.c
@@ -26,4 +26,4 @@ main (void)
}
/* { dg-final { scan-tree-dump-times "MIN_EXPR" 1 "phiopt1" } } */
-/* { dg-final { scan-tree-dump-times "MAX_EXPR" 2 "phiopt1" } } */
+/* { dg-final { scan-tree-dump-times "MAX_EXPR" 1 "phiopt1" } } */
diff --git a/gcc/tree-ssa-phiopt.cc b/gcc/tree-ssa-phiopt.cc
index fbc1fd66607..7ba24211025 100644
--- a/gcc/tree-ssa-phiopt.cc
+++ b/gcc/tree-ssa-phiopt.cc
@@ -94,6 +94,7 @@ replace_phi_edge_with_variable (basic_block cond_block,
basic_block bb = gimple_bb (phi);
gimple_stmt_iterator gsi;
tree phi_result = PHI_RESULT (phi);
+ bool deleteboth = false;
/* Duplicate range info if they are the only things setting the target PHI.
This is needed as later on, the new_tree will be replacing
@@ -137,7 +138,14 @@ replace_phi_edge_with_variable (basic_block cond_block,
keep_edge = EDGE_SUCC (cond_block, 1);
}
else if ((keep_edge = find_edge (cond_block, e->src)))
- ;
+ {
+ basic_block bb1 = EDGE_SUCC (cond_block, 0)->dest;
+ basic_block bb2 = EDGE_SUCC (cond_block, 1)->dest;
+ if (single_pred_p (bb1) && single_pred_p (bb2)
+ && single_succ_p (bb1) && single_succ_p (bb2)
+ && empty_block_p (bb1) && empty_block_p (bb2))
+ deleteboth = true;
+ }
else
gcc_unreachable ();
@@ -148,6 +156,31 @@ replace_phi_edge_with_variable (basic_block cond_block,
e->probability = profile_probability::always ();
delete_basic_block (edge_to_remove->dest);
+ /* Eliminate the COND_EXPR at the end of COND_BLOCK. */
+ gsi = gsi_last_bb (cond_block);
+ gsi_remove (&gsi, true);
+ }
+ else if (deleteboth)
+ {
+ basic_block bb1 = EDGE_SUCC (cond_block, 0)->dest;
+ basic_block bb2 = EDGE_SUCC (cond_block, 1)->dest;
+
+ edge newedge = redirect_edge_and_branch (keep_edge, bb);
+
+ /* The new edge should be the same. */
+ gcc_assert (newedge == keep_edge);
+
+ keep_edge->flags |= EDGE_FALLTHRU;
+ keep_edge->flags &= ~(EDGE_TRUE_VALUE | EDGE_FALSE_VALUE);
+ keep_edge->probability = profile_probability::always ();
+
+ /* Copy the edge's phi entry from the old one. */
+ copy_phi_arg_into_existing_phi (e, keep_edge);
+
+ /* Delete the old 2 empty basic blocks */
+ delete_basic_block (bb1);
+ delete_basic_block (bb2);
+
/* Eliminate the COND_EXPR at the end of COND_BLOCK. */
gsi = gsi_last_bb (cond_block);
gsi_remove (&gsi, true);
--
2.31.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] Move copy_phi_arg_into_existing_phi to common location and use it
2023-05-03 23:12 [PATCH 1/2] Move copy_phi_arg_into_existing_phi to common location and use it Andrew Pinski
2023-05-03 23:12 ` [PATCHv2 2/2] PHIOPT: Improve replace_phi_edge_with_variable for diamond shapped bb Andrew Pinski
@ 2023-05-04 9:42 ` Richard Biener
1 sibling, 0 replies; 4+ messages in thread
From: Richard Biener @ 2023-05-04 9:42 UTC (permalink / raw)
To: Andrew Pinski; +Cc: gcc-patches
On Thu, May 4, 2023 at 1:13 AM Andrew Pinski via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> While improving replace_phi_edge_with_variable for the diamond formed bb
> case, I need a way to copy phi entries from one edge to another as I am
> removing a forwarding bb inbetween. I was pointed out that jump threading
> code had copy_phi_arg_into_existing_phi which I can use.
> I also noticed that both gimple_duplicate_sese_tail and
> remove_forwarder_block have similar code so it makes sense to use that function
> in those two locations too.
>
> OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.
OK.
> gcc/ChangeLog:
>
> * tree-cfg.cc (copy_phi_args): New function
> (gimple_duplicate_sese_tail): Use it instead of
> doing it inline.
> * tree-cfg.h (copy_phi_args): New declaration.
> * tree-cfgcleanup.cc (remove_forwarder_block): Use
> copy_phi_args instead of implementing it inline.
>
> gcc/ChangeLog:
>
> * tree-ssa-threadupdate.cc (copy_phi_arg_into_existing_phi): Move to ...
> * tree-cfg.cc (copy_phi_arg_into_existing_phi): Here and remove static.
> (gimple_duplicate_sese_tail): Use copy_phi_arg_into_existing_phi instead
> of an inline version of it.
> * tree-cfgcleanup.cc (remove_forwarder_block): Likewise.
> * tree-cfg.h (copy_phi_arg_into_existing_phi): New declaration.
> ---
> gcc/tree-cfg.cc | 38 +++++++++++++++++++++++++-----------
> gcc/tree-cfg.h | 1 +
> gcc/tree-cfgcleanup.cc | 12 ++----------
> gcc/tree-ssa-threadupdate.cc | 25 ------------------------
> 4 files changed, 30 insertions(+), 46 deletions(-)
>
> diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc
> index 4927fc0a8d9..a94dc3c2eea 100644
> --- a/gcc/tree-cfg.cc
> +++ b/gcc/tree-cfg.cc
> @@ -6802,6 +6802,32 @@ bb_part_of_region_p (basic_block bb, basic_block* bbs, unsigned n_region)
> return false;
> }
>
> +
> +/* For each PHI in BB, copy the argument associated with SRC_E to TGT_E.
> + Assuming the argument exists, just does not have a value. */
> +
> +void
> +copy_phi_arg_into_existing_phi (edge src_e, edge tgt_e)
> +{
> + int src_idx = src_e->dest_idx;
> + int tgt_idx = tgt_e->dest_idx;
> +
> + /* Iterate over each PHI in e->dest. */
> + for (gphi_iterator gsi = gsi_start_phis (src_e->dest),
> + gsi2 = gsi_start_phis (tgt_e->dest);
> + !gsi_end_p (gsi);
> + gsi_next (&gsi), gsi_next (&gsi2))
> + {
> + gphi *src_phi = gsi.phi ();
> + gphi *dest_phi = gsi2.phi ();
> + tree val = gimple_phi_arg_def (src_phi, src_idx);
> + location_t locus = gimple_phi_arg_location (src_phi, src_idx);
> +
> + SET_PHI_ARG_DEF (dest_phi, tgt_idx, val);
> + gimple_phi_arg_set_location (dest_phi, tgt_idx, locus);
> + }
> +}
> +
> /* Duplicates REGION consisting of N_REGION blocks. The new blocks
> are stored to REGION_COPY in the same order in that they appear
> in REGION, if REGION_COPY is not NULL. ENTRY is the entry to
> @@ -6847,9 +6873,6 @@ gimple_duplicate_sese_tail (edge entry, edge exit,
> gimple_stmt_iterator gsi;
> edge sorig, snew;
> basic_block exit_bb;
> - gphi_iterator psi;
> - gphi *phi;
> - tree def;
> class loop *target, *aloop, *cloop;
>
> gcc_assert (EDGE_COUNT (exit->src->succs) == 2);
> @@ -6947,14 +6970,7 @@ gimple_duplicate_sese_tail (edge entry, edge exit,
> gcc_assert (single_succ_edge (region_copy[i]));
> e = redirect_edge_and_branch (single_succ_edge (region_copy[i]), exit_bb);
> PENDING_STMT (e) = NULL;
> - for (psi = gsi_start_phis (exit_bb);
> - !gsi_end_p (psi);
> - gsi_next (&psi))
> - {
> - phi = psi.phi ();
> - def = PHI_ARG_DEF (phi, nexits[0]->dest_idx);
> - add_phi_arg (phi, def, e, gimple_phi_arg_location_from_edge (phi, e));
> - }
> + copy_phi_arg_into_existing_phi (nexits[0], e);
> }
> e = redirect_edge_and_branch (nexits[1], nexits[0]->dest);
> PENDING_STMT (e) = NULL;
> diff --git a/gcc/tree-cfg.h b/gcc/tree-cfg.h
> index 9b56a68fe9d..9a1605be305 100644
> --- a/gcc/tree-cfg.h
> +++ b/gcc/tree-cfg.h
> @@ -113,6 +113,7 @@ extern basic_block gimple_switch_default_bb (function *, gswitch *);
> extern edge gimple_switch_edge (function *, gswitch *, unsigned);
> extern edge gimple_switch_default_edge (function *, gswitch *);
> extern bool cond_only_block_p (basic_block);
> +extern void copy_phi_arg_into_existing_phi (edge, edge);
>
> /* Return true if the LHS of a call should be removed. */
>
> diff --git a/gcc/tree-cfgcleanup.cc b/gcc/tree-cfgcleanup.cc
> index 42b25312122..193d87e3278 100644
> --- a/gcc/tree-cfgcleanup.cc
> +++ b/gcc/tree-cfgcleanup.cc
> @@ -610,17 +610,9 @@ remove_forwarder_block (basic_block bb)
>
> if (s == e)
> {
> - /* Create arguments for the phi nodes, since the edge was not
> + /* Copy arguments for the phi nodes, since the edge was not
> here before. */
> - for (gphi_iterator psi = gsi_start_phis (dest);
> - !gsi_end_p (psi);
> - gsi_next (&psi))
> - {
> - gphi *phi = psi.phi ();
> - location_t l = gimple_phi_arg_location_from_edge (phi, succ);
> - tree def = gimple_phi_arg_def (phi, succ->dest_idx);
> - add_phi_arg (phi, unshare_expr (def), s, l);
> - }
> + copy_phi_arg_into_existing_phi (succ, s);
> }
> }
>
> diff --git a/gcc/tree-ssa-threadupdate.cc b/gcc/tree-ssa-threadupdate.cc
> index 33a91063638..d5416b21a78 100644
> --- a/gcc/tree-ssa-threadupdate.cc
> +++ b/gcc/tree-ssa-threadupdate.cc
> @@ -511,31 +511,6 @@ fwd_jt_path_registry::lookup_redirection_data (edge e, insert_option insert)
> }
> }
>
> -/* Similar to copy_phi_args, except that the PHI arg exists, it just
> - does not have a value associated with it. */
> -
> -static void
> -copy_phi_arg_into_existing_phi (edge src_e, edge tgt_e)
> -{
> - int src_idx = src_e->dest_idx;
> - int tgt_idx = tgt_e->dest_idx;
> -
> - /* Iterate over each PHI in e->dest. */
> - for (gphi_iterator gsi = gsi_start_phis (src_e->dest),
> - gsi2 = gsi_start_phis (tgt_e->dest);
> - !gsi_end_p (gsi);
> - gsi_next (&gsi), gsi_next (&gsi2))
> - {
> - gphi *src_phi = gsi.phi ();
> - gphi *dest_phi = gsi2.phi ();
> - tree val = gimple_phi_arg_def (src_phi, src_idx);
> - location_t locus = gimple_phi_arg_location (src_phi, src_idx);
> -
> - SET_PHI_ARG_DEF (dest_phi, tgt_idx, val);
> - gimple_phi_arg_set_location (dest_phi, tgt_idx, locus);
> - }
> -}
> -
> /* Given ssa_name DEF, backtrack jump threading PATH from node IDX
> to see if it has constant value in a flow sensitive manner. Set
> LOCUS to location of the constant phi arg and return the value.
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCHv2 2/2] PHIOPT: Improve replace_phi_edge_with_variable for diamond shapped bb
2023-05-03 23:12 ` [PATCHv2 2/2] PHIOPT: Improve replace_phi_edge_with_variable for diamond shapped bb Andrew Pinski
@ 2023-05-04 9:43 ` Richard Biener
0 siblings, 0 replies; 4+ messages in thread
From: Richard Biener @ 2023-05-04 9:43 UTC (permalink / raw)
To: Andrew Pinski; +Cc: gcc-patches
On Thu, May 4, 2023 at 1:13 AM Andrew Pinski via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> While looking at differences between what minmax_replacement
> and match_simplify_replacement does. I noticed that they sometimes
> chose different edges to remove. I decided we should be able to do
> better and be able to remove both empty basic blocks in the
> case of match_simplify_replacement as that moves the statements.
>
> This also updates the testcases as now match_simplify_replacement
> will remove the unused MIN/MAX_EXPR and they were checking for
> those.
>
> OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.
OK.
> gcc/ChangeLog:
>
> * tree-ssa-phiopt.cc (replace_phi_edge_with_variable): Handle
> diamond form bb with forwarder only empty blocks better.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.dg/tree-ssa/minmax-15.c: Update test.
> * gcc.dg/tree-ssa/minmax-16.c: Update test.
> * gcc.dg/tree-ssa/minmax-3.c: Update test.
> * gcc.dg/tree-ssa/minmax-4.c: Update test.
> * gcc.dg/tree-ssa/minmax-5.c: Update test.
> * gcc.dg/tree-ssa/minmax-8.c: Update test.
> ---
> gcc/testsuite/gcc.dg/tree-ssa/minmax-15.c | 3 +-
> gcc/testsuite/gcc.dg/tree-ssa/minmax-16.c | 9 ++----
> gcc/testsuite/gcc.dg/tree-ssa/minmax-3.c | 2 +-
> gcc/testsuite/gcc.dg/tree-ssa/minmax-4.c | 2 +-
> gcc/testsuite/gcc.dg/tree-ssa/minmax-5.c | 2 +-
> gcc/testsuite/gcc.dg/tree-ssa/minmax-8.c | 2 +-
> gcc/tree-ssa-phiopt.cc | 35 ++++++++++++++++++++++-
> 7 files changed, 43 insertions(+), 12 deletions(-)
>
> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-15.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-15.c
> index 8a39871c938..6731f91e6c3 100644
> --- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-15.c
> +++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-15.c
> @@ -30,5 +30,6 @@ main (void)
> return 0;
> }
>
> -/* { dg-final { scan-tree-dump-times "MIN_EXPR" 3 "phiopt1" } } */
> +/* There should only be two MIN_EXPR left, the 3rd one was removed. */
> +/* { dg-final { scan-tree-dump-times "MIN_EXPR" 2 "phiopt1" } } */
> /* { dg-final { scan-tree-dump-times "MAX_EXPR" 0 "phiopt1" } } */
> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-16.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-16.c
> index 623b12b3f74..094364e6424 100644
> --- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-16.c
> +++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-16.c
> @@ -25,11 +25,8 @@ main (void)
> return 0;
> }
>
> -/* After phiopt1, there really should be only 3 MIN_EXPR in the IR (including debug statements).
> - But the way phiopt does not cleanup the CFG all the time, the PHI might still reference the
> - alternative bb's moved statement.
> - Note in the end, we do dce the statement and other debug statements to end up with only 2 MIN_EXPR.
> - So check that too. */
> -/* { dg-final { scan-tree-dump-times "MIN_EXPR" 4 "phiopt1" } } */
> +/* After phiopt1, will be only 2 MIN_EXPR in the IR (including debug statements). */
> +/* xk will only have the final result so the extra debug info does not change anything. */
> +/* { dg-final { scan-tree-dump-times "MIN_EXPR" 2 "phiopt1" } } */
> /* { dg-final { scan-tree-dump-times "MIN_EXPR" 2 "optimized" } } */
> /* { dg-final { scan-tree-dump-times "MAX_EXPR" 0 "phiopt1" } } */
> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-3.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-3.c
> index 2af10776346..521afe3e4d9 100644
> --- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-3.c
> +++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-3.c
> @@ -25,5 +25,5 @@ main (void)
> return 0;
> }
>
> -/* { dg-final { scan-tree-dump-times "MIN_EXPR" 3 "phiopt1" } } */
> +/* { dg-final { scan-tree-dump-times "MIN_EXPR" 2 "phiopt1" } } */
> /* { dg-final { scan-tree-dump-times "MAX_EXPR" 0 "phiopt1" } } */
> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-4.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-4.c
> index 973f39bfed3..49e27185b5e 100644
> --- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-4.c
> +++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-4.c
> @@ -26,4 +26,4 @@ main (void)
> }
>
> /* { dg-final { scan-tree-dump-times "MIN_EXPR" 0 "phiopt1" } } */
> -/* { dg-final { scan-tree-dump-times "MAX_EXPR" 3 "phiopt1" } } */
> +/* { dg-final { scan-tree-dump-times "MAX_EXPR" 2 "phiopt1" } } */
> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-5.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-5.c
> index 34e4e720511..194c881cc98 100644
> --- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-5.c
> +++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-5.c
> @@ -25,5 +25,5 @@ main (void)
> return 0;
> }
>
> -/* { dg-final { scan-tree-dump-times "MIN_EXPR" 2 "phiopt1" } } */
> +/* { dg-final { scan-tree-dump-times "MIN_EXPR" 1 "phiopt1" } } */
> /* { dg-final { scan-tree-dump-times "MAX_EXPR" 1 "phiopt1" } } */
> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-8.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-8.c
> index 0160e573fef..d5cb53145ea 100644
> --- a/gcc/testsuite/gcc.dg/tree-ssa/minmax-8.c
> +++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-8.c
> @@ -26,4 +26,4 @@ main (void)
> }
>
> /* { dg-final { scan-tree-dump-times "MIN_EXPR" 1 "phiopt1" } } */
> -/* { dg-final { scan-tree-dump-times "MAX_EXPR" 2 "phiopt1" } } */
> +/* { dg-final { scan-tree-dump-times "MAX_EXPR" 1 "phiopt1" } } */
> diff --git a/gcc/tree-ssa-phiopt.cc b/gcc/tree-ssa-phiopt.cc
> index fbc1fd66607..7ba24211025 100644
> --- a/gcc/tree-ssa-phiopt.cc
> +++ b/gcc/tree-ssa-phiopt.cc
> @@ -94,6 +94,7 @@ replace_phi_edge_with_variable (basic_block cond_block,
> basic_block bb = gimple_bb (phi);
> gimple_stmt_iterator gsi;
> tree phi_result = PHI_RESULT (phi);
> + bool deleteboth = false;
>
> /* Duplicate range info if they are the only things setting the target PHI.
> This is needed as later on, the new_tree will be replacing
> @@ -137,7 +138,14 @@ replace_phi_edge_with_variable (basic_block cond_block,
> keep_edge = EDGE_SUCC (cond_block, 1);
> }
> else if ((keep_edge = find_edge (cond_block, e->src)))
> - ;
> + {
> + basic_block bb1 = EDGE_SUCC (cond_block, 0)->dest;
> + basic_block bb2 = EDGE_SUCC (cond_block, 1)->dest;
> + if (single_pred_p (bb1) && single_pred_p (bb2)
> + && single_succ_p (bb1) && single_succ_p (bb2)
> + && empty_block_p (bb1) && empty_block_p (bb2))
> + deleteboth = true;
> + }
> else
> gcc_unreachable ();
>
> @@ -148,6 +156,31 @@ replace_phi_edge_with_variable (basic_block cond_block,
> e->probability = profile_probability::always ();
> delete_basic_block (edge_to_remove->dest);
>
> + /* Eliminate the COND_EXPR at the end of COND_BLOCK. */
> + gsi = gsi_last_bb (cond_block);
> + gsi_remove (&gsi, true);
> + }
> + else if (deleteboth)
> + {
> + basic_block bb1 = EDGE_SUCC (cond_block, 0)->dest;
> + basic_block bb2 = EDGE_SUCC (cond_block, 1)->dest;
> +
> + edge newedge = redirect_edge_and_branch (keep_edge, bb);
> +
> + /* The new edge should be the same. */
> + gcc_assert (newedge == keep_edge);
> +
> + keep_edge->flags |= EDGE_FALLTHRU;
> + keep_edge->flags &= ~(EDGE_TRUE_VALUE | EDGE_FALSE_VALUE);
> + keep_edge->probability = profile_probability::always ();
> +
> + /* Copy the edge's phi entry from the old one. */
> + copy_phi_arg_into_existing_phi (e, keep_edge);
> +
> + /* Delete the old 2 empty basic blocks */
> + delete_basic_block (bb1);
> + delete_basic_block (bb2);
> +
> /* Eliminate the COND_EXPR at the end of COND_BLOCK. */
> gsi = gsi_last_bb (cond_block);
> gsi_remove (&gsi, true);
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-04 9:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-03 23:12 [PATCH 1/2] Move copy_phi_arg_into_existing_phi to common location and use it Andrew Pinski
2023-05-03 23:12 ` [PATCHv2 2/2] PHIOPT: Improve replace_phi_edge_with_variable for diamond shapped bb Andrew Pinski
2023-05-04 9:43 ` Richard Biener
2023-05-04 9:42 ` [PATCH 1/2] Move copy_phi_arg_into_existing_phi to common location and use it 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).