X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeilpsched.c;h=105e1394ef30ba79d958d4aed0835f38e5205099;hb=59528405f7e6b495a3092ff206e4ca4626869ddc;hp=5054e0303730eb877068f9feb2b6fedb71284a71;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm diff --git a/ir/be/beilpsched.c b/ir/be/beilpsched.c index 5054e0303..105e1394e 100644 --- a/ir/be/beilpsched.c +++ b/ir/be/beilpsched.c @@ -29,11 +29,7 @@ * by Daniel Kaestner and Sebastian Winkel * extended with register pressure constraints by Christian Wuerdig */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif - -#include "firm_config.h" #ifdef WITH_ILP @@ -56,21 +52,23 @@ #include "irprintf.h" #include "plist.h" #include "irprintf.h" +#include "timing.h" #include #include -#include -#include -#include +#include "lc_opts.h" +#include "lc_opts_enum.h" #include "be.h" #include "benode_t.h" -#include "besched_t.h" +#include "besched.h" #include "beilpsched.h" #include "beutil.h" #include "bestat.h" -#include "beirg_t.h" +#include "beirg.h" +#include "bemachine.h" +#include "belistsched.h" typedef struct _ilpsched_options_t { unsigned regpress; @@ -151,7 +149,6 @@ typedef struct { void *irg_env; /**< An environment for the irg scheduling, provided by the backend */ void *block_env; /**< An environment for scheduling a block, provided by the backend */ const arch_env_t *arch_env; - const arch_isa_t *isa; /**< The ISA */ const be_main_env_t *main_env; const be_machine_t *cpu; /**< the current abstract machine */ ilpsched_options_t *opts; /**< the ilp options for current irg */ @@ -168,9 +165,9 @@ typedef struct { #define get_ilpsched_node_attr(node) (&(node)->attr.node_attr) /* check if node is considered for ILP scheduling */ -#define consider_for_sched(isa, irn) \ +#define consider_for_sched(env, irn) \ (! (is_Block(irn) || \ - is_normal_Proj(isa, irn) || \ + is_normal_Proj(env, irn) || \ is_Phi(irn) || \ is_NoMem(irn) || \ is_Unknown(irn) || \ @@ -194,9 +191,9 @@ typedef struct { /* check if a double value is within an epsilon environment of 0 */ #define LPP_VALUE_IS_0(dbl) (fabs((dbl)) <= 1e-10) -#define ilp_timer_push(t) lc_timer_push((t)) -#define ilp_timer_pop() lc_timer_pop() -#define ilp_timer_elapsed_usec(t) lc_timer_elapsed_usec((t)) +#define ilp_timer_push(t) ir_timer_push((t)) +#define ilp_timer_pop() ir_timer_pop() +#define ilp_timer_elapsed_usec(t) ir_timer_elapsed_usec((t)) /* option variable */ static ilpsched_options_t ilp_opts = { @@ -223,21 +220,21 @@ static heights_t *glob_heights; * Check if irn is a Proj, which has no execution units assigned. * @return 1 if irn is a Proj having no execution units assigned, 0 otherwise */ -static INLINE int is_normal_Proj(const arch_isa_t *isa, const ir_node *irn) { - return is_Proj(irn) && (arch_isa_get_allowed_execution_units(isa, irn) == NULL); +static inline int is_normal_Proj(const arch_env_t *env, const ir_node *irn) { + return is_Proj(irn) && (arch_env_get_allowed_execution_units(env, irn) == NULL); } /** * Skips normal Projs. * @return predecessor if irn is a normal Proj, otherwise irn. */ -static INLINE ir_node *skip_normal_Proj(const arch_isa_t *isa, ir_node *irn) { - if (is_normal_Proj(isa, irn)) +static inline ir_node *skip_normal_Proj(const arch_env_t *env, ir_node *irn) { + if (is_normal_Proj(env, irn)) return get_Proj_pred(irn); return irn; } -static INLINE int fixed_latency(const ilp_sched_selector_t *sel, ir_node *irn, void *env) { +static inline int fixed_latency(const ilp_sched_selector_t *sel, ir_node *irn, void *env) { unsigned lat = be_ilp_sched_latency(sel, irn, env); if (lat == 0 && ! is_Proj(irn) && ! be_is_Keep(irn)) lat = 1; @@ -340,7 +337,7 @@ static void build_block_idx(ir_node *irn, void *walk_env) { ilpsched_block_attr_t *ba; set_irn_link(irn, NULL); - if (! consider_for_sched(env->arch_env->isa, irn)) + if (! consider_for_sched(env->arch_env, irn)) return; node = get_ilpsched_irn(env, irn); @@ -379,7 +376,7 @@ static void collect_alap_root_nodes(ir_node *irn, void *walk_env) { ir_node **consumer; unsigned idx; - if (! consider_for_sched(env->arch_env->isa, irn)) + if (! consider_for_sched(env->arch_env, irn)) return; block = get_nodes_block(irn); @@ -393,7 +390,7 @@ static void collect_alap_root_nodes(ir_node *irn, void *walk_env) { foreach_out_edge_kind(irn, edge, ekind[i]) { ir_node *user = get_edge_src_irn(edge); - if (is_normal_Proj(env->arch_env->isa, user)) { + if (is_normal_Proj(env->arch_env, user)) { const ir_edge_t *user_edge; if (get_irn_mode(user) == mode_X) @@ -495,7 +492,7 @@ static void calculate_irn_asap(ir_node *irn, void *walk_env) { ilpsched_block_attr_t *ba; /* These nodes are handled separate */ - if (! consider_for_sched(env->arch_env->isa, irn)) + if (! consider_for_sched(env->arch_env, irn)) return; DBG((env->dbg, LEVEL_2, "Calculating ASAP of node %+F ... ", irn)); @@ -506,7 +503,7 @@ static void calculate_irn_asap(ir_node *irn, void *walk_env) { na->asap = 1; for (i = get_irn_ins_or_deps(irn) - 1; i >= 0; --i) { - ir_node *pred = skip_normal_Proj(env->arch_env->isa, get_irn_in_or_dep(irn, i)); + ir_node *pred = skip_normal_Proj(env->arch_env, get_irn_in_or_dep(irn, i)); /* check for greatest distance to top */ if (! is_Phi(pred) && ! is_NoMem(pred) && get_nodes_block(pred) == block) { @@ -579,7 +576,7 @@ static void calculate_block_alap(ir_node *block, void *walk_env) { /* set the alap's of all predecessors */ for (i = get_irn_ins_or_deps(cur_irn) - 1; i >= 0; --i) { - ir_node *pred = skip_normal_Proj(env->arch_env->isa, get_irn_in_or_dep(cur_irn, i)); + ir_node *pred = skip_normal_Proj(env->arch_env, get_irn_in_or_dep(cur_irn, i)); /* check for greatest distance to bottom */ if (! is_Phi(pred) && ! is_NoMem(pred) && get_nodes_block(pred) == block) { @@ -649,7 +646,7 @@ static void refine_asap_alap_times(ir_node *irn, void *walk_env) { be_ilpsched_irn_t *node, *pred_node; ilpsched_node_attr_t *na, *pna; - if (! consider_for_sched(env->arch_env->isa, irn)) + if (! consider_for_sched(env->arch_env, irn)) return; if (! is_Proj(irn) && ! be_is_Keep(irn)) @@ -686,7 +683,7 @@ static void refine_asap_alap_times(ir_node *irn, void *walk_env) { * *******************************************/ -static INLINE void check_for_keeps(waitq *keeps, const ir_node *block, const ir_node *irn) { +static inline void check_for_keeps(waitq *keeps, const ir_node *block, const ir_node *irn) { const ir_edge_t *edge; (void) block; @@ -703,11 +700,11 @@ static INLINE void check_for_keeps(waitq *keeps, const ir_node *block, const ir_ /** * Inserts @p irn before @p before into schedule and notifies backend. */ -static INLINE void notified_sched_add_before(be_ilpsched_env_t *env, +static inline void notified_sched_add_before(be_ilpsched_env_t *env, const ir_node *before, const ir_node *irn, unsigned cycle) { be_ilp_sched_node_scheduled(env->sel, irn, cycle, env->block_env); - sched_add_before(before, irn); + sched_add_before((ir_node*) before, (ir_node*) irn); } /** @@ -759,15 +756,13 @@ static void add_to_sched(be_ilpsched_env_t *env, const ir_node *block, const ir_ static void apply_solution(be_ilpsched_env_t *env, lpp_t *lpp, ir_node *block) { be_ilpsched_irn_t *block_node = get_ilpsched_irn(env, block); ilpsched_block_attr_t *ba = get_ilpsched_block_attr(block_node); - sched_info_t *info = get_irn_sched_info(block); be_ilpsched_irn_t **sched_nodes; unsigned i, l; ir_node *cfop, *irn; const ir_edge_t *edge; /* init block schedule list */ - INIT_LIST_HEAD(&info->list); - info->scheduled = 1; + sched_init_block(block); /* collect nodes and their scheduling time step */ sched_nodes = NEW_ARR_F(be_ilpsched_irn_t *, 0); @@ -880,7 +875,7 @@ static void apply_solution(be_ilpsched_env_t *env, lpp_t *lpp, ir_node *block) { /** * Check if node can be executed on given unit type. */ -static INLINE int is_valid_unit_type_for_node(const be_execution_unit_type_t *tp, be_ilpsched_irn_t *node) { +static inline int is_valid_unit_type_for_node(const be_execution_unit_type_t *tp, be_ilpsched_irn_t *node) { int i; ilpsched_node_attr_t *na = get_ilpsched_node_attr(node); @@ -903,7 +898,7 @@ static INLINE int is_valid_unit_type_for_node(const be_execution_unit_type_t *tp ************************************************/ static int be_ilpsched_set_type_info(be_ilpsched_env_t *env, ir_node *irn, struct obstack *obst) { - const be_execution_unit_t ***execunits = arch_isa_get_allowed_execution_units(env->arch_env->isa, irn); + const be_execution_unit_t ***execunits = arch_env_get_allowed_execution_units(env->arch_env, irn); unsigned n_unit_types = 0; be_ilpsched_irn_t *node; ilpsched_node_attr_t *na; @@ -980,7 +975,7 @@ static void create_variables(be_ilpsched_env_t *env, lpp_t *lpp, be_ilpsched_irn ilp_livein_node_t *livein; ilpsched_block_attr_t *ba = get_ilpsched_block_attr(block_node); unsigned weigth_y = ba->n_interesting_nodes * ba->n_interesting_nodes; - lc_timer_t *t_var = lc_timer_register("beilpsched_var", "create ilp variables"); + ir_timer_t *t_var = ir_timer_register("beilpsched_var", "create ilp variables"); ilp_timer_push(t_var); num_block_var = num_nodes = 0; @@ -1060,7 +1055,7 @@ static void create_variables(be_ilpsched_env_t *env, lpp_t *lpp, be_ilpsched_irn for (i = get_irn_arity(irn) - 1; i >= 0; --i) { ir_node *pred = get_irn_n(irn, i); - if (get_nodes_block(pred) != block_node->irn && consider_for_sched(env->arch_env->isa, pred)) { + if (get_nodes_block(pred) != block_node->irn && consider_for_sched(env->arch_env, pred)) { be_ilpsched_set_type_info(env, pred, var_obst); if (! na->is_dummy_node) { ilp_livein_node_t *entry = obstack_alloc(var_obst, sizeof(*entry)); @@ -1162,8 +1157,8 @@ static void create_assignment_and_precedence_constraints(be_ilpsched_env_t *env, ir_node *irn; ilpsched_block_attr_t *ba = get_ilpsched_block_attr(block_node); bitset_t *bs_block_irns = bitset_alloca(ba->block_last_idx); - lc_timer_t *t_cst_assign = lc_timer_register("beilpsched_cst_assign", "create assignment constraints"); - lc_timer_t *t_cst_prec = lc_timer_register("beilpsched_cst_prec", "create precedence constraints"); + ir_timer_t *t_cst_assign = ir_timer_register("beilpsched_cst_assign", "create assignment constraints"); + ir_timer_t *t_cst_prec = ir_timer_register("beilpsched_cst_prec", "create precedence constraints"); num_cst_assign = num_cst_prec = num_cst_dead = 0; foreach_linked_irns(ba->head_ilp_nodes, irn) { @@ -1207,7 +1202,7 @@ static void create_assignment_and_precedence_constraints(be_ilpsched_env_t *env, ilpsched_node_attr_t *pna; unsigned delay; - pred = skip_normal_Proj(env->arch_env->isa, pred); + pred = skip_normal_Proj(env->arch_env, pred); if (is_Phi(pred) || block_node->irn != get_nodes_block(pred) || is_NoMem(pred)) continue; @@ -1293,7 +1288,7 @@ static void create_ressource_constraints(be_ilpsched_env_t *env, lpp_t *lpp, be_ char buf[1024]; unsigned num_cst_resrc = 0; ilpsched_block_attr_t *ba = get_ilpsched_block_attr(block_node); - lc_timer_t *t_cst_rsrc = lc_timer_register("beilpsched_cst_rsrc", "create resource constraints"); + ir_timer_t *t_cst_rsrc = ir_timer_register("beilpsched_cst_rsrc", "create resource constraints"); ilp_timer_push(t_cst_rsrc); for (glob_type_idx = env->cpu->n_unit_types - 1; glob_type_idx >= 0; --glob_type_idx) { @@ -1349,7 +1344,7 @@ static void create_bundle_constraints(be_ilpsched_env_t *env, lpp_t *lpp, be_ilp unsigned num_cst_bundle = 0; unsigned n_instr_max = env->cpu->bundle_size * env->cpu->bundels_per_cycle; ilpsched_block_attr_t *ba = get_ilpsched_block_attr(block_node); - lc_timer_t *t_cst_bundle = lc_timer_register("beilpsched_cst_bundle", "create bundle constraints"); + ir_timer_t *t_cst_bundle = ir_timer_register("beilpsched_cst_bundle", "create bundle constraints"); ilp_timer_push(t_cst_bundle); for (t = 0; t < ba->max_steps; ++t) { @@ -1405,7 +1400,7 @@ static void create_alive_nodes_constraint(be_ilpsched_env_t *env, lpp_t *lpp, be ir_node *irn; unsigned num_cst = 0; ilpsched_block_attr_t *ba = get_ilpsched_block_attr(block_node); - lc_timer_t *t_cst = lc_timer_register("beilpsched_cst_alive_nodes", "create alive nodes constraints"); + ir_timer_t *t_cst = ir_timer_register("beilpsched_cst_alive_nodes", "create alive nodes constraints"); ilp_timer_push(t_cst); /* for each node */ @@ -1487,7 +1482,7 @@ static void create_alive_livein_nodes_constraint(be_ilpsched_env_t *env, lpp_t * ilp_livein_node_t *livein; unsigned num_cst = 0; ilpsched_block_attr_t *ba = get_ilpsched_block_attr(block_node); - lc_timer_t *t_cst = lc_timer_register("beilpsched_cst_alive_livein_nodes", "create alive livein nodes constraints"); + ir_timer_t *t_cst = ir_timer_register("beilpsched_cst_alive_livein_nodes", "create alive livein nodes constraints"); ilp_timer_push(t_cst); /* for each node */ @@ -1566,7 +1561,7 @@ static void create_pressure_alive_constraint(be_ilpsched_env_t *env, lpp_t *lpp, ir_node *cur_irn; unsigned num_cst = 0; ilpsched_block_attr_t *ba = get_ilpsched_block_attr(block_node); - lc_timer_t *t_cst = lc_timer_register("beilpsched_cst_pressure", "create pressure constraints"); + ir_timer_t *t_cst = ir_timer_register("beilpsched_cst_pressure", "create pressure constraints"); ilp_timer_push(t_cst); /* y_{nt}^k is set for each node and timestep and unit type */ @@ -1669,7 +1664,7 @@ static void create_branch_constraint(be_ilpsched_env_t *env, lpp_t *lpp, be_ilps unsigned num_cst = 0; unsigned num_non_branches = 0; ilpsched_block_attr_t *ba = get_ilpsched_block_attr(block_node); - lc_timer_t *t_cst = lc_timer_register("beilpsched_cst_branch", "create branch constraints"); + ir_timer_t *t_cst = ir_timer_register("beilpsched_cst_branch", "create branch constraints"); ilp_timer_push(t_cst); cfop = NULL; @@ -1761,7 +1756,7 @@ static void create_proj_keep_constraints(be_ilpsched_env_t *env, lpp_t *lpp, be_ ir_node *irn; unsigned num_cst = 0; ilpsched_block_attr_t *ba = get_ilpsched_block_attr(block_node); - lc_timer_t *t_cst = lc_timer_register("beilpsched_cst_projkeep", "create proj and keep constraints"); + ir_timer_t *t_cst = ir_timer_register("beilpsched_cst_projkeep", "create proj and keep constraints"); ilp_timer_push(t_cst); /* check all nodes */ @@ -2013,8 +2008,7 @@ void be_ilp_sched(const be_irg_t *birg, be_options_t *be_opts) { const char *name = "be ilp scheduling"; ir_graph *irg = be_get_birg_irg(birg); const arch_env_t *arch_env = be_get_birg_arch_env(birg); - const arch_isa_t *isa = arch_env->isa; - const ilp_sched_selector_t *sel = isa->impl->get_ilp_sched_selector(isa); + const ilp_sched_selector_t *sel = arch_env->impl->get_ilp_sched_selector(arch_env); FIRM_DBG_REGISTER(env.dbg, "firm.be.sched.ilp"); @@ -2028,7 +2022,7 @@ void be_ilp_sched(const be_irg_t *birg, be_options_t *be_opts) { env.height = heights_new(irg); env.main_env = birg->main_env; env.arch_env = arch_env; - env.cpu = arch_isa_get_machine(arch_env->isa); + env.cpu = arch_env_get_machine(arch_env); env.opts = &ilp_opts; env.birg = birg; env.be_opts = be_opts; @@ -2091,7 +2085,7 @@ void be_init_ilpsched(void) #else /* WITH_ILP */ -static INLINE void some_picky_compiler_do_not_allow_empty_files(void) +static inline void some_picky_compiler_do_not_allow_empty_files(void) {} #endif /* WITH_ILP */