X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelower.c;h=ea759db6f76873cbfa22c789ca3de92801eeb2d6;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=bdef2063487728420ba2aa69db861ad337a7efb6;hpb=f18baed9c341f6cd95ec6d6a61236df29b35ce8b;p=libfirm diff --git a/ir/be/belower.c b/ir/be/belower.c index bdef20634..ea759db6f 100644 --- a/ir/be/belower.c +++ b/ir/be/belower.c @@ -38,6 +38,7 @@ #include "irgmod.h" #include "iredges_t.h" #include "irgwalk.h" +#include "array_t.h" #include "bearch_t.h" #include "belower.h" @@ -49,14 +50,14 @@ #undef KEEP_ALIVE_COPYKEEP_HACK -/* associates op with it's copy and CopyKeep */ +/** Associates an op with it's copy and CopyKeep. */ typedef struct { - ir_node *op; /* an irn which must be different */ - ir_nodeset_t copies; /* all non-spillable copies of this irn */ + ir_node *op; /**< an irn which must be different */ + ir_nodeset_t copies; /**< all non-spillable copies of this irn */ const arch_register_class_t *cls; } op_copy_assoc_t; -/* environment for constraints */ +/** Environment for constraints. */ typedef struct { be_irg_t *birg; pset *op_set; @@ -64,7 +65,7 @@ typedef struct { DEBUG_ONLY(firm_dbg_module_t *dbg;) } constraint_env_t; -/* lowering walker environment */ +/** Lowering walker environment. */ typedef struct _lower_env_t { be_irg_t *birg; const arch_env_t *arch_env; @@ -72,7 +73,7 @@ typedef struct _lower_env_t { DEBUG_ONLY(firm_dbg_module_t *dbg_module;) } lower_env_t; -/* holds a perm register pair */ +/** Holds a Perm register pair. */ typedef struct _reg_pair_t { const arch_register_t *in_reg; /**< a perm IN register */ ir_node *in_node; /**< the in node to which the register belongs */ @@ -90,15 +91,14 @@ typedef enum _perm_type_t { PERM_COPY } perm_type_t; -/* structure to represent cycles or chains in a perm */ +/** Structure to represent cycles or chains in a Perm. */ typedef struct _perm_cycle_t { const arch_register_t **elems; /**< the registers in the cycle */ int n_elems; /**< number of elements in the cycle */ perm_type_t type; /**< type (CHAIN or CYCLE) */ } perm_cycle_t; -// -/* Compare the two operands */ +/** Compare the two operands. */ static int cmp_op_copy_assoc(const void *a, const void *b) { const op_copy_assoc_t *op1 = a; const op_copy_assoc_t *op2 = b; @@ -106,7 +106,7 @@ static int cmp_op_copy_assoc(const void *a, const void *b) { return op1->op != op2->op; } -/* Compare the in registers of two register pairs */ +/** Compare the in registers of two register pairs. */ static int compare_reg_pair(const void *a, const void *b) { const reg_pair_t *pair_a = a; const reg_pair_t *pair_b = b; @@ -117,7 +117,7 @@ static int compare_reg_pair(const void *a, const void *b) { return -1; } -/* returns the number register pairs marked as checked */ +/** returns the number register pairs marked as checked. */ static int get_n_checked_pairs(reg_pair_t *pairs, int n) { int i, n_checked = 0; @@ -225,7 +225,7 @@ static perm_cycle_t *get_perm_cycle(perm_cycle_t *cycle, reg_pair_t *pairs, int } /* assume worst case: all remaining pairs build a cycle or chain */ - cycle->elems = xcalloc((n - n_pairs_done) * 2, sizeof(cycle->elems[0])); + cycle->elems = XMALLOCNZ(const arch_register_t*, (n - n_pairs_done) * 2); cycle->n_elems = 2; /* initial number of elements is 2 */ cycle->elems[0] = pairs[start].in_reg; cycle->elems[1] = pairs[start].out_reg; @@ -290,7 +290,6 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { int n, i, pn, do_copy, j, n_ops; reg_pair_t *pairs; const ir_edge_t *edge; - perm_cycle_t *cycle; ir_node *sched_point, *block, *in[2]; ir_node *arg1, *arg2, *res1, *res2; ir_node *cpyxchg = NULL; @@ -365,15 +364,15 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { real_size = n - get_n_checked_pairs(pairs, n); - be_do_stat_perm(reg_class->name, reg_class->n_regs, irn, block, n, real_size); - /* check for cycles and chains */ while (get_n_checked_pairs(pairs, n) < n) { + perm_cycle_t *cycle; + i = n_ops = 0; /* go to the first not-checked pair */ while (pairs[i].checked) i++; - cycle = xcalloc(1, sizeof(*cycle)); + cycle = XMALLOCZ(perm_cycle_t); cycle = get_perm_cycle(cycle, pairs, n, i); DB((mod, LEVEL_1, "%+F: following %s created:\n ", irn, cycle->type == PERM_CHAIN ? "chain" : "cycle")); @@ -496,8 +495,6 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { } } - be_do_stat_permcycle(reg_class->name, irn, block, cycle->type == PERM_CHAIN, cycle->n_elems, n_ops); - free((void *) cycle->elems); free(cycle); } @@ -505,23 +502,19 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { /* remove the perm from schedule */ if (! keep_perm) { sched_remove(irn); - be_kill_node(irn); + kill_node(irn); } } -static int get_n_out_edges(const ir_node *irn) { - const ir_edge_t *edge; - int cnt = 0; - - foreach_out_edge(irn, edge) { - cnt++; - } - - return cnt; +static int has_irn_users(const ir_node *irn) { + return get_irn_out_edge_first_kind(irn, EDGE_KIND_NORMAL) != 0; } +/** + * Skip all Proj nodes. + */ static INLINE ir_node *belower_skip_proj(ir_node *irn) { while(is_Proj(irn)) irn = get_Proj_pred(irn); @@ -565,7 +558,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, /* in block far far away */ /* The copy is optimized later if not needed */ - /* check if already exists such a copy in the schedule immediatly before */ + /* check if already exists such a copy in the schedule immediately before */ cpy = find_copy(env, belower_skip_proj(irn), other_different); if (! cpy) { cpy = be_new_Copy(cls, irg, block, other_different); @@ -581,13 +574,13 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, /* Add the Keep resp. CopyKeep and reroute the users */ /* of the other_different irn in case of CopyKeep. */ - if (get_n_out_edges(other_different) == 0) { - keep = be_new_Keep(cls, irg, block, 2, in); - } - else { + if (has_irn_users(other_different)) { keep = be_new_CopyKeep_single(cls, irg, block, cpy, irn, get_irn_mode(other_different)); be_node_set_reg_class(keep, 1, cls); } + else { + keep = be_new_Keep(cls, irg, block, 2, in); + } DBG((mod, LEVEL_1, "created %+F(%+F, %+F)\n\n", keep, irn, cpy)); @@ -620,16 +613,17 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different, } /** - * Checks if node has a should_be_different constraint in output - * and adds a Keep then to assure the constraint. + * Checks if node has a must_be_different constraint in output and adds a Keep + * then to assure the constraint. */ static void assure_different_constraints(ir_node *irn, constraint_env_t *env) { const arch_register_req_t *req; - const arch_env_t *arch_env = be_get_birg_arch_env(env->birg); + const arch_env_t *arch_env = be_get_birg_arch_env(env->birg); + ir_node *skipped_irn = belower_skip_proj(irn); req = arch_get_register_req(arch_env, irn, -1); - if (arch_register_req_is(req, should_be_different)) { + if (arch_register_req_is(req, must_be_different)) { const unsigned other = req->other_different; int i; @@ -641,25 +635,23 @@ static void assure_different_constraints(ir_node *irn, constraint_env_t *env) { int idx_same = ntz(same); /* - * We can safely ignore a should_be_same x should_be_different y - * IFF both nodes are equal! + * We can safely ignore a should_be_same x must_be_different y + * IFF both inputs are equal! */ - if (get_irn_n(irn, idx_other) == get_irn_n(irn, idx_same)) { + if (get_irn_n(skipped_irn, idx_other) == get_irn_n(skipped_irn, idx_same)) { return; } } } for (i = 0; 1U << i <= other; ++i) { if (other & (1U << i)) { - ir_node *different_from = get_irn_n(belower_skip_proj(irn), i); + ir_node *different_from = get_irn_n(skipped_irn, i); gen_assure_different_pattern(irn, different_from, env); } } } } - - /** * Calls the functions to assure register constraints. * @@ -672,8 +664,6 @@ static void assure_constraints_walker(ir_node *irn, void *walk_env) { if (sched_is_scheduled(irn) && mode_is_datab(get_irn_mode(irn))) assure_different_constraints(irn, walk_env); - - return; } /** @@ -761,7 +751,7 @@ static void melt_copykeeps(constraint_env_t *cenv) { /* now, we can kill the melted keep, except the */ /* ref one, we still need some information */ if (melt_arr[j] != ref) - be_kill_node(melt_arr[j]); + kill_node(melt_arr[j]); } #ifdef KEEP_ALIVE_COPYKEEP_HACK @@ -788,7 +778,7 @@ static void melt_copykeeps(constraint_env_t *cenv) { DBG((cenv->dbg, LEVEL_1, "created %+F, scheduled before %+F\n", new_ck, sched_pt)); /* finally: kill the reference copykeep */ - be_kill_node(ref); + kill_node(ref); } } @@ -809,8 +799,6 @@ void assure_constraints(be_irg_t *birg) { ir_node **nodes; FIRM_DBG_REGISTER(firm_dbg_module_t *mod, "firm.be.lower.constr"); - be_assure_dom_front(birg); - DEBUG_ONLY(cenv.dbg = mod;) cenv.birg = birg; cenv.op_set = new_pset(cmp_op_copy_assoc, 16); @@ -860,12 +848,12 @@ void assure_constraints(be_irg_t *birg) { int n = get_irn_arity(cp); keep = be_new_Keep(arch_get_irn_reg_class(arch_env, cp, -1), - irg, get_nodes_block(cp), n, (ir_node **)&get_irn_in(cp)[1]); + irg, get_nodes_block(cp), n, get_irn_in(cp) + 1); sched_add_before(cp, keep); /* Set all ins (including the block) of the CopyKeep BAD to keep the verifier happy. */ sched_remove(cp); - be_kill_node(cp); + kill_node(cp); } } @@ -903,35 +891,36 @@ static int push_through_perm(ir_node *perm, void *data) bitset_t *moved = bitset_alloca(arity); int n_moved; int new_size; - ir_node *frontier = sched_first(bl); + ir_node *frontier = bl; FIRM_DBG_REGISTER(firm_dbg_module_t *mod, "firm.be.lower.permmove"); int i, n; const ir_edge_t *edge; - ir_node *last_proj = NULL, *irn; + ir_node *one_proj = NULL, *irn; const arch_register_class_t *cls = NULL; DBG((mod, LEVEL_1, "perm move %+F irg %+F\n", perm, irg)); - /* get some proj and find out the register class of the proj. */ - foreach_out_edge (perm, edge) { - last_proj = get_edge_src_irn(edge); - cls = arch_get_irn_reg_class(aenv, last_proj, -1); - assert(is_Proj(last_proj)); - break; - } + /* get some Proj and find out the register class of that Proj. */ + edge = get_irn_out_edge_first_kind(perm, EDGE_KIND_NORMAL); + one_proj = get_edge_src_irn(edge); + assert(is_Proj(one_proj)); + cls = arch_get_irn_reg_class(aenv, one_proj, -1); - /* find the point in the schedule after which the + /* Find the point in the schedule after which the * potentially movable nodes must be defined. - * A perm will only be pushed up to first instruction - * which lets an operand of itself die. */ - + * A Perm will only be pushed up to first instruction + * which lets an operand of itself die. + * If we would allow to move the Perm above this instruction, + * the former dead operand would be live now at the point of + * the Perm, increasing the register pressure by one. + */ sched_foreach_reverse_from (sched_prev(perm), irn) { - for(i = get_irn_arity(irn) - 1; i >= 0; --i) { + for (i = get_irn_arity(irn) - 1; i >= 0; --i) { ir_node *op = get_irn_n(irn, i); - if(arch_irn_consider_in_reg_alloc(aenv, cls, op) - && !values_interfere(env->birg, op, last_proj)) { - frontier = sched_next(irn); + if (arch_irn_consider_in_reg_alloc(aenv, cls, op) && + !values_interfere(env->birg, op, one_proj)) { + frontier = irn; goto found_front; } } @@ -947,11 +936,12 @@ found_front: int input = -1; ir_node *proj; + /* search if node is a INPUT of Perm */ foreach_out_edge(perm, edge) { ir_node *out = get_edge_src_irn(edge); int pn = get_Proj_proj(out); ir_node *in = get_irn_n(perm, pn); - if(node == in) { + if (node == in) { proj = out; input = pn; break; @@ -995,7 +985,7 @@ found_front: /* and kill it */ set_Proj_pred(proj, new_Bad()); - be_kill_node(proj); + kill_node(proj); bitset_set(moved, input); n_moved++;