projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added new default emitter function for Copy and Perm
[libfirm]
/
ir
/
be
/
bechordal_main.c
diff --git
a/ir/be/bechordal_main.c
b/ir/be/bechordal_main.c
index
7ab4399
..
328d760
100644
(file)
--- a/
ir/be/bechordal_main.c
+++ b/
ir/be/bechordal_main.c
@@
-47,13
+47,9
@@
#include "beconstrperm.h"
#include "belower.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) {
@@
-83,7
+79,7
@@
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));
+ 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]) {
// assert(0 && "Register constraint does not hold");
}
for (o = i+1, n2 = nodes[o]; n2; n2 = nodes[++o]) {
@@
-159,7
+155,7
@@
int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node
static be_ra_chordal_opts_t options = {
static be_ra_chordal_opts_t options = {
- BE_CH_DUMP_
NONE
,
+ BE_CH_DUMP_
ALL
,
BE_CH_SPILL_BELADY,
BE_CH_COPYMIN_HEUR,
BE_CH_IFG_STD,
BE_CH_SPILL_BELADY,
BE_CH_COPYMIN_HEUR,
BE_CH_IFG_STD,
@@
-215,11
+211,22
@@
static void be_ra_chordal_register_options(lc_opt_entry_t *grp)
}
#endif
}
#endif
-static void dump(int mask, ir_graph *irg, const char *suffix,
- void (*dump)(ir_graph *, const char *))
+static void dump(int mask, ir_graph *irg,
+ const arch_register_class_t *cls,
+ const char *suffix,
+ void (*dump_func)(ir_graph *, const char *))
{
{
- if((options.dump_flags & mask) == mask)
- dump(irg, suffix);
+
+ if((options.dump_flags & mask) == mask) {
+ if(cls) {
+ char buf[256];
+ snprintf(buf, sizeof(buf), "-%s%s", cls->name, suffix);
+ dump_func(irg, buf);
+ }
+
+ else
+ dump_func(irg, suffix);
+ }
}
static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
}
static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
@@
-256,10
+263,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, chordal_env.cls, "-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);
/* Insert perms before reg-constrained instructions */
be_insert_constr_perms(&chordal_env);
+ dump(BE_CH_DUMP_CONSTR, irg, chordal_env.cls, "-constr", dump_ir_block_graph_sched);
be_liveness(irg);
be_numbering(irg);
be_liveness(irg);
be_numbering(irg);
@@
-270,21
+280,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);
/* copy minimization */
copystat_collect_cls(&chordal_env);
be_copy_opt(&chordal_env);
- dump(BE_CH_DUMP_COPYMIN, irg, "-copymin", dump_ir_block_graph_sched);
+ dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-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, chordal_env.cls, "-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);
@@
-292,9
+302,10
@@
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);
}
-#ifdef DO_SSADESTR
+ dump(BE_CH_DUMP_SSADESTR, irg, NULL, "-ssadestr-complete", dump_ir_block_graph_sched);
+
lower_perms(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0);
lower_perms(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0);
-#endif /* DO_SSADESTR */
+ dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower", dump_ir_block_graph_sched);
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);