From: spop Date: Thu, 28 Jan 2016 16:39:10 +0000 (+0000) Subject: remove out of sync comments X-Git-Tag: upstream/6.1~1379 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7139736af13a32c92d44a13ffcc57a3e38eb7cb2;p=platform%2Fupstream%2Flinaro-gcc.git remove out of sync comments * graphite-isl-ast-to-gimple.c (class translate_isl_ast_to_gimple): Remove comments from class declarations: they are already in the code close by the defs. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232934 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 13de443..9d5f81b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2016-01-28 Sebastian Pop + * graphite-isl-ast-to-gimple.c (class translate_isl_ast_to_gimple): + Remove comments from class declarations: they are already in the code + close by the defs. + +2016-01-28 Sebastian Pop + * graphite-isl-ast-to-gimple.c (binary_op_to_tree): Call codegen_error_p. (ternary_op_to_tree): Same. (unary_op_to_tree): Same. diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c index ded1f74..161b434 100644 --- a/gcc/graphite-isl-ast-to-gimple.c +++ b/gcc/graphite-isl-ast-to-gimple.c @@ -171,342 +171,117 @@ class translate_isl_ast_to_gimple { public: translate_isl_ast_to_gimple (sese_info_p r) - : region (r), codegen_error (false) - { } - - /* Translates an isl AST node NODE to GCC representation in the - context of a SESE. */ + : region (r), codegen_error (false) { } edge translate_isl_ast (loop_p context_loop, __isl_keep isl_ast_node *node, edge next_e, ivs_params &ip); - - /* Translates an isl_ast_node_for to Gimple. */ edge translate_isl_ast_node_for (loop_p context_loop, __isl_keep isl_ast_node *node, edge next_e, ivs_params &ip); - - /* Create the loop for a isl_ast_node_for. - - - NEXT_E is the edge where new generated code should be attached. */ edge translate_isl_ast_for_loop (loop_p context_loop, __isl_keep isl_ast_node *node_for, edge next_e, tree type, tree lb, tree ub, ivs_params &ip); - - /* Translates an isl_ast_node_if to Gimple. */ edge translate_isl_ast_node_if (loop_p context_loop, __isl_keep isl_ast_node *node, edge next_e, ivs_params &ip); - - /* Translates an isl_ast_node_user to Gimple. - - FIXME: We should remove iv_map.create (loop->num + 1), if it is - possible. */ edge translate_isl_ast_node_user (__isl_keep isl_ast_node *node, edge next_e, ivs_params &ip); - - /* Translates an isl_ast_node_block to Gimple. */ edge translate_isl_ast_node_block (loop_p context_loop, __isl_keep isl_ast_node *node, edge next_e, ivs_params &ip); - - /* Converts a unary isl_ast_expr_op expression E to a GCC expression tree of - type TYPE. */ tree unary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip); - - /* Converts a binary isl_ast_expr_op expression E to a GCC expression tree of - type TYPE. */ tree binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip); - - /* Converts a ternary isl_ast_expr_op expression E to a GCC expression tree of - type TYPE. */ tree ternary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip); - - /* Converts an isl_ast_expr_op expression E with unknown number of arguments - to a GCC expression tree of type TYPE. */ tree nary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip); - - /* Converts an isl AST expression E back to a GCC expression tree of - type TYPE. */ tree gcc_expression_from_isl_expression (tree type, __isl_take isl_ast_expr *, ivs_params &ip); - - /* Return the tree variable that corresponds to the given isl ast identifier - expression (an isl_ast_expr of type isl_ast_expr_id). - - FIXME: We should replace blind conversation of id's type with derivation - of the optimal type when we get the corresponding isl support. Blindly - converting type sizes may be problematic when we switch to smaller - types. */ tree gcc_expression_from_isl_ast_expr_id (tree type, __isl_keep isl_ast_expr *expr_id, ivs_params &ip); - - /* Converts an isl_ast_expr_int expression E to a GCC expression tree of - type TYPE. */ tree gcc_expression_from_isl_expr_int (tree type, __isl_take isl_ast_expr *expr); - - /* Converts an isl_ast_expr_op expression E to a GCC expression tree of - type TYPE. */ tree gcc_expression_from_isl_expr_op (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip); - - /* Creates a new LOOP corresponding to isl_ast_node_for. Inserts an - induction variable for the new LOOP. New LOOP is attached to CFG - starting at ENTRY_EDGE. LOOP is inserted into the loop tree and - becomes the child loop of the OUTER_LOOP. NEWIVS_INDEX binds - isl's scattering name to the induction variable created for the - loop of STMT. The new induction variable is inserted in the NEWIVS - vector and is of type TYPE. */ struct loop *graphite_create_new_loop (edge entry_edge, __isl_keep isl_ast_node *node_for, loop_p outer, tree type, tree lb, tree ub, ivs_params &ip); - - /* All loops generated by create_empty_loop_on_edge have the form of - a post-test loop: - - do - - { - body of the loop; - } while (lower bound < upper bound); - - We create a new if region protecting the loop to be executed, if - the execution count is zero (lower bound > upper bound). */ edge graphite_create_new_loop_guard (edge entry_edge, __isl_keep isl_ast_node *node_for, tree *type, tree *lb, tree *ub, ivs_params &ip); - - /* Creates a new if region corresponding to isl's cond. */ edge graphite_create_new_guard (edge entry_edge, __isl_take isl_ast_expr *if_cond, ivs_params &ip); - - /* Inserts in iv_map a tuple (OLD_LOOP->num, NEW_NAME) for the induction - variables of the loops around GBB in SESE. - - FIXME: Instead of using a vec that maps each loop id to a possible - chrec, we could consider using a map that maps loop ids to the - corresponding tree expressions. */ void build_iv_mapping (vec iv_map, gimple_poly_bb_p gbb, __isl_keep isl_ast_expr *user_expr, ivs_params &ip, sese_l ®ion); - - /* Patch the missing arguments of the phi nodes. */ - void translate_pending_phi_nodes (void); - - /* Add isl's parameter identifiers and corresponding trees to ivs_params. */ - void add_parameters_to_ivs_params (scop_p scop, ivs_params &ip); - - /* Generates a build, which specifies the constraints on the parameters. */ - __isl_give isl_ast_build *generate_isl_context (scop_p scop); #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS - /* Generate isl AST from schedule of SCOP. */ __isl_give isl_ast_node * scop_to_isl_ast (scop_p scop); #else - /* Get the maximal number of schedule dimensions in the scop SCOP. */ int get_max_schedule_dimensions (scop_p scop); - - /* Extend the schedule to NB_SCHEDULE_DIMS schedule dimensions. - - For schedules with different dimensionality, the isl AST generator can not - define an order and will just randomly choose an order. The solution to - this problem is to extend all schedules to the maximal number of schedule - dimensions (using '0's for the remaining values). */ __isl_give isl_map *extend_schedule (__isl_take isl_map *schedule, int nb_schedule_dims); - - /* Generates a schedule, which specifies an order used to - visit elements in a domain. */ __isl_give isl_union_map *generate_isl_schedule (scop_p scop); - - /* Set the separate option for all dimensions. - This helps to reduce control overhead. */ __isl_give isl_ast_build *set_options (__isl_take isl_ast_build *control, __isl_keep isl_union_map *schedule); - - /* Generate isl AST from schedule of SCOP. Also, collects IVS_PARAMS in - IP. */ __isl_give isl_ast_node *scop_to_isl_ast (scop_p scop, ivs_params &ip); - - /* Prints NODE to FILE. */ - void print_isl_ast_node (FILE *file, __isl_keep isl_ast_node *node, - __isl_keep isl_ctx *ctx) const - { - isl_printer *prn = isl_printer_to_file (ctx, file); - prn = isl_printer_set_output_format (prn, ISL_FORMAT_C); - prn = isl_printer_print_ast_node (prn, node); - prn = isl_printer_print_str (prn, "\n"); - isl_printer_free (prn); - } #endif - /* Return true if RENAME (defined in BB) is a valid use in NEW_BB. The - definition should flow into use, and the use should respect the loop-closed - SSA form. */ - bool is_valid_rename (tree rename, basic_block def_bb, basic_block use_bb, phi_node_kind, tree old_name, basic_block old_bb) const; - - /* Returns the expression associated to OLD_NAME (which is used in OLD_BB), in - NEW_BB from RENAME_MAP. LOOP_PHI is true when we want to rename OLD_NAME - within a loop PHI instruction. */ - tree get_rename (basic_block new_bb, tree old_name, basic_block old_bb, phi_node_kind) const; - - /* For ops which are scev_analyzeable, we can regenerate a new name from - its scalar evolution around LOOP. */ - tree get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop, basic_block new_bb, basic_block old_bb, vec iv_map); - - /* Returns a basic block that could correspond to where a constant was defined - in the original code. In the original code OLD_BB had the definition, we - need to find which basic block out of the copies of old_bb, in the new - region, should a definition correspond to if it has to reach BB. */ - basic_block get_def_bb_for_const (basic_block bb, basic_block old_bb) const; - - /* Get the new name of OP (from OLD_BB) to be used in NEW_BB. LOOP_PHI is - true when we want to rename an OP within a loop PHI instruction. */ - tree get_new_name (basic_block new_bb, tree op, basic_block old_bb, phi_node_kind) const; - - /* Collect all the operands of NEW_EXPR by recursively visiting each - operand. */ - void collect_all_ssa_names (tree new_expr, vec *vec_ssa); - - /* Copy the PHI arguments from OLD_PHI to the NEW_PHI. The arguments to - NEW_PHI must be found unless they can be POSTPONEd for later. */ - bool copy_loop_phi_args (gphi *old_phi, init_back_edge_pair_t &ibp_old_bb, gphi *new_phi, init_back_edge_pair_t &ibp_new_bb, bool postpone); - - /* Copy loop phi nodes from BB to NEW_BB. */ - bool copy_loop_phi_nodes (basic_block bb, basic_block new_bb); - - /* Add phi nodes to all merge points of all the diamonds enclosing the loop of - the close phi node PHI. */ - bool add_close_phis_to_merge_points (gphi *old_phi, gphi *new_phi, tree default_value); - tree add_close_phis_to_outer_loops (tree last_merge_name, edge merge_e, gimple *old_close_phi); - - /* Copy all the loop-close phi args from BB to NEW_BB. */ - bool copy_loop_close_phi_args (basic_block old_bb, basic_block new_bb, bool postpone); - - /* Copy loop close phi nodes from BB to NEW_BB. */ - bool copy_loop_close_phi_nodes (basic_block old_bb, basic_block new_bb); - - /* Copy the arguments of cond-phi node PHI, to NEW_PHI in the codegenerated - region. If postpone is true and it isn't possible to copy any arg of PHI, - the PHI is added to the REGION->INCOMPLETE_PHIS to be codegenerated later. - Returns false if the copying was unsuccessful. */ - bool copy_cond_phi_args (gphi *phi, gphi *new_phi, vec iv_map, bool postpone); - - /* Copy cond phi nodes from BB to NEW_BB. A cond-phi node is a basic block - containing phi nodes coming from two predecessors, and none of them are back - edges. */ - bool copy_cond_phi_nodes (basic_block bb, basic_block new_bb, vec iv_map); - - /* Duplicates the statements of basic block BB into basic block NEW_BB - and compute the new induction variables according to the IV_MAP. */ - bool graphite_copy_stmts_from_block (basic_block bb, basic_block new_bb, vec iv_map); - - /* Copies BB and includes in the copied BB all the statements that can - be reached following the use-def chains from the memory accesses, - and returns the next edge following this new block. */ - edge copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec iv_map); - - /* Given a basic block containing close-phi it returns the new basic block - where to insert a copy of the close-phi nodes. All the uses in close phis - should come from a single loop otherwise it returns NULL. */ edge edge_for_new_close_phis (basic_block bb); - - /* Add NEW_NAME as the ARGNUM-th arg of NEW_PHI which is in NEW_BB. - DOMINATING_PRED is the predecessor basic block of OLD_BB which dominates - the other pred of OLD_BB as well. If no such basic block exists then it is - NULL. NON_DOMINATING_PRED is a pred which does not dominate OLD_BB, it - cannot be NULL. - - Case1: OLD_BB->preds {BB1, BB2} and BB1 does not dominate BB2 and vice - versa. In this case DOMINATING_PRED = NULL. - - Case2: OLD_BB->preds {BB1, BB2} and BB1 dominates BB2. - - Returns true on successful copy of the args, false otherwise. */ - bool add_phi_arg_for_new_expr (tree old_phi_args[2], tree new_phi_args[2], edge old_bb_dominating_edge, edge old_bb_non_dominating_edge, gphi *phi, gphi *new_phi, basic_block new_bb); - - /* Renames the scalar uses of the statement COPY, using the substitution map - RENAME_MAP, inserting the gimplification code at GSI_TGT, for the - translation REGION, with the original copied statement in LOOP, and using - the induction variable renaming map IV_MAP. Returns true when something - has been renamed. */ - bool rename_uses (gimple *copy, gimple_stmt_iterator *gsi_tgt, basic_block old_bb, loop_p loop, vec iv_map); - - /* Register in RENAME_MAP the rename tuple (OLD_NAME, EXPR). - When OLD_NAME and EXPR are the same we assert. */ - void set_rename (tree old_name, tree expr); - - /* Create new names for all the definitions created by COPY and add - replacement mappings for each new name. */ - void set_rename_for_each_def (gimple *stmt); - - /* Insert each statement from SEQ at its earliest insertion p. */ - void gsi_insert_earliest (gimple_seq seq); - - /* Rename all the operands of NEW_EXPR by recursively visiting each - operand. */ - tree rename_all_uses (tree new_expr, basic_block new_bb, basic_block old_bb); - - bool codegen_error_p () const - { return codegen_error; } - - /* Return true when OP is a constant tree. */ - + bool codegen_error_p () const { return codegen_error; } bool is_constant (tree op) const { return TREE_CODE (op) == INTEGER_CST @@ -535,8 +310,7 @@ private: converting type sizes may be problematic when we switch to smaller types. */ -tree -translate_isl_ast_to_gimple:: +tree translate_isl_ast_to_gimple:: gcc_expression_from_isl_ast_expr_id (tree type, __isl_take isl_ast_expr *expr_id, ivs_params &ip) @@ -560,8 +334,7 @@ gcc_expression_from_isl_ast_expr_id (tree type, /* Converts an isl_ast_expr_int expression E to a GCC expression tree of type TYPE. */ -tree -translate_isl_ast_to_gimple:: +tree translate_isl_ast_to_gimple:: gcc_expression_from_isl_expr_int (tree type, __isl_take isl_ast_expr *expr) { gcc_assert (isl_ast_expr_get_type (expr) == isl_ast_expr_int); @@ -582,8 +355,7 @@ gcc_expression_from_isl_expr_int (tree type, __isl_take isl_ast_expr *expr) /* Converts a binary isl_ast_expr_op expression E to a GCC expression tree of type TYPE. */ -tree -translate_isl_ast_to_gimple:: +tree translate_isl_ast_to_gimple:: binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) { isl_ast_expr *arg_expr = isl_ast_expr_get_op_arg (expr, 0); @@ -682,8 +454,7 @@ binary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) /* Converts a ternary isl_ast_expr_op expression E to a GCC expression tree of type TYPE. */ -tree -translate_isl_ast_to_gimple:: +tree translate_isl_ast_to_gimple:: ternary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) { enum isl_ast_op_type t = isl_ast_expr_get_op_type (expr); @@ -705,8 +476,7 @@ ternary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) /* Converts a unary isl_ast_expr_op expression E to a GCC expression tree of type TYPE. */ -tree -translate_isl_ast_to_gimple:: +tree translate_isl_ast_to_gimple:: unary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) { gcc_assert (isl_ast_expr_get_op_type (expr) == isl_ast_op_minus); @@ -720,8 +490,7 @@ unary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) /* Converts an isl_ast_expr_op expression E with unknown number of arguments to a GCC expression tree of type TYPE. */ -tree -translate_isl_ast_to_gimple:: +tree translate_isl_ast_to_gimple:: nary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) { enum tree_code op_code; @@ -768,8 +537,7 @@ nary_op_to_tree (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) /* Converts an isl_ast_expr_op expression E to a GCC expression tree of type TYPE. */ -tree -translate_isl_ast_to_gimple:: +tree translate_isl_ast_to_gimple:: gcc_expression_from_isl_expr_op (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) { @@ -830,8 +598,7 @@ gcc_expression_from_isl_expr_op (tree type, __isl_take isl_ast_expr *expr, /* Converts an isl AST expression E back to a GCC expression tree of type TYPE. */ -tree -translate_isl_ast_to_gimple:: +tree translate_isl_ast_to_gimple:: gcc_expression_from_isl_expression (tree type, __isl_take isl_ast_expr *expr, ivs_params &ip) { @@ -867,8 +634,7 @@ gcc_expression_from_isl_expression (tree type, __isl_take isl_ast_expr *expr, loop of STMT. The new induction variable is inserted in the NEWIVS vector and is of type TYPE. */ -struct loop * -translate_isl_ast_to_gimple:: +struct loop *translate_isl_ast_to_gimple:: graphite_create_new_loop (edge entry_edge, __isl_keep isl_ast_node *node_for, loop_p outer, tree type, tree lb, tree ub, ivs_params &ip) @@ -901,8 +667,7 @@ graphite_create_new_loop (edge entry_edge, __isl_keep isl_ast_node *node_for, - NEXT_E is the edge where new generated code should be attached. */ -edge -translate_isl_ast_to_gimple:: +edge translate_isl_ast_to_gimple:: translate_isl_ast_for_loop (loop_p context_loop, __isl_keep isl_ast_node *node_for, edge next_e, tree type, tree lb, tree ub, @@ -1009,8 +774,7 @@ get_upper_bound (__isl_keep isl_ast_node *node_for) We create a new if region protecting the loop to be executed, if the execution count is zero (lower bound > upper bound). */ -edge -translate_isl_ast_to_gimple:: +edge translate_isl_ast_to_gimple:: graphite_create_new_loop_guard (edge entry_edge, __isl_keep isl_ast_node *node_for, tree *type, tree *lb, tree *ub, ivs_params &ip) @@ -1064,8 +828,7 @@ graphite_create_new_loop_guard (edge entry_edge, /* Translates an isl_ast_node_for to Gimple. */ -edge -translate_isl_ast_to_gimple:: +edge translate_isl_ast_to_gimple:: translate_isl_ast_node_for (loop_p context_loop, __isl_keep isl_ast_node *node, edge next_e, ivs_params &ip) { @@ -1100,8 +863,7 @@ translate_isl_ast_node_for (loop_p context_loop, __isl_keep isl_ast_node *node, chrec, we could consider using a map that maps loop ids to the corresponding tree expressions. */ -void -translate_isl_ast_to_gimple:: +void translate_isl_ast_to_gimple:: build_iv_mapping (vec iv_map, gimple_poly_bb_p gbb, __isl_keep isl_ast_expr *user_expr, ivs_params &ip, sese_l ®ion) @@ -1130,8 +892,7 @@ build_iv_mapping (vec iv_map, gimple_poly_bb_p gbb, FIXME: We should remove iv_map.create (loop->num + 1), if it is possible. */ -edge -translate_isl_ast_to_gimple:: +edge translate_isl_ast_to_gimple:: translate_isl_ast_node_user (__isl_keep isl_ast_node *node, edge next_e, ivs_params &ip) { @@ -1189,8 +950,7 @@ translate_isl_ast_node_user (__isl_keep isl_ast_node *node, /* Translates an isl_ast_node_block to Gimple. */ -edge -translate_isl_ast_to_gimple:: +edge translate_isl_ast_to_gimple:: translate_isl_ast_node_block (loop_p context_loop, __isl_keep isl_ast_node *node, edge next_e, ivs_params &ip) @@ -1210,8 +970,7 @@ translate_isl_ast_node_block (loop_p context_loop, /* Creates a new if region corresponding to isl's cond. */ -edge -translate_isl_ast_to_gimple:: +edge translate_isl_ast_to_gimple:: graphite_create_new_guard (edge entry_edge, __isl_take isl_ast_expr *if_cond, ivs_params &ip) { @@ -1229,8 +988,7 @@ graphite_create_new_guard (edge entry_edge, __isl_take isl_ast_expr *if_cond, /* Translates an isl_ast_node_if to Gimple. */ -edge -translate_isl_ast_to_gimple:: +edge translate_isl_ast_to_gimple:: translate_isl_ast_node_if (loop_p context_loop, __isl_keep isl_ast_node *node, edge next_e, ivs_params &ip) @@ -1257,10 +1015,9 @@ translate_isl_ast_node_if (loop_p context_loop, /* Translates an isl AST node NODE to GCC representation in the context of a SESE. */ -edge -translate_isl_ast_to_gimple::translate_isl_ast (loop_p context_loop, - __isl_keep isl_ast_node *node, - edge next_e, ivs_params &ip) +edge translate_isl_ast_to_gimple:: +translate_isl_ast (loop_p context_loop, __isl_keep isl_ast_node *node, + edge next_e, ivs_params &ip) { if (codegen_error_p ()) return NULL; @@ -1397,8 +1154,7 @@ phi_uses_name (basic_block bb, tree name) definition should flow into use, and the use should respect the loop-closed SSA form. */ -bool -translate_isl_ast_to_gimple:: +bool translate_isl_ast_to_gimple:: is_valid_rename (tree rename, basic_block def_bb, basic_block use_bb, phi_node_kind phi_kind, tree old_name, basic_block old_bb) const { @@ -1439,11 +1195,9 @@ is_valid_rename (tree rename, basic_block def_bb, basic_block use_bb, /* Returns the expression associated to OLD_NAME (which is used in OLD_BB), in NEW_BB from RENAME_MAP. PHI_KIND determines the kind of phi node. */ -tree -translate_isl_ast_to_gimple::get_rename (basic_block new_bb, - tree old_name, - basic_block old_bb, - phi_node_kind phi_kind) const +tree translate_isl_ast_to_gimple:: +get_rename (basic_block new_bb, tree old_name, basic_block old_bb, + phi_node_kind phi_kind) const { gcc_assert (TREE_CODE (old_name) == SSA_NAME); vec *renames = region->rename_map->get (old_name); @@ -1504,8 +1258,8 @@ translate_isl_ast_to_gimple::get_rename (basic_block new_bb, /* Register in RENAME_MAP the rename tuple (OLD_NAME, EXPR). When OLD_NAME and EXPR are the same we assert. */ -void -translate_isl_ast_to_gimple::set_rename (tree old_name, tree expr) +void translate_isl_ast_to_gimple:: +set_rename (tree old_name, tree expr) { if (dump_file) { @@ -1575,8 +1329,8 @@ later_of_the_two (gimple_stmt_iterator gsi1, gimple_stmt_iterator gsi2) /* Insert each statement from SEQ at its earliest insertion p. */ -void -translate_isl_ast_to_gimple::gsi_insert_earliest (gimple_seq seq) +void translate_isl_ast_to_gimple:: +gsi_insert_earliest (gimple_seq seq) { update_modified_stmts (seq); sese_l &codegen_region = region->if_region->true_region->region; @@ -1646,9 +1400,8 @@ translate_isl_ast_to_gimple::gsi_insert_earliest (gimple_seq seq) /* Collect all the operands of NEW_EXPR by recursively visiting each operand. */ -void -translate_isl_ast_to_gimple::collect_all_ssa_names (tree new_expr, - vec *vec_ssa) +void translate_isl_ast_to_gimple:: +collect_all_ssa_names (tree new_expr, vec *vec_ssa) { /* Rename all uses in new_expr. */ @@ -1809,9 +1562,8 @@ substitute_ssa_name (tree exp, tree f, tree r) /* Rename all the operands of NEW_EXPR by recursively visiting each operand. */ -tree -translate_isl_ast_to_gimple::rename_all_uses (tree new_expr, basic_block new_bb, - basic_block old_bb) +tree translate_isl_ast_to_gimple:: +rename_all_uses (tree new_expr, basic_block new_bb, basic_block old_bb) { auto_vec ssa_names; collect_all_ssa_names (new_expr, &ssa_names); @@ -1827,8 +1579,7 @@ translate_isl_ast_to_gimple::rename_all_uses (tree new_expr, basic_block new_bb, /* For ops which are scev_analyzeable, we can regenerate a new name from its scalar evolution around LOOP. */ -tree -translate_isl_ast_to_gimple:: +tree translate_isl_ast_to_gimple:: get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop, basic_block new_bb, basic_block old_bb, vec iv_map) @@ -1890,11 +1641,9 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop, statement in LOOP, and using the induction variable renaming map IV_MAP. Returns true when something has been renamed. */ -bool -translate_isl_ast_to_gimple::rename_uses (gimple *copy, - gimple_stmt_iterator *gsi_tgt, - basic_block old_bb, - loop_p loop, vec iv_map) +bool translate_isl_ast_to_gimple:: +rename_uses (gimple *copy, gimple_stmt_iterator *gsi_tgt, basic_block old_bb, + loop_p loop, vec iv_map) { bool changed = false; @@ -2002,9 +1751,8 @@ translate_isl_ast_to_gimple::rename_uses (gimple *copy, need to find which basic block out of the copies of old_bb, in the new region, should a definition correspond to if it has to reach BB. */ -basic_block -translate_isl_ast_to_gimple::get_def_bb_for_const (basic_block bb, - basic_block old_bb) const +basic_block translate_isl_ast_to_gimple:: +get_def_bb_for_const (basic_block bb, basic_block old_bb) const { vec *bbs = region->copied_bb_map->get (old_bb); @@ -2037,8 +1785,7 @@ translate_isl_ast_to_gimple::get_def_bb_for_const (basic_block bb, /* Get the new name of OP (from OLD_BB) to be used in NEW_BB. PHI_KIND determines the kind of phi node. */ -tree -translate_isl_ast_to_gimple:: +tree translate_isl_ast_to_gimple:: get_new_name (basic_block new_bb, tree op, basic_block old_bb, phi_node_kind phi_kind) const { @@ -2082,8 +1829,7 @@ get_edges (basic_block bb) /* Copy the PHI arguments from OLD_PHI to the NEW_PHI. The arguments to NEW_PHI must be found unless they can be POSTPONEd for later. */ -bool -translate_isl_ast_to_gimple:: +bool translate_isl_ast_to_gimple:: copy_loop_phi_args (gphi *old_phi, init_back_edge_pair_t &ibp_old_bb, gphi *new_phi, init_back_edge_pair_t &ibp_new_bb, bool postpone) @@ -2130,9 +1876,8 @@ copy_loop_phi_args (gphi *old_phi, init_back_edge_pair_t &ibp_old_bb, /* Copy loop phi nodes from BB to NEW_BB. */ -bool -translate_isl_ast_to_gimple::copy_loop_phi_nodes (basic_block bb, - basic_block new_bb) +bool translate_isl_ast_to_gimple:: +copy_loop_phi_nodes (basic_block bb, basic_block new_bb) { if (dump_file) fprintf (dump_file, "[codegen] copying loop phi nodes in bb_%d.\n", @@ -2340,10 +2085,8 @@ add_close_phis_to_merge_points (gphi *old_close_phi, gphi *new_close_phi, /* Copy all the loop-close phi args from BB to NEW_BB. */ -bool -translate_isl_ast_to_gimple::copy_loop_close_phi_args (basic_block old_bb, - basic_block new_bb, - bool postpone) +bool translate_isl_ast_to_gimple:: +copy_loop_close_phi_args (basic_block old_bb, basic_block new_bb, bool postpone) { for (gphi_iterator psi = gsi_start_phis (old_bb); !gsi_end_p (psi); gsi_next (&psi)) @@ -2415,9 +2158,8 @@ translate_isl_ast_to_gimple::copy_loop_close_phi_args (basic_block old_bb, /* Copy loop close phi nodes from BB to NEW_BB. */ -bool -translate_isl_ast_to_gimple::copy_loop_close_phi_nodes (basic_block old_bb, - basic_block new_bb) +bool translate_isl_ast_to_gimple:: +copy_loop_close_phi_nodes (basic_block old_bb, basic_block new_bb) { if (dump_file) fprintf (dump_file, "[codegen] copying loop close phi nodes in bb_%d.\n", @@ -2442,8 +2184,7 @@ translate_isl_ast_to_gimple::copy_loop_close_phi_nodes (basic_block old_bb, Returns true on successful copy of the args, false otherwise. */ -bool -translate_isl_ast_to_gimple:: +bool translate_isl_ast_to_gimple:: add_phi_arg_for_new_expr (tree old_phi_args[2], tree new_phi_args[2], edge old_bb_dominating_edge, edge old_bb_non_dominating_edge, @@ -2605,10 +2346,8 @@ add_phi_arg_for_new_expr (tree old_phi_args[2], tree new_phi_args[2], the PHI is added to the REGION->INCOMPLETE_PHIS to be codegenerated later. Returns false if the copying was unsuccessful. */ -bool -translate_isl_ast_to_gimple::copy_cond_phi_args (gphi *phi, gphi *new_phi, - vec iv_map, - bool postpone) +bool translate_isl_ast_to_gimple:: +copy_cond_phi_args (gphi *phi, gphi *new_phi, vec iv_map, bool postpone) { if (dump_file) fprintf (dump_file, "[codegen] copying cond phi args.\n"); @@ -2722,10 +2461,8 @@ translate_isl_ast_to_gimple::copy_cond_phi_args (gphi *phi, gphi *new_phi, containing phi nodes coming from two predecessors, and none of them are back edges. */ -bool -translate_isl_ast_to_gimple::copy_cond_phi_nodes (basic_block bb, - basic_block new_bb, - vec iv_map) +bool translate_isl_ast_to_gimple:: +copy_cond_phi_nodes (basic_block bb, basic_block new_bb, vec iv_map) { gcc_assert (!bb_contains_loop_close_phi_nodes (bb)); @@ -2797,8 +2534,8 @@ should_copy_to_new_region (gimple *stmt, sese_info_p region) /* Create new names for all the definitions created by COPY and add replacement mappings for each new name. */ -void -translate_isl_ast_to_gimple::set_rename_for_each_def (gimple *stmt) +void translate_isl_ast_to_gimple:: +set_rename_for_each_def (gimple *stmt) { def_operand_p def_p; ssa_op_iter op_iter; @@ -2813,10 +2550,9 @@ translate_isl_ast_to_gimple::set_rename_for_each_def (gimple *stmt) /* Duplicates the statements of basic block BB into basic block NEW_BB and compute the new induction variables according to the IV_MAP. */ -bool -translate_isl_ast_to_gimple::graphite_copy_stmts_from_block (basic_block bb, - basic_block new_bb, - vec iv_map) +bool translate_isl_ast_to_gimple:: +graphite_copy_stmts_from_block (basic_block bb, basic_block new_bb, + vec iv_map) { /* Iterator poining to the place where new statement (s) will be inserted. */ gimple_stmt_iterator gsi_tgt = gsi_last_bb (new_bb); @@ -2885,8 +2621,8 @@ translate_isl_ast_to_gimple::graphite_copy_stmts_from_block (basic_block bb, to insert a copy of the close-phi nodes. All the uses in close phis should come from a single loop otherwise it returns NULL. */ -edge -translate_isl_ast_to_gimple::edge_for_new_close_phis (basic_block bb) +edge translate_isl_ast_to_gimple:: +edge_for_new_close_phis (basic_block bb) { /* Make sure that NEW_BB is the new_loop->exit->dest. We find the definition of close phi in the original code and then find the mapping of basic block @@ -2925,10 +2661,8 @@ translate_isl_ast_to_gimple::edge_for_new_close_phis (basic_block bb) be reached following the use-def chains from the memory accesses, and returns the next edge following this new block. */ -edge -translate_isl_ast_to_gimple::copy_bb_and_scalar_dependences (basic_block bb, - edge next_e, - vec iv_map) +edge translate_isl_ast_to_gimple:: +copy_bb_and_scalar_dependences (basic_block bb, edge next_e, vec iv_map) { int num_phis = number_of_phi_nodes (bb); @@ -3072,8 +2806,8 @@ translate_isl_ast_to_gimple::copy_bb_and_scalar_dependences (basic_block bb, /* Patch the missing arguments of the phi nodes. */ -void -translate_isl_ast_to_gimple::translate_pending_phi_nodes () +void translate_isl_ast_to_gimple:: +translate_pending_phi_nodes () { int i; phi_rename *rename; @@ -3115,9 +2849,8 @@ translate_isl_ast_to_gimple::translate_pending_phi_nodes () /* Add isl's parameter identifiers and corresponding trees to ivs_params. */ -void -translate_isl_ast_to_gimple::add_parameters_to_ivs_params (scop_p scop, - ivs_params &ip) +void translate_isl_ast_to_gimple:: +add_parameters_to_ivs_params (scop_p scop, ivs_params &ip) { sese_info_p region = scop->scop_info; unsigned nb_parameters = isl_set_dim (scop->param_context, isl_dim_param); @@ -3134,8 +2867,8 @@ translate_isl_ast_to_gimple::add_parameters_to_ivs_params (scop_p scop, /* Generates a build, which specifies the constraints on the parameters. */ -__isl_give isl_ast_build * -translate_isl_ast_to_gimple::generate_isl_context (scop_p scop) +__isl_give isl_ast_build *translate_isl_ast_to_gimple:: +generate_isl_context (scop_p scop) { isl_set *context_isl = isl_set_params (isl_set_copy (scop->param_context)); return isl_ast_build_from_context (context_isl); @@ -3162,8 +2895,8 @@ ast_build_before_for (__isl_keep isl_ast_build *build, void *user) /* Generate isl AST from schedule of SCOP. */ -__isl_give isl_ast_node * -translate_isl_ast_to_gimple::scop_to_isl_ast (scop_p scop) +__isl_give isl_ast_node *translate_isl_ast_to_gimple:: +scop_to_isl_ast (scop_p scop) { gcc_assert (scop->transformed_schedule); @@ -3189,8 +2922,8 @@ translate_isl_ast_to_gimple::scop_to_isl_ast (scop_p scop) #else /* Get the maximal number of schedule dimensions in the scop SCOP. */ -int -translate_isl_ast_to_gimple::get_max_schedule_dimensions (scop_p scop) +int translate_isl_ast_to_gimple:: +get_max_schedule_dimensions (scop_p scop) { int i; poly_bb_p pbb; @@ -3213,9 +2946,8 @@ translate_isl_ast_to_gimple::get_max_schedule_dimensions (scop_p scop) problem is to extend all schedules to the maximal number of schedule dimensions (using '0's for the remaining values). */ -__isl_give isl_map * -translate_isl_ast_to_gimple::extend_schedule (__isl_take isl_map *schedule, - int nb_schedule_dims) +__isl_give isl_map *translate_isl_ast_to_gimple:: +extend_schedule (__isl_take isl_map *schedule, int nb_schedule_dims) { int tmp_dims = isl_map_dim (schedule, isl_dim_out); schedule = @@ -3235,8 +2967,8 @@ translate_isl_ast_to_gimple::extend_schedule (__isl_take isl_map *schedule, /* Generates a schedule, which specifies an order used to visit elements in a domain. */ -__isl_give isl_union_map * -translate_isl_ast_to_gimple::generate_isl_schedule (scop_p scop) +__isl_give isl_union_map *translate_isl_ast_to_gimple:: +generate_isl_schedule (scop_p scop) { int nb_schedule_dims = get_max_schedule_dimensions (scop); int i; @@ -3267,9 +2999,9 @@ translate_isl_ast_to_gimple::generate_isl_schedule (scop_p scop) /* Set the separate option for all dimensions. This helps to reduce control overhead. */ -__isl_give isl_ast_build * -translate_isl_ast_to_gimple::set_options (__isl_take isl_ast_build *control, - __isl_keep isl_union_map *schedule) +__isl_give isl_ast_build *translate_isl_ast_to_gimple:: +set_options (__isl_take isl_ast_build *control, + __isl_keep isl_union_map *schedule) { isl_ctx *ctx = isl_union_map_get_ctx (schedule); isl_space *range_space = isl_space_set_alloc (ctx, 0, 1); @@ -3285,8 +3017,8 @@ translate_isl_ast_to_gimple::set_options (__isl_take isl_ast_build *control, /* Generate isl AST from schedule of SCOP. Also, collects IVS_PARAMS in IP. */ -__isl_give isl_ast_node * -translate_isl_ast_to_gimple::scop_to_isl_ast (scop_p scop, ivs_params &ip) +__isl_give isl_ast_node *translate_isl_ast_to_gimple:: +scop_to_isl_ast (scop_p scop, ivs_params &ip) { /* Generate loop upper bounds that consist of the current loop iterator, an operator (< or <=) and an expression not involving the iterator. If this @@ -3383,11 +3115,8 @@ copy_internal_parameters (sese_info_p region, sese_info_p to_region) } } -/* GIMPLE Loop Generator: generates loops from STMT in GIMPLE form for - the given SCOP. Return true if code generation succeeded. - - FIXME: This is not yet a full implementation of the code generator - with isl ASTs. Generation of GIMPLE code has to be completed. */ +/* GIMPLE Loop Generator: generates loops in GIMPLE form for the given SCOP. + Return true if code generation succeeded. */ bool graphite_regenerate_ast_isl (scop_p scop)