fixed CopyB emitter
[libfirm] / ir / be / ia32 / bearch_ia32.c
index 8f0594c..dcefdcf 100644 (file)
@@ -29,8 +29,8 @@
 #include "ircons.h"
 #include "irgmod.h"
 #include "irgopt.h"
-
-#include "bitset.h"
+#include "irbitset.h"
+#include "pdeq.h"
 #include "debug.h"
 
 #include "../beabi.h"                 /* the general register allocator interface */
@@ -69,6 +69,21 @@ ir_node *ia32_new_NoReg_fp(ia32_code_gen_t *cg) {
                USE_SSE2(cg) ? &ia32_xmm_regs[REG_XMM_NOREG] : &ia32_vfp_regs[REG_VFP_NOREG]);
 }
 
+/* returns the first Proj with given mode from mode_T node */
+static ir_node *get_proj_for_mode(ir_node *node, ir_mode *mode) {
+       const ir_edge_t *edge;
+
+       assert(get_irn_mode(node) == mode_T && "Need mode_T node.");
+
+       foreach_out_edge(node, edge) {
+               ir_node *proj = get_edge_src_irn(edge);
+               if (get_irn_mode(proj) == mode)
+                       return proj;
+       }
+
+       return NULL;
+}
+
 /**************************************************
  *                         _ _              _  __
  *                        | | |            (_)/ _|
@@ -425,6 +440,7 @@ static void ia32_abi_epilogue(void *self, ir_node *bl, ir_node **mem, pmap *reg_
  */
 static ir_type *ia32_abi_get_between_type(void *self)
 {
+#define IDENT(s) new_id_from_chars(s, sizeof(s)-1)
        static ir_type *omit_fp_between_type = NULL;
        static ir_type *between_type         = NULL;
 
@@ -435,25 +451,76 @@ static ir_type *ia32_abi_get_between_type(void *self)
                entity *ret_addr_ent;
                entity *omit_fp_ret_addr_ent;
 
-               ir_type *old_bp_type   = new_type_primitive(new_id_from_str("bp"), mode_P);
-               ir_type *ret_addr_type = new_type_primitive(new_id_from_str("return_addr"), mode_P);
+               ir_type *old_bp_type   = new_type_primitive(IDENT("bp"), mode_P);
+               ir_type *ret_addr_type = new_type_primitive(IDENT("return_addr"), mode_P);
 
-               between_type           = new_type_class(new_id_from_str("ia32_between_type"));
-               old_bp_ent             = new_entity(between_type, new_id_from_str("old_bp"), old_bp_type);
-               ret_addr_ent           = new_entity(between_type, new_id_from_str("ret_addr"), ret_addr_type);
+               between_type           = new_type_struct(IDENT("ia32_between_type"));
+               old_bp_ent             = new_entity(between_type, IDENT("old_bp"), old_bp_type);
+               ret_addr_ent           = new_entity(between_type, IDENT("ret_addr"), ret_addr_type);
 
                set_entity_offset_bytes(old_bp_ent, 0);
                set_entity_offset_bytes(ret_addr_ent, get_type_size_bytes(old_bp_type));
                set_type_size_bytes(between_type, get_type_size_bytes(old_bp_type) + get_type_size_bytes(ret_addr_type));
+               set_type_state(between_type, layout_fixed);
 
-               omit_fp_between_type   = new_type_class(new_id_from_str("ia32_between_type_omit_fp"));
-               omit_fp_ret_addr_ent   = new_entity(omit_fp_between_type, new_id_from_str("ret_addr"), ret_addr_type);
+               omit_fp_between_type   = new_type_struct(IDENT("ia32_between_type_omit_fp"));
+               omit_fp_ret_addr_ent   = new_entity(omit_fp_between_type, IDENT("ret_addr"), ret_addr_type);
 
                set_entity_offset_bytes(omit_fp_ret_addr_ent, 0);
                set_type_size_bytes(omit_fp_between_type, get_type_size_bytes(ret_addr_type));
+               set_type_state(omit_fp_between_type, layout_fixed);
        }
 
        return env->flags.try_omit_fp ? omit_fp_between_type : between_type;
+#undef IDENT
+}
+
+/**
+ * Get the estimated cycle count for @p irn.
+ *
+ * @param self The this pointer.
+ * @param irn  The node.
+ *
+ * @return     The estimated cycle count for this operation
+ */
+static int ia32_get_op_estimated_cost(const void *self, const ir_node *irn)
+{
+  int cost;
+  switch (get_ia32_irn_opcode(irn)) {
+    case iro_ia32_xDiv:
+    case iro_ia32_DivMod:
+      cost = 8;
+      break;
+
+    case iro_ia32_xLoad:
+    case iro_ia32_l_Load:
+    case iro_ia32_Load:
+    case iro_ia32_Push:
+    case iro_ia32_Pop:
+      cost = 10;
+      break;
+
+    case iro_ia32_xStore:
+    case iro_ia32_l_Store:
+    case iro_ia32_Store:
+    case iro_ia32_Store8Bit:
+      cost = 50;
+      break;
+
+    case iro_ia32_MulS:
+    case iro_ia32_Mul:
+    case iro_ia32_Mulh:
+    case iro_ia32_xMul:
+    case iro_ia32_l_MulS:
+    case iro_ia32_l_Mul:
+      cost = 2;
+      break;
+
+    default:
+      cost = 1;
+  }
+
+  return cost;
 }
 
 /**
@@ -511,14 +578,17 @@ static arch_inverse_t *ia32_get_inverse(const void *self, const ir_node *irn, in
                                /* invers == sub with const */
                                inverse->nodes[0] = new_rd_ia32_Sub(NULL, irg, block, noreg, noreg, get_irn_n(irn, i), noreg, nomem);
                                pnc               = pn_ia32_Sub_res;
-                               inverse->costs   += 5;
+                               inverse->costs   += 2;
                                copy_ia32_Immop_attr(inverse->nodes[0], (ir_node *)irn);
                        }
                        else {
                                /* normal add: inverse == sub */
-                               inverse->nodes[0] = new_rd_ia32_Sub(NULL, irg, block, noreg, noreg, (ir_node *)irn, get_irn_n(irn, i ^ 1), nomem);
+                               ir_node  *proj = get_irn_out_edge_first(irn)->src;
+                               assert(proj && is_Proj(proj));
+
+                               inverse->nodes[0] = new_rd_ia32_Sub(NULL, irg, block, noreg, noreg, proj, get_irn_n(irn, i ^ 1), nomem);
                                pnc               = pn_ia32_Sub_res;
-                               inverse->costs   += 5;
+                               inverse->costs   += 2;
                        }
                        break;
                case iro_ia32_Sub:
@@ -532,11 +602,14 @@ static arch_inverse_t *ia32_get_inverse(const void *self, const ir_node *irn, in
                        }
                        else {
                                /* normal sub */
+                               ir_node  *proj = get_irn_out_edge_first(irn)->src;
+                               assert(proj && is_Proj(proj));
+
                                if (i == 2) {
-                                       inverse->nodes[0] = new_rd_ia32_Add(NULL, irg, block, noreg, noreg, (ir_node *)irn, get_irn_n(irn, 3), nomem);
+                                       inverse->nodes[0] = new_rd_ia32_Add(NULL, irg, block, noreg, noreg, proj, get_irn_n(irn, 3), nomem);
                                }
                                else {
-                                       inverse->nodes[0] = new_rd_ia32_Sub(NULL, irg, block, noreg, noreg, get_irn_n(irn, 2), (ir_node *)irn, nomem);
+                                       inverse->nodes[0] = new_rd_ia32_Sub(NULL, irg, block, noreg, noreg, get_irn_n(irn, 2), proj, nomem);
                                }
                                pnc             = pn_ia32_Sub_res;
                                inverse->costs += 1;
@@ -572,6 +645,7 @@ static arch_inverse_t *ia32_get_inverse(const void *self, const ir_node *irn, in
                        return NULL;
        }
 
+       set_ia32_res_mode(inverse->nodes[0], mode);
        inverse->nodes[1] = new_r_Proj(irg, block, inverse->nodes[0], mode, pnc);
 
        return inverse;
@@ -596,7 +670,8 @@ static const arch_irn_ops_if_t ia32_irn_ops_if = {
        ia32_get_flags,
        ia32_get_frame_entity,
        ia32_set_stack_bias,
-       ia32_get_inverse
+       ia32_get_inverse,
+       ia32_get_op_estimated_cost
 };
 
 ia32_irn_ops_t ia32_irn_ops = {
@@ -636,12 +711,17 @@ static void ia32_prepare_graph(void *self) {
        dom = be_compute_dominance_frontiers(cg->irg);
        irg_walk_blkwise_graph(cg->irg, NULL, ia32_transform_node, cg);
        be_free_dominance_frontiers(dom);
-       be_dump(cg->irg, "-transformed", dump_ir_block_graph_sched);
+
+       if (cg->dump)
+               be_dump(cg->irg, "-transformed", dump_ir_block_graph_sched);
 
        /* 3rd: optimize address mode */
        FIRM_DBG_REGISTER(cg->mod, "firm.be.ia32.am");
        ia32_optimize_addressmode(cg);
-       be_dump(cg->irg, "-am", dump_ir_block_graph_sched);
+
+       if (cg->dump)
+               be_dump(cg->irg, "-am", dump_ir_block_graph_sched);
+
        DEBUG_ONLY(cg->mod = old_mod;)
 }
 
@@ -756,17 +836,32 @@ end:
 static void ia32_finish_irg_walker(ir_node *block, void *env) {
        ir_node *irn, *next;
 
-       for (irn = sched_first(block); !sched_is_end(irn); irn = next) {
+       for (irn = sched_first(block); ! sched_is_end(irn); irn = next) {
                next = sched_next(irn);
                ia32_finish_node(irn, env);
        }
 }
 
+static void ia32_push_on_queue_walker(ir_node *block, void *env) {
+       waitq *wq = env;
+       waitq_put(wq, block);
+}
+
+
 /**
  * Add Copy nodes for not fulfilled should_be_equal constraints
  */
 static void ia32_finish_irg(ir_graph *irg, ia32_code_gen_t *cg) {
-       irg_block_walk_graph(irg, NULL, ia32_finish_irg_walker, cg);
+       waitq *wq = new_waitq();
+
+       /* Push the blocks on the waitq because ia32_finish_irg_walker starts more walks ... */
+       irg_block_walk_graph(irg, NULL, ia32_push_on_queue_walker, wq);
+
+       while (! waitq_empty(wq)) {
+               ir_node *block = waitq_get(wq);
+               ia32_finish_irg_walker(block, cg);
+       }
+       del_waitq(wq);
 }
 
 
@@ -777,15 +872,80 @@ static void ia32_finish_irg(ir_graph *irg, ia32_code_gen_t *cg) {
 static void ia32_before_sched(void *self) {
 }
 
+static void remove_unused_nodes(ir_node *irn, bitset_t *already_visited) {
+       int i;
+       ir_mode *mode;
+       ir_node *mem_proj;
+
+       if (is_Block(irn))
+               return;
+
+       mode = get_irn_mode(irn);
+
+       /* check if we already saw this node or the node has more than one user */
+       if (bitset_contains_irn(already_visited, irn) || get_irn_n_edges(irn) > 1)
+               return;
+
+       /* mark irn visited */
+       bitset_add_irn(already_visited, irn);
+
+       /* non-Tuple nodes with one user: ok, return */
+       if (get_irn_n_edges(irn) >= 1 && mode != mode_T)
+               return;
+
+       /* tuple node has one user which is not the mem proj-> ok */
+       if (mode == mode_T && get_irn_n_edges(irn) == 1) {
+               mem_proj = get_proj_for_mode(irn, mode_M);
+               if (! mem_proj)
+                       return;
+       }
+
+       for (i = get_irn_arity(irn) - 1; i >= 0; i--) {
+               ir_node *pred = get_irn_n(irn, i);
+
+               /* do not follow memory edges or we will accidentally remove stores */
+               if (is_Proj(pred) && get_irn_mode(pred) == mode_M)
+                       continue;
+
+               set_irn_n(irn, i, new_Bad());
+
+               /*
+                       The current node is about to be removed: if the predecessor
+                       has only this node as user, it need to be removed as well.
+               */
+               if (get_irn_n_edges(pred) <= 1)
+                       remove_unused_nodes(pred, already_visited);
+       }
+
+       if (sched_is_scheduled(irn))
+               sched_remove(irn);
+}
+
+static void remove_unused_loads_walker(ir_node *irn, void *env) {
+       bitset_t *already_visited = env;
+       if (is_ia32_Ld(irn) && ! bitset_contains_irn(already_visited, irn))
+               remove_unused_nodes(irn, env);
+}
+
 /**
  * Called before the register allocator.
  * Calculate a block schedule here. We need it for the x87
  * simulator and the emitter.
  */
 static void ia32_before_ra(void *self) {
-       ia32_code_gen_t *cg = self;
+       ia32_code_gen_t *cg              = self;
+       bitset_t        *already_visited = bitset_irg_malloc(cg->irg);
 
        cg->blk_sched = sched_create_block_schedule(cg->irg);
+
+       /*
+               Handle special case:
+               There are sometimes unused loads, only pinned by memory.
+               We need to remove those Loads and all other nodes which won't be used
+               after removing the Load from schedule.
+       */
+       irg_walk_graph(cg->irg, remove_unused_loads_walker, NULL, already_visited);
+       bitset_free(already_visited);
 }
 
 
@@ -889,8 +1049,6 @@ static void transform_to_Store(ia32_transform_env_t *env) {
 
        if (sched_point) {
                sched_add_after(sched_point, new_op);
-               sched_add_after(new_op, proj);
-
                sched_remove(irn);
        }
 
@@ -975,7 +1133,8 @@ static void ia32_codegen(void *self) {
        ir_graph        *irg = cg->irg;
 
        ia32_finish_irg(irg, cg);
-       be_dump(irg, "-finished", dump_ir_block_graph_sched);
+       if (cg->dump)
+               be_dump(irg, "-finished", dump_ir_block_graph_sched);
        ia32_gen_routine(cg->isa->out, irg, cg);
 
        cur_reg_set = NULL;
@@ -1019,6 +1178,7 @@ static void *ia32_cg_init(const be_irg_t *birg) {
        cg->gp_to_fp  = NULL;
        cg->fp_kind   = isa->fp_kind;
        cg->used_fp   = fp_none;
+       cg->dump      = (birg->main_env->options->dump_flags & DUMP_BE) ? 1 : 0;
 
        FIRM_DBG_REGISTER(cg->mod, "firm.be.ia32.cg");
 
@@ -1126,14 +1286,14 @@ static void *ia32_init(FILE *file_handle) {
 
        /* patch register names of x87 registers */
        if (USE_x87(isa)) {
-         ia32_st_regs[0].name = "st";
-         ia32_st_regs[1].name = "st(1)";
-         ia32_st_regs[2].name = "st(2)";
-         ia32_st_regs[3].name = "st(3)";
-         ia32_st_regs[4].name = "st(4)";
-         ia32_st_regs[5].name = "st(5)";
-         ia32_st_regs[6].name = "st(6)";
-         ia32_st_regs[7].name = "st(7)";
+               ia32_st_regs[0].name = "st";
+               ia32_st_regs[1].name = "st(1)";
+               ia32_st_regs[2].name = "st(2)";
+               ia32_st_regs[3].name = "st(3)";
+               ia32_st_regs[4].name = "st(4)";
+               ia32_st_regs[5].name = "st(5)";
+               ia32_st_regs[6].name = "st(6)";
+               ia32_st_regs[7].name = "st(7)";
        }
 
 #ifndef NDEBUG
@@ -1326,7 +1486,7 @@ const arch_irn_handler_t *ia32_get_irn_handler(const void *self) {
 }
 
 int ia32_to_appear_in_schedule(void *block_env, const ir_node *irn) {
-       return is_ia32_irn(irn);
+       return is_ia32_irn(irn) ? 1 : -1;
 }
 
 /**