#include "irop.h"
#include "pdeq.h"
#include "irphase_t.h"
-#include "irprintf.h"
+#include "debug.h"
static char v;
static void *VISITED = &v;
struct vrp_env_t {
waitq *workqueue;
+ DEBUG_ONLY(firm_dbg_module_t *dbg);
};
static vrp_attr *get_vrp_attr(const ir_node *node)
return 0; /* we don't optimize for non-int-nodes*/
}
- ir_printf("update_vrp for %d called\n", get_irn_node_nr(node));
vrp = get_vrp_attr(node);
/* TODO: Check if all predecessors have valid VRP information*/
case iro_Const: {
tarval *tv = get_Const_tarval(node);
new_bits_set = tv;
- new_bits_not_set = tarval_not(tv);
+ new_bits_not_set = tv;
new_range_bottom = tv;
new_range_top = tv;
new_range_type = VRP_RANGE;
break;
}
-
case iro_And: {
- vrp_attr *vrp_left, *vrp_right;
- ir_node *left, *right;
+ const vrp_attr *vrp_left, *vrp_right;
+ const ir_node *left, *right;
left = get_And_left(node);
right = get_And_right(node);
vrp_left = get_vrp_attr(left);
vrp_right = get_vrp_attr(right);
new_bits_set = tarval_and(vrp_left->bits_set, vrp_right->bits_set);
- new_bits_not_set = tarval_or(vrp_left->bits_not_set, vrp_right->bits_not_set);
+ new_bits_not_set = tarval_and(vrp_left->bits_not_set, vrp_right->bits_not_set);
break;
}
case iro_Add: {
int overflow_top, overflow_bottom;
tarval *new_top, *new_bottom;
- vrp_attr *vrp_left, *vrp_right;
+ const vrp_attr *vrp_left, *vrp_right;
vrp_left = get_vrp_attr(get_Add_left(node));
vrp_right = get_vrp_attr(get_Add_right(node));
case iro_Sub: {
int overflow_top, overflow_bottom;
tarval *new_top, *new_bottom;
- vrp_attr *vrp_left, *vrp_right;
+ const vrp_attr *vrp_left, *vrp_right;
vrp_left = get_vrp_attr(get_Sub_left(node));
vrp_right = get_vrp_attr(get_Sub_right(node));
if (vrp_left->range_type == VRP_UNDEFINED || vrp_right->range_type ==
- VRP_UNDEFINED) {
+ VRP_UNDEFINED || vrp_left->range_type == VRP_VARYING ||
+ vrp_right->range_type == VRP_VARYING) {
return 0;
}
}
case iro_Or: {
- vrp_attr *vrp_left, *vrp_right;
+ const vrp_attr *vrp_left, *vrp_right;
vrp_left = get_vrp_attr(get_Or_left(node));
vrp_right = get_vrp_attr(get_Or_right(node));
new_bits_set = tarval_or(vrp_left->bits_set, vrp_right->bits_set);
- new_bits_not_set = tarval_and(vrp_left->bits_not_set, vrp_right->bits_not_set);
+ new_bits_not_set = tarval_or(vrp_left->bits_not_set, vrp_right->bits_not_set);
break;
}
case iro_Rotl: {
- vrp_attr *vrp_left, *vrp_right;
- ir_node *right = get_Rotl_right(node);
+ const vrp_attr *vrp_left, *vrp_right;
+ const ir_node *right = get_Rotl_right(node);
vrp_left = get_vrp_attr(get_Rotl_left(node));
vrp_right = get_vrp_attr(get_Rotl_right(node));
tarval *bits_set, *bits_not_set;
bits_set = tarval_rotl(vrp_left->bits_set, get_Const_tarval(right));
bits_not_set = tarval_rotl(vrp_left->bits_not_set, get_Const_tarval(right));
-
- new_bits_set = tarval_or(bits_set, vrp->bits_set);
- new_bits_not_set = tarval_or(bits_not_set, vrp->bits_not_set);
}
break;
}
case iro_Shl: {
- vrp_attr *vrp_left, *vrp_right;
- ir_node *right = get_Shl_right(node);
+ const vrp_attr *vrp_left, *vrp_right;
+ const ir_node *right = get_Shl_right(node);
vrp_left = get_vrp_attr(get_Shl_left(node));
vrp_right = get_vrp_attr(get_Shl_right(node));
/* We can only compute this if the right value is a constant*/
if (is_Const(right)) {
- tarval *bits_set, *bits_not_set;
- ir_mode *m = get_tarval_mode(vrp->bits_not_set);
- bits_set = tarval_shl(vrp_left->bits_set, get_Const_tarval(right));
- bits_not_set = tarval_shl(vrp_left->bits_not_set, get_Const_tarval(right));
-
- new_bits_set = tarval_or(bits_set, vrp->bits_set);
- new_bits_not_set = tarval_or(bits_not_set, vrp->bits_not_set);
-
- bits_not_set = tarval_not( tarval_shl(
- get_mode_all_one(m),
- get_Const_tarval(right)));
- new_bits_not_set = tarval_or(bits_not_set, new_bits_not_set);
-
+ new_bits_set = tarval_shl(vrp_left->bits_set, get_Const_tarval(right));
+ new_bits_not_set = tarval_shl(vrp_left->bits_not_set, get_Const_tarval(right));
}
break;
}
case iro_Shr: {
- vrp_attr *vrp_left, *vrp_right;
- ir_node *right = get_Shr_right(node);
+ const vrp_attr *vrp_left, *vrp_right;
+ const ir_node *right = get_Shr_right(node);
vrp_left = get_vrp_attr(get_Shr_left(node));
vrp_right = get_vrp_attr(get_Shr_right(node));
/* We can only compute this if the right value is a constant*/
if (is_Const(right)) {
- tarval *bits_set, *bits_not_set;
- ir_mode *m = get_tarval_mode(vrp->bits_not_set);
- bits_set = tarval_shr(vrp_left->bits_set, get_Const_tarval(right));
- bits_not_set = tarval_shr(vrp_left->bits_not_set, get_Const_tarval(right));
-
- new_bits_set = tarval_or(bits_set, vrp->bits_set);
- new_bits_not_set = tarval_or(bits_not_set, vrp->bits_not_set);
-
- bits_not_set = tarval_not( tarval_shr(
- get_mode_all_one(m),
- get_Const_tarval(right)));
- new_bits_not_set = tarval_or(bits_not_set, new_bits_not_set);
+ new_bits_set = tarval_shr(vrp_left->bits_set, get_Const_tarval(right));
+ new_bits_not_set = tarval_shr(vrp_left->bits_not_set, get_Const_tarval(right));
}
break;
}
case iro_Shrs: {
- vrp_attr *vrp_left, *vrp_right;
- ir_node *right = get_Shrs_right(node);
+ const vrp_attr *vrp_left, *vrp_right;
+ const ir_node *right = get_Shrs_right(node);
vrp_left = get_vrp_attr(get_Shrs_left(node));
vrp_right = get_vrp_attr(get_Shrs_right(node));
/* We can only compute this if the right value is a constant*/
if (is_Const(right)) {
- tarval *bits_set, *bits_not_set;
- ir_mode *m = get_tarval_mode(vrp->bits_not_set);
- bits_set = tarval_shrs(vrp_left->bits_set, get_Const_tarval(right));
- bits_not_set = tarval_shrs(vrp_left->bits_not_set, get_Const_tarval(right));
-
- new_bits_set = tarval_or(bits_set, vrp->bits_set);
- new_bits_not_set = tarval_or(bits_not_set, vrp->bits_not_set);
-
- bits_not_set = tarval_not( tarval_shrs(
- get_mode_all_one(m),
- get_Const_tarval(right)));
- new_bits_not_set = tarval_or(bits_not_set, new_bits_not_set);
+ new_bits_set = tarval_shrs(vrp_left->bits_set, get_Const_tarval(right));
+ new_bits_not_set = tarval_shrs(vrp_left->bits_not_set, get_Const_tarval(right));
}
break;
}
case iro_Eor: {
- tarval *bits_set, *bits_not_set;
- vrp_attr *vrp_left, *vrp_right;
+ const vrp_attr *vrp_left, *vrp_right;
vrp_left = get_vrp_attr(get_Eor_left(node));
vrp_right = get_vrp_attr(get_Eor_right(node));
- bits_not_set = tarval_or(
- tarval_and(vrp_left->bits_set, vrp_right->bits_set),
- tarval_and(vrp_left->bits_not_set,
- vrp_right->bits_not_set));
+ new_bits_set = tarval_or(
+ tarval_and(vrp_left->bits_set, tarval_not(vrp_right->bits_not_set)),
+ tarval_and(tarval_not(vrp_left->bits_not_set), vrp_right->bits_set));
- bits_set = tarval_or(
- tarval_and(vrp_left->bits_set, vrp_right->bits_not_set),
- tarval_and(vrp_left->bits_not_set, vrp_right->bits_set));
+ new_bits_not_set = tarval_not(tarval_or(
+ tarval_and(vrp_left->bits_set,vrp_right->bits_set),
+ tarval_and(tarval_not(vrp_left->bits_not_set),
+ tarval_not(vrp_right->bits_not_set))));
- new_bits_set = tarval_or(bits_set, vrp->bits_set);
- new_bits_not_set = tarval_or(bits_not_set, vrp->bits_not_set);
break;
}
case iro_Id: {
- vrp_attr *vrp_pred = get_vrp_attr(get_Id_pred(node));
+ const vrp_attr *vrp_pred = get_vrp_attr(get_Id_pred(node));
new_bits_set = vrp_pred->bits_set;
new_bits_not_set = vrp_pred->bits_not_set;
new_range_top = vrp_pred->range_top;
}
case iro_Not: {
- vrp_attr *vrp_pred = get_vrp_attr(get_Not_op(node));
- new_bits_set = tarval_or(vrp_pred->bits_not_set, vrp->bits_set);
- new_bits_not_set = tarval_or(vrp_pred->bits_set, vrp->bits_not_set);
+ const vrp_attr *vrp_pred = get_vrp_attr(get_Not_op(node));
+ new_bits_set = tarval_not(vrp_pred->bits_not_set);
+ new_bits_not_set = tarval_not(vrp_pred->bits_set);
break;
}
case iro_Conv: {
- ir_node *pred = get_Conv_op(node);
+ const ir_node *pred = get_Conv_op(node);
ir_mode *old_mode = get_irn_mode(pred);
- vrp_attr *vrp_pred = get_vrp_attr(pred);
+ const vrp_attr *vrp_pred = get_vrp_attr(pred);
ir_mode *new_mode;
- tarval *bits_not_set;
if (!mode_is_int(old_mode))
return 0;
new_mode = get_irn_mode(node);
/* The second and is needed if target type is smaller*/
- bits_not_set = tarval_not(
- tarval_convert_to(get_mode_all_one(old_mode),
- new_mode
- ));
- bits_not_set = tarval_or(bits_not_set, tarval_convert_to(vrp_pred->bits_not_set, new_mode));
- new_bits_not_set = tarval_or(bits_not_set, vrp->bits_not_set);
+ new_bits_not_set = tarval_convert_to(get_mode_all_one(old_mode), new_mode);
+ new_bits_not_set = tarval_and(new_bits_not_set, tarval_convert_to(vrp_pred->bits_not_set, new_mode));
new_bits_set = tarval_and(
- tarval_not(bits_not_set), tarval_convert_to(vrp_pred->bits_set, new_mode));
+ new_bits_not_set, tarval_convert_to(vrp_pred->bits_set, new_mode));
if (tarval_cmp(vrp_pred->range_top, get_mode_max(new_mode)) == pn_Cmp_Le) {
vrp->range_top = vrp_pred->range_top;
}
case iro_Confirm: {
- pn_Cmp cmp = get_Confirm_cmp(node);
- ir_node *bound = get_Confirm_bound(node);
+ const pn_Cmp cmp = get_Confirm_cmp(node);
+ const ir_node *bound = get_Confirm_bound(node);
if (cmp == pn_Cmp_Lg) {
pn_Cmp cmp;
int i;
- ir_node *pred = get_Phi_pred(node,0);
- vrp_attr *vrp_pred = get_vrp_attr(pred);
+ const ir_node *pred = get_Phi_pred(node,0);
+ const vrp_attr *vrp_pred = get_vrp_attr(pred);
new_range_top = vrp_pred->range_top;
new_range_bottom = vrp_pred->range_bottom;
new_range_type = vrp_pred->range_type;
assert(num > 0);
-
for (i = 1; i < num; i++) {
pred = get_Phi_pred(node, i);
vrp_pred = get_vrp_attr(pred);
}
} else {
new_range_type = VRP_VARYING;
- break;
}
+ new_bits_set = tarval_and(new_bits_set, vrp_pred->bits_set);
+ new_bits_not_set = tarval_or(new_bits_not_set,
+ vrp_pred->bits_not_set);
}
break;
is_SymConst(node) is_Sync(node) is_Tuple(node)
*/
+ /* @todo: At this place, we check if the mode of the variable changed. A
+ * better place for this might be in the convopt.c file
+ */
+
+ if (new_bits_set != tarval_bad && get_tarval_mode(new_bits_set) != get_tarval_mode(vrp->bits_set)) {
+ vrp->bits_set = tarval_convert_to(vrp->bits_set, get_irn_mode(node));
+ }
+ if (new_bits_not_set != tarval_bad && get_tarval_mode(new_bits_not_set) != get_tarval_mode(vrp->bits_not_set)) {
+ vrp->bits_not_set = tarval_convert_to(vrp->bits_not_set, get_irn_mode(node));
+ }
+
+ if (vrp->range_type != VRP_UNDEFINED && new_range_type != VRP_UNDEFINED && get_tarval_mode(new_range_top) != get_tarval_mode(vrp->range_top)) {
+ /* @todo: We might be able to preserve this range information if it
+ * fits in */
+ vrp->range_type = VRP_VARYING;
+ }
+
/* Merge the newly calculated values with those that might already exist*/
if (new_bits_set != tarval_bad) {
new_bits_set = tarval_or(new_bits_set, vrp->bits_set);
vrp->bits_set = new_bits_set;
}
}
-
if (new_bits_not_set != tarval_bad) {
- new_bits_not_set = tarval_or(new_bits_not_set, vrp->bits_not_set);
+ new_bits_not_set = tarval_and(new_bits_not_set, vrp->bits_not_set);
if (tarval_cmp(new_bits_not_set, vrp->bits_not_set) != pn_Cmp_Eq) {
something_changed = 1;
}
assert(tarval_is_null(
- tarval_and(vrp->bits_set, vrp->bits_not_set)));
+ tarval_and(vrp->bits_set, tarval_not(vrp->bits_not_set))));
return something_changed;
}
vrp_update_node(n);
+ assure_irg_outs(get_current_ir_graph());
for (i = get_irn_n_outs(n) - 1; i >=0; --i) {
succ = get_irn_out(n, i);
if (get_irn_link(succ) == VISITED) {
/* we found a loop*/
- waitq_put(env->workqueue, n);
+ waitq_put(env->workqueue, succ);
}
}
}
{
ir_mode *mode;
vrp_attr *vrp;
+ struct vrp_env_t *env = phase->priv;
- ir_printf("initialized node nr: %d\n", get_irn_node_nr(n));
- if (old) {
- assert(1==0 && "init called for node already initialized");
- }
+ DBG((env->dbg, LEVEL_2, "initialized node nr: %d\n", get_irn_node_nr(n)));
+ assert(old==NULL && "init called for node already initialized");
vrp = phase_alloc(phase, sizeof(vrp_attr));
memset(vrp, 0, sizeof(vrp_attr));
/* We are assuming that 0 is always represented as this modes null */
vrp->valid = 1;
vrp->bits_set = get_mode_null(mode);
- vrp->bits_not_set = get_mode_null(mode);
+ vrp->bits_not_set = get_mode_all_one(mode);
vrp->range_bottom = get_tarval_top();
vrp->range_top = get_tarval_top();
} else {
phase = new_phase(irg, vrp_init_node);
irg_register_phase(irg, PHASE_VRP, phase);
env = phase_alloc(phase, sizeof(*env));
+ FIRM_DBG_REGISTER(env->dbg, "ir.ana.vrp");
phase->priv = env;
} else {
env = phase->priv;
}
}
- if (!tarval_is_null(tarval_and(vrp_left->bits_set, vrp_right->bits_not_set)) ||
- !tarval_is_null(tarval_and(vrp_left->bits_not_set, vrp_right->bits_set))) {
+ if (!tarval_is_null(tarval_and(vrp_left->bits_set, tarval_not(vrp_right->bits_not_set))) ||
+ !tarval_is_null(tarval_and(tarval_not(vrp_left->bits_not_set), vrp_right->bits_set))) {
return pn_Cmp_Lg;
}
/* TODO: We can get way more information here*/
{
const ir_graph *irg = get_irn_irg(node);
const ir_phase *phase = irg_get_phase(irg, PHASE_VRP);
+ vrp_attr *vrp;
if (phase == NULL) {
/* phase has not yet been initialized */
return NULL;
}
- return phase_get_irn_data(phase, node);
+ vrp = phase_get_irn_data(phase, node);
+ if (vrp && vrp->valid) {
+ return vrp;
+ }
+ return NULL;
}
projects / libfirm / blobdiff