On Thu, Aug 24, 2023 at 03:14:32PM +0200, Jan Hubicka via Gcc-patches wrote:
> this patch extends verifier to check that all probabilities and counts are
> initialized if profile is supposed to be present. This is a bit complicated
> by the posibility that we inline !flag_guess_branch_probability function
> into function with profile defined and in this case we need to stop
> verification. For this reason I added flag to cfg structure tracking this.
This patch broke a couple of _BitInt tests (in the admittedly still
uncommitted series - still waiting for review of the C FE bits).
Here is a minimal patch to make it work again, though I'm not sure
if in the if_then_else and if_then_if_then_else cases I shouldn't scale
count of the other bbs as well. if_then method creates
if (COND) new_bb1;
in a middle of some pre-existing bb (with PROB that COND is true), if_then_else
if (COND) new_bb1; else new_bb2;
and if_then_if_then_else
if (COND1) { if (COND2) new_bb2; else new_bb1; }
with PROB1 and PROB2 probabilities that COND1 and COND2 are true.
The lowering happens shortly after IPA.
Ok for trunk with rest of the series?
2023-09-05 Jakub Jelinek <ja...@redhat.com>
PR c/102989
* gimple-lower-bitint.cc (bitint_large_huge::if_then_else,
bitint_large_huge::if_then_if_then_else): Use make_single_succ_edge
rather than make_edge, initialize bb->count.
--- gcc/gimple-lower-bitint.cc.jj 2023-09-04 09:45:37.357004452 +0200
+++ gcc/gimple-lower-bitint.cc 2023-09-04 22:53:30.343756938 +0200
@@ -683,9 +683,10 @@ bitint_large_huge::if_then_else (gimple
e1->flags = EDGE_FALSE_VALUE;
e3->probability = prob;
e1->probability = prob.invert ();
+ bb->count = e1->src->count.apply_probability (prob);
set_immediate_dominator (CDI_DOMINATORS, bb, e1->src);
set_immediate_dominator (CDI_DOMINATORS, e2->dest, e1->src);
- edge_true = make_edge (bb, e2->dest, EDGE_FALLTHRU);
+ edge_true = make_single_succ_edge (bb, e2->dest, EDGE_FALLTHRU);
edge_false = e2;
m_gsi = gsi_after_labels (bb);
}
@@ -741,7 +742,8 @@ bitint_large_huge::if_then_if_then_else
e4->probability = prob2;
e2->flags = EDGE_FALSE_VALUE;
e2->probability = prob2.invert ();
- e4 = make_edge (bb, e3->dest, EDGE_FALLTHRU);
+ bb->count = e2->src->count.apply_probability (prob2);
+ e4 = make_single_succ_edge (bb, e3->dest, EDGE_FALLTHRU);
e2 = find_edge (e2->dest, e3->dest);
edge_true_true = e4;
edge_true_false = e2;
Jakub
