From 7603e336b06a31379716d1b5ad627087b26de7c8 Mon Sep 17 00:00:00 2001 From: Michael Beck Date: Mon, 26 May 2008 13:50:30 +0000 Subject: [PATCH] use block Phi lists and Block marks to get rid of block_info_t [r19774] --- ir/opt/boolopt.c | 61 ++++++++++++++++-------------------------------- ir/opt/ifconv.c | 57 +++++++++++++------------------------------- 2 files changed, 36 insertions(+), 82 deletions(-) diff --git a/ir/opt/boolopt.c b/ir/opt/boolopt.c index 680a11ec7..a86c4a517 100644 --- a/ir/opt/boolopt.c +++ b/ir/opt/boolopt.c @@ -6,7 +6,7 @@ #include "irgmod.h" #include "irgwalk.h" #include "irprintf.h" -#include "irnode.h" +#include "irnode_t.h" #include "tv.h" typedef struct cond_pair { @@ -225,60 +225,46 @@ static void bool_walk(ir_node *n, void *env) } } -static struct obstack obst; - -typedef struct block_info_t { - ir_node *phi; /**< head of the Phi list */ - int has_pinned; /**< set if the block contains instructions that cannot be - moved */ -} block_info_t; - -static block_info_t* get_block_blockinfo(ir_node* block) -{ - return get_irn_link(block); -} - -static void create_blockinfos(ir_node *node, void *env) +/** + * Walker, clear Block mark and Phi list + */ +static void clear_block_infos(ir_node *node, void *env) { - block_info_t *block_info; (void) env; /* we visit blocks before any other nodes (from the block) */ if (!is_Block(node)) return; - block_info = obstack_alloc(&obst, sizeof(block_info[0])); - memset(block_info, 0, sizeof(block_info[0])); - set_irn_link(node, block_info); + /* clear the PHI list */ + set_Block_phis(node, NULL); + set_Block_mark(node, 0); } +/** + * Walker: collect Phi nodes and update the + */ static void collect_phis(ir_node *node, void *env) { (void) env; if (is_Phi(node)) { - ir_node *block = get_nodes_block(node); - block_info_t *bi = get_block_blockinfo(block); - - set_irn_link(node, bi->phi); - bi->phi = node; + ir_node *block = get_nodes_block(node); + add_Block_phi(block, node); return; } /* Ignore control flow nodes, these will be removed. */ if (get_irn_pinned(node) == op_pin_state_pinned && !is_Block(node) && !is_cfop(node)) { - ir_node *block = get_nodes_block(node); - block_info_t *bi = get_block_blockinfo(block); - - bi->has_pinned = 1; + ir_node *block = get_nodes_block(node); + set_Block_mark(block, 1); } } ir_node *skip_empty_block(ir_node *node) { ir_node *block; - block_info_t *block_info; if(!is_Jmp(node)) return node; @@ -287,8 +273,7 @@ ir_node *skip_empty_block(ir_node *node) if(get_Block_n_cfgpreds(block) != 1) return node; - block_info = get_block_blockinfo(block); - if(block_info->has_pinned) + if(get_Block_mark(block)) return node; return get_Block_cfgpred(block, 0); @@ -320,7 +305,6 @@ restart: ir_node *lower_cf; ir_node *cond; ir_node *cond_selector; - block_info_t *block_info; ir_node *lower_pred; lower_cf = get_Block_cfgpred(block, i); @@ -341,8 +325,7 @@ restart: continue; /* the block must not produce any side-effects */ - block_info = get_block_blockinfo(lower_block); - if(block_info->has_pinned) + if(get_Block_mark(lower_block)) continue; lower_pred = get_Block_cfgpred_block(lower_block, 0); @@ -436,20 +419,16 @@ void opt_bool(ir_graph *const irg) { irg_walk_graph(irg, NULL, bool_walk, NULL); - set_using_irn_link(irg); + set_using_block_mark(irg); - obstack_init(&obst); - - irg_walk_graph(irg, create_blockinfos, collect_phis, NULL); + irg_walk_graph(irg, clear_block_infos, collect_phis, NULL); irg_block_walk_graph(irg, NULL, find_cf_and_or_walker, NULL); - obstack_free(&obst, NULL); - set_irg_outs_inconsistent(irg); set_irg_doms_inconsistent(irg); set_irg_extblk_inconsistent(irg); set_irg_loopinfo_inconsistent(irg); - clear_using_irn_link(irg); + clear_using_block_mark(irg); } diff --git a/ir/opt/ifconv.c b/ir/opt/ifconv.c index f47344221..cfd2e04bc 100644 --- a/ir/opt/ifconv.c +++ b/ir/opt/ifconv.c @@ -66,25 +66,11 @@ static const ir_settings_if_conv_t default_info = { default_allow_ifconv }; -/** - * Additional block info. - */ -typedef struct block_info { - ir_node *phi; /**< head of the Phi list */ - int has_pinned; /**< set if the block contains instructions that cannot be moved */ -} block_info; - -/** Returns the additional block info of a block. */ -static INLINE block_info* get_block_blockinfo(const ir_node* block) { - return get_irn_link(block); -} - - /** * Returns non-zero if a Block can be emptied. */ static int can_empty_block(ir_node *block) { - return !get_block_blockinfo(block)->has_pinned; + return !get_Block_mark(block); } @@ -195,7 +181,7 @@ static void split_block(ir_node* block, int i, int j) NEW_ARR_A(ir_node*, ins, arity + 1); - for (phi = get_block_blockinfo(block)->phi; phi != NULL; phi = get_irn_link(phi)) { + for (phi = get_Block_phis(block); phi != NULL; phi = get_Phi_next(phi)) { ir_node* copy = copy_to(get_irn_n(phi, i), pred_block, j); for (k = 0; k < i; ++k) ins[k] = get_irn_n(phi, k); @@ -216,7 +202,7 @@ static void split_block(ir_node* block, int i, int j) new_pred_arity = get_irn_arity(pred_block) - 1; NEW_ARR_A(ir_node*, pred_ins, new_pred_arity); - for (phi = get_block_blockinfo(pred_block)->phi; phi != NULL; phi = get_irn_link(phi)) { + for (phi = get_Block_phis(pred_block); phi != NULL; phi = get_Phi_next(phi)) { for (k = 0; k < j; ++k) pred_ins[k] = get_irn_n(phi, k); for (; k < new_pred_arity; ++k) pred_ins[k] = get_irn_n(phi, k + 1); assert(k == new_pred_arity); @@ -266,7 +252,7 @@ static void if_conv_walker(ir_node* block, void* env) int i; /* Bail out, if there are no Phis at all */ - if (get_block_blockinfo(block)->phi == NULL) return; + if (get_Block_phis(block) == NULL) return; restart: arity = get_irn_arity(block); @@ -305,7 +291,7 @@ restart: if (projx1 == NULL) continue; - phi = get_block_blockinfo(block)->phi; + phi = get_Block_phis(block); if (!opt_info->allow_ifconv(get_Cond_selector(cond), phi, i, j)) continue; DB((dbg, LEVEL_1, "Found Cond %+F with proj %+F and %+F\n", @@ -348,7 +334,7 @@ restart: DB((dbg, LEVEL_2, "Generating %+F for %+F\n", psi, phi)); } - next_phi = get_irn_link(phi); + next_phi = get_Phi_next(phi); if (arity == 2) { exchange(phi, psi); @@ -366,7 +352,7 @@ restart: #if 1 DB((dbg, LEVEL_1, "Welding block %+F and %+F\n", block, psi_block)); /* copy the block-info from the Psi-block to the block before merging */ - get_block_blockinfo(psi_block)->has_pinned |= get_block_blockinfo(block)->has_pinned; + set_Block_mark(psi_block, get_Block_mark(psi_block) | get_Block_mark(block)); set_irn_link(block, get_irn_link(psi_block)); set_irn_in(block, get_irn_arity(psi_block), get_irn_in(psi_block) + 1); @@ -374,7 +360,7 @@ restart: exchange(psi_block, block); #else DB((dbg, LEVEL_1, "Welding block %+F to %+F\n", block, psi_block)); - get_block_blockinfo(psi_block)->has_pinned |= get_block_blockinfo(block)->has_pinned; + set_Block_mark(psi_block, get_Block_mark(psi_block) | get_Block_mark(block)); exchange(block, psi_block); #endif return; @@ -388,16 +374,12 @@ restart: } /** - * Block walker: add additional data + * Block walker: clear block mark and Phi list */ static void init_block_link(ir_node *block, void *env) { - struct obstack *obst = env; - block_info *bi = obstack_alloc(obst, sizeof(*bi)); - - bi->phi = NULL; - bi->has_pinned = 0; - set_irn_link(block, bi); + set_Block_mark(block, 0); + set_Block_phis(block, NULL); } @@ -410,10 +392,8 @@ static void collect_phis(ir_node *node, void *env) { if (is_Phi(node)) { ir_node *block = get_nodes_block(node); - block_info *bi = get_block_blockinfo(block); - set_irn_link(node, bi->phi); - bi->phi = node; + add_Block_phi(block, node); } else { if (is_no_Block(node) && get_irn_pinned(node) == op_pin_state_pinned) { /* @@ -422,10 +402,9 @@ static void collect_phis(ir_node *node, void *env) { */ if (!is_cfop(node)) { ir_node *block = get_nodes_block(node); - block_info *bi = get_block_blockinfo(block); DB((dbg, LEVEL_2, "Node %+F in block %+F is unmovable\n", node, block)); - bi->has_pinned = 1; + set_Block_mark(block, 1); } } } @@ -540,7 +519,6 @@ static void optimise_psis_1(ir_node* psi, void* env) void opt_if_conv(ir_graph *irg, const ir_settings_if_conv_t *params) { - struct obstack obst; ir_settings_if_conv_t p; /* get the parameters */ @@ -556,14 +534,13 @@ void opt_if_conv(ir_graph *irg, const ir_settings_if_conv_t *params) compute_cdep(irg); assure_doms(irg); - set_using_irn_link(irg); + set_using_block_mark(irg); - obstack_init(&obst); - irg_block_walk_graph(irg, init_block_link, NULL, &obst); + irg_block_walk_graph(irg, init_block_link, NULL, NULL); irg_walk_graph(irg, collect_phis, NULL, NULL); irg_block_walk_graph(irg, NULL, if_conv_walker, &p); - clear_using_irn_link(irg); + clear_using_block_mark(irg); local_optimize_graph(irg); @@ -572,8 +549,6 @@ void opt_if_conv(ir_graph *irg, const ir_settings_if_conv_t *params) irg_walk_graph(irg, NULL, optimise_psis_1, NULL); #endif - obstack_free(&obst, NULL); - /* TODO: graph might be changed, handle more graceful */ set_irg_outs_inconsistent(irg); set_irg_extblk_inconsistent(irg); -- 2.20.1