projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix x87 simulator not killing float copies that only move registers around,
[libfirm]
/
ir
/
be
/
bessadestr.c
diff --git
a/ir/be/bessadestr.c
b/ir/be/bessadestr.c
index
aad06dd
..
39f4480
100644
(file)
--- a/
ir/be/bessadestr.c
+++ b/
ir/be/bessadestr.c
@@
-28,6
+28,8
@@
#include "belive_t.h"
#include "benode_t.h"
#include "besched_t.h"
#include "belive_t.h"
#include "benode_t.h"
#include "besched_t.h"
+#include "benodesets.h"
+#include "bestatevent.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
@@
-35,7
+37,7
@@
DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
#define get_reg(irn) arch_get_irn_register(get_chordal_arch(chordal_env), irn)
#define set_reg(irn, reg) arch_set_irn_register(get_chordal_arch(chordal_env), irn, reg)
#define get_reg(irn) arch_get_irn_register(get_chordal_arch(chordal_env), irn)
#define set_reg(irn, reg) arch_set_irn_register(get_chordal_arch(chordal_env), irn, reg)
-#define is_Perm(irn) (arch_irn_class
ify(arch_env, irn) == arch_irn_class_perm
)
+#define is_Perm(irn) (arch_irn_class
_is(arch_env, irn, perm)
)
#define get_reg_cls(irn) (arch_get_irn_reg_class(arch_env, irn, -1))
#define is_curr_reg_class(irn) (get_reg_cls(p) == chordal_env->cls)
#define get_reg_cls(irn) (arch_get_irn_reg_class(arch_env, irn, -1))
#define is_curr_reg_class(irn) (get_reg_cls(p) == chordal_env->cls)
@@
-77,13
+79,20
@@
static int cmp_perm_proj(const void *a, const void *b, size_t n) {
return !(p->arg == q->arg);
}
return !(p->arg == q->arg);
}
+typedef struct insert_all_perms_env_t {
+ be_chordal_env_t *chordal_env;
+ pmap *perm_map;
+} insert_all_perms_env_t;
+
/**
* Insert Perms in all predecessors of a block containing a phi
*/
static void insert_all_perms_walker(ir_node *bl, void *data) {
/**
* Insert Perms in all predecessors of a block containing a phi
*/
static void insert_all_perms_walker(ir_node *bl, void *data) {
- be_chordal_env_t *chordal_env = data;
- pmap *perm_map = chordal_env->data;
+ insert_all_perms_env_t *env = data;
+ be_chordal_env_t *chordal_env = env->chordal_env;
+ pmap *perm_map = env->perm_map;
ir_graph *irg = chordal_env->irg;
ir_graph *irg = chordal_env->irg;
+ be_lv_t *lv = chordal_env->birg->lv;
int i, n;
assert(is_Block(bl));
int i, n;
assert(is_Block(bl));
@@
-109,7
+118,7
@@
static void insert_all_perms_walker(ir_node *bl, void *data) {
for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
perm_proj_t templ;
ir_node *arg = get_irn_n(phi, i);
for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
perm_proj_t templ;
ir_node *arg = get_irn_n(phi, i);
- unsigned hash =
HASH_PTR
(arg);
+ unsigned hash =
nodeset_hash
(arg);
templ.arg = arg;
pp = set_find(arg_set, &templ, sizeof(templ), hash);
templ.arg = arg;
pp = set_find(arg_set, &templ, sizeof(templ), hash);
@@
-121,7
+130,7
@@
static void insert_all_perms_walker(ir_node *bl, void *data) {
* interferes with the phi and must thus not be member of a
* Perm. A copy will be inserted for this argument alter on.
*/
* interferes with the phi and must thus not be member of a
* Perm. A copy will be inserted for this argument alter on.
*/
- if(!pp && !be_is_live_in(
chordal_env->
lv, bl, arg)) {
+ if(!pp && !be_is_live_in(lv, bl, arg)) {
templ.pos = n_projs++;
set_insert(arg_set, &templ, sizeof(templ), hash);
}
templ.pos = n_projs++;
set_insert(arg_set, &templ, sizeof(templ), hash);
}
@@
-138,6
+147,8
@@
static void insert_all_perms_walker(ir_node *bl, void *data) {
in[pp->pos] = pp->arg;
perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in);
in[pp->pos] = pp->arg;
perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in);
+ be_stat_ev("phi_perm", n_projs);
+
free(in);
insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env);
sched_add_after(insert_after, perm);
free(in);
insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env);
sched_add_after(insert_after, perm);
@@
-165,7
+176,7
@@
static void insert_all_perms_walker(ir_node *bl, void *data) {
perm_proj_t templ;
templ.arg = get_irn_n(phi, i);
perm_proj_t templ;
templ.arg = get_irn_n(phi, i);
- pp = set_find(arg_set, &templ, sizeof(templ),
HASH_PTR
(templ.arg));
+ pp = set_find(arg_set, &templ, sizeof(templ),
nodeset_hash
(templ.arg));
/* If not found, it was an interfering argument */
if (pp)
/* If not found, it was an interfering argument */
if (pp)
@@
-190,6
+201,7
@@
static void insert_all_perms_walker(ir_node *bl, void *data) {
*/
static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
be_chordal_env_t *chordal_env = data;
*/
static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
be_chordal_env_t *chordal_env = data;
+ be_lv_t *lv = chordal_env->birg->lv;
ir_node *phi;
/* Consider all phis of this block */
ir_node *phi;
/* Consider all phis of this block */
@@
-215,7
+227,7
@@
static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
DBG((dbg, LEVEL_1, " for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
DBG((dbg, LEVEL_1, " for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
- if(values_interfere(
chordal_env->
lv, phi, arg)) {
+ if(values_interfere(lv, phi, arg)) {
/*
Insert a duplicate in arguments block,
make it the new phi arg,
/*
Insert a duplicate in arguments block,
make it the new phi arg,
@@
-331,20
+343,26
@@
static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
void be_ssa_destruction(be_chordal_env_t *chordal_env) {
pmap *perm_map = pmap_create();
ir_graph *irg = chordal_env->irg;
void be_ssa_destruction(be_chordal_env_t *chordal_env) {
pmap *perm_map = pmap_create();
ir_graph *irg = chordal_env->irg;
+ insert_all_perms_env_t insert_perms_env;
FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr");
FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr");
+ be_assure_liveness(chordal_env->birg);
+
/* create a map for fast lookup of perms: block --> perm */
/* create a map for fast lookup of perms: block --> perm */
- chordal_env->data = perm_map;
irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env);
DBG((dbg, LEVEL_1, "Placing perms...\n"));
irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env);
DBG((dbg, LEVEL_1, "Placing perms...\n"));
- irg_block_walk_graph(irg, insert_all_perms_walker, NULL, chordal_env);
+ insert_perms_env.chordal_env = chordal_env;
+ insert_perms_env.perm_map = perm_map;
+ irg_block_walk_graph(irg, insert_all_perms_walker, NULL, &insert_perms_env);
if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched);
if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched);
- be_liveness_recompute(chordal_env->lv);
+ // Matze: really needed here?
+ be_invalidate_liveness(chordal_env->birg);
+ be_assure_liveness(chordal_env->birg);
DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n"));
irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env);
DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n"));
irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env);