X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=d2f794c1046d2d18dee3b62a9333ff483bba7419;hb=9bb328756235509a74ffb9c3fcbfac86d9c409f1;hp=51f54f6265c33f16e282baf9dac7604550467f84;hpb=4f1077b5ac22b42feab0a5bf395301979c9a11bd;p=libfirm

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index 51f54f626..d2f794c10 100644
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -1,28 +1,49 @@
+/*
+ * 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.
+ */
+
 /**
- * Author:      Daniel Grund
- * Date:		19.04.2005
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * @file
+ * @brief       Copy node statistics.
+ * @author      Daniel Grund
+ * @date        19.04.2005
+ * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
-#include <libcore/lc_timing.h>
 
-#include "xmalloc.h"
+#include "timing.h"
 #include "irgraph.h"
 #include "irgwalk.h"
 #include "irprog.h"
 #include "iredges_t.h"
 #include "phiclass.h"
+#include "irnodeset.h"
+
 #include "bechordal_t.h"
+#include "benode_t.h"
 #include "beutil.h"
 #include "becopyopt_t.h"
 #include "becopystat.h"
 #include "beirg_t.h"
 #include "bemodule.h"
+#include "beintlive_t.h"
 
 #define DEBUG_LVL SET_LEVEL_1
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
@@ -90,22 +111,22 @@ enum vals_t {
  */
 int curr_vals[ASIZE];
 
-static pset *all_phi_nodes;
-static pset *all_copy_nodes;
+static ir_nodeset_t *all_phi_nodes;
+static ir_nodeset_t *all_copy_nodes;
 static ir_graph *last_irg;
 
 void be_init_copystat(void) {
 	FIRM_DBG_REGISTER(dbg, "firm.be.copystat");
 
-	all_phi_nodes   = pset_new_ptr_default();
-	all_copy_nodes  = pset_new_ptr_default();
+	all_phi_nodes  = ir_nodeset_new(64);
+	all_copy_nodes = ir_nodeset_new(64);
 	memset(curr_vals, 0, sizeof(curr_vals));
 }
 BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copystat);
 
 void be_quit_copystat(void) {
-	del_pset(all_phi_nodes);
-	del_pset(all_copy_nodes);
+	ir_nodeset_del(all_phi_nodes);
+	ir_nodeset_del(all_copy_nodes);
 }
 BE_REGISTER_MODULE_DESTRUCTOR(be_quit_copystat);
 
@@ -117,24 +138,27 @@ void copystat_reset(void) {
 /**
  * Collect general data
  */
-static void irg_stat_walker(ir_node *node, void *env) {
-	arch_env_t *arch_env = env;
+static void irg_stat_walker(ir_node *node, void *env)
+{
+	(void)env;
+
 	curr_vals[I_ALL_NODES]++; /* count all nodes */
 
 	if (is_Block(node)) /* count all blocks */
 		curr_vals[I_BLOCKS]++;
 
 	if (is_Reg_Phi(node)) /* collect phis */
-		pset_insert_ptr(all_phi_nodes, node);
+		ir_nodeset_insert(all_phi_nodes, node);
 
-	if (is_Perm_Proj(arch_env, node))
-		pset_insert_ptr(all_copy_nodes, node);
+	if (is_Perm_Proj(node))
+		ir_nodeset_insert(all_copy_nodes, node);
 
 	/* TODO: Add 2-Addr-Code nodes */
 }
 
-static void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) {
-	irg_walk_graph(irg, irg_stat_walker, NULL, arch_env);
+static void copystat_collect_irg(ir_graph *irg)
+{
+	irg_walk_graph(irg, irg_stat_walker, NULL, NULL);
 	last_irg = irg;
 }
 
@@ -142,7 +166,7 @@ static void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) {
  * @return 1 if the block at pos @p pos removed a critical edge
  * 		   0 else
  */
-static INLINE int was_edge_critical(const ir_node *bl, int pos) {
+static inline int was_edge_critical(const ir_node *bl, int pos) {
 	const ir_edge_t *edge;
 	const ir_node *bl_at_pos, *bl_before;
 	assert(is_Block(bl));
@@ -165,10 +189,12 @@ static INLINE int was_edge_critical(const ir_node *bl, int pos) {
 /**
  * Collect phi node data
  */
-static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi) {
+static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi)
+{
  	int arity, i;
  	ir_node *phi_bl;
 	assert(is_Phi(phi));
+	(void) chordal_env;
 
 	/* count all phi phis */
 	curr_vals[I_PHI_CNT]++;
@@ -216,10 +242,9 @@ static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi) {
  * Collect register-constrained node data
  */
 static void stat_copy_node(be_chordal_env_t *chordal_env, ir_node *root) {
-	be_lv_t *lv = be_get_birg_liveness(chordal_env->birg);
 	curr_vals[I_CPY_CNT]++;
 	curr_vals[I_COPIES_MAX]++;
-	if (values_interfere(lv, root, get_Perm_src(root))) {
+	if (values_interfere(chordal_env->birg, root, get_Perm_src(root))) {
 		curr_vals[I_COPIES_IF]++;
 		assert(0 && "A Perm pair (in/out) should never interfere!");
 	}
@@ -230,7 +255,6 @@ static void stat_copy_node(be_chordal_env_t *chordal_env, ir_node *root) {
  */
 static void stat_phi_class(be_chordal_env_t *chordal_env, ir_node **pc) {
 	int i, o, size, if_free, phis;
-	be_lv_t *lv = be_get_birg_liveness(chordal_env->birg);
 
 	/* phi class count */
 	curr_vals[I_CLS_CNT]++;
@@ -256,7 +280,7 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, ir_node **pc) {
 	curr_vals[I_CLS_IF_MAX] += size * (size - 1) / 2;
 	for (if_free = 1, i = 0; i < size - 1; ++i)
 		for (o = i + 1; o < size; ++o)
-			if (values_interfere(lv, pc[i], pc[o])) {
+			if (values_interfere(chordal_env->birg, pc[i], pc[o])) {
 				if_free = 0;
 				curr_vals[I_CLS_IF_CNT]++;
 			}
@@ -266,30 +290,32 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, ir_node **pc) {
 }
 
 static void copystat_collect_cls(be_chordal_env_t *cenv) {
-	ir_graph      *irg  = cenv->irg;
-	arch_env_t    *aenv = cenv->birg->main_env->arch_env;
-	ir_node       *n, **pc;
-	phi_classes_t *pc_obj;
-	pset          *all_phi_classes;
+	ir_graph              *irg  = cenv->irg;
+	ir_node               *n, **pc;
+	phi_classes_t         *pc_obj;
+	pset                  *all_phi_classes;
+	ir_nodeset_iterator_t iter;
 
 	copystat_reset();
-	copystat_collect_irg(irg, aenv);
+	copystat_collect_irg(irg);
 
 	/* compute the Phi classes of the collected Phis */
 	pc_obj          = phi_class_new_from_set(cenv->irg, all_phi_nodes, 0);
 	all_phi_classes = get_all_phi_classes(pc_obj);
 
-	for (n = pset_first(all_phi_nodes); n; n = pset_next(all_phi_nodes))
-		if (arch_get_irn_reg_class(aenv, n, -1) == cenv->cls)
+	foreach_ir_nodeset(all_phi_nodes, n, iter) {
+		if (arch_get_irn_reg_class_out(n) == cenv->cls)
 			stat_phi_node(cenv, n);
+	}
 
-	for (n = pset_first(all_copy_nodes); n; n = pset_next(all_copy_nodes))
-		if (arch_get_irn_reg_class(aenv, n, -1) == cenv->cls)
+	foreach_ir_nodeset(all_copy_nodes, n, iter) {
+		if (arch_get_irn_reg_class_out(n) == cenv->cls)
 			stat_copy_node(cenv, n);
+	}
 
 	foreach_pset(all_phi_classes, pc) {
 		ir_node *member = pc[0];
-		if (arch_get_irn_reg_class(aenv, member, -1) == cenv->cls)
+		if (arch_get_irn_reg_class_out(member) == cenv->cls)
 			stat_phi_class(cenv, pc);
 	}
 
@@ -346,7 +372,7 @@ void copystat_dump(ir_graph *irg) {
 
 	snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
 	buf[sizeof(buf) - 1] = '\0';
-	out = ffopen(buf, "stat", "wt");
+	out = be_ffopen(buf, "stat", "wt");
 
 	fprintf(out, "%d\n", ASIZE);
 	for (i = 0; i < ASIZE; i++) {
@@ -370,7 +396,7 @@ void copystat_dump_pretty(ir_graph *irg) {
 
 	snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
 	buf[sizeof(buf) - 1] = '\0';
-	out = ffopen(buf, "pstat", "wt");
+	out = be_ffopen(buf, "pstat", "wt");
 
 	fprintf(out, "Nodes     %4d\n", curr_vals[I_ALL_NODES]);
 	fprintf(out, "Blocks    %4d\n", curr_vals[I_BLOCKS]);
@@ -416,7 +442,6 @@ void copystat_dump_pretty(ir_graph *irg) {
  * Used to get dependable and comparable benchmark results.
  */
 typedef struct color_saver {
-	arch_env_t *arch_env;
 	be_chordal_env_t *chordal_env;
 	pmap *saved_colors;
 	int flag; /* 0 save, 1 load */
@@ -424,13 +449,13 @@ typedef struct color_saver {
 
 static void save_load(ir_node *irn, void *env) {
 	color_save_t *saver = env;
-	if (saver->chordal_env->cls == arch_get_irn_reg_class(saver->arch_env, irn, -1)) {
+	if (saver->chordal_env->cls == arch_get_irn_reg_class_out(irn)) {
 		if (saver->flag == 0) { /* save */
-			const arch_register_t *reg = arch_get_irn_register(saver->arch_env, irn);
+			const arch_register_t *reg = arch_get_irn_register(irn);
 			pmap_insert(saver->saved_colors, irn, (void *) reg);
 		} else { /*load */
 			arch_register_t *reg = pmap_get(saver->saved_colors, irn);
-			arch_set_irn_register(saver->arch_env, irn, reg);
+			arch_set_irn_register(irn, reg);
 		}
 	}
 }
@@ -452,7 +477,7 @@ static void load_colors(color_save_t *color_saver) {
  */
 void co_compare_solvers(be_chordal_env_t *chordal_env) {
 	copy_opt_t    *co;
-	lc_timer_t    *timer;
+	ir_timer_t    *timer;
 	color_save_t  saver;
 	int costs_inevit, costs_init, costs_solved, lower_bound;
 
@@ -464,7 +489,6 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 	DBG((dbg, LEVEL_1, "----> CO: %s\n", co->name));
 
 	/* save colors */
-	saver.arch_env     = chordal_env->birg->main_env->arch_env;
 	saver.chordal_env  = chordal_env;
 	saver.saved_colors = pmap_create();
 	save_colors(&saver);
@@ -483,44 +507,44 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 	copystat_add_max_costs(co_get_max_copy_costs(co));
 
 	/* heuristic 1 (Daniel Grund) */
-	timer = lc_timer_register("heur1", NULL);
-	lc_timer_reset_and_start(timer);
+	timer = ir_timer_register("heur1", NULL);
+	ir_timer_reset_and_start(timer);
 
 	co_solve_heuristic(co);
 
-	lc_timer_stop(timer);
+	ir_timer_stop(timer);
 
 	costs_solved = co_get_copy_costs(co);
 	DBG((dbg, LEVEL_1, "HEUR1 costs: %3d\n", costs_solved));
-	copystat_add_heur_time(lc_timer_elapsed_msec(timer));
+	copystat_add_heur_time(ir_timer_elapsed_msec(timer));
 	copystat_add_heur_costs(costs_solved);
 	assert(lower_bound <= costs_solved);
 
 	/* heuristic 2 (Sebastian Hack) */
-	timer = lc_timer_register("heur2", NULL);
-	lc_timer_reset_and_start(timer);
+	timer = ir_timer_register("heur2", NULL);
+	ir_timer_reset_and_start(timer);
 
 	co_solve_heuristic_new(co);
 
-	lc_timer_stop(timer);
+	ir_timer_stop(timer);
 
 	costs_solved = co_get_copy_costs(co);
 	DBG((dbg, LEVEL_1, "HEUR2 costs: %3d\n", costs_solved));
-	copystat_add_heur_time(lc_timer_elapsed_msec(timer));
+	copystat_add_heur_time(ir_timer_elapsed_msec(timer));
 	copystat_add_heur_costs(costs_solved);
 	assert(lower_bound <= costs_solved);
 
 	/* Park & Moon register coalescing (Kimon Hoffmann) */
-	timer = lc_timer_register("park", NULL);
-	lc_timer_reset_and_start(timer);
+	timer = ir_timer_register("park", NULL);
+	ir_timer_reset_and_start(timer);
 
 	co_solve_park_moon(co);
 
-	lc_timer_stop(timer);
+	ir_timer_stop(timer);
 
 	costs_solved = co_get_copy_costs(co);
 	DBG((dbg, LEVEL_1, "Park/Moon costs: %3d\n", costs_solved));
-	copystat_add_heur_time(lc_timer_elapsed_msec(timer));
+	copystat_add_heur_time(ir_timer_elapsed_msec(timer));
 	copystat_add_heur_costs(costs_solved);
 	assert(lower_bound <= costs_solved);