X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeintlive_t.h;h=b471a4179ca86f36607abf44411fb90dd4c42a78;hb=847c1b62a1eae1e8055645996049f7f5db0a0d8b;hp=eae2e3dd903c30786f58b19c9b6719ab490956e1;hpb=fd96240794b2bc719ca2da1e2415ae9cef8d475a;p=libfirm diff --git a/ir/be/beintlive_t.h b/ir/be/beintlive_t.h index eae2e3dd9..b471a4179 100644 --- a/ir/be/beintlive_t.h +++ b/ir/be/beintlive_t.h @@ -12,14 +12,10 @@ #ifndef _BELIVECHK_T_H #define _BELIVECHK_T_H -#include "irgraph_t.h" -#include "iredges_t.h" - -#include "statev_t.h" - -#include "beirg.h" #include "besched.h" #include "belive_t.h" +#include "beutil.h" +#include "iredges_t.h" /** * Check dominance of two nodes in the same block. @@ -29,9 +25,8 @@ */ static inline int _value_dominates_intrablock(const ir_node *a, const ir_node *b) { - /* TODO: ? : can be removed?! */ - sched_timestep_t as = sched_is_scheduled(a) ? sched_get_time_step(a) : 0; - sched_timestep_t bs = sched_is_scheduled(b) ? sched_get_time_step(b) : 0; + sched_timestep_t const as = sched_get_time_step(a); + sched_timestep_t const bs = sched_get_time_step(b); return as <= bs; } @@ -43,9 +38,8 @@ static inline int _value_dominates_intrablock(const ir_node *a, const ir_node *b */ static inline int _value_strictly_dominates_intrablock(const ir_node *a, const ir_node *b) { - /* TODO: ? : can be removed?! */ - sched_timestep_t as = sched_is_scheduled(a) ? sched_get_time_step(a) : 0; - sched_timestep_t bs = sched_is_scheduled(b) ? sched_get_time_step(b) : 0; + sched_timestep_t const as = sched_get_time_step(a); + sched_timestep_t const bs = sched_get_time_step(b); return as < bs; } @@ -56,7 +50,7 @@ static inline int _value_strictly_dominates_intrablock(const ir_node *a, const i * @param b The second node. * @return 1 if a dominates b or if a == b, 0 else. */ -static inline int _value_dominates(const ir_node *a, const ir_node *b) +static inline int value_dominates(const ir_node *a, const ir_node *b) { const ir_node *block_a = get_block_const(a); const ir_node *block_b = get_block_const(b); @@ -75,118 +69,49 @@ static inline int _value_dominates(const ir_node *a, const ir_node *b) return _value_dominates_intrablock(a, b); } -/** - * Check, if one value dominates the other. - * The dominance is strict here. - * @param a The first node. - * @param b The second node. - * @return 1 if a dominates b, 0 else. - */ -static inline int _value_strictly_dominates(const ir_node *a, const ir_node *b) -{ - const ir_node *block_a = get_block_const(a); - const ir_node *block_b = get_block_const(b); - - /* - * a and b are not in the same block, - * so dominance is determined by the dominance of the blocks. - */ - if(block_a != block_b) { - return block_dominates(block_a, block_b); - } - - /* - * Dominance is determined by the time steps of the schedule. - */ - return _value_strictly_dominates_intrablock(a, b); -} - /** * Check, if two values interfere. * @param lv Liveness information * @param a The first value. * @param b The second value. - * @return 1, if a and b interfere, 0 if not. + * @return true, if a and b interfere, false if not. */ -static inline int be_values_interfere(const be_lv_t *lv, const ir_node *a, const ir_node *b) +static inline bool be_values_interfere(be_lv_t const *lv, ir_node const *a, ir_node const *b) { - int a2b = _value_dominates(a, b); - int b2a = _value_dominates(b, a); - int res = 0; - - /* - * Adjust a and b so, that a dominates b if - * a dominates b or vice versa. - */ - if(b2a) { - const ir_node *t = a; + if (value_dominates(b, a)) { + /* Adjust a and b so, that a dominates b if + * a dominates b or vice versa. */ + ir_node const *const t = a; a = b; b = t; - a2b = 1; + } else if (!value_dominates(a, b)) { + /* If there is no dominance relation, they do not interfere. */ + return false; } - /* If there is no dominance relation, they do not interfere. */ - if(a2b) { - ir_node *bb = get_nodes_block(b); - - /* - * If a is live end in b's block it is - * live at b's definition (a dominates b) - */ - if(be_is_live_end(lv, bb, a)) { - res = 1; - goto end; - } - - /* - * Look at all usages of a. - * If there's one usage of a in the block of b, then - * we check, if this use is dominated by b, if that's true - * a and b interfere. Note that b must strictly dominate the user, - * since if b is the last user of in the block, b and a do not - * interfere. - * Uses of a not in b's block can be disobeyed, because the - * check for a being live at the end of b's block is already - * performed. - */ - foreach_out_edge(a, edge) { - const ir_node *user = get_edge_src_irn(edge); - if(get_nodes_block(user) == bb && !is_Phi(user) && _value_strictly_dominates(b, user)) { - res = 1; - goto end; - } - } + ir_node *const bb = get_nodes_block(b); + + /* If a is live end in b's block it is + * live at b's definition (a dominates b) */ + if (be_is_live_end(lv, bb, a)) + return true; + + /* Look at all usages of a. + * If there's one usage of a in the block of b, then + * we check, if this use is dominated by b, if that's true + * a and b interfere. Note that b must strictly dominate the user, + * since if b is the last user of in the block, b and a do not + * interfere. + * Uses of a not in b's block can be disobeyed, because the + * check for a being live at the end of b's block is already + * performed. */ + foreach_out_edge(a, edge) { + ir_node const *const user = get_edge_src_irn(edge); + if (get_nodes_block(user) == bb && !is_Phi(user) && _value_strictly_dominates_intrablock(b, user)) + return true; } -end: - return res; + return false; } - - -/** - * Check if a node dominates a use. - * Note that the use of a phi is in its corresponding predecessor. - * @param irn The node. - * @param edge The use. - * @return 1, if @p irn dominates the use @p edge. - */ -static inline int _dominates_use(const ir_node *irn, const ir_edge_t *edge) -{ - ir_node *use = get_edge_src_irn(edge); - - if (is_Phi(use)) { - int pos = get_edge_src_pos(edge); - ir_node *phi_bl = get_nodes_block(use); - ir_node *use_bl = get_Block_cfgpred_block(phi_bl, pos); - ir_node *irn_bl = get_nodes_block(irn); - return block_dominates(irn_bl, use_bl); - } - - return _value_dominates(irn, use); -} - -#define value_dominates(a, b) _value_dominates(a, b) -#define dominates_use(a, e) _dominates_use(a, e) - #endif