projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added DUMP const for belower
[libfirm]
/
ir
/
be
/
bechordal_main.c
diff --git
a/ir/be/bechordal_main.c
b/ir/be/bechordal_main.c
index
7ca168f
..
c44fbe2
100644
(file)
--- a/
ir/be/bechordal_main.c
+++ b/
ir/be/bechordal_main.c
@@
-44,14
+44,12
@@
#include "bespillbelady.h"
#include "bespillilp.h"
#include "bespillbelady.h"
#include "bespillilp.h"
+#include "beconstrperm.h"
+#include "belower.h"
-#define DO_SSADESTR
-
-#ifdef DO_SSADESTR
+#include "becopyoptmain.h"
#include "bessadestr.h"
#include "becopystat.h"
#include "bessadestr.h"
#include "becopystat.h"
-#include "becopyoptmain.h"
-#endif /* DO_SSADESTR */
void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
@@
-81,8
+79,8
@@
void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
n1_reg = arch_get_irn_register(arch_env, n1);
if (!arch_reg_is_allocatable(arch_env, n1, -1, n1_reg)) {
n1_reg = arch_get_irn_register(arch_env, n1);
if (!arch_reg_is_allocatable(arch_env, n1, -1, n1_reg)) {
- DBG((dbg, 0, "Register
assigned to %+F is not allowed\n"
, n1));
-
assert(0 && "Register constraint does not hold");
+ DBG((dbg, 0, "Register
%s assigned to %+F is not allowed\n", n1_reg->name
, n1));
+
//
assert(0 && "Register constraint does not hold");
}
for (o = i+1, n2 = nodes[o]; n2; n2 = nodes[++o]) {
n2_reg = arch_get_irn_register(arch_env, n2);
}
for (o = i+1, n2 = nodes[o]; n2; n2 = nodes[++o]) {
n2_reg = arch_get_irn_register(arch_env, n2);
@@
-160,7
+158,8
@@
static be_ra_chordal_opts_t options = {
BE_CH_DUMP_NONE,
BE_CH_SPILL_BELADY,
BE_CH_COPYMIN_HEUR,
BE_CH_DUMP_NONE,
BE_CH_SPILL_BELADY,
BE_CH_COPYMIN_HEUR,
- BE_CH_IFG_STD
+ BE_CH_IFG_STD,
+ BE_CH_LOWER_PERM_SWAP
};
#ifdef WITH_LIBCORE
};
#ifdef WITH_LIBCORE
@@
-182,6
+181,12
@@
static const lc_opt_enum_int_items_t ifg_flavor_items[] = {
{ NULL, 0 }
};
{ NULL, 0 }
};
+static const lc_opt_enum_int_items_t lower_perm_items[] = {
+ { "swap", BE_CH_LOWER_PERM_SWAP },
+ { "copy", BE_CH_LOWER_PERM_COPY },
+ { NULL, 0 }
+};
+
static lc_opt_enum_int_var_t spill_var = {
&options.spill_method, spill_items
};
static lc_opt_enum_int_var_t spill_var = {
&options.spill_method, spill_items
};
@@
-194,6
+199,10
@@
static lc_opt_enum_int_var_t ifg_flavor_var = {
&options.spill_method, ifg_flavor_items
};
&options.spill_method, ifg_flavor_items
};
+static lc_opt_enum_int_var_t lower_perm_var = {
+ &options.lower_perm_method, lower_perm_items
+};
+
static void be_ra_chordal_register_options(lc_opt_entry_t *grp)
{
lc_opt_entry_t *dump;
static void be_ra_chordal_register_options(lc_opt_entry_t *grp)
{
lc_opt_entry_t *dump;
@@
-243,8
+252,13
@@
static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
fprintf(stderr, "no valid spiller selected. falling back to belady\n");
be_spill_belady(&chordal_env);
}
fprintf(stderr, "no valid spiller selected. falling back to belady\n");
be_spill_belady(&chordal_env);
}
-
dump(BE_CH_DUMP_SPILL, irg, "-spill", dump_ir_block_graph_sched);
dump(BE_CH_DUMP_SPILL, irg, "-spill", dump_ir_block_graph_sched);
+ be_liveness(irg);
+ be_check_pressure(&chordal_env);
+
+ /* Insert perms before reg-constrained instructions */
+ be_insert_constr_perms(&chordal_env);
+ dump(BE_CH_DUMP_CONSTR, irg, "-constr", dump_ir_block_graph_sched);
be_liveness(irg);
be_numbering(irg);
be_liveness(irg);
be_numbering(irg);
@@
-255,21
+269,21
@@
static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
/* Build the interference graph. */
chordal_env.ifg = be_ifg_std_new(&chordal_env);
/* Build the interference graph. */
chordal_env.ifg = be_ifg_std_new(&chordal_env);
+ be_ifg_check(chordal_env.ifg);
-#ifdef DO_SSADESTR
/* copy minimization */
copystat_collect_cls(&chordal_env);
be_copy_opt(&chordal_env);
dump(BE_CH_DUMP_COPYMIN, irg, "-copymin", dump_ir_block_graph_sched);
/* copy minimization */
copystat_collect_cls(&chordal_env);
be_copy_opt(&chordal_env);
dump(BE_CH_DUMP_COPYMIN, irg, "-copymin", dump_ir_block_graph_sched);
+ be_ra_chordal_check(&chordal_env);
/* ssa destruction */
be_ssa_destruction(&chordal_env);
/* ssa destruction */
be_ssa_destruction(&chordal_env);
+ dump(BE_CH_DUMP_SSADESTR, irg, "-ssadestr", dump_ir_block_graph_sched);
be_ssa_destruction_check(&chordal_env);
be_ra_chordal_check(&chordal_env);
be_ssa_destruction_check(&chordal_env);
be_ra_chordal_check(&chordal_env);
- dump(BE_CH_DUMP_SSADESTR, irg, "-ssadestr", dump_ir_block_graph_sched);
copystat_dump(irg);
copystat_dump(irg);
-#endif /* DO_SSADESTR */
be_ifg_free(chordal_env.ifg);
be_numbering_done(irg);
be_ifg_free(chordal_env.ifg);
be_numbering_done(irg);
@@
-277,6
+291,8
@@
static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
pmap_destroy(chordal_env.border_heads);
}
pmap_destroy(chordal_env.border_heads);
}
+ lower_perms(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0);
+
be_free_dominance_frontiers(chordal_env.dom_front);
obstack_free(&chordal_env.obst, NULL);
}
be_free_dominance_frontiers(chordal_env.dom_front);
obstack_free(&chordal_env.obst, NULL);
}