X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched.c;h=4a14efc8a13e2b82540d1e8b127475cbe1492f86;hb=335c4762b4ac75793f3614d01c197a5289b4a946;hp=4256936ac75f18cc9c464bc63c17c5a5a39944d7;hpb=93dcf9f29548c6f5036cdeb9cf5c60f4b3ca1e9c;p=libfirm diff --git a/ir/be/besched.c b/ir/be/besched.c index 4256936ac..4a14efc8a 100644 --- a/ir/be/besched.c +++ b/ir/be/besched.c @@ -1,14 +1,22 @@ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#ifdef HAVE_STDLIB_H +# include +#endif #include "impl.h" #include "irprintf.h" #include "irgwalk.h" -#include "irnode.h" +#include "irnode_t.h" +#include "irgraph_t.h" +#include "iredges_t.h" #include "debug.h" +#include "bearch.h" #include "besched_t.h" -#include "besched.h" +#include "beutil.h" #include "belistsched.h" FIRM_IMPL1(sched_get_time_step, int, const ir_node *) @@ -20,6 +28,8 @@ FIRM_IMPL1(sched_first, ir_node *, const ir_node *) FIRM_IMPL1(sched_last, ir_node *, const ir_node *) FIRM_IMPL2(sched_add_after, ir_node *, ir_node *, ir_node *) FIRM_IMPL2(sched_add_before, ir_node *, ir_node *, ir_node *) +FIRM_IMPL2(sched_comes_after, int, const ir_node *, const ir_node *) +FIRM_IMPL1_VOID(sched_remove, ir_node *) size_t sched_irn_data_offset = 0; @@ -28,38 +38,23 @@ static void block_sched_dumper(ir_node *block, void *env) FILE *f = env; const ir_node *curr; - ir_fprintf(f, "%n:\n", block); + ir_fprintf(f, "%+F:\n", block); sched_foreach(block, curr) { - ir_fprintf(f, "\t%n\n", curr); + sched_info_t *info = get_irn_sched_info(curr); + ir_fprintf(f, "\t%6d: %+F\n", info->time_step, curr); } } -void be_sched_dump(FILE *f, const ir_graph *irg) +void be_sched_dump(FILE *f, ir_graph *irg) { - irg_block_walk_graph((ir_graph *) irg, block_sched_dumper, NULL, f); + irg_block_walk_graph(irg, block_sched_dumper, NULL, f); } +/* Init the scheduling stuff. */ void be_sched_init(void) { sched_irn_data_offset = register_additional_node_data(sizeof(sched_info_t)); - firm_dbg_register("be.sched"); -} - -void be_sched_test(void) -{ - int i, n; - struct obstack obst; - - obstack_init(&obst); - - for(i = 0, n = get_irp_n_irgs(); i < n; ++i) { - ir_graph *irg = get_irp_irg(i); - - list_sched(irg, trivial_selector); - be_sched_dump(stdout, irg); - } - - obstack_free(&obst, NULL); + firm_dbg_register("be.sched"); } void sched_renumber(const ir_node *block) @@ -75,7 +70,7 @@ void sched_renumber(const ir_node *block) } } - +/* Verify a schedule. */ int sched_verify(const ir_node *block) { firm_dbg_module_t *dbg_sched = firm_dbg_register("be.sched"); @@ -83,19 +78,30 @@ int sched_verify(const ir_node *block) const ir_node *irn; int i, n; int *save_time_step; + const ir_node **save_nodes; + const ir_edge_t *edge; + pset *scheduled_nodes = pset_new_ptr_default(); + + firm_dbg_set_mask(dbg_sched, -1); /* Count the number of nodes in the schedule. */ n = 0; sched_foreach(block, irn) n++; - save_time_step = malloc(n * sizeof(save_time_step[0])); + if(n <= 0) + return 1; + + save_time_step = xmalloc(n * sizeof(save_time_step[0])); + save_nodes = xmalloc(n * sizeof(save_nodes[0])); i = 0; sched_foreach(block, irn) { sched_info_t *info = get_irn_sched_info(irn); save_time_step[i] = info->time_step; + save_nodes[i] = (ir_node *)irn; info->time_step = i; + pset_insert_ptr(scheduled_nodes, irn); i += 1; } @@ -111,12 +117,13 @@ int sched_verify(const ir_node *block) for(i = 0, n = get_irn_arity(irn); i < n; i++) { ir_node *op = get_irn_n(irn, i); - if(mode_is_datab(get_irn_mode(op)) + if(to_appear_in_schedule(op) + && !is_Phi(irn) && get_nodes_block(op) == block && sched_get_time_step(op) > step) { DBG((dbg_sched, LEVEL_DEFAULT, - "%n is operand of %n but scheduled after", op, irn)); + "%+F: %+F is operand of %+F but scheduled after\n", block, op, irn)); res = 0; } } @@ -126,8 +133,9 @@ int sched_verify(const ir_node *block) for(i = 1; i < n; ++i) { if(save_time_step[i] - save_time_step[i - 1] <= 0) { DBG((dbg_sched, LEVEL_DEFAULT, - "position %d: time step shrinks (from %d to %d)\n", - i, save_time_step[i - 1], save_time_step[i])); + "%+F from %+F(%d) -> %+F(%d) step shrinks from %d -> %d\n", + block, save_nodes[i - 1], i - 1, save_nodes[i], i, + save_time_step[i - 1], save_time_step[i])); res = 0; } } @@ -139,16 +147,30 @@ int sched_verify(const ir_node *block) info->time_step = save_time_step[i++]; } + /* Check for all nodes in the block if they are scheduled. */ + foreach_out_edge(block, edge) { + ir_node *irn = get_edge_src_irn(edge); + if(to_appear_in_schedule(irn) && !pset_find_ptr(scheduled_nodes, irn)) + DBG((dbg_sched, LEVEL_DEFAULT, + "%+F: %+F is in block but not scheduled\n", block, irn)); + } + + del_pset(scheduled_nodes); free(save_time_step); + free((void *) save_nodes); return res; } -static void sched_verify_walker(ir_node *irn, void *data) +/** + * Block-Walker: verify the current block and update the status + */ +static void sched_verify_walker(ir_node *block, void *data) { int *res = data; - *res &= sched_verify(irn); + *res &= sched_verify(block); } +/* Verify the schedules in all blocks of the irg. */ int sched_verify_irg(ir_graph *irg) { int res = 1; @@ -156,3 +178,25 @@ int sched_verify_irg(ir_graph *irg) return res; } + +int sched_skip_cf_predicator(const ir_node *irn, void *data) { + arch_env_t *ae = data; + return arch_irn_classify(ae, irn) == arch_irn_class_branch; +} + +int sched_skip_phi_predicator(const ir_node *irn, void *data) { + return is_Phi(irn); +} + +ir_node *sched_skip(ir_node *from, int forward, sched_predicator_t *predicator, void *data) +{ + const ir_node *bl = get_block(from); + ir_node *curr; + + if (is_Block(from)) + from = forward ? sched_next(from) : sched_prev(from); + + for(curr = from; curr != bl && predicator(curr, data); curr = forward ? sched_next(curr) : sched_prev(curr)); + + return curr; +}