- Changed wrong (and slow) implementation of fix_atsrt_block(),
[libfirm] / ir / opt / combo.c
index c3fe183..9e68175 100644 (file)
@@ -63,7 +63,6 @@
 #include <assert.h>
 
 #include "iroptimize.h"
-#include "archop.h"
 #include "irflag.h"
 #include "ircons.h"
 #include "list.h"
@@ -112,6 +111,7 @@ struct opcode_key_t {
        union {
                long      proj;   /**< For Proj nodes, its proj number */
                ir_entity *ent;   /**< For Sel Nodes, its entity */
+               int       intVal; /**< For Conv/Div Nodes: strict/remainderless */
        } u;
 };
 
@@ -281,6 +281,12 @@ static void check_opcode(const partition_t *Z) {
                        case iro_Sel:
                                key.u.ent = get_Sel_entity(irn);
                                break;
+                       case iro_Conv:
+                               key.u.intVal = get_Conv_strict(irn);
+                               break;
+                       case iro_Div:
+                               key.u.intVal = is_Div_remainderless(irn);
+                               break;
                        default:
                                break;
                        }
@@ -297,6 +303,12 @@ static void check_opcode(const partition_t *Z) {
                        case iro_Sel:
                                assert(key.u.ent == get_Sel_entity(irn));
                                break;
+                       case iro_Conv:
+                               assert(key.u.intVal == get_Conv_strict(irn));
+                               break;
+                       case iro_Div:
+                               assert(key.u.intVal == is_Div_remainderless(irn));
+                               break;
                        default:
                                break;
                        }
@@ -551,7 +563,8 @@ static int cmp_opcode(const void *elt, const void *key, size_t size) {
        (void) size;
        return o1->code != o2->code || o1->mode != o2->mode ||
               o1->arity != o2->arity ||
-              o1->u.proj != o2->u.proj || o1->u.ent != o2->u.ent;
+              o1->u.proj != o2->u.proj || o1->u.ent != o2->u.ent ||
+                  o1->u.intVal != o2->u.intVal;
 }  /* cmp_opcode */
 
 /**
@@ -1012,10 +1025,6 @@ static int is_real_follower(const ir_node *irn, int input) {
                if (is_tarval(pred->type.tv) && tarval_is_all_one(pred->type.tv))
                        return 0;
                break;
-       case iro_Min:
-       case iro_Max:
-               /* all inputs are followers */
-               return 1;
        default:
                assert(!"opcode not implemented yet");
                break;
@@ -1638,6 +1647,12 @@ static void *lambda_opcode(const node_t *node, environment_t *env) {
        case iro_Sel:
                key.u.ent = get_Sel_entity(irn);
                break;
+       case iro_Conv:
+               key.u.intVal = get_Conv_strict(irn);
+               break;
+       case iro_Div:
+               key.u.intVal = is_Div_remainderless(irn);
+               break;
        default:
                break;
        }
@@ -1863,8 +1878,8 @@ static void compute_Block(node_t *node) {
        int     i;
        ir_node *block = node->node;
 
-       if (block == get_irg_start_block(current_ir_graph)) {
-               /* start block is always reachable */
+       if (block == get_irg_start_block(current_ir_graph) || has_Block_label(block)) {
+               /* start block and labelled blocks are always reachable */
                node->type.tv = tarval_reachable;
                return;
        }
@@ -2430,94 +2445,6 @@ static void compute_Confirm(node_t *node) {
        node->type = pred->type;
 }  /* compute_Confirm */
 
-/**
- * (Re-)compute the type for a Max.
- *
- * @param node  the node
- */
-static void compute_Max(node_t *node) {
-       ir_node        *op = node->node;
-       node_t         *l  = get_irn_node(get_binop_left(op));
-       node_t         *r  = get_irn_node(get_binop_right(op));
-       lattice_elem_t a   = l->type;
-       lattice_elem_t b   = r->type;
-
-       if (a.tv == tarval_top || b.tv == tarval_top) {
-               node->type.tv = tarval_top;
-       } else if (is_con(a) && is_con(b)) {
-               /* both nodes are constants, we can probably do something */
-               if (a.tv == b.tv) {
-                       /* this case handles SymConsts as well */
-                       node->type = a;
-               } else {
-                       ir_mode *mode   = get_irn_mode(op);
-                       tarval  *tv_min = get_mode_min(mode);
-
-                       if (a.tv == tv_min)
-                               node->type = b;
-                       else if (b.tv == tv_min)
-                               node->type = a;
-                       else if (is_tarval(a.tv) && is_tarval(b.tv)) {
-                               if (tarval_cmp(a.tv, b.tv) & pn_Cmp_Gt)
-                                       node->type.tv = a.tv;
-                               else
-                                       node->type.tv = b.tv;
-                       } else {
-                               node->type.tv = tarval_bad;
-                       }
-               }
-       } else if (r->part == l->part) {
-               /* both nodes congruent, we can probably do something */
-               node->type = a;
-       } else {
-               node->type.tv = tarval_bottom;
-       }
-}  /* compute_Max */
-
-/**
- * (Re-)compute the type for a Min.
- *
- * @param node  the node
- */
-static void compute_Min(node_t *node) {
-       ir_node        *op = node->node;
-       node_t         *l  = get_irn_node(get_binop_left(op));
-       node_t         *r  = get_irn_node(get_binop_right(op));
-       lattice_elem_t a   = l->type;
-       lattice_elem_t b   = r->type;
-
-       if (a.tv == tarval_top || b.tv == tarval_top) {
-               node->type.tv = tarval_top;
-       } else if (is_con(a) && is_con(b)) {
-               /* both nodes are constants, we can probably do something */
-               if (a.tv == b.tv) {
-                       /* this case handles SymConsts as well */
-                       node->type = a;
-               } else {
-                       ir_mode *mode   = get_irn_mode(op);
-                       tarval  *tv_max = get_mode_max(mode);
-
-                       if (a.tv == tv_max)
-                               node->type = b;
-                       else if (b.tv == tv_max)
-                               node->type = a;
-                       else if (is_tarval(a.tv) && is_tarval(b.tv)) {
-                               if (tarval_cmp(a.tv, b.tv) & pn_Cmp_Gt)
-                                       node->type.tv = a.tv;
-                               else
-                                       node->type.tv = b.tv;
-                       } else {
-                               node->type.tv = tarval_bad;
-                       }
-               }
-       } else if (r->part == l->part) {
-               /* both nodes congruent, we can probably do something */
-               node->type = a;
-       } else {
-               node->type.tv = tarval_bottom;
-       }
-}  /* compute_Min */
-
 /**
  * (Re-)compute the type for a given node.
  *
@@ -2729,54 +2656,6 @@ static node_t *identity_Mux(node_t *node) {
        return node;
 }  /* identity_Mux */
 
-/**
- * Calculates the Identity for Min nodes.
- */
-static node_t *identity_Min(node_t *node) {
-       ir_node *op   = node->node;
-       node_t  *a    = get_irn_node(get_binop_left(op));
-       node_t  *b    = get_irn_node(get_binop_right(op));
-       ir_mode *mode = get_irn_mode(op);
-       tarval  *tv_max;
-
-       if (a->part == b->part) {
-               /* leader of multiple predecessors */
-               return a;
-       }
-
-       /* works even with NaN */
-       tv_max = get_mode_max(mode);
-       if (a->type.tv == tv_max)
-               return b;
-       if (b->type.tv == tv_max)
-               return a;
-       return node;
-}  /* identity_Min */
-
-/**
- * Calculates the Identity for Max nodes.
- */
-static node_t *identity_Max(node_t *node) {
-       ir_node *op   = node->node;
-       node_t  *a    = get_irn_node(get_binop_left(op));
-       node_t  *b    = get_irn_node(get_binop_right(op));
-       ir_mode *mode = get_irn_mode(op);
-       tarval  *tv_min;
-
-       if (a->part == b->part) {
-               /* leader of multiple predecessors */
-               return a;
-       }
-
-       /* works even with NaN */
-       tv_min = get_mode_min(mode);
-       if (a->type.tv == tv_min)
-               return b;
-       if (b->type.tv == tv_min)
-               return a;
-       return node;
-}  /* identity_Max */
-
 /**
  * Calculates the Identity for nodes.
  */
@@ -2805,10 +2684,6 @@ static node_t *identity(node_t *node) {
                return identity_Confirm(node);
        case iro_Mux:
                return identity_Mux(node);
-       case iro_Min:
-               return identity_Min(node);
-       case iro_Max:
-               return identity_Max(node);
        default:
                return node;
        }
@@ -3039,10 +2914,11 @@ static int only_one_reachable_proj(ir_node *n) {
  * Return non-zero if the control flow predecessor node pred
  * is the only reachable control flow exit of its block.
  *
- * @param pred  the control flow exit
+ * @param pred   the control flow exit
+ * @param block  the destination block
  */
-static int can_exchange(ir_node *pred) {
-       if (is_Start(pred))
+static int can_exchange(ir_node *pred, ir_node *block) {
+       if (is_Start(pred) || has_Block_label(block))
                return 0;
        else if (is_Jmp(pred))
                return 1;
@@ -3108,7 +2984,7 @@ static void apply_cf(ir_node *block, void *ctx) {
                /* only one predecessor combine */
                ir_node *pred = skip_Proj(get_Block_cfgpred(block, 0));
 
-               if (can_exchange(pred)) {
+               if (can_exchange(pred, block)) {
                        ir_node *new_block = get_nodes_block(pred);
                        DB((dbg, LEVEL_1, "Fuse %+F with %+F\n", block, new_block));
                        DBG_OPT_COMBO(block, new_block, FS_OPT_COMBO_CF);
@@ -3159,7 +3035,7 @@ static void apply_cf(ir_node *block, void *ctx) {
                if (is_tarval(node->type.tv) && tarval_is_constant(node->type.tv)) {
                        /* this Phi is replaced by a constant */
                        tarval  *tv = node->type.tv;
-                       ir_node *c  = new_Const(get_tarval_mode(tv), tv);
+                       ir_node *c  = new_Const(tv);
 
                        set_irn_node(c, node);
                        node->node = c;
@@ -3199,7 +3075,7 @@ static void apply_cf(ir_node *block, void *ctx) {
                /* this Block has only one live predecessor */
                ir_node *pred = skip_Proj(in_X[0]);
 
-               if (can_exchange(pred)) {
+               if (can_exchange(pred, block)) {
                        ir_node *new_block = get_nodes_block(pred);
                        DBG_OPT_COMBO(block, new_block, FS_OPT_COMBO_CF);
                        exchange(block, new_block);
@@ -3382,7 +3258,7 @@ static void apply_result(ir_node *irn, void *ctx) {
                                 */
                                if (! is_Const(irn) && get_irn_mode(irn) != mode_T) {
                                        /* can be replaced by a constant */
-                                       ir_node *c = new_Const(get_tarval_mode(tv), tv);
+                                       ir_node *c = new_Const(tv);
                                        set_irn_node(c, node);
                                        node->node = c;
                                        DB((dbg, LEVEL_1, "%+F is replaced by %+F\n", irn, c));
@@ -3498,11 +3374,6 @@ static void set_compute_functions(void) {
        SET(Return);
        SET(End);
        SET(Call);
-
-       if (op_Max != NULL)
-               SET(Max);
-       if (op_Min != NULL)
-               SET(Min);
 }  /* set_compute_functions */
 
 /**