projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct a subtle bug in the ia32 backend: Sub(x, x) triggered that the Neg+Add trick...
[libfirm]
/
ir
/
be
/
bessaconstr.c
diff --git
a/ir/be/bessaconstr.c
b/ir/be/bessaconstr.c
index
7f7fd8b
..
e12f273
100644
(file)
--- a/
ir/be/bessaconstr.c
+++ b/
ir/be/bessaconstr.c
@@
-46,19
+46,18
@@
* This function reroutes all uses of the original value to the copies in the
* corresponding dominance subtrees and creates Phi functions where necessary.
*/
* This function reroutes all uses of the original value to the copies in the
* corresponding dominance subtrees and creates Phi functions where necessary.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
/* statev in this file is extensive, so only enable if needed */
#define DISABLE_STATEV
#include "bessaconstr.h"
#include "bemodule.h"
/* statev in this file is extensive, so only enable if needed */
#define DISABLE_STATEV
#include "bessaconstr.h"
#include "bemodule.h"
-#include "besched
_t
.h"
+#include "besched.h"
#include "beintlive_t.h"
#include "beintlive_t.h"
-#include "beirg
_t
.h"
+#include "beirg.h"
#include "be_t.h"
#include "be_t.h"
+#include "benode.h"
#include "debug.h"
#include "error.h"
#include "debug.h"
#include "error.h"
@@
-76,8
+75,8
@@
DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
* blocks as visited. Sets the link fields of the blocks in the dominance
* frontier to the block itself.
*/
* blocks as visited. Sets the link fields of the blocks in the dominance
* frontier to the block itself.
*/
-static
-
void mark_iterated_dominance_frontiers(
const be_ssa_construction_env_t *env)
+static
void mark_iterated_dominance_frontiers(
+
const be_ssa_construction_env_t *env)
{
stat_ev_cnt_decl(blocks);
DBG((dbg, LEVEL_3, "Dominance Frontier:"));
{
stat_ev_cnt_decl(blocks);
DBG((dbg, LEVEL_3, "Dominance Frontier:"));
@@
-108,30
+107,28
@@
void mark_iterated_dominance_frontiers(const be_ssa_construction_env_t *env)
DBG((dbg, LEVEL_3, "\n"));
}
DBG((dbg, LEVEL_3, "\n"));
}
-static
-ir_node *search_def_end_of_block(be_ssa_construction_env_t *env,
- ir_node *block);
+static ir_node *search_def_end_of_block(be_ssa_construction_env_t *env,
+ ir_node *block);
-static
-ir_node *create_phi(be_ssa_construction_env_t *env, ir_node *block,
- ir_node *link_with)
+static ir_node *create_phi(be_ssa_construction_env_t *env, ir_node *block,
+ ir_node *link_with)
{
int i, n_preds = get_Block_n_cfgpreds(block);
{
int i, n_preds = get_Block_n_cfgpreds(block);
- ir_graph *irg = get_
irn
_irg(block);
- ir_node *
phi
;
- ir_node
**ins = alloca(n_preds * sizeof(ins[0]))
;
+ ir_graph *irg = get_
Block
_irg(block);
+ ir_node *
*ins = ALLOCAN(ir_node*, n_preds)
;
+ ir_node
*phi
;
assert(n_preds > 1);
assert(n_preds > 1);
- for(i = 0; i < n_preds; ++i) {
+ for
(i = 0; i < n_preds; ++i) {
ins[i] = new_r_Unknown(irg, env->mode);
}
ins[i] = new_r_Unknown(irg, env->mode);
}
- phi =
new_r_Phi(irg, block, n_preds, ins, env->mode
);
- if(env->new_phis != NULL) {
+ phi =
be_new_Phi(block, n_preds, ins, env->mode, env->phi_cls
);
+ if
(env->new_phis != NULL) {
ARR_APP1(ir_node*, env->new_phis, phi);
}
ARR_APP1(ir_node*, env->new_phis, phi);
}
- if(env->mode != mode_M) {
+ if
(env->mode != mode_M) {
sched_add_after(block, phi);
}
sched_add_after(block, phi);
}
@@
-139,7
+136,7
@@
ir_node *create_phi(be_ssa_construction_env_t *env, ir_node *block,
set_irn_link(link_with, phi);
mark_irn_visited(block);
set_irn_link(link_with, phi);
mark_irn_visited(block);
- for(i = 0; i < n_preds; ++i) {
+ for
(i = 0; i < n_preds; ++i) {
ir_node *pred_block = get_Block_cfgpred_block(block, i);
ir_node *pred_def = search_def_end_of_block(env, pred_block);
ir_node *pred_block = get_Block_cfgpred_block(block, i);
ir_node *pred_def = search_def_end_of_block(env, pred_block);
@@
-149,21
+146,20
@@
ir_node *create_phi(be_ssa_construction_env_t *env, ir_node *block,
return phi;
}
return phi;
}
-static
-ir_node *get_def_at_idom(be_ssa_construction_env_t *env, ir_node *block)
+static ir_node *get_def_at_idom(be_ssa_construction_env_t *env, ir_node *block)
{
ir_node *dom = get_Block_idom(block);
assert(dom != NULL);
return search_def_end_of_block(env, dom);
}
{
ir_node *dom = get_Block_idom(block);
assert(dom != NULL);
return search_def_end_of_block(env, dom);
}
-static
-
ir_node *search_def_end_of_block(be_ssa_construction_env_t *env,
ir_node *block)
+static
ir_node *search_def_end_of_block(be_ssa_construction_env_t *env,
+
ir_node *block)
{
{
- if(irn_visited(block)) {
+ if
(irn_visited(block)) {
assert(get_irn_link(block) != NULL);
return get_irn_link(block);
assert(get_irn_link(block) != NULL);
return get_irn_link(block);
- } else if(Block_block_visited(block)) {
+ } else if
(Block_block_visited(block)) {
return create_phi(env, block, block);
} else {
ir_node *def = get_def_at_idom(env, block);
return create_phi(env, block, block);
} else {
ir_node *def = get_def_at_idom(env, block);
@@
-173,8
+169,7
@@
ir_node *search_def_end_of_block(be_ssa_construction_env_t *env, ir_node *block)
}
}
}
}
-static
-ir_node *search_def(be_ssa_construction_env_t *env, ir_node *at)
+static ir_node *search_def(be_ssa_construction_env_t *env, ir_node *at)
{
ir_node *block = get_nodes_block(at);
ir_node *node;
{
ir_node *block = get_nodes_block(at);
ir_node *node;
@@
-183,7
+178,7
@@
ir_node *search_def(be_ssa_construction_env_t *env, ir_node *at)
DBG((dbg, LEVEL_3, "\t...searching def at %+F\n", at));
/* no defs in the current block we can do the normal searching */
DBG((dbg, LEVEL_3, "\t...searching def at %+F\n", at));
/* no defs in the current block we can do the normal searching */
- if(!irn_visited(block) && !Block_block_visited(block)) {
+ if
(!irn_visited(block) && !Block_block_visited(block)) {
DBG((dbg, LEVEL_3, "\t...continue at idom\n"));
return get_def_at_idom(env, block);
}
DBG((dbg, LEVEL_3, "\t...continue at idom\n"));
return get_def_at_idom(env, block);
}
@@
-193,8
+188,8
@@
ir_node *search_def(be_ssa_construction_env_t *env, ir_node *at)
*/
node = block;
def = get_irn_link(node);
*/
node = block;
def = get_irn_link(node);
- while(def != NULL) {
- if(!value_dominates(at, def)) {
+ while
(def != NULL) {
+ if
(!value_dominates(at, def)) {
DBG((dbg, LEVEL_3, "\t...found dominating def %+F\n", def));
return def;
}
DBG((dbg, LEVEL_3, "\t...found dominating def %+F\n", def));
return def;
}
@@
-204,7
+199,7
@@
ir_node *search_def(be_ssa_construction_env_t *env, ir_node *at)
}
/* block in dominance frontier? create a phi then */
}
/* block in dominance frontier? create a phi then */
- if(Block_block_visited(block)) {
+ if
(Block_block_visited(block)) {
DBG((dbg, LEVEL_3, "\t...create phi at block %+F\n", block));
assert(!is_Phi(node));
return create_phi(env, block, node);
DBG((dbg, LEVEL_3, "\t...create phi at block %+F\n", block));
assert(!is_Phi(node));
return create_phi(env, block, node);
@@
-219,22
+214,21
@@
ir_node *search_def(be_ssa_construction_env_t *env, ir_node *at)
* sorted by dominance. A non-visited block means no definition has been
* inserted yet.
*/
* sorted by dominance. A non-visited block means no definition has been
* inserted yet.
*/
-static
-void introduce_def_at_block(ir_node *block, ir_node *def)
+static void introduce_def_at_block(ir_node *block, ir_node *def)
{
{
- if
(irn_visited
(block)) {
+ if
(irn_visited_else_mark
(block)) {
ir_node *node = block;
ir_node *current_def;
ir_node *node = block;
ir_node *current_def;
-
while(1
) {
+
for (;;
) {
current_def = get_irn_link(node);
current_def = get_irn_link(node);
- if(current_def == def) {
+ if
(current_def == def) {
/* already in block */
return;
}
/* already in block */
return;
}
- if(current_def == NULL)
+ if
(current_def == NULL)
break;
break;
- if(value_dominates(current_def, def))
+ if
(value_dominates(current_def, def))
break;
node = current_def;
}
break;
node = current_def;
}
@@
-244,7
+238,6
@@
void introduce_def_at_block(ir_node *block, ir_node *def)
} else {
set_irn_link(block, def);
set_irn_link(def, NULL);
} else {
set_irn_link(block, def);
set_irn_link(def, NULL);
- mark_irn_visited(block);
}
}
}
}
@@
-299,15
+292,16
@@
void be_ssa_construction_add_copy(be_ssa_construction_env_t *env,
assert(env->iterated_domfront_calculated == 0);
assert(env->iterated_domfront_calculated == 0);
- if(env->mode == NULL) {
- env->mode = get_irn_mode(copy);
+ if (env->mode == NULL) {
+ env->mode = get_irn_mode(copy);
+ env->phi_cls = arch_get_irn_reg_class_out(copy);
} else {
assert(env->mode == get_irn_mode(copy));
}
block = get_nodes_block(copy);
} else {
assert(env->mode == get_irn_mode(copy));
}
block = get_nodes_block(copy);
- if(!irn_visited(block)) {
+ if
(!irn_visited(block)) {
waitq_put(env->worklist, block);
}
introduce_def_at_block(block, copy);
waitq_put(env->worklist, block);
}
introduce_def_at_block(block, copy);
@@
-320,16
+314,17
@@
void be_ssa_construction_add_copies(be_ssa_construction_env_t *env,
assert(env->iterated_domfront_calculated == 0);
assert(env->iterated_domfront_calculated == 0);
- if(env->mode == NULL) {
- env->mode = get_irn_mode(copies[0]);
+ if (env->mode == NULL) {
+ env->mode = get_irn_mode(copies[0]);
+ env->phi_cls = arch_get_irn_reg_class_out(copies[0]);
}
}
- for(i = 0; i < copies_len; ++i) {
- ir_node *copy = copies[i];
+ for
(i = 0; i < copies_len; ++i) {
+ ir_node *copy
= copies[i];
ir_node *block = get_nodes_block(copy);
assert(env->mode == get_irn_mode(copy));
ir_node *block = get_nodes_block(copy);
assert(env->mode == get_irn_mode(copy));
- if(!irn_visited(block)) {
+ if
(!irn_visited(block)) {
waitq_put(env->worklist, block);
}
introduce_def_at_block(block, copy);
waitq_put(env->worklist, block);
}
introduce_def_at_block(block, copy);
@@
-354,15
+349,15
@@
void be_ssa_construction_fix_users_array(be_ssa_construction_env_t *env,
size_t i;
stat_ev_cnt_decl(uses);
size_t i;
stat_ev_cnt_decl(uses);
-
BE_TIMER_PUSH(t_ssa_constr
);
+
be_timer_push(T_SSA_CONSTR
);
- if(!env->iterated_domfront_calculated) {
+ if
(!env->iterated_domfront_calculated) {
mark_iterated_dominance_frontiers(env);
env->iterated_domfront_calculated = 1;
}
stat_ev_tim_push();
mark_iterated_dominance_frontiers(env);
env->iterated_domfront_calculated = 1;
}
stat_ev_tim_push();
- for(i = 0; i < nodes_len; ++i) {
+ for
(i = 0; i < nodes_len; ++i) {
ir_node *value = nodes[i];
/*
ir_node *value = nodes[i];
/*
@@
-374,21
+369,21
@@
void be_ssa_construction_fix_users_array(be_ssa_construction_env_t *env,
int pos = get_edge_src_pos(edge);
ir_node *def;
int pos = get_edge_src_pos(edge);
ir_node *def;
- if
(env->ignore_uses != NULL
&&
+ if
(env->ignore_uses != NULL
&&
ir_nodeset_contains(env->ignore_uses, use))
continue;
ir_nodeset_contains(env->ignore_uses, use))
continue;
- if
(is_Anchor
(use))
+ if
(is_Anchor(use) || is_End
(use))
continue;
continue;
- if(is_Phi(use)) {
- ir_node *block = get_nodes_block(use);
+ if
(is_Phi(use)) {
+ ir_node *block
= get_nodes_block(use);
ir_node *predblock = get_Block_cfgpred_block(block, pos);
at = sched_last(predblock);
}
def = search_def(env, at);
ir_node *predblock = get_Block_cfgpred_block(block, pos);
at = sched_last(predblock);
}
def = search_def(env, at);
- if(def == NULL) {
+ if
(def == NULL) {
panic("no definition found for %+F at position %d", use, pos);
}
panic("no definition found for %+F at position %d", use, pos);
}
@@
-397,7
+392,7
@@
void be_ssa_construction_fix_users_array(be_ssa_construction_env_t *env,
stat_ev_cnt_inc(uses);
}
}
stat_ev_cnt_inc(uses);
}
}
-
BE_TIMER_POP(t_ssa_constr
);
+
be_timer_pop(T_SSA_CONSTR
);
stat_ev_tim_pop("bessaconstr_fix_time");
stat_ev_cnt_done(uses, "bessaconstr_uses");
stat_ev_tim_pop("bessaconstr_fix_time");
stat_ev_cnt_done(uses, "bessaconstr_uses");
@@
-414,15
+409,15
@@
void be_ssa_construction_update_liveness_phis(be_ssa_construction_env_t *env,
{
int i, n;
{
int i, n;
-
BE_TIMER_PUSH(t_ssa_constr
);
+
be_timer_push(T_SSA_CONSTR
);
n = ARR_LEN(env->new_phis);
n = ARR_LEN(env->new_phis);
- for(i = 0; i < n; ++i) {
+ for
(i = 0; i < n; ++i) {
ir_node *phi = env->new_phis[i];
be_liveness_introduce(lv, phi);
}
ir_node *phi = env->new_phis[i];
be_liveness_introduce(lv, phi);
}
-
BE_TIMER_POP(t_ssa_constr
);
+
be_timer_pop(T_SSA_CONSTR
);
}
void be_init_ssaconstr(void)
}
void be_init_ssaconstr(void)