X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp2.c;h=d6e6f20fcf66534ff3c3b7dbd17a1a7e4bbe97d8;hb=ecfcdc3a97ed77eebe8f4944c89dc26d7a395347;hp=2f7e7528fc63ebcdfc8d294044c8cbb42198c46a;hpb=8a5ac70896b18a522fa39aad29b3c7cf36d5941e;p=libfirm diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c index 2f7e7528f..d6e6f20fc 100644 --- a/ir/be/becopyilp2.c +++ b/ir/be/becopyilp2.c @@ -1,20 +1,6 @@ /* - * Copyright (C) 1995-2008 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. - * - * 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. + * Copyright (C) 2012 University of Karlsruhe. */ /** @@ -45,7 +31,11 @@ */ #include "config.h" +#include "be_t.h" +#include "beintlive_t.h" +#include "beirg.h" #include "bitset.h" +#include "error.h" #include "raw_bitset.h" #include "pdeq.h" @@ -68,11 +58,8 @@ static unsigned check_alignment_constraints(ir_node *node) { const arch_register_req_t *req = arch_get_irn_register_req(node); // For larger than 1 variables, support only aligned constraints - assert(((!(req->type & arch_register_req_type_aligned) - && req->width == 1) - || (req->type & arch_register_req_type_aligned)) - && "Unaligned large (width > 1) variables not supported"); - return (req->type & arch_register_req_type_aligned) && req->width > 1; + assert((arch_register_req_is(req, aligned) || req->width == 1) && "Unaligned large (width > 1) variables not supported"); + return arch_register_req_is(req, aligned) && req->width > 1; } static void make_color_var_name(char *buf, size_t buf_size, @@ -88,14 +75,10 @@ static void build_coloring_cstr(ilp_env_t *ienv) be_ifg_t *ifg = ienv->co->cenv->ifg; unsigned n_regs = arch_register_class_n_regs(ienv->co->cls); const unsigned *allocatable_colors = lenv->allocatable_colors; - nodes_iter_t iter; - unsigned *colors; - ir_node *irn; char buf[32]; - rbitset_alloca(colors, n_regs); - - be_ifg_foreach_node(ifg, &iter, irn) { + unsigned *const colors = rbitset_alloca(n_regs); + be_ifg_foreach_node(ifg, irn) { const arch_register_req_t *req; unsigned col; int cst_idx; @@ -240,7 +223,6 @@ static void make_affinity_var_name(char *buf, size_t buf_size, static void build_affinity_cstr(ilp_env_t *ienv) { unsigned n_colors = arch_register_class_n_regs(ienv->co->cls); - unit_t *curr; /* for all optimization units */ list_for_each_entry(unit_t, curr, &ienv->co->units, units) { @@ -348,7 +330,7 @@ static inline void remove_edge(set *edges, ir_node *n1, ir_node *n2, size_t *cou } } -#define pset_foreach(pset, irn) for (irn=(ir_node*)pset_first(pset); irn; irn=(ir_node*)pset_next(pset)) +#define pset_foreach(pset, irn) foreach_pset((pset), ir_node, (irn)) /** * Search for an interference clique and an external node @@ -358,9 +340,9 @@ static inline void remove_edge(set *edges, ir_node *n1, ir_node *n2, size_t *cou static void build_clique_star_cstr(ilp_env_t *ienv) { /* for each node with affinity edges */ + be_lv_t *const lv = be_get_irg_liveness(ienv->co->irg); co_gs_foreach_aff_node(ienv->co, aff) { struct obstack ob; - neighb_t *nbr; const ir_node *center = aff->irn; ir_node **nodes; set *edges; @@ -387,7 +369,7 @@ static void build_clique_star_cstr(ilp_env_t *ienv) n_edges = 0; for (i=0; ico->cenv->ifg, nodes[i], nodes[o])) + if (be_values_interfere(lv, nodes[i], nodes[o])) add_edge(edges, nodes[i], nodes[o], &n_edges); } } @@ -415,7 +397,6 @@ static void build_clique_star_cstr(ilp_env_t *ienv) /* search for a candidate to extend the clique */ for (i=0; ilp, NULL, lpp_greater_equal, pset_count(clique)-1); @@ -472,11 +452,9 @@ static void build_clique_star_cstr(ilp_env_t *ienv) static void extend_path(ilp_env_t *ienv, pdeq *path, const ir_node *irn) { - be_ifg_t *ifg = ienv->co->cenv->ifg; int i, len; ir_node **curr_path; affinity_node_t *aff; - neighb_t *nbr; /* do not walk backwards or in circles */ if (pdeq_contains(path, irn)) @@ -493,13 +471,14 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, const ir_node *irn) curr_path = ALLOCAN(ir_node*, len); pdeq_copyl(path, (const void **)curr_path); + be_lv_t *const lv = be_get_irg_liveness(ienv->co->irg); for (i=1; i 2) { @@ -552,7 +531,7 @@ static void ilp2_build(ilp_env_t *ienv) { int lower_bound; - ienv->lp = lpp_new(ienv->co->name, lpp_minimize); + ienv->lp = lpp_new("copyilp", lpp_minimize); build_coloring_cstr(ienv); build_interference_cstr(ienv); build_affinity_cstr(ienv); @@ -576,8 +555,7 @@ static void ilp2_apply(ilp_env_t *ienv) int i; if (state != lpp_optimal) { - printf("WARNING %s: Solution state is not 'optimal': %d\n", - ienv->co->name, (int)state); + ir_printf("WARNING: Solution state of %F register class %s is not 'optimal': %d\n", ienv->co->irg, ienv->co->cls->name, (int)state); if (state < lpp_feasible) { panic("Copy coalescing solution not feasible!"); } @@ -620,7 +598,6 @@ static void ilp2_apply(ilp_env_t *ienv) */ static int co_solve_ilp2(copy_opt_t *co) { - unsigned *allocatable_colors; unsigned n_regs = arch_register_class_n_regs(co->cls); lpp_sol_state_t sol_state; ilp_env_t *ienv; @@ -633,7 +610,7 @@ static int co_solve_ilp2(copy_opt_t *co) my.last_x_var = -1; FIRM_DBG_REGISTER(dbg, "firm.be.coilp2"); - rbitset_alloca(allocatable_colors, n_regs); + unsigned *const allocatable_colors = rbitset_alloca(n_regs); be_set_allocatable_regs(co->irg, co->cls, allocatable_colors); my.allocatable_colors = allocatable_colors;