projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed warning for ILP scheduler, as the scheduler can now schedule on it's own
[libfirm]
/
ir
/
be
/
bemain.c
diff --git
a/ir/be/bemain.c
b/ir/be/bemain.c
index
18ab7b3
..
4b109ca
100644
(file)
--- a/
ir/be/bemain.c
+++ b/
ir/be/bemain.c
@@
-42,6
+42,7
@@
#include "arm/bearch_arm.h"
#include "ppc32/bearch_ppc32.h"
#include "mips/bearch_mips.h"
#include "arm/bearch_arm.h"
#include "ppc32/bearch_ppc32.h"
#include "mips/bearch_mips.h"
+// #include "sta/bearch_sta.h"
#include "be_t.h"
#include "benumb_t.h"
#include "be_t.h"
#include "benumb_t.h"
@@
-124,6
+125,7
@@
static const lc_opt_enum_const_ptr_items_t ra_items[] = {
static const lc_opt_enum_const_ptr_items_t isa_items[] = {
{ "ia32", &ia32_isa_if },
#if 0
static const lc_opt_enum_const_ptr_items_t isa_items[] = {
{ "ia32", &ia32_isa_if },
#if 0
+ { "sta", &sta_isa_if },
{ "arm", &arm_isa_if },
{ "ppc32", &ppc32_isa_if },
{ "mips", &mips_isa_if },
{ "arm", &arm_isa_if },
{ "ppc32", &ppc32_isa_if },
{ "mips", &mips_isa_if },
@@
-216,9
+218,14
@@
void be_opt_register(void)
isa->register_options(be_grp_root);
}
isa->register_options(be_grp_root);
}
- /* scheduler register options */
+ /*
list
scheduler register options */
list_sched_register_options(be_grp_root);
list_sched_register_options(be_grp_root);
+#ifdef WITH_ILP
+ /* ilp scheduler register options */
+ ilpsched_register_options(be_grp_root);
+#endif /* WITH_ILP */
+
be_block_schedule_register_options(be_grp_root);
}
#endif /* WITH_LIBCORE */
be_block_schedule_register_options(be_grp_root);
}
#endif /* WITH_LIBCORE */
@@
-505,6
+512,7
@@
static void be_main_loop(FILE *file_handle, const char *cup_name)
if(be_stat_ev_is_active()) {
ir_snprintf(irg_name, sizeof(irg_name), "%F", irg);
if(be_stat_ev_is_active()) {
ir_snprintf(irg_name, sizeof(irg_name), "%F", irg);
+ be_stat_tags[STAT_TAG_CLS] = "<all>";
be_stat_tags[STAT_TAG_IRG] = irg_name;
be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file);
}
be_stat_tags[STAT_TAG_IRG] = irg_name;
be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file);
}
@@
-591,8
+599,8
@@
static void be_main_loop(FILE *file_handle, const char *cup_name)
#ifdef WITH_ILP
case BE_SCHED_ILP:
be_ilp_sched(birg);
#ifdef WITH_ILP
case BE_SCHED_ILP:
be_ilp_sched(birg);
- fprintf(stderr, "Warning: ILP scheduler not yet fully implemented, falling back to list scheduler.\n");
- list_sched(birg, &be_options);
+
//
fprintf(stderr, "Warning: ILP scheduler not yet fully implemented, falling back to list scheduler.\n");
+
//
list_sched(birg, &be_options);
break;
#endif /* WITH_ILP */
};
break;
#endif /* WITH_ILP */
};
@@
-642,11
+650,21
@@
static void be_main_loop(FILE *file_handle, const char *cup_name)
arch_code_generator_before_ra(birg->cg);
BE_TIMER_POP(t_codegen);
arch_code_generator_before_ra(birg->cg);
BE_TIMER_POP(t_codegen);
+ if(be_stat_ev_is_active()) {
+ be_stat_ev_l("costs_before_ra",
+ (long) be_estimate_irg_costs(irg, env.arch_env, birg->execfreqs));
+ }
+
/* Do register allocation */
BE_TIMER_PUSH(t_regalloc);
ra_timer = ra->allocate(birg);
BE_TIMER_POP(t_regalloc);
/* Do register allocation */
BE_TIMER_PUSH(t_regalloc);
ra_timer = ra->allocate(birg);
BE_TIMER_POP(t_regalloc);
+ if(be_stat_ev_is_active()) {
+ be_stat_ev_l("costs_after_ra",
+ (long) be_estimate_irg_costs(irg, env.arch_env, birg->execfreqs));
+ }
+
dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
be_do_stat_nodes(irg, "06 Register Allocation");
dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
be_do_stat_nodes(irg, "06 Register Allocation");