From 076d564d3072837b2c008912634d5980f8a3c0e3 Mon Sep 17 00:00:00 2001 From: Aditya Kumar Date: Mon, 5 Oct 2015 16:02:59 +0000 Subject: [PATCH] move scop detection related stuff to graphite-scop-detection.c Co-Authored-By: Sebastian Pop From-SVN: r228492 --- gcc/ChangeLog | 31 + gcc/graphite-scop-detection.c | 1914 ++++++++++++++++++++------------- gcc/graphite-sese-to-poly.c | 184 +--- 3 files changed, 1226 insertions(+), 903 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d8abc262549..6b71dc7780e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,34 @@ +2015-10-05 Aditya Kumar + Sebastian Pop + + * graphite-scop-detection.c: Include domwalk.h and tree-cfg.h. + (trivially_empty_bb_p): Move... + (same_close_phi_node): Move... + (new_gimple_poly_bb): Move... + (compare_bb_depths): Move... + (graphite_sort_dominated_info): Move... + (remove_duplicate_close_phi): Move... + (make_close_phi_nodes_unique): Move... + (canonicalize_loop_closed_ssa): Move... + (canonicalize_loop_closed_ssa_form): Move... + (loop_ivs_can_be_represented): Move... + (single_pred_cond_non_loop_exit): Move... + (graphite_can_represent_init): Move... + (graphite_can_represent_scev): Move... + (stmt_has_simple_data_refs_p): Move... + (stmt_has_side_effects): Move... + (graphite_can_represent_stmt): Move... + (scop_detection): ... here. + (sese_dom_walker): ... and here. + (build_scops): Call all moved functions. + * graphite-sese-to-poly.c (try_generate_gimple_bb): Move... + (all_non_dominated_preds_marked_p): Move... + (build_scop_bbs_1): Move... + (build_scop_bbs): Move... + (set_scop_parameter_dim): Move... + (nb_pbbs_in_loops): Move... + (build_poly_scop): Do not call all the moved functions. + 2015-10-05 Martin Jambor Jan Hubicka diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c index d6a6705dd5e..03fd023a56d 100644 --- a/gcc/graphite-scop-detection.c +++ b/gcc/graphite-scop-detection.c @@ -34,12 +34,14 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "backend.h" #include "cfghooks.h" +#include "domwalk.h" #include "params.h" #include "tree.h" #include "gimple.h" #include "ssa.h" #include "fold-const.h" #include "gimple-iterator.h" +#include "tree-cfg.h" #include "tree-ssa-loop-manip.h" #include "tree-ssa-loop-niter.h" #include "tree-ssa-loop.h" @@ -58,23 +60,14 @@ along with GCC; see the file COPYING3. If not see TODO: Make all this as a constant_edge. */ struct sese_l { - sese_l (edge e, edge x) - : entry (e), exit (x) - { } + sese_l (edge e, edge x) : entry (e), exit (x) {} /* This is to push objects of sese_l in a vec. */ - sese_l (int i) - : entry (NULL), exit (NULL) - { - gcc_assert (i == 0); - } + sese_l (int i) : entry (NULL), exit (NULL) { gcc_assert (i == 0); } - operator bool () const - { - return entry && exit; - } + operator bool () const { return entry && exit; } - const sese_l& + const sese_l & operator= (const sese_l &s) { entry = s.entry; @@ -86,70 +79,967 @@ struct sese_l edge exit; }; -/* APIs for getting entry/exit of an sese. */ -static basic_block -get_entry_bb (edge e) -{ - return e->dest; -} +/* APIs for getting entry/exit of an sese. */ +static basic_block +get_entry_bb (edge e) +{ + return e->dest; +} + +static basic_block +get_exit_bb (edge e) +{ + return e->src; +} + +class debug_printer +{ +private: + FILE *dump_file; + +public: + void + set_dump_file (FILE *f) + { + gcc_assert (f); + dump_file = f; + } + + friend debug_printer & + operator<< (debug_printer &output, int i) + { + fprintf (output.dump_file, "%d", i); + return output; + } + friend debug_printer & + operator<< (debug_printer &output, const char *s) + { + fprintf (output.dump_file, "%s", s); + return output; + } +} dp; + +#define DEBUG_PRINT(args) do \ + { \ + if (dump_file && (dump_flags & TDF_DETAILS)) { args; } \ + } while (0); + + +/* Return true if BB is empty, contains only DEBUG_INSNs. */ + +static bool +trivially_empty_bb_p (basic_block bb) +{ + gimple_stmt_iterator gsi; + + for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) + if (gimple_code (gsi_stmt (gsi)) != GIMPLE_DEBUG) + return false; + + return true; +} + +/* Returns true when P1 and P2 are close phis with the same + argument. */ + +static inline bool +same_close_phi_node (gphi *p1, gphi *p2) +{ + return operand_equal_p (gimple_phi_arg_def (p1, 0), + gimple_phi_arg_def (p2, 0), 0); +} + +/* Store the GRAPHITE representation of BB. */ + +static gimple_poly_bb_p +new_gimple_poly_bb (basic_block bb, vec drs) +{ + gimple_poly_bb_p gbb; + + gbb = XNEW (struct gimple_poly_bb); + bb->aux = gbb; + GBB_BB (gbb) = bb; + GBB_DATA_REFS (gbb) = drs; + GBB_CONDITIONS (gbb).create (0); + GBB_CONDITION_CASES (gbb).create (0); + + return gbb; +} + +/* Compare the depth of two basic_block's P1 and P2. */ + +static int +compare_bb_depths (const void *p1, const void *p2) +{ + const_basic_block const bb1 = *(const_basic_block const *)p1; + const_basic_block const bb2 = *(const_basic_block const *)p2; + int d1 = loop_depth (bb1->loop_father); + int d2 = loop_depth (bb2->loop_father); + + if (d1 < d2) + return 1; + + if (d1 > d2) + return -1; + + return 0; +} + +/* Sort the basic blocks from DOM such that the first are the ones at + a deepest loop level. */ + +static void +graphite_sort_dominated_info (vec dom) +{ + dom.qsort (compare_bb_depths); +} + +static void make_close_phi_nodes_unique (basic_block bb); + +/* Remove the close phi node at GSI and replace its rhs with the rhs + of PHI. */ + +static void +remove_duplicate_close_phi (gphi *phi, gphi_iterator *gsi) +{ + gimple *use_stmt; + use_operand_p use_p; + imm_use_iterator imm_iter; + tree res = gimple_phi_result (phi); + tree def = gimple_phi_result (gsi->phi ()); + + gcc_assert (same_close_phi_node (phi, gsi->phi ())); + + FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def) + { + FOR_EACH_IMM_USE_ON_STMT (use_p, imm_iter) + SET_USE (use_p, res); + + update_stmt (use_stmt); + + /* It is possible that we just created a duplicate close-phi + for an already-processed containing loop. Check for this + case and clean it up. */ + if (gimple_code (use_stmt) == GIMPLE_PHI + && gimple_phi_num_args (use_stmt) == 1) + make_close_phi_nodes_unique (gimple_bb (use_stmt)); + } + + remove_phi_node (gsi, true); +} + +/* Removes all the close phi duplicates from BB. */ + +static void +make_close_phi_nodes_unique (basic_block bb) +{ + gphi_iterator psi; + + for (psi = gsi_start_phis (bb); !gsi_end_p (psi); gsi_next (&psi)) + { + gphi_iterator gsi = psi; + gphi *phi = psi.phi (); + + /* At this point, PHI should be a close phi in normal form. */ + gcc_assert (gimple_phi_num_args (phi) == 1); + + /* Iterate over the next phis and remove duplicates. */ + gsi_next (&gsi); + while (!gsi_end_p (gsi)) + if (same_close_phi_node (phi, gsi.phi ())) + remove_duplicate_close_phi (phi, &gsi); + else + gsi_next (&gsi); + } +} + +/* Transforms LOOP to the canonical loop closed SSA form. */ + +static void +canonicalize_loop_closed_ssa (loop_p loop) +{ + edge e = single_exit (loop); + basic_block bb; + + if (!e || e->flags & EDGE_ABNORMAL) + return; + + bb = e->dest; + + if (single_pred_p (bb)) + { + e = split_block_after_labels (bb); + DEBUG_PRINT (dp << "\nSplitting bb_" << bb->index); + make_close_phi_nodes_unique (e->src); + } + else + { + gphi_iterator psi; + basic_block close = split_edge (e); + + e = single_succ_edge (close); + DEBUG_PRINT (dp << "\nSplitting edge (" << e->src->index << "," + << e->dest->index << ")\n"); + + for (psi = gsi_start_phis (bb); !gsi_end_p (psi); gsi_next (&psi)) + { + gphi *phi = psi.phi (); + unsigned i; + + for (i = 0; i < gimple_phi_num_args (phi); i++) + if (gimple_phi_arg_edge (phi, i) == e) + { + tree res, arg = gimple_phi_arg_def (phi, i); + use_operand_p use_p; + gphi *close_phi; + + if (TREE_CODE (arg) != SSA_NAME) + continue; + + close_phi = create_phi_node (NULL_TREE, close); + res = create_new_def_for (arg, close_phi, + gimple_phi_result_ptr (close_phi)); + add_phi_arg (close_phi, arg, + gimple_phi_arg_edge (close_phi, 0), + UNKNOWN_LOCATION); + use_p = gimple_phi_arg_imm_use_ptr (phi, i); + replace_exp (use_p, res); + update_stmt (phi); + } + } + + make_close_phi_nodes_unique (close); + } + + /* The code above does not properly handle changes in the post dominance + information (yet). */ + recompute_all_dominators (); +} + +/* Converts the current loop closed SSA form to a canonical form + expected by the Graphite code generation. + + The loop closed SSA form has the following invariant: a variable + defined in a loop that is used outside the loop appears only in the + phi nodes in the destination of the loop exit. These phi nodes are + called close phi nodes. + + The canonical loop closed SSA form contains the extra invariants: + + - when the loop contains only one exit, the close phi nodes contain + only one argument. That implies that the basic block that contains + the close phi nodes has only one predecessor, that is a basic block + in the loop. + + - the basic block containing the close phi nodes does not contain + other statements. + + - there exist only one phi node per definition in the loop. +*/ + +static void +canonicalize_loop_closed_ssa_form (void) +{ + loop_p loop; + +#ifdef ENABLE_CHECKING + verify_loop_closed_ssa (true); +#endif + + FOR_EACH_LOOP (loop, 0) + canonicalize_loop_closed_ssa (loop); + + rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa); + update_ssa (TODO_update_ssa); + +#ifdef ENABLE_CHECKING + verify_loop_closed_ssa (true); +#endif +} + +/* Can all ivs be represented by a signed integer? + As ISL might generate negative values in its expressions, signed loop ivs + are required in the backend. */ + +static bool +loop_ivs_can_be_represented (loop_p loop) +{ + unsigned type_long_long = TYPE_PRECISION (long_long_integer_type_node); + for (gphi_iterator psi = gsi_start_phis (loop->header); !gsi_end_p (psi); + gsi_next (&psi)) + { + gphi *phi = psi.phi (); + tree res = PHI_RESULT (phi); + tree type = TREE_TYPE (res); + + if (TYPE_UNSIGNED (type) && TYPE_PRECISION (type) >= type_long_long) + return false; + } + + return true; +} + +/* Returns a COND_EXPR statement when BB has a single predecessor, the + edge between BB and its predecessor is not a loop exit edge, and + the last statement of the single predecessor is a COND_EXPR. */ + +static gcond * +single_pred_cond_non_loop_exit (basic_block bb) +{ + if (single_pred_p (bb)) + { + edge e = single_pred_edge (bb); + basic_block pred = e->src; + gimple *stmt; + + if (loop_depth (pred->loop_father) > loop_depth (bb->loop_father)) + return NULL; + + stmt = last_stmt (pred); + + if (stmt && gimple_code (stmt) == GIMPLE_COND) + return as_a (stmt); + } + + return NULL; +} + +namespace +{ + +/* Build the maximal scop containing LOOPs and add it to SCOPS. */ + +class scop_detection +{ +public: + scop_detection () : scops (vNULL) {} + + /* A marker for invalid sese_l. */ + static sese_l invalid_sese; + + /* Return the SCOPS in this SCOP_DETECTION. */ + + vec + get_scops () + { + return scops; + } + + /* Return an sese_l around the LOOP. */ + + sese_l get_sese (loop_p loop); + + /* Return the closest dominator with a single entry edge. In case of a + back-loop the back-edge is not counted. */ + + static edge get_nearest_dom_with_single_entry (basic_block dom); + + /* Return the closest post-dominator with a single exit edge. In case of a + back-loop the back-edge is not counted. */ + + static edge get_nearest_pdom_with_single_exit (basic_block dom); + + /* Print S to FILE. */ + + static void print_sese (FILE *file, sese_l s); + + /* Merge scops at same loop depth and returns the new sese. + Returns a new SESE when merge was successful, INVALID_SESE otherwise. */ + + sese_l merge_sese (sese_l first, sese_l second) const; + + /* Build scop outer->inner if possible. */ + + sese_l build_scop_depth (sese_l s, loop_p loop); + + /* If loop and loop->next are valid scops, try to merge them. */ + + sese_l build_scop_breadth (sese_l s1, loop_p loop); + + /* Return true when LOOP is a valid scop, that is a Static Control Part, a + region of code that can be represented in the polyhedral model. SCOP + defines the region we analyse. */ + + bool loop_is_valid_scop (loop_p loop, sese_l scop) const; + + /* Return true when BEGIN is the preheader edge of a loop with a single exit + END. */ + + static bool region_has_one_loop (sese_l s); + + /* Add to SCOPS a scop starting at SCOP_BEGIN and ending at SCOP_END. */ + + void add_scop (sese_l s); + + /* Returns true if S1 subsumes/surrounds S2. */ + static bool subsumes (sese_l s1, sese_l s2); + + /* Remove a SCoP which is subsumed by S1. */ + void remove_subscops (sese_l s1); + + /* Returns true if S1 intersects with S2. Since we already know that S1 does + not subsume S2 or vice-versa, we only check for entry bbs. */ + + static bool intersects (sese_l s1, sese_l s2); + + /* Remove one of the scops when it intersects with any other. */ + + void remove_intersecting_scops (sese_l s1); + + /* Return true when the body of LOOP has statements that can be represented + as a valid scop. */ + + bool loop_body_is_valid_scop (loop_p loop, sese_l scop) const; + + /* Return true when BB contains a harmful operation for a scop: that + can be a function call with side effects, the induction variables + are not linear with respect to SCOP, etc. The current open + scop should end before this statement. */ + + bool harmful_stmt_in_bb (sese_l scop, basic_block bb) const; + + /* Return true when a statement in SCOP cannot be represented by Graphite. + The assumptions are that L1 dominates L2, and SCOP->entry dominates L1. + Limit the number of bbs between adjacent loops to + PARAM_SCOP_MAX_NUM_BBS_BETWEEN_LOOPS. */ + + bool harmful_stmt_in_region (sese_l scop) const; + + /* Return true only when STMT is simple enough for being handled by Graphite. + This depends on SCOP, as the parameters are initialized relatively to + this basic block, the linear functions are initialized based on the + outermost loop containing STMT inside the SCOP. BB is the place where we + try to evaluate the STMT. */ + + bool stmt_simple_for_scop_p (sese_l scop, gimple *stmt, + basic_block bb) const; + + /* Something like "n * m" is not allowed. */ + + static bool graphite_can_represent_init (tree e); + + /* Return true when SCEV can be represented in the polyhedral model. + + An expression can be represented, if it can be expressed as an + affine expression. For loops (i, j) and parameters (m, n) all + affine expressions are of the form: + + x1 * i + x2 * j + x3 * m + x4 * n + x5 * 1 where x1..x5 element of Z + + 1 i + 20 j + (-2) m + 25 + + Something like "i * n" or "n * m" is not allowed. */ + + static bool graphite_can_represent_scev (tree scev); + + /* Return true when EXPR can be represented in the polyhedral model. + + This means an expression can be represented, if it is linear with respect + to the loops and the strides are non parametric. LOOP is the place where + the expr will be evaluated. SCOP defines the region we analyse. */ + + static bool graphite_can_represent_expr (sese_l scop, loop_p loop, + tree expr); + + /* Return true if the data references of STMT can be represented by Graphite. + We try to analyze the data references in a loop contained in the SCOP. */ + + static bool stmt_has_simple_data_refs_p (sese_l scop, gimple *stmt); + + /* Remove the close phi node at GSI and replace its rhs with the rhs + of PHI. */ + + static void remove_duplicate_close_phi (gphi *phi, gphi_iterator *gsi); + + /* Returns true when Graphite can represent LOOP in SCOP. + FIXME: For the moment, graphite cannot be used on loops that iterate using + induction variables that wrap. */ + + static bool can_represent_loop_1 (loop_p loop, sese_l scop); + + /* Return true when all the loops within LOOP can be represented by + Graphite. */ + + static bool can_represent_loop (loop_p loop, sese_l scop); + + /* Generates a polyhedral black box only if the bb contains interesting + information. */ + + static gimple_poly_bb_p try_generate_gimple_bb (scop_p scop, basic_block bb); + + /* Returns true if all predecessors of BB, that are not dominated by BB, are + marked in MAP. The predecessors dominated by BB are loop latches and will + be handled after BB. */ + + static bool all_non_dominated_preds_marked_p (basic_block bb, sbitmap map); + + /* Recursive helper function for build_scops_bbs. */ + + static void build_scop_bbs_1 (scop_p scop, sbitmap visited, basic_block bb); + + /* Gather the basic blocks belonging to the SCOP. */ + + static void build_scop_bbs (scop_p scop); + + /* Returns the number of pbbs that are in loops contained in SCOP. */ + + static int nb_pbbs_in_loops (scop_p scop); + + static bool graphite_can_represent_stmt (sese_l, gimple *, basic_block); + +private: + vec scops; +}; + +sese_l scop_detection::invalid_sese (0); + +/* Return an sese_l around the LOOP. */ + +sese_l +scop_detection::get_sese (loop_p loop) +{ + if (!loop) + return invalid_sese; + + if (!loops_state_satisfies_p (LOOPS_HAVE_PREHEADERS)) + return invalid_sese; + edge scop_end = single_exit (loop); + if (!scop_end) + return invalid_sese; + edge scop_begin = loop_preheader_edge (loop); + sese_l s (scop_begin, scop_end); + return s; +} + +/* Return the closest dominator with a single entry edge. */ + +edge +scop_detection::get_nearest_dom_with_single_entry (basic_block dom) +{ + if (!dom->preds) + return NULL; + /* If e1->src dominates e2->src then e1->src will also dominate dom. */ + if (dom->preds->length () == 2) + { + edge e1 = (*dom->preds)[0]; + edge e2 = (*dom->preds)[1]; + if (dominated_by_p (CDI_DOMINATORS, e2->src, e1->src)) + return e1; + if (dominated_by_p (CDI_DOMINATORS, e1->src, e2->src)) + return e2; + } + + while (dom->preds->length () != 1) + { + if (dom->preds->length () < 1) + return NULL; + dom = get_immediate_dominator (CDI_DOMINATORS, dom); + if (!dom->preds) + return NULL; + } + return (*dom->preds)[0]; +} + +/* Return the closest post-dominator with a single exit edge. In case of a + back-loop the back-edge is not counted. */ + +edge +scop_detection::get_nearest_pdom_with_single_exit (basic_block dom) +{ + if (!dom->succs) + return NULL; + if (dom->succs->length () == 2) + { + edge e1 = (*dom->succs)[0]; + edge e2 = (*dom->succs)[1]; + if (dominated_by_p (CDI_POST_DOMINATORS, e2->dest, e1->dest)) + return e1; + if (dominated_by_p (CDI_POST_DOMINATORS, e1->dest, e2->dest)) + return e2; + } + + while (dom->succs->length () != 1) + { + if (dom->succs->length () < 1) + return NULL; + dom = get_immediate_dominator (CDI_POST_DOMINATORS, dom); + if (!dom->succs) + return NULL; + } + return (*dom->succs)[0]; +} + +/* Print S to FILE. */ + +void +scop_detection::print_sese (FILE *file, sese_l s) +{ + fprintf (file, "(entry_edge (bb_%d, bb_%d), exit_edge (bb_%d, bb_%d))\n", + s.entry->src->index, s.entry->dest->index, + s.exit->src->index, s.exit->dest->index); +} + +/* Merge scops at same loop depth and returns the new sese. + Returns a new SESE when merge was successful, INVALID_SESE otherwise. */ + +sese_l +scop_detection::merge_sese (sese_l first, sese_l second) const +{ + /* In the trivial case first/second may be NULL. */ + if (!first) + return second; + if (!second) + return first; + + DEBUG_PRINT (dp << "[try-merging-sese] s1: "; print_sese (dump_file, first); + dp << "[try-merging-sese] s2: "; + print_sese (dump_file, second)); + + /* Assumption: Both the sese's should be at the same loop depth or one scop + should subsume the other like in case of nested loops. */ + + /* Find the common dominators for entry, + and common post-dominators for the exit. */ + basic_block dom = nearest_common_dominator (CDI_DOMINATORS, + get_entry_bb (first.entry), + get_entry_bb (second.entry)); + + edge entry = get_nearest_dom_with_single_entry (dom); + if (!entry) + return invalid_sese; + + basic_block pdom = nearest_common_dominator (CDI_POST_DOMINATORS, + get_exit_bb (first.exit), + get_exit_bb (second.exit)); + pdom = nearest_common_dominator (CDI_POST_DOMINATORS, dom, pdom); + + edge exit = get_nearest_pdom_with_single_exit (pdom); + if (!exit) + return invalid_sese; + + sese_l combined (entry, exit); + + /* FIXME: We could iterate to find the dom which dominates pdom, and pdom + which post-dominates dom, until it stabilizes. Also, ENTRY->SRC and + EXIT->DEST should be in the same loop nest. */ + if (!dominated_by_p (CDI_DOMINATORS, pdom, dom) + || loop_depth (entry->src->loop_father) + != loop_depth (exit->dest->loop_father)) + return invalid_sese; + + /* For now we just want to bail out when exit does not post-dominate entry. + TODO: We might just add a basic_block at the exit to make exit + post-dominate entry (the entire region). */ + if (!dominated_by_p (CDI_POST_DOMINATORS, get_entry_bb (entry), + get_exit_bb (exit)) + || !dominated_by_p (CDI_DOMINATORS, get_exit_bb (exit), + get_entry_bb (entry))) + { + DEBUG_PRINT (dp << "[scop-detection-fail] cannot merge seses.\n"); + return invalid_sese; + } + + /* FIXME: We should remove this piece of code once + canonicalize_loop_closed_ssa has been removed, because that function + adds a BB with single exit. */ + if (!trivially_empty_bb_p (get_exit_bb (combined.exit))) + { + /* Find the first empty succ (with single exit) of combined.exit. */ + basic_block imm_succ = combined.exit->dest; + if (single_succ_p (imm_succ) && trivially_empty_bb_p (imm_succ)) + combined.exit = single_succ_edge (imm_succ); + else + { + DEBUG_PRINT (dp << "\n[scop-detection-fail] Discarding SCoP because " + << "no single exit (empty succ) for sese exit"; + print_sese (dump_file, combined)); + return invalid_sese; + } + } + + /* Analyze all the BBs in new sese. */ + if (harmful_stmt_in_region (combined)) + return invalid_sese; + + DEBUG_PRINT (dp << "[merged-sese] s1: "; print_sese (dump_file, combined)); + + return combined; +} + +/* Build scop outer->inner if possible. */ + +sese_l +scop_detection::build_scop_depth (sese_l s, loop_p loop) +{ + if (!loop) + return s; + + DEBUG_PRINT (dp << "\n[Depth loop_" << loop->num << "]"); + s = build_scop_depth (s, loop->inner); + + sese_l s2 = merge_sese (s, get_sese (loop)); + if (!s2) + { + /* s might be a valid scop, so return it and start analyzing from the + adjacent loop. */ + build_scop_depth (invalid_sese, loop->next); + return s; + } + + if (!loop_is_valid_scop (loop, s2)) + return build_scop_depth (invalid_sese, loop->next); + + return build_scop_breadth (s2, loop); +} + +/* If loop and loop->next are valid scops, try to merge them. */ + +sese_l +scop_detection::build_scop_breadth (sese_l s1, loop_p loop) +{ + if (!loop) + return s1; + DEBUG_PRINT (dp << "\n[Breadth loop_" << loop->num << "]"); + gcc_assert (s1); + + loop_p l = loop; + sese_l s2 = build_scop_depth (invalid_sese, l->next); + if (!s2) + { + if (s1) + add_scop (s1); + return s1; + } + + sese_l combined = merge_sese (s1, s2); + + if (combined) + s1 = combined; + else + add_scop (s2); + + if (s1) + add_scop (s1); + return s1; +} + +/* Returns true when Graphite can represent LOOP in SCOP. + FIXME: For the moment, graphite cannot be used on loops that iterate using + induction variables that wrap. */ + +bool +scop_detection::can_represent_loop_1 (loop_p loop, sese_l scop) +{ + tree niter; + struct tree_niter_desc niter_desc; + + return single_exit (loop) + && number_of_iterations_exit (loop, single_exit (loop), &niter_desc, false) + && niter_desc.control.no_overflow + && (niter = number_of_latch_executions (loop)) + && !chrec_contains_undetermined (niter) + && graphite_can_represent_expr (scop, loop, niter); +} + +/* Return true when all the loops within LOOP can be represented by + Graphite. */ + +bool +scop_detection::can_represent_loop (loop_p loop, sese_l scop) +{ + if (!can_represent_loop_1 (loop, scop)) + return false; + if (loop->inner && !can_represent_loop (loop->inner, scop)) + return false; + if (loop->next && !can_represent_loop (loop->next, scop)) + return false; + + return true; +} + +/* Return true when LOOP is a valid scop, that is a Static Control Part, a + region of code that can be represented in the polyhedral model. SCOP + defines the region we analyse. */ + +bool +scop_detection::loop_is_valid_scop (loop_p loop, sese_l scop) const +{ + if (!scop) + return false; + + if (!can_represent_loop (loop, scop)) + { + DEBUG_PRINT (dp << "[scop-detection-fail] cannot represent loop_" + << loop->num << "\n"); + return false; + } + + if (loop_body_is_valid_scop (loop, scop)) + { + DEBUG_PRINT (dp << "[valid-scop] loop_" << loop->num + << "is a valid scop.\n"); + return true; + } + return false; +} + +/* Return true when BEGIN is the preheader edge of a loop with a single exit + END. */ + +bool +scop_detection::region_has_one_loop (sese_l s) +{ + edge begin = s.entry; + edge end = s.exit; + /* Check for a single perfectly nested loop. */ + if (begin->dest->loop_father->inner) + return false; + + /* Otherwise, check whether we have adjacent loops. */ + return begin->dest->loop_father == end->src->loop_father; +} + +/* Add to SCOPS a scop starting at SCOP_BEGIN and ending at SCOP_END. */ + +void +scop_detection::add_scop (sese_l s) +{ + gcc_assert (s); + + /* Do not add scops with only one loop. */ + if (region_has_one_loop (s)) + { + DEBUG_PRINT (dp << "\n[scop-detection-fail] Discarding one loop SCoP"; + print_sese (dump_file, s)); + return; + } + + if (get_exit_bb (s.exit) == EXIT_BLOCK_PTR_FOR_FN (cfun)) + { + DEBUG_PRINT (dp << "\n[scop-detection-fail] " + << "Discarding SCoP exiting to return"; + print_sese (dump_file, s)); + return; + } + + /* Remove all the scops which are subsumed by s. */ + remove_subscops (s); + + /* Replace this with split-intersecting scops. */ + remove_intersecting_scops (s); -static basic_block -get_exit_bb (edge e) -{ - return e->src; + scops.safe_push (s); + DEBUG_PRINT (dp << "\nAdding SCoP "; print_sese (dump_file, s)); } -class debug_printer +/* Return true when a statement in SCOP cannot be represented by Graphite. + The assumptions are that L1 dominates L2, and SCOP->entry dominates L1. + Limit the number of bbs between adjacent loops to + PARAM_SCOP_MAX_NUM_BBS_BETWEEN_LOOPS. */ + +bool +scop_detection::harmful_stmt_in_region (sese_l scop) const { -private: - FILE *dump_file; -public: - void set_dump_file (FILE *f) - { - gcc_assert (f); - dump_file = f; - } + basic_block exit_bb = get_exit_bb (scop.exit); + basic_block entry_bb = get_entry_bb (scop.entry); - friend debug_printer &operator<<(debug_printer &output, int i) - { - fprintf (output.dump_file, "%d", i); - return output; - } - friend debug_printer &operator<<(debug_printer &output, const char *s) - { - fprintf (output.dump_file, "%s", s); - return output; - } -} dp; + DEBUG_PRINT (dp << "\n[checking-harmful-bbs] "; + print_sese (dump_file, scop)); + gcc_assert (dominated_by_p (CDI_DOMINATORS, exit_bb, entry_bb)); -#define DEBUG_PRINT(args) do \ - { \ - if (dump_file && (dump_flags & TDF_DETAILS)) { args; } \ - } while (0); + int depth = bb_dom_dfs_in (CDI_DOMINATORS, exit_bb) + - bb_dom_dfs_in (CDI_DOMINATORS, entry_bb); + gcc_assert (depth > 0); -/* Return true if BB is empty, contains only DEBUG_INSNs. */ + vec dom + = get_dominated_to_depth (CDI_DOMINATORS, entry_bb, depth); + int i; + basic_block bb; + FOR_EACH_VEC_ELT (dom, i, bb) + { + DEBUG_PRINT (dp << "\nVisiting bb_" << bb->index); -static bool -trivially_empty_bb_p (basic_block bb) + /* We don't want to analyze any bb outside sese. */ + if (!dominated_by_p (CDI_POST_DOMINATORS, bb, exit_bb)) + continue; + + if (harmful_stmt_in_bb (scop, bb)) + return true; + } + + return false; +} + +/* Returns true if S1 subsumes/surrounds S2. */ +bool +scop_detection::subsumes (sese_l s1, sese_l s2) { - gimple_stmt_iterator gsi; + if (dominated_by_p (CDI_DOMINATORS, get_entry_bb (s2.entry), + get_entry_bb (s1.entry)) + && dominated_by_p (CDI_POST_DOMINATORS, get_entry_bb (s2.exit), + get_entry_bb (s1.exit))) + return true; + return false; +} - for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) - if (gimple_code (gsi_stmt (gsi)) != GIMPLE_DEBUG) - return false; +/* Remove a SCoP which is subsumed by S1. */ +void +scop_detection::remove_subscops (sese_l s1) +{ + int j; + sese_l s2 (0); + FOR_EACH_VEC_ELT_REVERSE (scops, j, s2) + { + if (subsumes (s1, s2)) + { + DEBUG_PRINT (dp << "\nRemoving sub-SCoP"; + print_sese (dump_file, s2)); + scops.unordered_remove (j); + } + } +} - return true; +/* Returns true if S1 intersects with S2. Since we already know that S1 does + not subsume S2 or vice-versa, we only check for entry bbs. */ + +bool +scop_detection::intersects (sese_l s1, sese_l s2) +{ + if (dominated_by_p (CDI_DOMINATORS, get_entry_bb (s2.entry), + get_entry_bb (s1.entry)) + && !dominated_by_p (CDI_DOMINATORS, get_entry_bb (s2.entry), + get_exit_bb (s1.exit))) + return true; + if ((s1.exit == s2.entry) || (s2.exit == s1.entry)) + return true; + + return false; } +/* Remove one of the scops when it intersects with any other. */ -/* Forward declarations. */ -static void make_close_phi_nodes_unique (basic_block); +void +scop_detection::remove_intersecting_scops (sese_l s1) +{ + int j; + sese_l s2 (0); + FOR_EACH_VEC_ELT_REVERSE (scops, j, s2) + { + if (intersects (s1, s2)) + { + DEBUG_PRINT (dp << "\nRemoving intersecting SCoP"; + print_sese (dump_file, s2); dp << "Intersects with:"; + print_sese (dump_file, s1)); + scops.unordered_remove (j); + } + } +} /* Something like "n * m" is not allowed. */ -static bool -graphite_can_represent_init (tree e) +bool +scop_detection::graphite_can_represent_init (tree e) { switch (TREE_CODE (e)) { @@ -177,8 +1067,8 @@ graphite_can_represent_init (tree e) case NON_LVALUE_EXPR: return graphite_can_represent_init (TREE_OPERAND (e, 0)); - default: - break; + default: + break; } return true; @@ -196,8 +1086,8 @@ graphite_can_represent_init (tree e) Something like "i * n" or "n * m" is not allowed. */ -static bool -graphite_can_represent_scev (tree scev) +bool +scop_detection::graphite_can_represent_scev (tree scev) { if (chrec_contains_undetermined (scev)) return false; @@ -248,22 +1138,21 @@ graphite_can_represent_scev (tree scev) } /* Only affine functions can be represented. */ - if (tree_contains_chrecs (scev, NULL) - || !scev_is_linear_expression (scev)) + if (tree_contains_chrecs (scev, NULL) || !scev_is_linear_expression (scev)) return false; return true; } - /* Return true when EXPR can be represented in the polyhedral model. This means an expression can be represented, if it is linear with respect to the loops and the strides are non parametric. LOOP is the place where the expr will be evaluated. SCOP defines the region we analyse. */ -static bool -graphite_can_represent_expr (sese_l scop, loop_p loop, tree expr) +bool +scop_detection::graphite_can_represent_expr (sese_l scop, loop_p loop, + tree expr) { sese region = new_sese (scop.entry, scop.exit); tree scev = scalar_evolution_in_region (region, loop, expr); @@ -274,8 +1163,8 @@ graphite_can_represent_expr (sese_l scop, loop_p loop, tree expr) /* Return true if the data references of STMT can be represented by Graphite. We try to analyze the data references in a loop contained in the SCOP. */ -static bool -stmt_has_simple_data_refs_p (sese_l scop, gimple *stmt) +bool +scop_detection::stmt_has_simple_data_refs_p (sese_l scop, gimple *stmt) { sese region = new_sese (scop.entry, scop.exit); loop_p nest = outermost_loop_in_sese (region, gimple_bb (stmt)); @@ -301,8 +1190,7 @@ stmt_has_simple_data_refs_p (sese_l scop, gimple *stmt) for (int i = nb_subscripts - 1; i >= 0; i--) { if (!graphite_can_represent_scev (DR_ACCESS_FN (dr, i)) - || (TREE_CODE (ref) != ARRAY_REF - && TREE_CODE (ref) != MEM_REF + || (TREE_CODE (ref) != ARRAY_REF && TREE_CODE (ref) != MEM_REF && TREE_CODE (ref) != COMPONENT_REF)) { free_data_refs (drs); @@ -313,8 +1201,8 @@ stmt_has_simple_data_refs_p (sese_l scop, gimple *stmt) } } - free_data_refs (drs); - return true; + free_data_refs (drs); + return true; } /* GIMPLE_ASM and GIMPLE_CALL may embed arbitrary side effects. @@ -331,7 +1219,7 @@ stmt_has_side_effects (gimple *stmt) { DEBUG_PRINT (dp << "[scop-detection-fail] " << "Statement has side-effects:\n"; - print_gimple_stmt (dump_file, stmt, 0, TDF_VOPS|TDF_MEMSYMS)); + print_gimple_stmt (dump_file, stmt, 0, TDF_VOPS | TDF_MEMSYMS)); return true; } return false; @@ -340,8 +1228,9 @@ stmt_has_side_effects (gimple *stmt) /* Returns true if STMT can be represented in polyhedral model. LABEL, simple COND stmts, pure calls, and assignments can be repesented. */ -static bool -graphite_can_represent_stmt (sese_l scop, gimple *stmt, basic_block bb) +bool +scop_detection::graphite_can_represent_stmt (sese_l scop, gimple *stmt, + basic_block bb) { loop_p loop = bb->loop_father; switch (gimple_code (stmt)) @@ -364,7 +1253,8 @@ graphite_can_represent_stmt (sese_l scop, gimple *stmt, basic_block bb) { DEBUG_PRINT (dp << "[scop-detection-fail] " << "Graphite cannot handle cond stmt:\n"; - print_gimple_stmt (dump_file, stmt, 0, TDF_VOPS|TDF_MEMSYMS)); + print_gimple_stmt (dump_file, stmt, 0, + TDF_VOPS | TDF_MEMSYMS)); return false; } @@ -375,9 +1265,10 @@ graphite_can_represent_stmt (sese_l scop, gimple *stmt, basic_block bb) /* We can only constrain on integer type. */ || (TREE_CODE (TREE_TYPE (op)) != INTEGER_TYPE)) { - DEBUG_PRINT (dp << "[scop-detection-fail] " - << "Graphite cannot represent stmt:\n"; - print_gimple_stmt (dump_file, stmt, 0, TDF_VOPS|TDF_MEMSYMS)); + DEBUG_PRINT (dp << "[scop-detection-fail] " + << "Graphite cannot represent stmt:\n"; + print_gimple_stmt (dump_file, stmt, 0, + TDF_VOPS | TDF_MEMSYMS)); return false; } } @@ -391,9 +1282,10 @@ graphite_can_represent_stmt (sese_l scop, gimple *stmt, basic_block bb) default: /* These nodes cut a new scope. */ - DEBUG_PRINT (dp << "[scop-detection-fail] " - << "Gimple stmt not handled in Graphite:\n"; - print_gimple_stmt (dump_file, stmt, 0, TDF_VOPS|TDF_MEMSYMS)); + DEBUG_PRINT ( + dp << "[scop-detection-fail] " + << "Gimple stmt not handled in Graphite:\n"; + print_gimple_stmt (dump_file, stmt, 0, TDF_VOPS | TDF_MEMSYMS)); return false; } } @@ -404,8 +1296,9 @@ graphite_can_represent_stmt (sese_l scop, gimple *stmt, basic_block bb) loop containing STMT inside the SCOP. BB is the place where we try to evaluate the STMT. */ -static bool -stmt_simple_for_scop_p (sese_l scop, gimple *stmt, basic_block bb) +bool +scop_detection::stmt_simple_for_scop_p (sese_l scop, gimple *stmt, + basic_block bb) const { gcc_assert (scop); @@ -431,188 +1324,16 @@ stmt_simple_for_scop_p (sese_l scop, gimple *stmt, basic_block bb) are not linear with respect to SCOP, etc. The current open scop should end before this statement. */ -static bool -harmful_stmt_in_bb (sese_l scop, basic_block bb) +bool +scop_detection::harmful_stmt_in_bb (sese_l scop, basic_block bb) const { gimple_stmt_iterator gsi; - for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) - if (!stmt_simple_for_scop_p (scop, gsi_stmt (gsi), bb)) - return true; - - return false; -} - -/* Returns true when P1 and P2 are close phis with the same - argument. */ - -static inline bool -same_close_phi_node (gphi *p1, gphi *p2) -{ - return operand_equal_p (gimple_phi_arg_def (p1, 0), - gimple_phi_arg_def (p2, 0), 0); -} - -/* Remove the close phi node at GSI and replace its rhs with the rhs - of PHI. */ - -static void -remove_duplicate_close_phi (gphi *phi, gphi_iterator *gsi) -{ - gimple *use_stmt; - use_operand_p use_p; - imm_use_iterator imm_iter; - tree res = gimple_phi_result (phi); - tree def = gimple_phi_result (gsi->phi ()); - - gcc_assert (same_close_phi_node (phi, gsi->phi ())); - - FOR_EACH_IMM_USE_STMT (use_stmt, imm_iter, def) - { - FOR_EACH_IMM_USE_ON_STMT (use_p, imm_iter) - SET_USE (use_p, res); - - update_stmt (use_stmt); - - /* It is possible that we just created a duplicate close-phi - for an already-processed containing loop. Check for this - case and clean it up. */ - if (gimple_code (use_stmt) == GIMPLE_PHI - && gimple_phi_num_args (use_stmt) == 1) - make_close_phi_nodes_unique (gimple_bb (use_stmt)); - } - - remove_phi_node (gsi, true); -} - -/* Removes all the close phi duplicates from BB. */ - -static void -make_close_phi_nodes_unique (basic_block bb) -{ - gphi_iterator psi; - - for (psi = gsi_start_phis (bb); !gsi_end_p (psi); gsi_next (&psi)) - { - gphi_iterator gsi = psi; - gphi *phi = psi.phi (); - - /* At this point, PHI should be a close phi in normal form. */ - gcc_assert (gimple_phi_num_args (phi) == 1); - - /* Iterate over the next phis and remove duplicates. */ - gsi_next (&gsi); - while (!gsi_end_p (gsi)) - if (same_close_phi_node (phi, gsi.phi ())) - remove_duplicate_close_phi (phi, &gsi); - else - gsi_next (&gsi); - } -} - -/* Transforms LOOP to the canonical loop closed SSA form. */ - -static void -canonicalize_loop_closed_ssa (loop_p loop) -{ - edge e = single_exit (loop); - basic_block bb; - - if (!e || e->flags & EDGE_ABNORMAL) - return; - - bb = e->dest; - - if (single_pred_p (bb)) - { - e = split_block_after_labels (bb); - DEBUG_PRINT (dp << "\nSplitting bb_" << bb->index); - make_close_phi_nodes_unique (e->src); - } - else - { - gphi_iterator psi; - basic_block close = split_edge (e); - - e = single_succ_edge (close); - DEBUG_PRINT (dp << "\nSplitting edge (" - << e->src->index << "," << e->dest->index - << ")\n"); - - for (psi = gsi_start_phis (bb); !gsi_end_p (psi); gsi_next (&psi)) - { - gphi *phi = psi.phi (); - unsigned i; - - for (i = 0; i < gimple_phi_num_args (phi); i++) - if (gimple_phi_arg_edge (phi, i) == e) - { - tree res, arg = gimple_phi_arg_def (phi, i); - use_operand_p use_p; - gphi *close_phi; - - if (TREE_CODE (arg) != SSA_NAME) - continue; - - close_phi = create_phi_node (NULL_TREE, close); - res = create_new_def_for (arg, close_phi, - gimple_phi_result_ptr (close_phi)); - add_phi_arg (close_phi, arg, - gimple_phi_arg_edge (close_phi, 0), - UNKNOWN_LOCATION); - use_p = gimple_phi_arg_imm_use_ptr (phi, i); - replace_exp (use_p, res); - update_stmt (phi); - } - } - - make_close_phi_nodes_unique (close); - } - - /* The code above does not properly handle changes in the post dominance - information (yet). */ - recompute_all_dominators (); -} - -/* Converts the current loop closed SSA form to a canonical form - expected by the Graphite code generation. - - The loop closed SSA form has the following invariant: a variable - defined in a loop that is used outside the loop appears only in the - phi nodes in the destination of the loop exit. These phi nodes are - called close phi nodes. - - The canonical loop closed SSA form contains the extra invariants: - - - when the loop contains only one exit, the close phi nodes contain - only one argument. That implies that the basic block that contains - the close phi nodes has only one predecessor, that is a basic block - in the loop. - - - the basic block containing the close phi nodes does not contain - other statements. - - - there exist only one phi node per definition in the loop. -*/ - -static void -canonicalize_loop_closed_ssa_form (void) -{ - loop_p loop; - -#ifdef ENABLE_CHECKING - verify_loop_closed_ssa (true); -#endif - - FOR_EACH_LOOP (loop, 0) - canonicalize_loop_closed_ssa (loop); - - rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa); - update_ssa (TODO_update_ssa); + for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) + if (!stmt_simple_for_scop_p (scop, gsi_stmt (gsi), bb)) + return true; -#ifdef ENABLE_CHECKING - verify_loop_closed_ssa (true); -#endif + return false; } /* Pretty print to FILE all the SCoPs in DOT format and mark them with @@ -632,7 +1353,7 @@ dot_all_scops_1 (FILE *file, vec scops) edge e; edge_iterator ei; scop_p scop; - const char* color; + const char *color; int i; /* Disable debugging while printing graph. */ @@ -646,18 +1367,17 @@ dot_all_scops_1 (FILE *file, vec scops) int part_of_scop = false; /* Use HTML for every bb label. So we are able to print bbs - which are part of two different SCoPs, with two different - background colors. */ + which are part of two different SCoPs, with two different + background colors. */ fprintf (file, "%d [label=<\n index); + bb->index); fprintf (file, "CELLSPACING=\"0\">\n"); /* Select color for SCoP. */ FOR_EACH_VEC_ELT (scops, i, scop) { sese region = SCOP_REGION (scop); - if (bb_in_sese_p (bb, region) - || (SESE_EXIT_BB (region) == bb) + if (bb_in_sese_p (bb, region) || (SESE_EXIT_BB (region) == bb) || (SESE_ENTRY_BB (region) == bb)) { switch (i % 17) @@ -717,13 +1437,13 @@ dot_all_scops_1 (FILE *file, vec scops) color = "#999999"; } - fprintf (file, " \n"); - part_of_scop = true; + part_of_scop = true; } } - if (!part_of_scop) - { - fprintf (file, " \n", - bb->index, bb->loop_father->num); - } - fprintf (file, "
", color); + fprintf (file, "
", + color); if (!bb_in_sese_p (bb, region)) fprintf (file, " ("); - if (bb == SESE_ENTRY_BB (region) - && bb == SESE_EXIT_BB (region)) + if (bb == SESE_ENTRY_BB (region) && bb == SESE_EXIT_BB (region)) fprintf (file, " %d*# ", bb->index); else if (bb == SESE_ENTRY_BB (region)) fprintf (file, " %d* ", bb->index); @@ -734,28 +1454,28 @@ dot_all_scops_1 (FILE *file, vec scops) fprintf (file, "{lp_%d}", bb->loop_father->num); - if (!bb_in_sese_p (bb,region)) + if (!bb_in_sese_p (bb, region)) fprintf (file, ")"); fprintf (file, "
"); - fprintf (file, " %d {lp_%d}
>, shape=box, style=\"setlinewidth(0)\"]\n"); + if (!part_of_scop) + { + fprintf (file, " "); + fprintf (file, " %d {lp_%d} \n", bb->index, + bb->loop_father->num); + } + fprintf (file, " >, shape=box, style=\"setlinewidth(0)\"]\n"); } - FOR_ALL_BB_FN (bb, cfun) - { - FOR_EACH_EDGE (e, ei, bb->succs) - fprintf (file, "%d -> %d;\n", bb->index, e->dest->index); - } + FOR_ALL_BB_FN (bb, cfun) + { + FOR_EACH_EDGE (e, ei, bb->succs) + fprintf (file, "%d -> %d;\n", bb->index, e->dest->index); + } fputs ("}\n\n", file); @@ -811,44 +1531,23 @@ dot_scop (scop_p scop) #endif } -/* Can all ivs be represented by a signed integer? - As ISL might generate negative values in its expressions, signed loop ivs - are required in the backend. */ - -static bool -loop_ivs_can_be_represented (loop_p loop) -{ - for (gphi_iterator psi = gsi_start_phis (loop->header); - !gsi_end_p (psi); gsi_next (&psi)) - { - gphi *phi = psi.phi (); - tree res = PHI_RESULT (phi); - tree type = TREE_TYPE (res); - - if (TYPE_UNSIGNED (type) - && TYPE_PRECISION (type) >= TYPE_PRECISION (long_long_integer_type_node)) - return false; - } - return true; -} - /* Return true when the body of LOOP has statements that can be represented as a valid scop. */ -static bool -loop_body_is_valid_scop (loop_p loop, sese_l scop) +bool +scop_detection::loop_body_is_valid_scop (loop_p loop, sese_l scop) const { if (!loop_ivs_can_be_represented (loop)) { - DEBUG_PRINT (dp << "[scop-detection-fail] loop_" - << loop->num << "IV cannot be represented.\n"); + DEBUG_PRINT (dp << "[scop-detection-fail] loop_" << loop->num + << "IV cannot be represented.\n"); return false; } if (!loop_nest_has_data_refs (loop)) { - DEBUG_PRINT (dp << "[scop-detection-fail] loop_" - << loop->num << "does not have any data reference.\n"); + DEBUG_PRINT (dp << "[scop-detection-fail] loop_" << loop->num + << "does not have any data reference.\n"); return false; } @@ -876,467 +1575,189 @@ loop_body_is_valid_scop (loop_p loop, sese_l scop) return true; } -/* Build the maximal scop containing LOOP(s) and add it to SCOPS. */ +/* Generates a polyhedral black box only if the bb contains interesting + information. */ -class scop_builder +gimple_poly_bb_p +scop_detection::try_generate_gimple_bb (scop_p scop, basic_block bb) { - public: - scop_builder () - : scops (vNULL) - { } - - static sese_l invalid_sese; - - vec - get_scops () - { - return scops; - } - - sese_l - get_sese (loop_p loop) - { - if (!loop) - return invalid_sese; - - if (!loops_state_satisfies_p (LOOPS_HAVE_PREHEADERS)) - return invalid_sese; - edge scop_end = single_exit (loop); - if (!scop_end) - return invalid_sese; - edge scop_begin = loop_preheader_edge (loop); - sese_l s (scop_begin, scop_end); - return s; - } - - static edge - get_nearest_dom_with_single_entry (basic_block dom) - { - if (!dom->preds) - return NULL; - /* If e1->src dominates e2->src then e1->src will also dominate dom. */ - if (dom->preds->length () == 2) - { - edge e1 = (*dom->preds)[0]; - edge e2 = (*dom->preds)[1]; - if (dominated_by_p (CDI_DOMINATORS, e2->src, e1->src)) - return e1; - if (dominated_by_p (CDI_DOMINATORS, e1->src, e2->src)) - return e2; - } - - while (dom->preds->length () != 1) - { - if (dom->preds->length () < 1) - return NULL; - dom = get_immediate_dominator (CDI_DOMINATORS, dom); - if (!dom->preds) - return NULL; - } - return (*dom->preds)[0]; - } + vec drs; + drs.create (5); + sese region = SCOP_REGION (scop); + loop_p nest = outermost_loop_in_sese (region, bb); - static edge - get_nearest_pdom_with_single_exit (basic_block dom) - { - if (!dom->succs) - return NULL; - if (dom->succs->length () == 2) - { - edge e1 = (*dom->succs)[0]; - edge e2 = (*dom->succs)[1]; - if (dominated_by_p (CDI_POST_DOMINATORS, e2->dest, e1->dest)) - return e1; - if (dominated_by_p (CDI_POST_DOMINATORS, e1->dest, e2->dest)) - return e2; - } + loop_p loop = bb->loop_father; + if (!loop_in_sese_p (loop, region)) + loop = nest; - while (dom->succs->length () != 1) - { - if (dom->succs->length () < 1) - return NULL; - dom = get_immediate_dominator (CDI_POST_DOMINATORS, dom); - if (!dom->succs) - return NULL; - } - return (*dom->succs)[0]; - } + gimple_stmt_iterator gsi; + for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) + { + gimple *stmt = gsi_stmt (gsi); + if (is_gimple_debug (stmt)) + continue; - /* Print S to FILE. */ + graphite_find_data_references_in_stmt (nest, loop, stmt, &drs); + } - static void - print_sese (FILE *file, sese_l s) - { - fprintf (file, "(entry_edge (bb_%d, bb_%d), exit_edge (bb_%d, bb_%d))\n", - s.entry->src->index, s.entry->dest->index, - s.exit->src->index, s.exit->dest->index); - } + return new_gimple_poly_bb (bb, drs); +} - /* Merge scops at same loop depth and returns the new sese. - Returns a new SESE when merge was successful, INVALID_SESE otherwise. */ +/* Returns true if all predecessors of BB, that are not dominated by BB, are + marked in MAP. The predecessors dominated by BB are loop latches and will + be handled after BB. */ - static sese_l - merge_sese (sese_l first, sese_l second) - { - /* In the trivial case first/second may be NULL. */ - if (!first) - return second; - if (!second) - return first; +bool +scop_detection::all_non_dominated_preds_marked_p (basic_block bb, sbitmap map) +{ + edge e; + edge_iterator ei; - DEBUG_PRINT (dp << "[try-merging-sese] s1: "; - print_sese (dump_file, first); - dp << "[try-merging-sese] s2: "; - print_sese (dump_file, second)); + FOR_EACH_EDGE (e, ei, bb->preds) + if (!bitmap_bit_p (map, e->src->index) + && !dominated_by_p (CDI_DOMINATORS, e->src, bb)) + return false; - /* Assumption: Both the sese's should be at the same loop depth or one scop - should subsume the other like in case of nested loops. */ + return true; +} - /* Find the common dominators for entry, - and common post-dominators for the exit. */ - basic_block dom = nearest_common_dominator (CDI_DOMINATORS, - get_entry_bb (first.entry), - get_entry_bb (second.entry)); +/* Recursive helper function for build_scops_bbs. */ +void +scop_detection::build_scop_bbs_1 (scop_p scop, sbitmap visited, basic_block bb) +{ + sese region = SCOP_REGION (scop); + vec dom; + poly_bb_p pbb; - edge entry = get_nearest_dom_with_single_entry (dom); - if (!entry) - return invalid_sese; + if (bitmap_bit_p (visited, bb->index) || !bb_in_sese_p (bb, region)) + return; - basic_block pdom = nearest_common_dominator (CDI_POST_DOMINATORS, - get_exit_bb (first.exit), - get_exit_bb (second.exit)); - pdom = nearest_common_dominator (CDI_POST_DOMINATORS, dom, pdom); + pbb = new_poly_bb (scop, try_generate_gimple_bb (scop, bb)); + SCOP_BBS (scop).safe_push (pbb); + bitmap_set_bit (visited, bb->index); - edge exit = get_nearest_pdom_with_single_exit (pdom); - if (!exit) - return invalid_sese; + dom = get_dominated_by (CDI_DOMINATORS, bb); - sese_l combined (entry, exit); + if (!dom.exists ()) + return; - /* FIXME: We could iterate to find the dom which dominates pdom, and pdom - which post-dominates dom, until it stabilizes. Also, ENTRY->SRC and - EXIT->DEST should be in the same loop nest. */ - if (!dominated_by_p (CDI_DOMINATORS, pdom, dom) - || loop_depth (entry->src->loop_father) - != loop_depth (exit->dest->loop_father)) - return invalid_sese; + graphite_sort_dominated_info (dom); - /* For now we just want to bail out when exit does not post-dominate entry. - TODO: We might just add a basic_block at the exit to make exit - post-dominate entry (the entire region). */ - if (!dominated_by_p (CDI_POST_DOMINATORS, get_entry_bb (entry), - get_exit_bb (exit)) - || !dominated_by_p (CDI_DOMINATORS, get_exit_bb (exit), - get_entry_bb (entry))) - { - DEBUG_PRINT (dp << "[scop-detection-fail] cannot merge seses.\n"); - return invalid_sese; - } + while (!dom.is_empty ()) + { + int i; + basic_block dom_bb; - /* FIXME: We should remove this piece of code once - canonicalize_loop_closed_ssa has been removed, because that function - adds a BB with single exit. */ - if (!trivially_empty_bb_p (get_exit_bb (combined.exit))) - { - /* Find the first empty succ (with single exit) of combined.exit. */ - basic_block imm_succ = combined.exit->dest; - if (single_succ_p (imm_succ) && trivially_empty_bb_p (imm_succ)) - combined.exit = single_succ_edge (imm_succ); - else + FOR_EACH_VEC_ELT (dom, i, dom_bb) + if (all_non_dominated_preds_marked_p (dom_bb, visited)) { - DEBUG_PRINT (dp << "\n[scop-detection-fail] Discarding SCoP because " - << "no single exit (empty succ) for sese exit"; - print_sese (dump_file, combined)); - return invalid_sese; + build_scop_bbs_1 (scop, visited, dom_bb); + dom.unordered_remove (i); + break; } - } - - /* Analyze all the BBs in new sese. */ - if (harmful_stmt_in_region (combined)) - return invalid_sese; - - DEBUG_PRINT (dp << "[merged-sese] s1: "; - print_sese (dump_file, combined)); - - return combined; - } - - /* Build scop outer->inner if possible. */ - sese_l - build_scop_depth (sese_l s, loop_p loop) - { - if (!loop) - return s; - - DEBUG_PRINT (dp << "\n[Depth loop_" << loop->num << "]"); - s = build_scop_depth (s, loop->inner); - - sese_l s2 = merge_sese (s, get_sese (loop)); - if (!s2) - { - /* s might be a valid scop, so return it and start analyzing from the - adjacent loop. */ - build_scop_depth (invalid_sese, loop->next); - return s; - } - - if (!loop_is_valid_scop (loop, s2)) - return build_scop_depth (invalid_sese, loop->next); - - return build_scop_breadth (s2, loop); - } - - /* If loop and loop->next are valid scops, try to merge them. */ - - sese_l - build_scop_breadth (sese_l s1, loop_p loop) - { - if (!loop) - return s1; - DEBUG_PRINT (dp << "\n[Breadth loop_" << loop->num << "]"); - gcc_assert (s1); - - loop_p l = loop; - sese_l s2 = build_scop_depth (invalid_sese, l->next); - if (!s2) - { - if (s1) - add_scop (s1); - return s1; - } - - sese_l combined = merge_sese (s1, s2); - - if (combined) - s1 = combined; - else - add_scop (s2); - - if (s1) - add_scop (s1); - return s1; - } - - /* Returns true when Graphite can represent LOOP in SCOP. - FIXME: For the moment, graphite cannot be used on loops that iterate using - induction variables that wrap. */ - static bool - can_represent_loop_1 (loop_p loop, sese_l scop) - { - tree niter; - struct tree_niter_desc niter_desc; - - return single_exit (loop) - && number_of_iterations_exit (loop, single_exit (loop), &niter_desc, false) - && niter_desc.control.no_overflow - && (niter = number_of_latch_executions (loop)) - && !chrec_contains_undetermined (niter) - && graphite_can_represent_expr (scop, loop, niter); - } - - /* Return true when all the loops within LOOP can be represented by - Graphite. */ - - static bool - can_represent_loop (loop_p loop, sese_l scop) - { - if (!can_represent_loop_1 (loop, scop)) - return false; - if (loop->inner && !can_represent_loop (loop->inner, scop)) - return false; - if (loop->next && !can_represent_loop (loop->next, scop)) - return false; - - return true; - } - - /* Return true when LOOP is a valid scop, that is a Static Control Part, a - region of code that can be represented in the polyhedral model. SCOP - defines the region we analyse. */ - - static bool - loop_is_valid_scop (loop_p loop, sese_l scop) - { - if (!scop) - return false; - - if (!can_represent_loop (loop, scop)) - { - DEBUG_PRINT (dp << "[scop-detection-fail] cannot represent loop_" - << loop->num << "\n"); - return false; - } - - if (loop_body_is_valid_scop (loop, scop)) - { - DEBUG_PRINT (dp << "[valid-scop] loop_" - << loop->num << "is a valid scop.\n"); - return true; - } - return false; - } - - /* Return true when BEGIN is the preheader edge of a loop with a single exit - END. */ - - static bool - region_has_one_loop (sese_l s) - { - edge begin = s.entry; - edge end = s.exit; - /* Check for a single perfectly nested loop. */ - if (begin->dest->loop_father->inner) - return false; - - /* Otherwise, check whether we have adjacent loops. */ - return begin->dest->loop_father == end->src->loop_father; - } - - /* Add to SCOPS a scop starting at SCOP_BEGIN and ending at SCOP_END. */ - - void - add_scop (sese_l s) - { - gcc_assert (s); + } - /* Do not add scops with only one loop. */ - if (region_has_one_loop (s)) - { - DEBUG_PRINT (dp << "\n[scop-detection-fail] Discarding one loop SCoP"; - print_sese (dump_file, s)); - return; - } + dom.release (); +} - if (get_exit_bb (s.exit) == EXIT_BLOCK_PTR_FOR_FN (cfun)) - { - DEBUG_PRINT (dp << "\n[scop-detection-fail] " - << "Discarding SCoP exiting to return"; - print_sese (dump_file, s)); - return; - } +/* Gather the basic blocks belonging to the SCOP. */ - /* Remove all the scops which are subsumed by s. */ - remove_subscops (s); +void +scop_detection::build_scop_bbs (scop_p scop) +{ + sbitmap visited = sbitmap_alloc (last_basic_block_for_fn (cfun)); + sese region = SCOP_REGION (scop); - /* Replace this with split-intersecting scops. */ - remove_intersecting_scops (s); + bitmap_clear (visited); + build_scop_bbs_1 (scop, visited, SESE_ENTRY_BB (region)); + sbitmap_free (visited); +} - scops.safe_push (s); - DEBUG_PRINT (dp << "\nAdding SCoP "; print_sese (dump_file, s)); - } +/* Returns the number of pbbs that are in loops contained in SCOP. */ - /* Return true when a statement in SCOP cannot be represented by Graphite. - The assumptions are that L1 dominates L2, and SCOP->entry dominates L1. - Limit the number of bbs between adjacent loops to - PARAM_SCOP_MAX_NUM_BBS_BETWEEN_LOOPS. */ +int +scop_detection::nb_pbbs_in_loops (scop_p scop) +{ + int i; + poly_bb_p pbb; + int res = 0; - static bool - harmful_stmt_in_region (sese_l scop) - { - basic_block exit_bb = get_exit_bb (scop.exit); - basic_block entry_bb = get_entry_bb (scop.entry); + FOR_EACH_VEC_ELT (SCOP_BBS (scop), i, pbb) + if (loop_in_sese_p (gbb_loop (PBB_BLACK_BOX (pbb)), SCOP_REGION (scop))) + res++; - DEBUG_PRINT (dp << "\n[checking-harmful-bbs] "; - print_sese (dump_file, scop)); - gcc_assert (dominated_by_p (CDI_DOMINATORS, exit_bb, entry_bb)); + return res; +} - int depth = bb_dom_dfs_in (CDI_DOMINATORS, exit_bb) - - bb_dom_dfs_in (CDI_DOMINATORS, entry_bb); +class sese_dom_walker : public dom_walker +{ +public: + sese_dom_walker (cdi_direction, sese); - gcc_assert (depth >0); + virtual void before_dom_children (basic_block); + virtual void after_dom_children (basic_block); - vec dom = get_dominated_to_depth (CDI_DOMINATORS, - entry_bb, depth); - int i; - basic_block bb; - FOR_EACH_VEC_ELT (dom, i, bb) - { - DEBUG_PRINT (dp << "\nVisiting bb_" << bb->index); +private: + auto_vec m_conditions, m_cases; + sese m_region; +}; +} +sese_dom_walker::sese_dom_walker (cdi_direction direction, sese region) + : dom_walker (direction), m_region (region) +{ +} - /* We don't want to analyze any bb outside sese. */ - if (!dominated_by_p (CDI_POST_DOMINATORS, bb, exit_bb)) - continue; +/* Call-back for dom_walk executed before visiting the dominated + blocks. */ - if (harmful_stmt_in_bb (scop, bb)) - return true; - } +void +sese_dom_walker::before_dom_children (basic_block bb) +{ + gimple_poly_bb_p gbb; + gcond *stmt; - return false; - } + if (!bb_in_sese_p (bb, m_region)) + return; - /* Returns true if S1 subsumes/surrounds S2. */ - static bool - subsumes (sese_l s1, sese_l s2) - { - if (dominated_by_p (CDI_DOMINATORS, get_entry_bb (s2.entry), - get_entry_bb (s1.entry)) - && dominated_by_p (CDI_POST_DOMINATORS, get_entry_bb (s2.exit), - get_entry_bb (s1.exit))) - return true; - return false; - } + stmt = single_pred_cond_non_loop_exit (bb); - /* Remove a SCoP which is subsumed by S1. */ - void - remove_subscops (sese_l s1) - { - int j; - sese_l s2 (0); - FOR_EACH_VEC_ELT_REVERSE (scops, j, s2) - { - if (subsumes (s1, s2)) - { - DEBUG_PRINT (dp << "\nRemoving sub-SCoP"; - print_sese (dump_file, s2)); - scops.unordered_remove (j); - } - } - } + if (stmt) + { + edge e = single_pred_edge (bb); - /* Returns true if S1 intersects with S2. Since we already know that S1 does - not subsume S2 or vice-versa, we only check for entry bbs. */ + m_conditions.safe_push (stmt); - static bool - intersects (sese_l s1, sese_l s2) - { - if (dominated_by_p (CDI_DOMINATORS, get_entry_bb (s2.entry), - get_entry_bb (s1.entry)) - && !dominated_by_p (CDI_DOMINATORS, get_entry_bb (s2.entry), - get_exit_bb (s1.exit))) - return true; - if ((s1.exit == s2.entry) - || (s2.exit == s1.entry)) - return true; + if (e->flags & EDGE_TRUE_VALUE) + m_cases.safe_push (stmt); + else + m_cases.safe_push (NULL); + } - return false; - } + gbb = gbb_from_bb (bb); - /* Remove one of the scops when it intersects with any other. */ + if (gbb) + { + GBB_CONDITIONS (gbb) = m_conditions.copy (); + GBB_CONDITION_CASES (gbb) = m_cases.copy (); + } +} - void - remove_intersecting_scops (sese_l s1) - { - int j; - sese_l s2 (0); - FOR_EACH_VEC_ELT_REVERSE (scops, j, s2) - { - if (intersects (s1, s2)) - { - DEBUG_PRINT (dp << "\nRemoving intersecting SCoP"; - print_sese (dump_file, s2); - dp << "Intersects with:"; - print_sese (dump_file, s1)); - scops.unordered_remove (j); - } - } - } +/* Call-back for dom_walk executed after visiting the dominated + blocks. */ - private: - vec scops; -}; +void +sese_dom_walker::after_dom_children (basic_block bb) +{ + if (!bb_in_sese_p (bb, m_region)) + return; -sese_l scop_builder::invalid_sese (0); + if (single_pred_cond_non_loop_exit (bb)) + { + m_conditions.pop (); + m_cases.pop (); + } +} /* Find Static Control Parts (SCoP) in the current function and pushes them to SCOPS. */ @@ -1349,20 +1770,41 @@ build_scops (vec *scops) canonicalize_loop_closed_ssa_form (); - scop_builder sb; - sb.build_scop_depth (scop_builder::invalid_sese, current_loops->tree_root); + scop_detection sb; + sb.build_scop_depth (scop_detection::invalid_sese, current_loops->tree_root); /* Now create scops from the lightweight SESEs. */ vec scops_l = sb.get_scops (); int i; sese_l s (0); FOR_EACH_VEC_ELT (scops_l, i, s) + { + sese sese_reg = new_sese (s.entry, s.exit); + scop_p scop = new_scop (sese_reg); + + /* Do not optimize a scop containing only PBBs that do not belong + to any loops. */ + if (sb.nb_pbbs_in_loops (scop) == 0) + { + free_sese (sese_reg); + free_scop (scop); + continue; + } + + scops->safe_push (scop); + } + + scop_p scop; + FOR_EACH_VEC_ELT (*scops, i, scop) { - sese sese_reg = new_sese (s.entry, s.exit); - scops->safe_push (new_scop (sese_reg)); + sb.build_scop_bbs (scop); + sese region = SCOP_REGION (scop); + build_sese_loop_nests (region); + /* Record all conditions in REGION. */ + sese_dom_walker (CDI_DOMINATORS, region).walk (cfun->cfg->x_entry_block_ptr); } DEBUG_PRINT (dp << "number of SCoPs: " << (scops ? scops->length () : 0);); } -#endif /* HAVE_isl */ +#endif /* HAVE_isl */ diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c index 158de1f16d6..0674689936e 100644 --- a/gcc/graphite-sese-to-poly.c +++ b/gcc/graphite-sese-to-poly.c @@ -274,134 +274,6 @@ free_scops (vec scops) scops.release (); } -/* Generates a polyhedral black box only if the bb contains interesting - information. */ - -static gimple_poly_bb_p -try_generate_gimple_bb (scop_p scop, basic_block bb) -{ - vec drs; - drs.create (5); - sese region = SCOP_REGION (scop); - - loop_p nest = outermost_loop_in_sese (region, bb); - loop_p loop = bb->loop_father; - if (!loop_in_sese_p (loop, region)) - loop = nest; - - gimple_stmt_iterator gsi; - for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) - { - gimple *stmt = gsi_stmt (gsi); - if (is_gimple_debug (stmt)) - continue; - - graphite_find_data_references_in_stmt (nest, loop, stmt, &drs); - } - - return new_gimple_poly_bb (bb, drs); -} - -/* Returns true if all predecessors of BB, that are not dominated by BB, are - marked in MAP. The predecessors dominated by BB are loop latches and will - be handled after BB. */ - -static bool -all_non_dominated_preds_marked_p (basic_block bb, sbitmap map) -{ - edge e; - edge_iterator ei; - - FOR_EACH_EDGE (e, ei, bb->preds) - if (!bitmap_bit_p (map, e->src->index) - && !dominated_by_p (CDI_DOMINATORS, e->src, bb)) - return false; - - return true; -} - -/* Compare the depth of two basic_block's P1 and P2. */ - -static int -compare_bb_depths (const void *p1, const void *p2) -{ - const_basic_block const bb1 = *(const_basic_block const*)p1; - const_basic_block const bb2 = *(const_basic_block const*)p2; - int d1 = loop_depth (bb1->loop_father); - int d2 = loop_depth (bb2->loop_father); - - if (d1 < d2) - return 1; - - if (d1 > d2) - return -1; - - return 0; -} - -/* Sort the basic blocks from DOM such that the first are the ones at - a deepest loop level. */ - -static void -graphite_sort_dominated_info (vec dom) -{ - dom.qsort (compare_bb_depths); -} - -/* Recursive helper function for build_scops_bbs. */ - -static void -build_scop_bbs_1 (scop_p scop, sbitmap visited, basic_block bb) -{ - sese region = SCOP_REGION (scop); - vec dom; - poly_bb_p pbb; - - if (bitmap_bit_p (visited, bb->index) - || !bb_in_sese_p (bb, region)) - return; - - pbb = new_poly_bb (scop, try_generate_gimple_bb (scop, bb)); - SCOP_BBS (scop).safe_push (pbb); - bitmap_set_bit (visited, bb->index); - - dom = get_dominated_by (CDI_DOMINATORS, bb); - - if (!dom.exists ()) - return; - - graphite_sort_dominated_info (dom); - - while (!dom.is_empty ()) - { - int i; - basic_block dom_bb; - - FOR_EACH_VEC_ELT (dom, i, dom_bb) - if (all_non_dominated_preds_marked_p (dom_bb, visited)) - { - build_scop_bbs_1 (scop, visited, dom_bb); - dom.unordered_remove (i); - break; - } - } - - dom.release (); -} - -/* Gather the basic blocks belonging to the SCOP. */ - -static void -build_scop_bbs (scop_p scop) -{ - sbitmap visited = sbitmap_alloc (last_basic_block_for_fn (cfun)); - sese region = SCOP_REGION (scop); - - bitmap_clear (visited); - build_scop_bbs_1 (scop, visited, SESE_ENTRY_BB (region)); - sbitmap_free (visited); -} - /* Return an ISL identifier for the polyhedral basic block PBB. */ static isl_id * @@ -931,17 +803,24 @@ find_scop_parameters (scop_p scop) nbp = sese_nb_params (region); scop_set_nb_params (scop, nbp); SESE_ADD_PARAMS (region) = false; +} - { - tree e; - isl_space *space = isl_space_set_alloc (scop->ctx, nbp, 0); +/* Assign dimension for each parameter in SCOP. */ - FOR_EACH_VEC_ELT (SESE_PARAMS (region), i, e) - space = isl_space_set_dim_id (space, isl_dim_param, i, - isl_id_for_ssa_name (scop, e)); +static void +set_scop_parameter_dim (scop_p scop) +{ + sese region = SCOP_REGION (scop); + unsigned nbp = sese_nb_params (region); + isl_space *space = isl_space_set_alloc (scop->ctx, nbp, 0); - scop->context = isl_set_universe (space); - } + unsigned i; + tree e; + FOR_EACH_VEC_ELT (SESE_PARAMS (region), i, e) + space = isl_space_set_dim_id (space, isl_dim_param, i, + isl_id_for_ssa_name (scop, e)); + + scop->context = isl_set_universe (space); } /* Builds the constraint polyhedra for LOOP in SCOP. OUTER_PH gives @@ -2454,46 +2333,17 @@ rewrite_cross_bb_scalar_deps_out_of_ssa (scop_p scop) } } -/* Returns the number of pbbs that are in loops contained in SCOP. */ - -static int -nb_pbbs_in_loops (scop_p scop) -{ - int i; - poly_bb_p pbb; - int res = 0; - - FOR_EACH_VEC_ELT (SCOP_BBS (scop), i, pbb) - if (loop_in_sese_p (gbb_loop (PBB_BLACK_BOX (pbb)), SCOP_REGION (scop))) - res++; - - return res; -} - /* Builds the polyhedral representation for a SESE region. */ void build_poly_scop (scop_p scop) { - sese region = SCOP_REGION (scop); - graphite_dim_t max_dim; - - build_scop_bbs (scop); - - /* Do not optimize a scop containing only PBBs that do not belong - to any loops. */ - if (nb_pbbs_in_loops (scop) == 0) - return; - - build_sese_loop_nests (region); - /* Record all conditions in REGION. */ - sese_dom_walker (CDI_DOMINATORS, region).walk (cfun->cfg->x_entry_block_ptr); find_scop_parameters (scop); - max_dim = PARAM_VALUE (PARAM_GRAPHITE_MAX_NB_SCOP_PARAMS); + graphite_dim_t max_dim = PARAM_VALUE (PARAM_GRAPHITE_MAX_NB_SCOP_PARAMS); if (scop_nb_params (scop) > max_dim) return; - + set_scop_parameter_dim (scop); build_scop_iteration_domain (scop); build_scop_context (scop); add_conditions_to_constraints (scop); -- 2.30.2