X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firarch.c;h=8f753f089041db943cb77028403f242a4ed4518f;hb=d367066554e7696b8faac47f06c17ba29b0cc040;hp=13273eae9fb3c62c140a17308219e0756ad70c12;hpb=f81ab0197cf9d101d6b17f2b87cd85b6eaa8a529;p=libfirm diff --git a/ir/ir/irarch.c b/ir/ir/irarch.c index 13273eae9..8f753f089 100644 --- a/ir/ir/irarch.c +++ b/ir/ir/irarch.c @@ -24,15 +24,12 @@ * @author Sebastian Hack, Michael Beck * @version $Id$ * - * Implements "Strenght Reduction of Multiplications by Integer Constants" by Youfeng Wu. + * Implements "Strength Reduction of Multiplications by Integer Constants" by Youfeng Wu. * Implements Division and Modulo by Consts from "Hackers Delight", */ #include "config.h" -#ifdef HAVE_STDLIB_H -# include -#endif - +#include #include #include "irnode_t.h" @@ -134,7 +131,7 @@ static int default_evaluate(insn_kind kind, tarval *tv) { * emit a LEA (or an Add) instruction */ static instruction *emit_LEA(mul_env *env, instruction *a, instruction *b, unsigned shift) { - instruction *res = obstack_alloc(&env->obst, sizeof(*res)); + instruction *res = OALLOC(&env->obst, instruction); res->kind = shift > 0 ? LEA : ADD; res->in[0] = a; res->in[1] = b; @@ -148,7 +145,7 @@ static instruction *emit_LEA(mul_env *env, instruction *a, instruction *b, unsig * emit a SHIFT (or an Add or a Zero) instruction */ static instruction *emit_SHIFT(mul_env *env, instruction *a, unsigned shift) { - instruction *res = obstack_alloc(&env->obst, sizeof(*res)); + instruction *res = OALLOC(&env->obst, instruction); if (shift == env->bits) { /* a 2^bits with bits resolution is a zero */ res->kind = ZERO; @@ -175,7 +172,7 @@ static instruction *emit_SHIFT(mul_env *env, instruction *a, unsigned shift) { * emit a SUB instruction */ static instruction *emit_SUB(mul_env *env, instruction *a, instruction *b) { - instruction *res = obstack_alloc(&env->obst, sizeof(*res)); + instruction *res = OALLOC(&env->obst, instruction); res->kind = SUB; res->in[0] = a; res->in[1] = b; @@ -189,7 +186,7 @@ static instruction *emit_SUB(mul_env *env, instruction *a, instruction *b) { * emit the ROOT instruction */ static instruction *emit_ROOT(mul_env *env, ir_node *root_op) { - instruction *res = obstack_alloc(&env->obst, sizeof(*res)); + instruction *res = OALLOC(&env->obst, instruction); res->kind = ROOT; res->in[0] = NULL; res->in[1] = NULL; @@ -448,23 +445,23 @@ static ir_node *build_graph(mul_env *env, instruction *inst) { case LEA: l = build_graph(env, inst->in[0]); r = build_graph(env, inst->in[1]); - c = new_Const(env->shf_mode, new_tarval_from_long(inst->shift_count, env->shf_mode)); - r = new_rd_Shl(env->dbg, current_ir_graph, env->blk, r, c, env->mode); - return inst->irn = new_rd_Add(env->dbg, current_ir_graph, env->blk, l, r, env->mode); + c = new_Const_long(env->shf_mode, inst->shift_count); + r = new_rd_Shl(env->dbg, env->blk, r, c, env->mode); + return inst->irn = new_rd_Add(env->dbg, env->blk, l, r, env->mode); case SHIFT: l = build_graph(env, inst->in[0]); - c = new_Const(env->shf_mode, new_tarval_from_long(inst->shift_count, env->shf_mode)); - return inst->irn = new_rd_Shl(env->dbg, current_ir_graph, env->blk, l, c, env->mode); + c = new_Const_long(env->shf_mode, inst->shift_count); + return inst->irn = new_rd_Shl(env->dbg, env->blk, l, c, env->mode); case SUB: l = build_graph(env, inst->in[0]); r = build_graph(env, inst->in[1]); - return inst->irn = new_rd_Sub(env->dbg, current_ir_graph, env->blk, l, r, env->mode); + return inst->irn = new_rd_Sub(env->dbg, env->blk, l, r, env->mode); case ADD: l = build_graph(env, inst->in[0]); r = build_graph(env, inst->in[1]); - return inst->irn = new_rd_Add(env->dbg, current_ir_graph, env->blk, l, r, env->mode); + return inst->irn = new_rd_Add(env->dbg, env->blk, l, r, env->mode); case ZERO: - return inst->irn = new_Const(env->mode, get_mode_null(env->mode)); + return inst->irn = new_Const(get_mode_null(env->mode)); default: panic("Unsupported instruction kind"); return NULL; @@ -506,6 +503,9 @@ static int evaluate_insn(mul_env *env, instruction *inst) { case ZERO: inst->costs = costs = env->evaluate(inst->kind, NULL); return costs; + case MUL: + case ROOT: + break; } panic("Unsupported instruction kind"); } @@ -559,42 +559,50 @@ static ir_node *do_decomposition(ir_node *irn, ir_node *operand, tarval *tv) { /* Replace Muls with Shifts and Add/Subs. */ ir_node *arch_dep_replace_mul_with_shifts(ir_node *irn) { - ir_node *res = irn; + ir_graph *irg; + ir_node *res = irn; ir_mode *mode = get_irn_mode(irn); + ir_node *left; + ir_node *right; + ir_node *operand; + tarval *tv; + /* If the architecture dependent optimizations were not initialized or this optimization was not enabled. */ if (params == NULL || (opts & arch_dep_mul_to_shift) == 0) return irn; - set_arch_dep_running(1); - { - if (is_Mul(irn) && mode_is_int(mode)) { - ir_node *left = get_binop_left(irn); - ir_node *right = get_binop_right(irn); - tarval *tv = NULL; - ir_node *operand = NULL; - - /* Look, if one operand is a constant. */ - if (is_Const(left)) { - tv = get_Const_tarval(left); - operand = right; - } else if (is_Const(right)) { - tv = get_Const_tarval(right); - operand = left; - } + if (!is_Mul(irn) || !mode_is_int(mode)) + return res; + + /* we should never do the reverse transformations again + (like x+x -> 2*x) */ + irg = get_irn_irg(irn); + set_irg_state(irg, IR_GRAPH_STATE_ARCH_DEP); + + left = get_binop_left(irn); + right = get_binop_right(irn); + tv = NULL; + operand = NULL; + + /* Look, if one operand is a constant. */ + if (is_Const(left)) { + tv = get_Const_tarval(left); + operand = right; + } else if (is_Const(right)) { + tv = get_Const_tarval(right); + operand = left; + } - if (tv != NULL) { - res = do_decomposition(irn, operand, tv); + if (tv != NULL) { + res = do_decomposition(irn, operand, tv); - if (res != irn) { - hook_arch_dep_replace_mul_with_shifts(irn); - exchange(irn, res); - } - } + if (res != irn) { + hook_arch_dep_replace_mul_with_shifts(irn); + exchange(irn, res); } } - //set_arch_dep_running(0); return res; } @@ -822,53 +830,53 @@ static ir_node *replace_div_by_mulh(ir_node *div, tarval *tv) { struct ms mag = magic(tv); /* generate the Mulh instruction */ - c = new_Const(mode, mag.M); - q = new_rd_Mulh(dbg, current_ir_graph, block, n, c, mode); + c = new_Const(mag.M); + q = new_rd_Mulh(dbg, block, n, c, mode); /* do we need an Add or Sub */ if (mag.need_add) - q = new_rd_Add(dbg, current_ir_graph, block, q, n, mode); + q = new_rd_Add(dbg, block, q, n, mode); else if (mag.need_sub) - q = new_rd_Sub(dbg, current_ir_graph, block, q, n, mode); + q = new_rd_Sub(dbg, block, q, n, mode); /* Do we need the shift */ if (mag.s > 0) { - c = new_r_Const_long(current_ir_graph, mode_Iu, mag.s); - q = new_rd_Shrs(dbg, current_ir_graph, block, q, c, mode); + c = new_Const_long(mode_Iu, mag.s); + q = new_rd_Shrs(dbg, block, q, c, mode); } /* final */ - c = new_r_Const_long(current_ir_graph, mode_Iu, bits-1); - t = new_rd_Shr(dbg, current_ir_graph, block, q, c, mode); + c = new_Const_long(mode_Iu, bits - 1); + t = new_rd_Shr(dbg, block, q, c, mode); - q = new_rd_Add(dbg, current_ir_graph, block, q, t, mode); + q = new_rd_Add(dbg, block, q, t, mode); } else { struct mu mag = magicu(tv); ir_node *c; /* generate the Mulh instruction */ - c = new_Const(mode, mag.M); - q = new_rd_Mulh(dbg, current_ir_graph, block, n, c, mode); + c = new_Const(mag.M); + q = new_rd_Mulh(dbg, block, n, c, mode); if (mag.need_add) { if (mag.s > 0) { /* use the GM scheme */ - t = new_rd_Sub(dbg, current_ir_graph, block, n, q, mode); + t = new_rd_Sub(dbg, block, n, q, mode); - c = new_Const(mode_Iu, get_mode_one(mode_Iu)); - t = new_rd_Shr(dbg, current_ir_graph, block, t, c, mode); + c = new_Const(get_mode_one(mode_Iu)); + t = new_rd_Shr(dbg, block, t, c, mode); - t = new_rd_Add(dbg, current_ir_graph, block, t, q, mode); + t = new_rd_Add(dbg, block, t, q, mode); - c = new_r_Const_long(current_ir_graph, mode_Iu, mag.s-1); - q = new_rd_Shr(dbg, current_ir_graph, block, t, c, mode); + c = new_Const_long(mode_Iu, mag.s - 1); + q = new_rd_Shr(dbg, block, t, c, mode); } else { /* use the default scheme */ - q = new_rd_Add(dbg, current_ir_graph, block, q, n, mode); + q = new_rd_Add(dbg, block, q, n, mode); } } else if (mag.s > 0) { /* default scheme, shift needed */ - c = new_r_Const_long(current_ir_graph, mode_Iu, mag.s); - q = new_rd_Shr(dbg, current_ir_graph, block, q, c, mode); + c = new_Const_long(mode_Iu, mag.s); + q = new_rd_Shr(dbg, block, q, c, mode); } } return q; @@ -928,34 +936,34 @@ ir_node *arch_dep_replace_div_by_const(ir_node *irn) { ir_node *curr = left; /* create the correction code for signed values only if there might be a remainder */ - if (! is_Div_remainderless(irn)) { + if (! get_Div_no_remainder(irn)) { if (k != 1) { - k_node = new_r_Const_long(current_ir_graph, mode_Iu, k - 1); - curr = new_rd_Shrs(dbg, current_ir_graph, block, left, k_node, mode); + k_node = new_Const_long(mode_Iu, k - 1); + curr = new_rd_Shrs(dbg, block, left, k_node, mode); } - k_node = new_r_Const_long(current_ir_graph, mode_Iu, bits - k); - curr = new_rd_Shr(dbg, current_ir_graph, block, curr, k_node, mode); + k_node = new_Const_long(mode_Iu, bits - k); + curr = new_rd_Shr(dbg, block, curr, k_node, mode); - curr = new_rd_Add(dbg, current_ir_graph, block, left, curr, mode); + curr = new_rd_Add(dbg, block, left, curr, mode); } else { k_node = left; } - k_node = new_r_Const_long(current_ir_graph, mode_Iu, k); - res = new_rd_Shrs(dbg, current_ir_graph, block, curr, k_node, mode); + k_node = new_Const_long(mode_Iu, k); + res = new_rd_Shrs(dbg, block, curr, k_node, mode); if (n_flag) { /* negate the result */ ir_node *k_node; - k_node = new_Const(mode, get_mode_null(mode)); - res = new_rd_Sub(dbg, current_ir_graph, block, k_node, res, mode); + k_node = new_Const(get_mode_null(mode)); + res = new_rd_Sub(dbg, block, k_node, res, mode); } } else { /* unsigned case */ ir_node *k_node; - k_node = new_r_Const_long(current_ir_graph, mode_Iu, k); - res = new_rd_Shr(dbg, current_ir_graph, block, left, k_node, mode); + k_node = new_Const_long(mode_Iu, k); + res = new_rd_Shr(dbg, block, left, k_node, mode); } } else { /* other constant */ @@ -1024,35 +1032,35 @@ ir_node *arch_dep_replace_mod_by_const(ir_node *irn) { ir_node *curr = left; if (k != 1) { - k_node = new_r_Const_long(current_ir_graph, mode_Iu, k - 1); - curr = new_rd_Shrs(dbg, current_ir_graph, block, left, k_node, mode); + k_node = new_Const_long(mode_Iu, k - 1); + curr = new_rd_Shrs(dbg, block, left, k_node, mode); } - k_node = new_r_Const_long(current_ir_graph, mode_Iu, bits - k); - curr = new_rd_Shr(dbg, current_ir_graph, block, curr, k_node, mode); + k_node = new_Const_long(mode_Iu, bits - k); + curr = new_rd_Shr(dbg, block, curr, k_node, mode); - curr = new_rd_Add(dbg, current_ir_graph, block, left, curr, mode); + curr = new_rd_Add(dbg, block, left, curr, mode); - k_node = new_r_Const_long(current_ir_graph, mode, (-1) << k); - curr = new_rd_And(dbg, current_ir_graph, block, curr, k_node, mode); + k_node = new_Const_long(mode, (-1) << k); + curr = new_rd_And(dbg, block, curr, k_node, mode); - res = new_rd_Sub(dbg, current_ir_graph, block, left, curr, mode); + res = new_rd_Sub(dbg, block, left, curr, mode); } else { /* unsigned case */ ir_node *k_node; - k_node = new_r_Const_long(current_ir_graph, mode, (1 << k) - 1); - res = new_rd_And(dbg, current_ir_graph, block, left, k_node, mode); + k_node = new_Const_long(mode, (1 << k) - 1); + res = new_rd_And(dbg, block, left, k_node, mode); } } else { /* other constant */ if (allow_Mulh(mode)) { res = replace_div_by_mulh(irn, tv); - res = new_rd_Mul(dbg, current_ir_graph, block, res, c, mode); + res = new_rd_Mul(dbg, block, res, c, mode); /* res = arch_dep_mul_to_shift(res); */ - res = new_rd_Sub(dbg, current_ir_graph, block, left, res, mode); + res = new_rd_Sub(dbg, block, left, res, mode); } } } @@ -1118,38 +1126,38 @@ void arch_dep_replace_divmod_by_const(ir_node **div, ir_node **mod, ir_node *irn ir_node *curr = left; if (k != 1) { - k_node = new_r_Const_long(current_ir_graph, mode_Iu, k - 1); - curr = new_rd_Shrs(dbg, current_ir_graph, block, left, k_node, mode); + k_node = new_Const_long(mode_Iu, k - 1); + curr = new_rd_Shrs(dbg, block, left, k_node, mode); } - k_node = new_r_Const_long(current_ir_graph, mode_Iu, bits - k); - curr = new_rd_Shr(dbg, current_ir_graph, block, curr, k_node, mode); + k_node = new_Const_long(mode_Iu, bits - k); + curr = new_rd_Shr(dbg, block, curr, k_node, mode); - curr = new_rd_Add(dbg, current_ir_graph, block, left, curr, mode); + curr = new_rd_Add(dbg, block, left, curr, mode); - c_k = new_r_Const_long(current_ir_graph, mode_Iu, k); + c_k = new_Const_long(mode_Iu, k); - *div = new_rd_Shrs(dbg, current_ir_graph, block, curr, c_k, mode); + *div = new_rd_Shrs(dbg, block, curr, c_k, mode); if (n_flag) { /* negate the div result */ ir_node *k_node; - k_node = new_Const(mode, get_mode_null(mode)); - *div = new_rd_Sub(dbg, current_ir_graph, block, k_node, *div, mode); + k_node = new_Const(get_mode_null(mode)); + *div = new_rd_Sub(dbg, block, k_node, *div, mode); } - k_node = new_r_Const_long(current_ir_graph, mode, (-1) << k); - curr = new_rd_And(dbg, current_ir_graph, block, curr, k_node, mode); + k_node = new_Const_long(mode, (-1) << k); + curr = new_rd_And(dbg, block, curr, k_node, mode); - *mod = new_rd_Sub(dbg, current_ir_graph, block, left, curr, mode); + *mod = new_rd_Sub(dbg, block, left, curr, mode); } else { /* unsigned case */ ir_node *k_node; - k_node = new_r_Const_long(current_ir_graph, mode_Iu, k); - *div = new_rd_Shr(dbg, current_ir_graph, block, left, k_node, mode); + k_node = new_Const_long(mode_Iu, k); + *div = new_rd_Shr(dbg, block, left, k_node, mode); - k_node = new_r_Const_long(current_ir_graph, mode, (1 << k) - 1); - *mod = new_rd_And(dbg, current_ir_graph, block, left, k_node, mode); + k_node = new_Const_long(mode, (1 << k) - 1); + *mod = new_rd_And(dbg, block, left, k_node, mode); } } else { /* other constant */ @@ -1158,11 +1166,11 @@ void arch_dep_replace_divmod_by_const(ir_node **div, ir_node **mod, ir_node *irn *div = replace_div_by_mulh(irn, tv); - t = new_rd_Mul(dbg, current_ir_graph, block, *div, c, mode); + t = new_rd_Mul(dbg, block, *div, c, mode); /* t = arch_dep_mul_to_shift(t); */ - *mod = new_rd_Sub(dbg, current_ir_graph, block, left, t, mode); + *mod = new_rd_Sub(dbg, block, left, t, mode); } } }