OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-optimization/105070 - annotate bit cluster tests with locations 

The following makes sure to annotate the tests generated by
switch lowering bit-clustering with locations which otherwise
can be completely lost even at -O0.

2022-03-28  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/105070
	* tree-switch-conversion.h
	(bit_test_cluster::hoist_edge_and_branch_if_true): Add location
	argument.
	* tree-switch-conversion.cc
	(bit_test_cluster::hoist_edge_and_branch_if_true): Annotate
	cond with location.
	(bit_test_cluster::emit): Annotate all generated expressions
	with location.
This commit is contained in:
Richard Biener 2022-03-28 10:07:53 +02:00
parent 9f37d31324
commit bc86a86a4f
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gcc/tree-switch-conversion.cc
View File

@ -1498,7 +1498,7 @@ case_bit_test::cmp (const void *p1, const void *p2)
void
bit_test_cluster::emit (tree index_expr, tree index_type,
tree, basic_block default_bb, location_t)
tree, basic_block default_bb, location_t loc)
{
case_bit_test test[m_max_case_bit_tests] = { {} };
unsigned int i, j, k;
@ -1622,9 +1622,9 @@ bit_test_cluster::emit (tree index_expr, tree index_type,
gsi = gsi_last_bb (m_case_bb);
/* idx = (unsigned)x - minval. */
idx = fold_convert (unsigned_index_type, index_expr);
idx = fold_build2 (MINUS_EXPR, unsigned_index_type, idx,
fold_convert (unsigned_index_type, minval));
idx = fold_convert_loc (loc, unsigned_index_type, index_expr);
idx = fold_build2_loc (loc, MINUS_EXPR, unsigned_index_type, idx,
fold_convert_loc (loc, unsigned_index_type, minval));
idx = force_gimple_operand_gsi (&gsi, idx,
/*simple=*/true, NULL_TREE,
/*before=*/true, GSI_SAME_STMT);
@ -1638,15 +1638,15 @@ bit_test_cluster::emit (tree index_expr, tree index_type,
fold_convert (unsigned_index_type, range),
/*simple=*/true, NULL_TREE,
/*before=*/true, GSI_SAME_STMT);
tmp = fold_build2 (GT_EXPR, boolean_type_node, idx, range);
tmp = fold_build2_loc (loc, GT_EXPR, boolean_type_node, idx, range);
basic_block new_bb
= hoist_edge_and_branch_if_true (&gsi, tmp, default_bb,
profile_probability::unlikely ());
profile_probability::unlikely (), loc);
gsi = gsi_last_bb (new_bb);
}
tmp = fold_build2 (LSHIFT_EXPR, word_type_node, word_mode_one,
fold_convert (word_type_node, idx));
tmp = fold_build2_loc (loc, LSHIFT_EXPR, word_type_node, word_mode_one,
fold_convert_loc (loc, word_type_node, idx));
/* csui = (1 << (word_mode) idx) */
if (count > 1)
@ -1672,13 +1672,15 @@ bit_test_cluster::emit (tree index_expr, tree index_type,
bt_range);
bt_range -= test[k].bits;
tmp = wide_int_to_tree (word_type_node, test[k].mask);
tmp = fold_build2 (BIT_AND_EXPR, word_type_node, csui, tmp);
tmp = fold_build2 (NE_EXPR, boolean_type_node, tmp, word_mode_zero);
tmp = fold_build2_loc (loc, BIT_AND_EXPR, word_type_node, csui, tmp);
tmp = fold_build2_loc (loc, NE_EXPR, boolean_type_node,
tmp, word_mode_zero);
tmp = force_gimple_operand_gsi (&gsi, tmp,
/*simple=*/true, NULL_TREE,
/*before=*/true, GSI_SAME_STMT);
basic_block new_bb
= hoist_edge_and_branch_if_true (&gsi, tmp, test[k].target_bb, prob);
= hoist_edge_and_branch_if_true (&gsi, tmp, test[k].target_bb,
prob, loc);
gsi = gsi_last_bb (new_bb);
}
@ -1708,7 +1710,8 @@ bit_test_cluster::emit (tree index_expr, tree index_type,
basic_block
bit_test_cluster::hoist_edge_and_branch_if_true (gimple_stmt_iterator *gsip,
tree cond, basic_block case_bb,
profile_probability prob)
profile_probability prob,
location_t loc)
{
tree tmp;
gcond *cond_stmt;
@ -1722,6 +1725,7 @@ bit_test_cluster::hoist_edge_and_branch_if_true (gimple_stmt_iterator *gsip,
tmp = force_gimple_operand_gsi (gsip, cond, /*simple=*/true, NULL,
/*before=*/true, GSI_SAME_STMT);
cond_stmt = gimple_build_cond_from_tree (tmp, NULL_TREE, NULL_TREE);
gimple_set_location (cond_stmt, loc);
gsi_insert_before (gsip, cond_stmt, GSI_SAME_STMT);
e_false = split_block (split_bb, cond_stmt);

3
gcc/tree-switch-conversion.h
View File

@ -429,7 +429,8 @@ public:
static basic_block hoist_edge_and_branch_if_true (gimple_stmt_iterator *gsip,
tree cond,
basic_block case_bb,
profile_probability prob);
profile_probability prob,
location_t);
/* Return whether bit test expansion is allowed. */
static inline bool is_enabled (void)