X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbestate.c;h=69e3e096a2af453d7830f70a9f31248c608a0df6;hb=03300a88ae8d61bb6c2129dcf55937f3250c1217;hp=66b6b00b074362f3e09f2138907943d5790f9185;hpb=1a26f4853c07d1ecd68a097409dd602edfe29eff;p=libfirm diff --git a/ir/be/bestate.c b/ir/be/bestate.c index 66b6b00b0..69e3e096a 100644 --- a/ir/be/bestate.c +++ b/ir/be/bestate.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -47,6 +47,7 @@ #include "belive_t.h" #include "bemodule.h" #include "benode.h" +#include "beirgmod.h" #include "bessaconstr.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) @@ -76,8 +77,7 @@ typedef struct block_info_t { ir_node *end_state; } block_info_t; -static inline -block_info_t *new_block_info(struct obstack *obst, ir_node *block) +static inline block_info_t *new_block_info(struct obstack *obst, ir_node *block) { block_info_t *res = OALLOCZ(obst, block_info_t); @@ -88,15 +88,13 @@ block_info_t *new_block_info(struct obstack *obst, ir_node *block) return res; } -static inline -block_info_t *get_block_info(ir_node *block) +static inline block_info_t *get_block_info(ir_node *block) { assert(irn_visited(block)); return (block_info_t*) get_irn_link(block); } -static inline -spill_info_t *create_spill_info(minibelady_env_t *env, ir_node *state) +static inline spill_info_t *create_spill_info(minibelady_env_t *env, ir_node *state) { spill_info_t *spill_info = OALLOCZ(&env->obst, spill_info_t); spill_info->value = state; @@ -111,8 +109,7 @@ spill_info_t *create_spill_info(minibelady_env_t *env, ir_node *state) return spill_info; } -static inline -spill_info_t *get_spill_info(minibelady_env_t *env, const ir_node *node) +static inline spill_info_t *get_spill_info(minibelady_env_t *env, const ir_node *node) { spill_info_t *spill_info = (spill_info_t*) ir_nodemap_get(&env->spill_infos, node); @@ -120,8 +117,7 @@ spill_info_t *get_spill_info(minibelady_env_t *env, const ir_node *node) return spill_info; } -static -spill_info_t *create_spill(minibelady_env_t *env, ir_node *state, int force) +static spill_info_t *create_spill(minibelady_env_t *env, ir_node *state, int force) { spill_info_t *spill_info; ir_node *next; @@ -148,9 +144,8 @@ spill_info_t *create_spill(minibelady_env_t *env, ir_node *state, int force) return spill_info; } -static -void create_reload(minibelady_env_t *env, ir_node *state, ir_node *before, - ir_node *last_state) +static void create_reload(minibelady_env_t *env, ir_node *state, + ir_node *before, ir_node *last_state) { spill_info_t *spill_info = create_spill(env, state, 0); ir_node *spill = spill_info->spill; @@ -161,13 +156,13 @@ void create_reload(minibelady_env_t *env, ir_node *state, ir_node *before, ARR_APP1(ir_node*, spill_info->reloads, reload); } -static -void spill_phi(minibelady_env_t *env, ir_node *phi) +static void spill_phi(minibelady_env_t *env, ir_node *phi) { ir_graph *irg = get_irn_irg(phi); ir_node *block = get_nodes_block(phi); int arity = get_irn_arity(phi); ir_node **in = ALLOCAN(ir_node*, arity); + ir_node *dummy = new_r_Dummy(irg, mode_M); ir_node *spill_to_kill = NULL; spill_info_t *spill_info; int i; @@ -182,13 +177,14 @@ void spill_phi(minibelady_env_t *env, ir_node *phi) /* create a new phi-M with bad preds */ for (i = 0; i < arity; ++i) { - in[i] = new_r_Unknown(irg, mode_M); + in[i] = dummy; } DBG((dbg, LEVEL_2, "\tcreate Phi-M for %+F\n", phi)); /* create a Phi-M */ - spill_info->spill = new_r_Phi(block, arity, in, mode_M); + spill_info->spill = be_new_Phi(block, arity, in, mode_M, NULL); + sched_add_after(block, spill_info->spill); if (spill_to_kill != NULL) { exchange(spill_to_kill, spill_info->spill); @@ -203,19 +199,17 @@ void spill_phi(minibelady_env_t *env, ir_node *phi) } } -static -void belady(minibelady_env_t *env, ir_node *block); +static void belady(minibelady_env_t *env, ir_node *block); /** * Collects all values live-in at block @p block and all phi results in this * block. * Then it adds the best values (at most n_regs) to the blocks start_workset. - * The phis among the remaining values get spilled: Introduce psudo-copies of + * The phis among the remaining values get spilled: Introduce pseudo-copies of * their args to break interference and make it possible to spill them to the * same spill slot. */ -static -block_info_t *compute_block_start_state(minibelady_env_t *env, ir_node *block) +static block_info_t *compute_block_start_state(minibelady_env_t *env, ir_node *block) { block_info_t *block_info; be_next_use_t next_use; @@ -268,7 +262,7 @@ block_info_t *compute_block_start_state(minibelady_env_t *env, ir_node *block) continue; DBG((dbg, LEVEL_2, "\t...checking %+F\n", node)); - next_use = be_get_next_use(env->uses, first, 0, node, 0); + next_use = be_get_next_use(env->uses, first, node, 0); if (USES_IS_INFINITE(next_use.time)) { DBG((dbg, LEVEL_2, "\tnot taken (dead)\n")); @@ -318,7 +312,7 @@ block_info_t *compute_block_start_state(minibelady_env_t *env, ir_node *block) continue; DBG((dbg, LEVEL_2, "\t...checking %+F\n", node)); - next_use = be_get_next_use(env->uses, first, 0, node, 0); + next_use = be_get_next_use(env->uses, first, node, 0); if (USES_IS_INFINITE(next_use.time)) { DBG((dbg, LEVEL_2, "\tnot taken (dead)\n")); @@ -362,8 +356,7 @@ block_info_t *compute_block_start_state(minibelady_env_t *env, ir_node *block) * whether it is used from a register or is reloaded * before the use. */ -static -void belady(minibelady_env_t *env, ir_node *block) +static void belady(minibelady_env_t *env, ir_node *block) { ir_node *current_state; ir_node *node; @@ -414,8 +407,9 @@ void belady(minibelady_env_t *env, ir_node *block) } /* create a reload to match state if necessary */ if (need_val != NULL && need_val != current_state) { + ir_node *before = node; DBG((dbg, LEVEL_3, "\t... reloading %+F\n", need_val)); - create_reload(env, need_val, node, current_state); + create_reload(env, need_val, before, current_state); current_state = need_val; } @@ -454,14 +448,12 @@ void belady(minibelady_env_t *env, ir_node *block) DBG((dbg, LEVEL_3, "End value for %+F: %+F\n", block, current_state)); } -static -void belady_walker(ir_node *block, void *data) +static void belady_walker(ir_node *block, void *data) { belady((minibelady_env_t*) data, block); } -static -ir_node *get_end_of_block_insertion_point(ir_node *block) +static ir_node *get_end_of_block_insertion_point(ir_node *block) { ir_node *last = sched_last(block); @@ -473,7 +465,7 @@ ir_node *get_end_of_block_insertion_point(ir_node *block) if (!is_cfop(last)) { last = sched_next(last); /* last node must be a cfop, only exception is the start block */ - assert(last == get_irg_start_block(get_irn_irg(block))); + assert(last == get_irg_start_block(get_irn_irg(block))); } return last; @@ -482,10 +474,9 @@ ir_node *get_end_of_block_insertion_point(ir_node *block) /** * We must adapt the live-outs to the live-ins at each block-border. */ -static -void fix_block_borders(ir_node *block, void *data) +static void fix_block_borders(ir_node *block, void *data) { - minibelady_env_t *env = data; + minibelady_env_t *env = (minibelady_env_t*)data; ir_graph *irg = get_irn_irg(block); ir_node *startblock = get_irg_start_block(irg); int i; @@ -520,7 +511,7 @@ void fix_block_borders(ir_node *block, void *data) pred_info->end_state, need_state)); if (pred_info->end_state != need_state) { - ir_node *insert_point = get_end_of_block_insertion_point(pred); + ir_node *insert_point = get_end_of_block_insertion_point(pred); DBG((dbg, LEVEL_3, " Creating reload for %+F\n", need_state)); @@ -529,13 +520,13 @@ void fix_block_borders(ir_node *block, void *data) } } -void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env, +void be_assure_state(ir_graph *irg, const arch_register_t *reg, void *func_env, create_spill_func create_spill, - create_reload_func create_reload) { + create_reload_func create_reload) +{ minibelady_env_t env; - ir_graph *irg = be_get_birg_irg(birg); spill_info_t *info; - be_lv_t *lv = be_assure_liveness(birg); + be_lv_t *lv = be_assure_liveness(irg); be_liveness_assure_sets(lv); /* construct control flow loop tree */ @@ -548,7 +539,7 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env, env.func_env = func_env; env.create_spill = create_spill; env.create_reload = create_reload; - env.lv = be_get_birg_liveness(birg); + env.lv = be_get_irg_liveness(irg); env.uses = be_begin_uses(irg, env.lv); env.spills = NULL; ir_nodemap_init(&env.spill_infos); @@ -569,10 +560,10 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env, info = env.spills; while (info != NULL) { be_ssa_construction_env_t senv; - int i, len; + size_t i, len; ir_node **phis; - be_ssa_construction_init(&senv, birg); + be_ssa_construction_init(&senv, irg); if (sched_is_scheduled(info->value)) be_ssa_construction_add_copy(&senv, info->value); be_ssa_construction_add_copies(&senv, @@ -604,16 +595,15 @@ void be_assure_state(be_irg_t *birg, const arch_register_t *reg, void *func_env, } /* some nodes might be dead now. */ - be_remove_dead_nodes_from_schedule(birg); + be_remove_dead_nodes_from_schedule(irg); ir_nodemap_destroy(&env.spill_infos); be_end_uses(env.uses); obstack_free(&env.obst, NULL); } +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_state) void be_init_state(void) { FIRM_DBG_REGISTER(dbg, "firm.be.state"); } - -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_state);