Skip to content

R
riscv-gcc-1
Commit 5e865972 by Richard Biener Committed by Richard Biener
Options

2017-09-29 Richard Biener <rguenther@suse.de> 

	* graphite-isl-ast-to-gimple.c
	(translate_isl_ast_to_gimple::set_codegen_error): New function.
	(binary_op_to_tree): Use it.
	(get_rename_from_scev): Likewise.
	(copy_loop_phi_nodes): Likewise.
	(copy_bb_and_scalar_dependences): Likewise.
	(translate_pending_phi_nodes): Likewise.

From-SVN: r253282
parent 27746ca9
Showing with 40 additions and 23 deletions
gcc/ChangeLog
2017-09-29 Richard Biener <rguenther@suse.de>
* graphite-isl-ast-to-gimple.c
(translate_isl_ast_to_gimple::set_codegen_error): New function.
(binary_op_to_tree): Use it.
(get_rename_from_scev): Likewise.
(copy_loop_phi_nodes): Likewise.
(copy_bb_and_scalar_dependences): Likewise.
(translate_pending_phi_nodes): Likewise.
2017-09-29 Jakub Jelinek <jakub@redhat.com> 2017-09-29 Jakub Jelinek <jakub@redhat.com>
PR target/82339 PR target/82339
gcc/graphite-isl-ast-to-gimple.c
...@@ -240,6 +240,7 @@ class translate_isl_ast_to_gimple ...@@ -240,6 +240,7 @@ class translate_isl_ast_to_gimple
void gsi_insert_earliest (gimple_seq seq); void gsi_insert_earliest (gimple_seq seq);
tree rename_all_uses (tree new_expr, basic_block new_bb, basic_block old_bb); tree rename_all_uses (tree new_expr, basic_block new_bb, basic_block old_bb);
bool codegen_error_p () const { return codegen_error; } bool codegen_error_p () const { return codegen_error; }
void set_codegen_error () { codegen_error = true; }
bool is_constant (tree op) const bool is_constant (tree op) const
{ {
return TREE_CODE (op) == INTEGER_CST return TREE_CODE (op) == INTEGER_CST
...@@ -347,7 +348,7 @@ binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) ...@@ -347,7 +348,7 @@ binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip)
division by 2^64 that is folded to 0. */ division by 2^64 that is folded to 0. */
if (integer_zerop (tree_rhs_expr)) if (integer_zerop (tree_rhs_expr))
{ {
codegen_error = true; set_codegen_error ();
return NULL_TREE; return NULL_TREE;
} }
return fold_build2 (EXACT_DIV_EXPR, type, tree_lhs_expr, tree_rhs_expr); return fold_build2 (EXACT_DIV_EXPR, type, tree_lhs_expr, tree_rhs_expr);
...@@ -357,7 +358,7 @@ binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) ...@@ -357,7 +358,7 @@ binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip)
division by 2^64 that is folded to 0. */ division by 2^64 that is folded to 0. */
if (integer_zerop (tree_rhs_expr)) if (integer_zerop (tree_rhs_expr))
{ {
codegen_error = true; set_codegen_error ();
return NULL_TREE; return NULL_TREE;
} }
return fold_build2 (TRUNC_DIV_EXPR, type, tree_lhs_expr, tree_rhs_expr); return fold_build2 (TRUNC_DIV_EXPR, type, tree_lhs_expr, tree_rhs_expr);
...@@ -368,7 +369,7 @@ binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) ...@@ -368,7 +369,7 @@ binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip)
division by 2^64 that is folded to 0. */ division by 2^64 that is folded to 0. */
if (integer_zerop (tree_rhs_expr)) if (integer_zerop (tree_rhs_expr))
{ {
codegen_error = true; set_codegen_error ();
return NULL_TREE; return NULL_TREE;
} }
return fold_build2 (TRUNC_MOD_EXPR, type, tree_lhs_expr, tree_rhs_expr); return fold_build2 (TRUNC_MOD_EXPR, type, tree_lhs_expr, tree_rhs_expr);
...@@ -378,7 +379,7 @@ binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) ...@@ -378,7 +379,7 @@ binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip)
division by 2^64 that is folded to 0. */ division by 2^64 that is folded to 0. */
if (integer_zerop (tree_rhs_expr)) if (integer_zerop (tree_rhs_expr))
{ {
codegen_error = true; set_codegen_error ();
return NULL_TREE; return NULL_TREE;
} }
return fold_build2 (FLOOR_DIV_EXPR, type, tree_lhs_expr, tree_rhs_expr); return fold_build2 (FLOOR_DIV_EXPR, type, tree_lhs_expr, tree_rhs_expr);
...@@ -1497,7 +1498,7 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop, ...@@ -1497,7 +1498,7 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop,
tree new_expr; tree new_expr;
if (chrec_contains_undetermined (scev)) if (chrec_contains_undetermined (scev))
{ {
codegen_error = true; set_codegen_error ();
return build_zero_cst (TREE_TYPE (old_name)); return build_zero_cst (TREE_TYPE (old_name));
} }
...@@ -1510,7 +1511,7 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop, ...@@ -1510,7 +1511,7 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop,
if (chrec_contains_undetermined (new_expr) if (chrec_contains_undetermined (new_expr)
|| tree_contains_chrecs (new_expr, NULL)) || tree_contains_chrecs (new_expr, NULL))
{ {
codegen_error = true; set_codegen_error ();
return build_zero_cst (TREE_TYPE (old_name)); return build_zero_cst (TREE_TYPE (old_name));
} }
...@@ -1519,7 +1520,7 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop, ...@@ -1519,7 +1520,7 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop,
basic_block bb = gimple_bb (SSA_NAME_DEF_STMT (new_expr)); basic_block bb = gimple_bb (SSA_NAME_DEF_STMT (new_expr));
if (bb && !dominated_by_p (CDI_DOMINATORS, new_bb, bb)) if (bb && !dominated_by_p (CDI_DOMINATORS, new_bb, bb))
{ {
codegen_error = true; set_codegen_error ();
return build_zero_cst (TREE_TYPE (old_name)); return build_zero_cst (TREE_TYPE (old_name));
} }
} }
...@@ -1539,7 +1540,7 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop, ...@@ -1539,7 +1540,7 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop,
basic_block bb = gimple_bb (SSA_NAME_DEF_STMT (new_ssa_name)); basic_block bb = gimple_bb (SSA_NAME_DEF_STMT (new_ssa_name));
if (bb && !dominated_by_p (CDI_DOMINATORS, new_bb, bb)) if (bb && !dominated_by_p (CDI_DOMINATORS, new_bb, bb))
{ {
codegen_error = true; set_codegen_error ();
return build_zero_cst (TREE_TYPE (old_name)); return build_zero_cst (TREE_TYPE (old_name));
} }
} }
...@@ -1820,8 +1821,8 @@ copy_loop_phi_nodes (basic_block bb, basic_block new_bb) ...@@ -1820,8 +1821,8 @@ copy_loop_phi_nodes (basic_block bb, basic_block new_bb)
tree new_res = create_new_def_for (res, new_phi, tree new_res = create_new_def_for (res, new_phi,
gimple_phi_result_ptr (new_phi)); gimple_phi_result_ptr (new_phi));
set_rename (res, new_res); set_rename (res, new_res);
codegen_error = !copy_loop_phi_args (phi, ibp_old_bb, new_phi, if (!copy_loop_phi_args (phi, ibp_old_bb, new_phi, ibp_new_bb, true))
ibp_new_bb, true); set_codegen_error ();
update_stmt (new_phi); update_stmt (new_phi);
if (dump_file) if (dump_file)
...@@ -2593,7 +2594,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map) ...@@ -2593,7 +2594,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map)
outside the region. */ outside the region. */
if (num_phis) if (num_phis)
{ {
codegen_error = true; set_codegen_error ();
return NULL; return NULL;
} }
} }
...@@ -2608,7 +2609,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map) ...@@ -2608,7 +2609,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map)
edge e = edge_for_new_close_phis (bb); edge e = edge_for_new_close_phis (bb);
if (!e) if (!e)
{ {
codegen_error = true; set_codegen_error ();
return NULL; return NULL;
} }
...@@ -2622,7 +2623,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map) ...@@ -2622,7 +2623,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map)
if (!copy_loop_close_phi_nodes (bb, phi_bb, iv_map)) if (!copy_loop_close_phi_nodes (bb, phi_bb, iv_map))
{ {
codegen_error = true; set_codegen_error ();
return NULL; return NULL;
} }
...@@ -2644,7 +2645,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map) ...@@ -2644,7 +2645,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map)
code. See gfortran.dg/graphite/pr29832.f90. */ code. See gfortran.dg/graphite/pr29832.f90. */
if (EDGE_COUNT (bb->preds) != EDGE_COUNT (phi_bb->preds)) if (EDGE_COUNT (bb->preds) != EDGE_COUNT (phi_bb->preds))
{ {
codegen_error = true; set_codegen_error ();
return NULL; return NULL;
} }
...@@ -2664,7 +2665,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map) ...@@ -2664,7 +2665,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map)
extend that to reductions that cannot be analyzed by SCEV. */ extend that to reductions that cannot be analyzed by SCEV. */
if (!bb_in_sese_p (phi_bb, region->if_region->true_region->region)) if (!bb_in_sese_p (phi_bb, region->if_region->true_region->region))
{ {
codegen_error = true; set_codegen_error ();
return NULL; return NULL;
} }
...@@ -2673,7 +2674,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map) ...@@ -2673,7 +2674,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map)
bb->index); bb->index);
if (!copy_loop_phi_nodes (bb, phi_bb)) if (!copy_loop_phi_nodes (bb, phi_bb))
{ {
codegen_error = true; set_codegen_error ();
return NULL; return NULL;
} }
} }
...@@ -2695,7 +2696,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map) ...@@ -2695,7 +2696,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map)
|| !bb_in_sese_p (phi_bb, region->if_region->true_region->region) || !bb_in_sese_p (phi_bb, region->if_region->true_region->region)
|| !copy_cond_phi_nodes (bb, phi_bb, iv_map)) || !copy_cond_phi_nodes (bb, phi_bb, iv_map))
{ {
codegen_error = true; set_codegen_error ();
return NULL; return NULL;
} }
} }
...@@ -2718,7 +2719,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map) ...@@ -2718,7 +2719,7 @@ copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec<tree> iv_map)
if (!graphite_copy_stmts_from_block (bb, new_bb, iv_map)) if (!graphite_copy_stmts_from_block (bb, new_bb, iv_map))
{ {
codegen_error = true; set_codegen_error ();
return NULL; return NULL;
} }
...@@ -2752,12 +2753,18 @@ translate_pending_phi_nodes () ...@@ -2752,12 +2753,18 @@ translate_pending_phi_nodes ()
auto_vec <tree, 1> iv_map; auto_vec <tree, 1> iv_map;
if (bb_contains_loop_phi_nodes (new_bb) if (bb_contains_loop_phi_nodes (new_bb)
&& bb_contains_loop_phi_nodes (old_bb)) && bb_contains_loop_phi_nodes (old_bb))
codegen_error = !copy_loop_phi_args (old_phi, ibp_old_bb, new_phi, {
ibp_new_bb, false); if (!copy_loop_phi_args (old_phi, ibp_old_bb, new_phi,
ibp_new_bb, false))
set_codegen_error ();
}
else if (bb_contains_loop_close_phi_nodes (new_bb)) else if (bb_contains_loop_close_phi_nodes (new_bb))
codegen_error = !copy_loop_close_phi_args (old_bb, new_bb, iv_map, false); {
else if (!copy_loop_close_phi_args (old_bb, new_bb, iv_map, false))
codegen_error = !copy_cond_phi_args (old_phi, new_phi, iv_map, false); set_codegen_error ();
}
else if (!copy_cond_phi_args (old_phi, new_phi, iv_map, false))
set_codegen_error ();
if (dump_file) if (dump_file)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment