X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=b42cad0e72a8d5251331a89e0cdb775c40e682eb;hb=d6768d8d4427959eb045aafb1d15bd189beaa5dd;hp=a02ab761b2f1a4007f93ad043c318c0ad483102d;hpb=aa44a311d7a861b1eb0a326cd6b66714883b3077;p=libfirm

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index a02ab761b..b42cad0e7 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -1,17 +1,44 @@
-/**
- * Author:      Daniel Grund
- * Date:		28.02.2006
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+/*
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
  *
- * Common stuff used by all ILP fomulations.
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
  *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
+/**
+ * @file
+ * @brief       Common stuff used by all ILP formulations.
+ * @author      Daniel Grund
+ * @date        28.02.2006
+ * @version     $Id$
+ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include "irtools.h"
+#include "irprintf.h"
+
+#include "bestatevent.h"
+#include "beirg_t.h"
+#include "bemodule.h"
+#include "error.h"
+
+#include <libcore/lc_opts.h>
+#include <libcore/lc_opts_enum.h>
+
 #ifdef WITH_ILP
 
 #define DUMP_ILP 1
@@ -19,11 +46,9 @@
 
 static int time_limit = 60;
 static int solve_net  = 1;
-static int dump_flags = 0;
+static int solve_log  = 0;
+static unsigned dump_flags = 0;
 
-#ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
 static const lc_opt_enum_mask_items_t dump_items[] = {
 	{ "ilp",   DUMP_ILP },
 	{ "sol",   DUMP_SOL },
@@ -35,19 +60,25 @@ static lc_opt_enum_mask_var_t dump_var = {
 };
 
 static const lc_opt_table_entry_t options[] = {
-	LC_OPT_ENT_INT      ("limit", "time limit for solving in seconds (0 for unlimited, default 60)", &time_limit),
-	LC_OPT_ENT_BOOL     ("net",   "solve over the net (default: yes)", &solve_net),
-	LC_OPT_ENT_ENUM_MASK("dump",  "dump flags (ilp, sol)",             &dump_var),
+	LC_OPT_ENT_INT      ("limit", "time limit for solving in seconds (0 for unlimited)", &time_limit),
+	LC_OPT_ENT_BOOL     ("net",   "solve over the net", &solve_net),
+	LC_OPT_ENT_BOOL     ("log",   "show ilp solving log",              &solve_log),
+	LC_OPT_ENT_ENUM_MASK("dump",  "dump flags",             &dump_var),
 	{ NULL }
 };
 
-void be_co_ilp_register_options(lc_opt_entry_t *grp)
+void be_init_copyilp(void)
 {
-	lc_opt_entry_t *ilp_grp = lc_opt_get_grp(grp, "ilp");
+	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+	lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra");
+	lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal");
+	lc_opt_entry_t *co_grp = lc_opt_get_grp(chordal_grp, "co");
+	lc_opt_entry_t *ilp_grp = lc_opt_get_grp(co_grp, "ilp");
+
 	lc_opt_add_table(ilp_grp, options);
 }
-#endif
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
 
 #include "becopyilp_t.h"
 #include "beifg_t.h"
@@ -110,11 +141,11 @@ void sr_remove(size_red_t *sr) {
 	while (redo) {
 		redo = 0;
 		be_ifg_foreach_node(ifg, iter, irn) {
-			arch_register_req_t req;
+			const arch_register_req_t *req;
 
-			arch_get_register_req(sr->co->aenv, &req, irn, -1);
+			req = arch_get_register_req(sr->co->aenv, irn, -1);
 
-			if (!arch_register_req_is(&req, limited) && !sr_is_removed(sr, irn) && !co_gs_is_optimizable(sr->co, irn)) {
+			if (!arch_register_req_is(req, limited) && !sr_is_removed(sr, irn) && !co_gs_is_optimizable(sr->co, irn)) {
           	 	if (sr_is_simplicial(sr, irn)) {
 					coloring_suffix_t *cs = obstack_alloc(&sr->ob, sizeof(*cs));
 
@@ -200,6 +231,9 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
 	ienv->build(ienv);
 	lpp_set_time_limit(ienv->lp, time_limit);
 
+	if(solve_log)
+		lpp_set_log(ienv->lp, stdout);
+
 	if(solve_net)
 		lpp_solve_net(ienv->lp, main_env->options->ilp_server, main_env->options->ilp_solver);
 	else {
@@ -210,8 +244,21 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
 #endif
 	}
 
+	be_stat_ev_dbl("co_ilp_objval",     ienv->lp->objval);
+	be_stat_ev_dbl("co_ilp_best_bound", ienv->lp->best_bound);
+	be_stat_ev    ("co_ilp_iter",       ienv->lp->iterations);
+	be_stat_ev_dbl("co_ilp_sol_time",   ienv->lp->sol_time);
+
 	if(dump_flags & DUMP_ILP) {
-		FILE *f = be_chordal_open(ienv->co->cenv, "", "-co.ilp");
+		char buf[128];
+		FILE *f;
+
+		ir_snprintf(buf, sizeof(buf), "%F_%s-co.ilp", ienv->co->cenv->irg,
+		            ienv->co->cenv->cls->name);
+		f = fopen(buf, "wt");
+		if(f == NULL) {
+			panic("Couldn't open '%s' for writing", buf);
+		}
 		lpp_dump_plain(ienv->lp, f);
 		fclose(f);
 	}