aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2020-10-07 07:22:53 +0200
committerTom de Vries <tdevries@suse.de>2020-10-14 14:37:03 +0200
commit17d5739a6b103cdd3315f5d0e09fe8faa6620a03 (patch)
treeb6f7b76c6622ee165aacb1e445fa7e54f14dd7a6 /gcc
parent9068711f210e02a2b80f46813e47f338718c94dc (diff)
downloadgcc-17d5739a6b103cdd3315f5d0e09fe8faa6620a03.zip
gcc-17d5739a6b103cdd3315f5d0e09fe8faa6620a03.tar.gz
gcc-17d5739a6b103cdd3315f5d0e09fe8faa6620a03.tar.bz2
[gimple] Move can_duplicate_bb_p to gimple_can_duplicate_bb_p
The function gimple_can_duplicate_bb_p currently always returns true. The presence of can_duplicate_bb_p in tracer.c however suggests that there are cases when bb's indeed cannot be duplicated. Move the implementation of can_duplicate_bb_p to gimple_can_duplicate_bb_p. Bootstrapped and reg-tested on x86_64-linux. Build x86_64-linux with nvptx accelerator and tested libgomp. No issues found. As corner-case check, bootstrapped and reg-tested a patch that makes gimple_can_duplicate_bb_p always return false, resulting in PR97333 - "[gimple_can_duplicate_bb_p == false, tree-ssa-threadupdate] ICE in duplicate_block, at cfghooks.c:1093". gcc/ChangeLog: 2020-10-09 Tom de Vries <tdevries@suse.de> * tracer.c (cached_can_duplicate_bb_p, analyze_bb): Use can_duplicate_block_p. (can_duplicate_insn_p, can_duplicate_bb_no_insn_iter_p) (can_duplicate_bb_p): Move and merge ... * tree-cfg.c (gimple_can_duplicate_bb_p): ... here.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/tracer.c66
-rw-r--r--gcc/tree-cfg.c38
2 files changed, 40 insertions, 64 deletions
diff --git a/gcc/tracer.c b/gcc/tracer.c
index e1c2b95..2f9daf9 100644
--- a/gcc/tracer.c
+++ b/gcc/tracer.c
@@ -84,65 +84,6 @@ bb_seen_p (basic_block bb)
return bitmap_bit_p (bb_seen, bb->index);
}
-/* Return true if gimple stmt G can be duplicated. */
-static bool
-can_duplicate_insn_p (gimple *g)
-{
- /* An IFN_GOMP_SIMT_ENTER_ALLOC/IFN_GOMP_SIMT_EXIT call must be
- duplicated as part of its group, or not at all.
- The IFN_GOMP_SIMT_VOTE_ANY and IFN_GOMP_SIMT_XCHG_* are part of such a
- group, so the same holds there. */
- if (is_gimple_call (g)
- && (gimple_call_internal_p (g, IFN_GOMP_SIMT_ENTER_ALLOC)
- || gimple_call_internal_p (g, IFN_GOMP_SIMT_EXIT)
- || gimple_call_internal_p (g, IFN_GOMP_SIMT_VOTE_ANY)
- || gimple_call_internal_p (g, IFN_GOMP_SIMT_XCHG_BFLY)
- || gimple_call_internal_p (g, IFN_GOMP_SIMT_XCHG_IDX)))
- return false;
-
- return true;
-}
-
-/* Return true if BB can be duplicated. Avoid iterating over the insns. */
-static bool
-can_duplicate_bb_no_insn_iter_p (const_basic_block bb)
-{
- if (bb->index < NUM_FIXED_BLOCKS)
- return false;
-
- if (gimple *g = last_stmt (CONST_CAST_BB (bb)))
- {
- /* A transaction is a single entry multiple exit region. It
- must be duplicated in its entirety or not at all. */
- if (gimple_code (g) == GIMPLE_TRANSACTION)
- return false;
-
- /* An IFN_UNIQUE call must be duplicated as part of its group,
- or not at all. */
- if (is_gimple_call (g)
- && gimple_call_internal_p (g)
- && gimple_call_internal_unique_p (g))
- return false;
- }
-
- return true;
-}
-
-/* Return true if BB can be duplicated. */
-static bool
-can_duplicate_bb_p (const_basic_block bb)
-{
- if (!can_duplicate_bb_no_insn_iter_p (bb))
- return false;
-
- for (gimple_stmt_iterator gsi = gsi_start_bb (CONST_CAST_BB (bb));
- !gsi_end_p (gsi); gsi_next (&gsi))
- if (!can_duplicate_insn_p (gsi_stmt (gsi)))
- return false;
-
- return true;
-}
-
static sbitmap can_duplicate_bb;
/* Cache VAL as value of can_duplicate_bb_p for BB. */
@@ -167,7 +108,7 @@ cached_can_duplicate_bb_p (const_basic_block bb)
return false;
}
- return can_duplicate_bb_p (bb);
+ return can_duplicate_block_p (bb);
}
/* Return true if we should ignore the basic block for purposes of tracing. */
@@ -190,16 +131,15 @@ analyze_bb (basic_block bb, int *count)
gimple_stmt_iterator gsi;
gimple *stmt;
int n = 0;
- bool can_duplicate = can_duplicate_bb_no_insn_iter_p (bb);
for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
{
stmt = gsi_stmt (gsi);
n += estimate_num_insns (stmt, &eni_size_weights);
- can_duplicate = can_duplicate && can_duplicate_insn_p (stmt);
}
*count = n;
- cache_can_duplicate_bb_p (bb, can_duplicate);
+
+ cache_can_duplicate_bb_p (bb, can_duplicate_block_p (CONST_CAST_BB (bb)));
}
/* Return true if E1 is more frequent than E2. */
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 5caf3b6..002560d 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -6211,8 +6211,44 @@ gimple_split_block_before_cond_jump (basic_block bb)
/* Return true if basic_block can be duplicated. */
static bool
-gimple_can_duplicate_bb_p (const_basic_block bb ATTRIBUTE_UNUSED)
+gimple_can_duplicate_bb_p (const_basic_block bb)
{
+ gimple *last = last_stmt (CONST_CAST_BB (bb));
+
+ /* Do checks that can only fail for the last stmt, to minimize the work in the
+ stmt loop. */
+ if (last) {
+ /* A transaction is a single entry multiple exit region. It
+ must be duplicated in its entirety or not at all. */
+ if (gimple_code (last) == GIMPLE_TRANSACTION)
+ return false;
+
+ /* An IFN_UNIQUE call must be duplicated as part of its group,
+ or not at all. */
+ if (is_gimple_call (last)
+ && gimple_call_internal_p (last)
+ && gimple_call_internal_unique_p (last))
+ return false;
+ }
+
+ for (gimple_stmt_iterator gsi = gsi_start_bb (CONST_CAST_BB (bb));
+ !gsi_end_p (gsi); gsi_next (&gsi))
+ {
+ gimple *g = gsi_stmt (gsi);
+
+ /* An IFN_GOMP_SIMT_ENTER_ALLOC/IFN_GOMP_SIMT_EXIT call must be
+ duplicated as part of its group, or not at all.
+ The IFN_GOMP_SIMT_VOTE_ANY and IFN_GOMP_SIMT_XCHG_* are part of such a
+ group, so the same holds there. */
+ if (is_gimple_call (g)
+ && (gimple_call_internal_p (g, IFN_GOMP_SIMT_ENTER_ALLOC)
+ || gimple_call_internal_p (g, IFN_GOMP_SIMT_EXIT)
+ || gimple_call_internal_p (g, IFN_GOMP_SIMT_VOTE_ANY)
+ || gimple_call_internal_p (g, IFN_GOMP_SIMT_XCHG_BFLY)
+ || gimple_call_internal_p (g, IFN_GOMP_SIMT_XCHG_IDX)))
+ return false;
+ }
+
return true;
}