added some comments

[libfirm] / ir / be / beblocksched.c

diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c
index c11ef72..704d33d 100644 (file)
--- a/ir/be/beblocksched.c
+++ b/ir/be/beblocksched.c
@@ -25,6 +25,8 @@
 #include "irtools.h"
 #include "debug.h"
 #include "beirgmod.h"
+#include "bemodule.h"
+#include "be.h"
 
 #ifdef WITH_LIBCORE
 #include <libcore/lc_opts.h>
@@ -43,6 +45,7 @@ typedef enum _blocksched_algos_t {
 
 static int algo = BLOCKSCHED_GREEDY;
 
+#ifdef WITH_LIBCORE
 static const lc_opt_enum_int_items_t blockschedalgo_items[] = {
        { "naiv",       BLOCKSCHED_NAIV },
        { "extbb",      BLOCKSCHED_EXTBB },
@@ -61,6 +64,7 @@ static const lc_opt_table_entry_t be_blocksched_options[] = {
        LC_OPT_ENT_ENUM_INT ("algo", "the block scheduling algorithm", &algo_var),
        { NULL }
 };
+#endif
 
 /*
  *   ____                   _
@@ -128,7 +132,7 @@ static void collect_egde_frequency(ir_node *block, void *data)
        } else {
                int    i;
                double highest_execfreq = -1;
-               int    highest_edge_num;
+               int    highest_edge_num = -1;
 
                edge.block = block;
                for (i = 0; i < arity; ++i) {
@@ -148,7 +152,8 @@ static void collect_egde_frequency(ir_node *block, void *data)
                        }
                }
 
-               env->edges[highest_edge_num].highest_execfreq = 1;
+               if(highest_edge_num >= 0)
+                       env->edges[highest_edge_num].highest_execfreq = 1;
        }
 }
 
@@ -213,7 +218,7 @@ static void coalesce_blocks(blocksched_env_t *env)
                entry      = get_irn_link(block);
                pred_entry = get_irn_link(pred_block);
 
-               /* TODO: what's this check for? */
+               /* is 1 of the blocks already attached to another block? */
                if (pred_entry->next != NULL || entry->prev != NULL)
                        continue;
 
@@ -490,8 +495,6 @@ static void coalesce_blocks_ilp(blocksched_ilp_env_t *env)
 {
        int  i;
        int  edge_count = ARR_LEN(env->ilpedges);
-       FILE *f;
-       char fname[256];
 
        /* complete out constraints */
        for(i = 0; i < edge_count; ++i) {
@@ -512,11 +515,18 @@ static void coalesce_blocks_ilp(blocksched_ilp_env_t *env)
                lpp_set_factor_fast(env->lpp, entry->out_cst, edge->ilpvar, 1.0);
        }
 
-       lpp_dump(env->lpp, "lpp.out");
-       snprintf(fname, sizeof(fname), "lpp_%s.plain", get_irg_dump_name(env->env.irg));
-       f = fopen(fname, "w");
-       lpp_dump_plain(env->lpp, f);
-       fclose(f);
+#if 0
+       {
+               FILE *f;
+               char fname[256];
+               lpp_dump(env->lpp, "lpp.out");
+               snprintf(fname, sizeof(fname), "lpp_%s.plain", get_irg_dump_name(env->env.irg));
+               f = fopen(fname, "w");
+               lpp_dump_plain(env->lpp, f);
+               fclose(f);
+       }
+#endif
+
        //lpp_solve_net(env->lpp, main_env->options->ilp_server, main_env->options->ilp_solver);
        lpp_solve_net(env->lpp, "i44pc52", "cplex");
        assert(lpp_is_sol_valid(env->lpp));
@@ -688,22 +698,15 @@ static ir_node **create_extbb_block_schedule(ir_graph *irg, ir_exec_freq *execfr
  * |_|  |_|\__,_|_|_| |_|
  *
  */
-
-#ifdef WITH_LIBCORE
-void be_block_schedule_register_options(lc_opt_entry_t *grp)
+void be_init_blocksched(void)
 {
-       static int     run_once = 0;
-       lc_opt_entry_t *blocksched_grp;
-
-       if (run_once)
-               return;
-
-       run_once       = 1;
-       blocksched_grp = lc_opt_get_grp(grp, "blocksched");
+       lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+       lc_opt_entry_t *blocksched_grp = lc_opt_get_grp(be_grp, "blocksched");
 
        lc_opt_add_table(blocksched_grp, be_blocksched_options);
 }
-#endif /* WITH_LIBCORE */
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_blocksched);
 
 ir_node **be_create_block_schedule(ir_graph *irg, ir_exec_freq *execfreqs)
 {