#include "debug.h"
#include "irpass.h"
-//#define NEW_REASSOC
-
DEBUG_ONLY(static firm_dbg_module_t *dbg;)
-typedef struct walker_t {
- int changes; /**< set, if a reassociation take place */
- ir_graph *irg;
- waitq *wq; /**< a wait queue */
-} walker_t;
-
typedef enum {
NO_CONSTANT = 0, /**< node is not constant */
REAL_CONSTANT = 1, /**< node is a Const that is suitable for constant folding */
return m1;
} /* get_mode_from_ops */
-#ifndef NEW_REASSOC
-
/**
* reassociate a commutative Binop
*
return 0;
} /* reassoc_commutative */
-#else
-
-static ir_op *commutative_op;
-static ir_node *commutative_block;
-static struct obstack commutative_args;
-
-static void collect_args(ir_node *node)
-{
- ir_node *left = get_binop_left(node);
- ir_node *right = get_binop_right(node);
-
- if (get_irn_op(left) == commutative_op
- && (!get_irn_outs_computed(left) || get_irn_n_outs(left) == 1)) {
- collect_args(left);
- } else {
- obstack_ptr_grow(&commutative_args, left);
- }
-
- if (get_irn_op(right) == commutative_op
- && (!get_irn_outs_computed(right) || get_irn_n_outs(right) == 1)) {
- collect_args(right);
- } else {
- obstack_ptr_grow(&commutative_args, right);
- }
-
-#ifndef NDEBUG
- {
- ir_mode *mode = get_irn_mode(node);
- if (is_Add(node) && mode_is_reference(mode)) {
- assert(get_irn_mode(left) == mode || get_irn_mode(right) == mode);
- } else {
- assert(get_irn_mode(left) == mode);
- assert(get_irn_mode(right) == mode);
- }
- }
-#endif
-}
-
-static int compare_nodes(const ir_node *node1, const ir_node *node2)
-{
- const_class_t class1 = get_const_class(node1, commutative_block);
- const_class_t class2 = get_const_class(node2, commutative_block);
-
- if (class1 == class2)
- return 0;
- // return get_irn_idx(node1) - get_irn_idx(node2);
-
- if (class1 < class2)
- return -1;
-
- assert(class1 > class2);
- return 1;
-}
-
-static int compare_node_ptr(const void *e1, const void *e2)
-{
- const ir_node *node1 = *((const ir_node *const*) e1);
- const ir_node *node2 = *((const ir_node *const*) e2);
- return compare_nodes(node1, node2);
-}
-
-static int reassoc_commutative(ir_node **n)
-{
- int i;
- int n_args;
- ir_node *last;
- ir_node **args;
- ir_mode *mode;
- ir_node *node = *n;
-
- commutative_op = get_irn_op(node);
- commutative_block = get_nodes_block(node);
-
- /* collect all nodes with same op type */
- collect_args(node);
-
- n_args = obstack_object_size(&commutative_args) / sizeof(ir_node*);
- args = obstack_finish(&commutative_args);
-
- /* shortcut: in most cases there's nothing to do */
- if (n_args == 2 && compare_nodes(args[0], args[1]) <= 0) {
- obstack_free(&commutative_args, args);
- return 0;
- }
-
- /* sort the arguments */
- qsort(args, n_args, sizeof(ir_node*), compare_node_ptr);
-
- /* build new tree */
- last = args[n_args-1];
- mode = get_irn_mode(last);
- for (i = n_args-2; i >= 0; --i) {
- ir_mode *mode_right;
- ir_node *new_node;
- ir_node *in[2];
- ir_graph *irg = get_irn_irg(last);
-
- in[0] = last;
- in[1] = args[i];
-
- /* AddP violates the assumption that all modes in args are equal...
- * we need some hacks to cope with this */
- mode_right = get_irn_mode(in[1]);
- if (mode_is_reference(mode_right)) {
- assert(is_Add(node) && mode_is_reference(get_irn_mode(node)));
- mode = get_irn_mode(in[1]);
- }
- if (mode_right != mode) {
- assert(is_Add(node) && mode_is_reference(get_irn_mode(node)));
- in[1] = new_r_Conv(irg, commutative_block,in[1], mode);
- }
-
- /* TODO: produce useful debug info! */
- new_node = new_ir_node(NULL, irg, commutative_block,
- commutative_op, mode, 2, in);
- new_node = optimize_node(new_node);
- last = new_node;
- }
-
- /* CSE often returns the old node again, only exchange if needed */
- if (last != node) {
- exchange(node, last);
- *n = last;
- return 1;
- }
- return 0;
-}
-
-#endif
-
#define reassoc_Add reassoc_commutative
#define reassoc_And reassoc_commutative
#define reassoc_Or reassoc_commutative
*/
static void wq_walker(ir_node *n, void *env)
{
- walker_t *wenv = (walker_t*)env;
+ waitq *const wq = (waitq*)env;
set_irn_link(n, NULL);
if (!is_Block(n)) {
- waitq_put(wenv->wq, n);
- set_irn_link(n, wenv->wq);
+ waitq_put(wq, n);
+ set_irn_link(n, wq);
}
} /* wq_walker */
/**
* The walker for the reassociation.
*/
-static void do_reassociation(walker_t *wenv)
+static void do_reassociation(waitq *const wq)
{
int i, res, changed;
ir_node *n;
- while (! waitq_empty(wenv->wq)) {
- n = (ir_node*)waitq_get(wenv->wq);
+ while (! waitq_empty(wq)) {
+ n = (ir_node*)waitq_get(wq);
set_irn_link(n, NULL);
hook_reassociate(1);
res = 0;
/* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */
- if (mode_is_float(mode) && get_irg_fp_model(wenv->irg) & fp_strict_algebraic)
+ if (mode_is_float(mode) && get_irg_fp_model(get_irn_irg(n)) & fp_strict_algebraic)
break;
if (op->ops.reassociate) {
} while (res == 1);
hook_reassociate(0);
- wenv->changes |= changed;
-
if (changed) {
for (i = get_irn_arity(n) - 1; i >= 0; --i) {
ir_node *pred = get_irn_n(n, i);
- if (get_irn_link(pred) != wenv->wq) {
- waitq_put(wenv->wq, pred);
- set_irn_link(pred, wenv->wq);
+ if (get_irn_link(pred) != wq) {
+ waitq_put(wq, pred);
+ set_irn_link(pred, wq);
}
}
}
*/
static int is_constant_expr(ir_node *irn)
{
- ir_op *op;
-
switch (get_irn_opcode(irn)) {
case iro_Const:
case iro_SymConst:
return 1;
- case iro_Add:
- op = get_irn_op(get_Add_left(irn));
- if (op != op_Const && op != op_SymConst)
+
+ case iro_Add: {
+ ir_node *const l = get_Add_left(irn);
+ if (!is_Const(l) && !is_SymConst(l))
return 0;
- op = get_irn_op(get_Add_right(irn));
- if (op != op_Const && op != op_SymConst)
+ ir_node *const r = get_Add_right(irn);
+ if (!is_Const(r) && !is_SymConst(r))
return 0;
return 1;
+ }
+
default:
return 0;
}
*/
static void reverse_rules(ir_node *node, void *env)
{
- walker_t *wenv = (walker_t*)env;
+ (void)env;
+
ir_graph *irg = get_irn_irg(node);
ir_mode *mode = get_irn_mode(node);
int res;
res = 0;
if (is_op_commutative(op)) {
- wenv->changes |= res = move_consts_up(&node);
+ res = move_consts_up(&node);
}
/* beware: move_consts_up might have changed the opcode, check again */
if (is_Add(node) || is_Sub(node)) {
- wenv->changes |= res = reverse_rule_distributive(&node);
+ res = reverse_rule_distributive(&node);
}
} while (res);
}
/*
* do the reassociation
*/
-int optimize_reassociation(ir_graph *irg)
+void optimize_reassociation(ir_graph *irg)
{
- walker_t env;
-
assert(get_irg_phase_state(irg) != phase_building);
assert(get_irg_pinned(irg) != op_pin_state_floats &&
"Reassociation needs pinned graph to work properly");
- /* we use dominance to detect dead blocks */
- assure_doms(irg);
-
-#ifdef NEW_REASSOC
- assure_irg_outs(irg);
- obstack_init(&commutative_args);
-#endif
-
- /*
- * Calculate loop info, so we could identify loop-invariant
- * code and treat it like a constant.
- */
- assure_loopinfo(irg);
+ assure_irg_properties(irg,
+ IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE
+ | IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO);
- env.changes = 0;
- env.irg = irg;
- env.wq = new_waitq();
+ waitq *const wq = new_waitq();
/* disable some optimizations while reassoc is running to prevent endless loops */
set_reassoc_running(1);
{
/* now we have collected enough information, optimize */
- irg_walk_graph(irg, NULL, wq_walker, &env);
- do_reassociation(&env);
+ irg_walk_graph(irg, NULL, wq_walker, wq);
+ do_reassociation(wq);
/* reverse those rules that do not result in collapsed constants */
- irg_walk_graph(irg, NULL, reverse_rules, &env);
+ irg_walk_graph(irg, NULL, reverse_rules, NULL);
}
set_reassoc_running(0);
-#ifdef NEW_REASSOC
- obstack_free(&commutative_args, NULL);
-#endif
+ del_waitq(wq);
- del_waitq(env.wq);
- return env.changes;
+ confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_CONTROL_FLOW);
} /* optimize_reassociation */
/* create a pass for the reassociation */
ir_graph_pass_t *optimize_reassociation_pass(const char *name)
{
- return def_graph_pass_ret(name ? name : "reassoc", optimize_reassociation);
+ return def_graph_pass(name ? name : "reassoc", optimize_reassociation);
} /* optimize_reassociation_pass */
-/* Sets the default reassociation operation for an ir_op_ops. */
-ir_op_ops *firm_set_default_reassoc(unsigned code, ir_op_ops *ops)
+static void register_node_reassoc_func(ir_op *op, reassociate_func func)
{
-#define CASE(a) case iro_##a: ops->reassociate = reassoc_##a; break
-
- switch (code) {
- CASE(Mul);
- CASE(Add);
- CASE(Sub);
- CASE(And);
- CASE(Or);
- CASE(Eor);
- CASE(Shl);
- default:
- break;
- }
+ op->ops.reassociate = func;
+}
- return ops;
-#undef CASE
-} /* firm_set_default_reassoc */
+void ir_register_reassoc_node_ops(void)
+{
+ register_node_reassoc_func(op_Mul, reassoc_Mul);
+ register_node_reassoc_func(op_Add, reassoc_Add);
+ register_node_reassoc_func(op_Sub, reassoc_Sub);
+ register_node_reassoc_func(op_And, reassoc_And);
+ register_node_reassoc_func(op_Or, reassoc_Or);
+ register_node_reassoc_func(op_Eor, reassoc_Eor);
+ register_node_reassoc_func(op_Shl, reassoc_Shl);
+}
/* initialize the reassociation by adding operations to some opcodes */
void firm_init_reassociation(void)
projects / libfirm / blobdiff