/*
- * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
- *
* This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
*/
/**
#include "irgmod.h"
#include "irgwalk.h"
#include "heights.h"
-#include "irbitset.h"
#include "irprintf.h"
#include "irdump.h"
#include "error.h"
+#include "firmstat_t.h"
#include "be_t.h"
#include "beabi.h"
*/
static void peephole_ia32_Cmp(ir_node *const node)
{
- ir_node *right;
- ir_graph *irg;
- ia32_immediate_attr_t const *imm;
- dbg_info *dbgi;
- ir_node *block;
- ir_node *noreg;
- ir_node *nomem;
- ir_node *op;
- ia32_attr_t const *attr;
- int ins_permuted;
- ir_node *test;
- arch_register_t const *reg;
- ir_edge_t const *edge;
- ir_edge_t const *tmp;
-
if (get_ia32_op_type(node) != ia32_Normal)
return;
- right = get_irn_n(node, n_ia32_Cmp_right);
+ ir_node *const right = get_irn_n(node, n_ia32_Cmp_right);
if (!is_ia32_Immediate(right))
return;
- imm = get_ia32_immediate_attr_const(right);
+ ia32_immediate_attr_t const *const imm = get_ia32_immediate_attr_const(right);
if (imm->symconst != NULL || imm->offset != 0)
return;
- dbgi = get_irn_dbg_info(node);
- irg = get_irn_irg(node);
- block = get_nodes_block(node);
- noreg = ia32_new_NoReg_gp(irg);
- nomem = get_irg_no_mem(current_ir_graph);
- op = get_irn_n(node, n_ia32_Cmp_left);
- attr = get_ia32_attr(node);
- ins_permuted = attr->data.ins_permuted;
-
- if (is_ia32_Cmp(node)) {
- test = new_bd_ia32_Test(dbgi, block, noreg, noreg, nomem,
- op, op, ins_permuted);
- } else {
- test = new_bd_ia32_Test8Bit(dbgi, block, noreg, noreg, nomem,
- op, op, ins_permuted);
- }
- set_ia32_ls_mode(test, get_ia32_ls_mode(node));
-
- reg = arch_get_irn_register_out(node, pn_ia32_Cmp_eflags);
+ dbg_info *const dbgi = get_irn_dbg_info(node);
+ ir_node *const block = get_nodes_block(node);
+ ir_graph *const irg = get_Block_irg(block);
+ ir_node *const noreg = ia32_new_NoReg_gp(irg);
+ ir_node *const nomem = get_irg_no_mem(irg);
+ ir_node *const op = get_irn_n(node, n_ia32_Cmp_left);
+ int const ins_permuted = get_ia32_attr(node)->data.ins_permuted;
+
+ ir_mode *const ls_mode = get_ia32_ls_mode(node);
+ ir_node *const test = get_mode_size_bits(ls_mode) == 8
+ ? new_bd_ia32_Test_8bit(dbgi, block, noreg, noreg, nomem, op, op, ins_permuted)
+ : new_bd_ia32_Test (dbgi, block, noreg, noreg, nomem, op, op, ins_permuted);
+ set_ia32_ls_mode(test, ls_mode);
+
+ arch_register_t const *const reg = arch_get_irn_register_out(node, pn_ia32_Cmp_eflags);
arch_set_irn_register_out(test, pn_ia32_Test_eflags, reg);
- foreach_out_edge_safe(node, edge, tmp) {
+ foreach_out_edge_safe(node, edge) {
ir_node *const user = get_edge_src_irn(edge);
if (is_Proj(user))
ir_node *left = get_irn_n(node, n_ia32_Test_left);
ir_node *right = get_irn_n(node, n_ia32_Test_right);
- assert((int)n_ia32_Test_left == (int)n_ia32_Test8Bit_left
- && (int)n_ia32_Test_right == (int)n_ia32_Test8Bit_right);
-
if (left == right) { /* we need a test for 0 */
ir_node *block = get_nodes_block(node);
int pn = pn_ia32_res;
ir_mode *flags_mode;
ir_mode *op_mode;
ir_node *schedpoint;
- const ir_edge_t *edge;
produces_flag_t produced;
if (get_nodes_block(left) != block)
/* If there are other users, reroute them to result proj */
if (get_irn_n_edges(op) != 2) {
ir_node *res = new_r_Proj(op, mode_Iu, pn_ia32_res);
-
- edges_reroute(op, res);
- /* Reattach the result proj to left */
- set_Proj_pred(res, op);
+ edges_reroute_except(op, res, res);
}
} else {
if (get_irn_n_edges(left) == 2)
offset = imm->offset;
if (get_ia32_op_type(node) == ia32_AddrModeS) {
ia32_attr_t *const attr = get_ia32_attr(node);
+ ir_graph *const irg = get_irn_irg(node);
if ((offset & 0xFFFFFF00) == 0) {
/* attr->am_offs += 0; */
} else if ((offset & 0xFFFF00FF) == 0) {
- ir_node *imm_node = ia32_create_Immediate(NULL, 0, offset>>8);
+ ir_node *imm_node = ia32_create_Immediate(irg, NULL, 0, offset >> 8);
set_irn_n(node, n_ia32_Test_right, imm_node);
attr->am_offs += 1;
} else if ((offset & 0xFF00FFFF) == 0) {
- ir_node *imm_node = ia32_create_Immediate(NULL, 0, offset>>16);
+ ir_node *imm_node = ia32_create_Immediate(irg, NULL, 0, offset >> 16);
set_irn_n(node, n_ia32_Test_right, imm_node);
attr->am_offs += 2;
} else if ((offset & 0x00FFFFFF) == 0) {
- ir_node *imm_node = ia32_create_Immediate(NULL, 0, offset>>24);
+ ir_node *imm_node = ia32_create_Immediate(irg, NULL, 0, offset >> 24);
set_irn_n(node, n_ia32_Test_right, imm_node);
attr->am_offs += 3;
} else {
*/
static void peephole_ia32_Return(ir_node *node)
{
- ir_node *irn;
-
if (!ia32_cg_config.use_pad_return)
return;
/* check if this return is the first on the block */
- sched_foreach_reverse_from(node, irn) {
+ sched_foreach_reverse_before(node, irn) {
switch (get_irn_opcode(irn)) {
- case beo_Return:
- /* the return node itself, ignore */
- continue;
- case iro_Start:
case beo_Start:
/* ignore no code generated */
continue;
*/
static void peephole_IncSP_Store_to_push(ir_node *irn)
{
- int i;
- int maxslot;
- int inc_ofs;
- ir_node *node;
- ir_node *stores[MAXPUSH_OPTIMIZE];
- ir_node *block;
- ir_graph *irg;
- ir_node *curr_sp;
- ir_mode *spmode;
- ir_node *first_push = NULL;
- ir_edge_t const *edge;
- ir_edge_t const *next;
+ int i;
+ int maxslot;
+ ir_node *stores[MAXPUSH_OPTIMIZE];
+ ir_node *block;
+ ir_graph *irg;
+ ir_node *curr_sp;
+ ir_mode *spmode;
+ ir_node *first_push = NULL;
memset(stores, 0, sizeof(stores));
- assert(be_is_IncSP(irn));
-
- inc_ofs = be_get_IncSP_offset(irn);
+ int inc_ofs = be_get_IncSP_offset(irn);
if (inc_ofs < 4)
return;
* attached to the node
*/
maxslot = -1;
- for (node = sched_next(irn); !sched_is_end(node); node = sched_next(node)) {
+ sched_foreach_after(irn, node) {
ir_node *mem;
int offset;
int storeslot;
mem_proj = new_r_Proj(push, mode_M, pn_ia32_Push_M);
/* rewire Store Projs */
- foreach_out_edge_safe(store, edge, next) {
+ foreach_out_edge_safe(store, edge) {
ir_node *proj = get_edge_src_irn(edge);
if (!is_Proj(proj))
continue;
inc_ofs -= 4;
}
- foreach_out_edge_safe(irn, edge, next) {
+ foreach_out_edge_safe(irn, edge) {
ir_node *const src = get_edge_src_irn(edge);
int const pos = get_edge_src_pos(edge);
be_set_IncSP_offset(irn, inc_ofs);
}
-#if 0
-/**
- * Creates a Push instruction before the given schedule point.
- *
- * @param dbgi debug info
- * @param block the block
- * @param stack the previous stack value
- * @param schedpoint the new node is added before this node
- * @param reg the register to pop
- *
- * @return the new stack value
- */
-static ir_node *create_push(dbg_info *dbgi, ir_node *block,
- ir_node *stack, ir_node *schedpoint)
-{
- const arch_register_t *esp = &ia32_registers[REG_ESP];
-
- ir_node *val = ia32_new_NoReg_gp(cg);
- ir_node *noreg = ia32_new_NoReg_gp(cg);
- ir_graph *irg = get_irn_irg(block);
- ir_node *nomem = get_irg_no_mem(irg);
- ir_node *push = new_bd_ia32_Push(dbgi, block, noreg, noreg, nomem, val, stack);
- sched_add_before(schedpoint, push);
-
- stack = new_r_Proj(push, mode_Iu, pn_ia32_Push_stack);
- arch_set_irn_register(stack, esp);
-
- return stack;
-}
-
-static void peephole_store_incsp(ir_node *store)
-{
- dbg_info *dbgi;
- ir_node *node;
- ir_node *block;
- ir_node *noreg;
- ir_node *mem;
- ir_node *push;
- ir_node *val;
- ir_node *base;
- ir_node *index;
- ir_node *am_base = get_irn_n(store, n_ia32_Store_base);
- if (!be_is_IncSP(am_base)
- || get_nodes_block(am_base) != get_nodes_block(store))
- return;
- mem = get_irn_n(store, n_ia32_Store_mem);
- if (!is_ia32_NoReg_GP(get_irn_n(store, n_ia32_Store_index))
- || !is_NoMem(mem))
- return;
-
- int incsp_offset = be_get_IncSP_offset(am_base);
- if (incsp_offset <= 0)
- return;
-
- /* we have to be at offset 0 */
- int my_offset = get_ia32_am_offs_int(store);
- if (my_offset != 0) {
- /* TODO here: find out whether there is a store with offset 0 before
- * us and whether we can move it down to our place */
- return;
- }
- ir_mode *ls_mode = get_ia32_ls_mode(store);
- int my_store_size = get_mode_size_bytes(ls_mode);
-
- if (my_offset + my_store_size > incsp_offset)
- return;
-
- /* correctness checking:
- - noone else must write to that stackslot
- (because after translation incsp won't allocate it anymore)
- */
- sched_foreach_reverse_from(store, node) {
- int i, arity;
-
- if (node == am_base)
- break;
-
- /* make sure noone else can use the space on the stack */
- arity = get_irn_arity(node);
- for (i = 0; i < arity; ++i) {
- ir_node *pred = get_irn_n(node, i);
- if (pred != am_base)
- continue;
-
- if (i == n_ia32_base &&
- (get_ia32_op_type(node) == ia32_AddrModeS
- || get_ia32_op_type(node) == ia32_AddrModeD)) {
- int node_offset = get_ia32_am_offs_int(node);
- ir_mode *node_ls_mode = get_ia32_ls_mode(node);
- int node_size = get_mode_size_bytes(node_ls_mode);
- /* overlapping with our position? abort */
- if (node_offset < my_offset + my_store_size
- && node_offset + node_size >= my_offset)
- return;
- /* otherwise it's fine */
- continue;
- }
-
- /* strange use of esp: abort */
- return;
- }
- }
-
- /* all ok, change to push */
- dbgi = get_irn_dbg_info(store);
- block = get_nodes_block(store);
- noreg = ia32_new_NoReg_gp(cg);
- val = get_irn_n(store, n_ia32_Store_val);
-
- push = new_bd_ia32_Push(dbgi, block, noreg, noreg, mem,
-
- create_push(dbgi, current_ir_graph, block, am_base, store);
-}
-#endif
-
/**
* Return true if a mode can be stored in the GP register set
*/
static void peephole_Load_IncSP_to_pop(ir_node *irn)
{
const arch_register_t *esp = &ia32_registers[REG_ESP];
- int i, maxslot, inc_ofs, ofs;
- ir_node *node, *pred_sp, *block;
+ int i, maxslot, ofs;
ir_node *loads[MAXPUSH_OPTIMIZE];
unsigned regmask = 0;
unsigned copymask = ~0;
memset(loads, 0, sizeof(loads));
- assert(be_is_IncSP(irn));
- inc_ofs = -be_get_IncSP_offset(irn);
+ int inc_ofs = -be_get_IncSP_offset(irn);
if (inc_ofs < 4)
return;
* attached to the node
*/
maxslot = -1;
- pred_sp = be_get_IncSP_pred(irn);
- for (node = sched_prev(irn); !sched_is_end(node); node = sched_prev(node)) {
+ ir_node *pred_sp = be_get_IncSP_pred(irn);
+ sched_foreach_reverse_before(irn, node) {
int offset;
int loadslot;
const arch_register_t *sreg, *dreg;
inc_ofs = (i+1) * 4;
/* create a new IncSP if needed */
- block = get_nodes_block(irn);
+ ir_node *const block = get_nodes_block(irn);
if (inc_ofs > 0) {
pred_sp = be_new_IncSP(esp, block, pred_sp, -inc_ofs, be_get_IncSP_align(irn));
sched_add_before(irn, pred_sp);
for (++i; i <= maxslot; ++i) {
ir_node *load = loads[i];
ir_node *mem, *pop;
- const ir_edge_t *edge, *tmp;
const arch_register_t *reg;
mem = get_irn_n(load, n_ia32_mem);
sched_add_before(irn, pop);
/* rewire now */
- foreach_out_edge_safe(load, edge, tmp) {
+ foreach_out_edge_safe(load, edge) {
ir_node *proj = get_edge_src_irn(edge);
set_Proj_pred(proj, pop);
*/
static void peephole_ia32_Lea(ir_node *node)
{
- ir_graph *irg;
ir_node *base;
ir_node *index;
const arch_register_t *base_reg;
dbg_info *dbgi;
ir_node *block;
ir_node *res;
- ir_node *noreg;
- ir_node *nomem;
assert(is_ia32_Lea(node));
make_add:
dbgi = get_irn_dbg_info(node);
block = get_nodes_block(node);
- irg = get_irn_irg(node);
- noreg = ia32_new_NoReg_gp(irg);
- nomem = get_irg_no_mem(irg);
+ ir_graph *irg = get_irn_irg(node);
+ ir_node *noreg = ia32_new_NoReg_gp(irg);
+ ir_node *nomem = get_irg_no_mem(irg);
res = new_bd_ia32_Add(dbgi, block, noreg, noreg, nomem, op1, op2);
arch_set_irn_register(res, out_reg);
set_ia32_commutative(res);
make_shl:
dbgi = get_irn_dbg_info(node);
block = get_nodes_block(node);
- irg = get_irn_irg(node);
- noreg = ia32_new_NoReg_gp(irg);
- nomem = get_irg_no_mem(irg);
res = new_bd_ia32_Shl(dbgi, block, op1, op2);
arch_set_irn_register(res, out_reg);
goto exchange;
*/
/* pass 1 */
- clear_irp_opcodes_generic_func();
+ ir_clear_opcodes_generic_func();
register_peephole_optimisation(op_ia32_Cmp, peephole_ia32_Cmp);
- register_peephole_optimisation(op_ia32_Cmp8Bit, peephole_ia32_Cmp);
register_peephole_optimisation(op_ia32_Lea, peephole_ia32_Lea);
if (ia32_cg_config.use_short_sex_eax)
register_peephole_optimisation(op_ia32_Conv_I2I, peephole_ia32_Conv_I2I);
be_peephole_opt(irg);
/* pass 2 */
- clear_irp_opcodes_generic_func();
- register_peephole_optimisation(op_ia32_Const, peephole_ia32_Const);
- register_peephole_optimisation(op_be_IncSP, peephole_be_IncSP);
- register_peephole_optimisation(op_ia32_Test, peephole_ia32_Test);
- register_peephole_optimisation(op_ia32_Test8Bit, peephole_ia32_Test);
- register_peephole_optimisation(op_be_Return, peephole_ia32_Return);
+ ir_clear_opcodes_generic_func();
+ register_peephole_optimisation(op_ia32_Const, peephole_ia32_Const);
+ register_peephole_optimisation(op_be_IncSP, peephole_be_IncSP);
+ register_peephole_optimisation(op_ia32_Test, peephole_ia32_Test);
+ register_peephole_optimisation(op_be_Return, peephole_ia32_Return);
be_peephole_opt(irg);
}
static inline void try_kill(ir_node *node)
{
if (get_irn_mode(node) == mode_T) {
- const ir_edge_t *edge, *next;
- foreach_out_edge_safe(node, edge, next) {
+ foreach_out_edge_safe(node, edge) {
ir_node *proj = get_edge_src_irn(edge);
try_kill(proj);
}
ir_mode *conv_mode;
ir_mode *store_mode;
- if (!is_ia32_Store(node) && !is_ia32_Store8Bit(node))
+ if (!is_ia32_Store(node))
return;
- assert((int)n_ia32_Store_val == (int)n_ia32_Store8Bit_val);
pred_proj = get_irn_n(node, n_ia32_Store_val);
if (is_Proj(pred_proj)) {
pred = get_Proj_pred(pred_proj);
} else {
pred = pred_proj;
}
- if (!is_ia32_Conv_I2I(pred) && !is_ia32_Conv_I2I8Bit(pred))
+ if (!is_ia32_Conv_I2I(pred))
return;
if (get_ia32_op_type(pred) != ia32_Normal)
return;
if (get_mode_size_bits(conv_mode) < get_mode_size_bits(store_mode))
return;
+ ir_fprintf(stderr, "Optimisation warning: unoptimized ia32 Store(Conv) (%+F, %+F)\n", node, pred);
set_irn_n(node, n_ia32_Store_val, get_irn_n(pred, n_ia32_Conv_I2I_val));
if (get_irn_n_edges(pred_proj) == 0) {
kill_node(pred_proj);
ir_mode *load_mode;
ir_mode *conv_mode;
- if (!is_ia32_Conv_I2I(node) && !is_ia32_Conv_I2I8Bit(node))
+ if (!is_ia32_Conv_I2I(node))
return;
- assert((int)n_ia32_Conv_I2I_val == (int)n_ia32_Conv_I2I8Bit_val);
pred = get_irn_n(node, n_ia32_Conv_I2I_val);
if (!is_Proj(pred))
return;
}
/* kill the conv */
+ ir_fprintf(stderr, "Optimisation warning: unoptimized ia32 Conv(Load) (%+F, %+F)\n", node, predpred);
exchange(node, pred);
}
int conv_mode_bits;
int pred_mode_bits;
- if (!is_ia32_Conv_I2I(node) && !is_ia32_Conv_I2I8Bit(node))
+ if (!is_ia32_Conv_I2I(node))
return;
- assert((int)n_ia32_Conv_I2I_val == (int)n_ia32_Conv_I2I8Bit_val);
pred_proj = get_irn_n(node, n_ia32_Conv_I2I_val);
if (is_Proj(pred_proj))
pred = get_Proj_pred(pred_proj);
else
pred = pred_proj;
- if (!is_ia32_Conv_I2I(pred) && !is_ia32_Conv_I2I8Bit(pred))
+ if (!is_ia32_Conv_I2I(pred))
return;
/* we know that after a conv, the upper bits are sign extended
/* Argh:We must change the opcode to 8bit AND copy the register constraints */
if (get_mode_size_bits(conv_mode) == 8) {
const arch_register_req_t **reqs = arch_get_irn_register_reqs_in(node);
- set_irn_op(pred, op_ia32_Conv_I2I8Bit);
+ set_irn_op(pred, op_ia32_Conv_I2I);
arch_set_irn_register_reqs_in(pred, reqs);
}
} else {
/* Argh:We must change the opcode to 8bit AND copy the register constraints */
if (get_mode_size_bits(conv_mode) == 8) {
const arch_register_req_t **reqs = arch_get_irn_register_reqs_in(node);
- set_irn_op(result_conv, op_ia32_Conv_I2I8Bit);
+ set_irn_op(result_conv, op_ia32_Conv_I2I);
arch_set_irn_register_reqs_in(result_conv, reqs);
}
}
}
}
+ ir_fprintf(stderr, "Optimisation warning: unoptimized ia32 Conv(Conv) (%+F, %+F)\n", node, pred);
/* Some user (like Phis) won't be happy if we change the mode. */
set_irn_mode(result_conv, get_irn_mode(node));
projects / libfirm / blobdiff