The following fixes the IL after code generation errors so we can
continue processing SCOPs. This increases the number of transformed
loop nests in SPEC CPU 2006 by 50%.
Bootstrap and regtest running on x86_64-unknown-linux-gnu.
Richard.
2017-09-21 Richard Biener <rguent...@suse.de>
* graphite-isl-ast-to-gimple.c (graphite_regenerate_ast_isl):
Restore valid IL after code generation errors.
* graphite.c (graphite_transform_loops): Diagnose code
generation issues as MSG_MISSED_OPTIMIZATION and continue
with processing SCOPs.
Index: gcc/graphite-isl-ast-to-gimple.c
===================================================================
--- gcc/graphite-isl-ast-to-gimple.c (revision 253050)
+++ gcc/graphite-isl-ast-to-gimple.c (working copy)
@@ -3068,6 +3068,26 @@ graphite_regenerate_ast_isl (scop_p scop
}
}
+ if (t.codegen_error_p ())
+ {
+ /* We registered new names, scrap that. */
+ if (need_ssa_update_p (cfun))
+ delete_update_ssa ();
+ /* Remove the unreachable region. */
+ remove_edge_and_dominated_blocks (if_region->true_region->region.entry);
+ basic_block ifb = if_region->false_region->region.entry->src;
+ gimple_stmt_iterator gsi = gsi_last_bb (ifb);
+ gsi_remove (&gsi, true);
+ if_region->false_region->region.entry->flags &= ~EDGE_FALSE_VALUE;
+ if_region->false_region->region.entry->flags |= EDGE_FALLTHRU;
+ /* remove_edge_and_dominated_blocks marks loops for removal but
+ doesn't actually remove them (fix that...). */
+ loop_p loop;
+ FOR_EACH_LOOP (loop, LI_FROM_INNERMOST)
+ if (! loop->header)
+ delete_loop (loop);
+ }
+
free (if_region->true_region);
free (if_region->region);
free (if_region);
Index: gcc/graphite.c
===================================================================
--- gcc/graphite.c (revision 253050)
+++ gcc/graphite.c (working copy)
@@ -337,17 +337,16 @@ graphite_transform_loops (void)
if (!apply_poly_transforms (scop))
continue;
+ location_t loc = find_loop_location
+ (scops[i]->scop_info->region.entry->dest->loop_father);
+
need_cfg_cleanup_p = true;
- /* When code generation is not successful, do not continue
- generating code for the next scops: the IR has to be cleaned up
- and could be in an inconsistent state. */
if (!graphite_regenerate_ast_isl (scop))
- break;
-
- location_t loc = find_loop_location
- (scop->scop_info->region.entry->dest->loop_father);
- dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, loc,
- "loop nest optimized\n");
+ dump_printf_loc (MSG_MISSED_OPTIMIZATION, loc,
+ "loop nest not optimized, code generation error\n");
+ else
+ dump_printf_loc (MSG_OPTIMIZED_LOCATIONS, loc,
+ "loop nest optimized\n");
}
free_scops (scops);
