X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeloopana.c;h=8c05a5d2a81d63751c9e0c85f12b636cd6af624c;hb=7fc5212efdd0faf06fed3850760ca319bdc66afc;hp=6b7ee74eec75d08b327ab97a703caf6279339b2b;hpb=69849fc8fe452350bfbd2ad67f1898147fc906b4;p=libfirm diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c index 6b7ee74ee..8c05a5d2a 100644 --- a/ir/be/beloopana.c +++ b/ir/be/beloopana.c @@ -44,21 +44,21 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL); #define HASH_LOOP_INFO(info) (HASH_PTR((info)->loop) ^ HASH_PTR((info)->cls)) -typedef struct _be_loop_info_t { +typedef struct be_loop_info_t { ir_loop *loop; const arch_register_class_t *cls; unsigned max_pressure; } be_loop_info_t; -struct _be_loopana_t { +struct be_loopana_t { set *data; - be_irg_t *birg; + ir_graph *irg; }; static int cmp_loop_info(const void *a, const void *b, size_t size) { - const be_loop_info_t *i1 = a; - const be_loop_info_t *i2 = b; + const be_loop_info_t *i1 = (const be_loop_info_t*)a; + const be_loop_info_t *i2 = (const be_loop_info_t*)b; (void) size; return ! (i1->loop == i2->loop && i1->cls == i2->cls); @@ -66,15 +66,16 @@ static int cmp_loop_info(const void *a, const void *b, size_t size) /** * Compute the highest register pressure in a block. - * @param birg The graph. + * @param irg The graph. * @param block The block to compute pressure for. * @param cls The register class to compute pressure for. * @return The highest register pressure in the given block. */ -static unsigned be_compute_block_pressure(const be_irg_t *birg, - ir_node *block, const arch_register_class_t *cls) +static unsigned be_compute_block_pressure(const ir_graph *irg, + ir_node *block, + const arch_register_class_t *cls) { - be_lv_t *lv = be_get_irg_liveness(birg->irg); + be_lv_t *lv = be_get_irg_liveness(irg); ir_nodeset_t live_nodes; ir_node *irn; int max_live; @@ -110,7 +111,8 @@ static unsigned be_compute_block_pressure(const be_irg_t *birg, * @param cls The register class to compute pressure for. * @return The highest register pressure in the given loop. */ -static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop, const arch_register_class_t *cls) +static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop, + const arch_register_class_t *cls) { int i, max; unsigned pressure; @@ -126,7 +128,7 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop, loop_element elem = get_loop_element(loop, i); if (*elem.kind == k_ir_node) - son_pressure = be_compute_block_pressure(loop_ana->birg, elem.node, cls); + son_pressure = be_compute_block_pressure(loop_ana->irg, elem.node, cls); else { assert(*elem.kind == k_ir_loop); son_pressure = be_compute_loop_pressure(loop_ana, elem.son, cls); @@ -140,26 +142,25 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop, key.loop = loop; key.cls = cls; key.max_pressure = 0; - entry = set_insert(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key)); + entry = (be_loop_info_t*)set_insert(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key)); entry->max_pressure = MAX(entry->max_pressure, pressure); return pressure; } /** - * Compute the register pressure for a class of all loops in the birg. - * @param birg The backend irg object + * Compute the register pressure for a class of all loops in a graph + * @param irg The graph * @param cls The register class to compute the pressure for * @return The loop analysis object. */ -be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg, +be_loopana_t *be_new_loop_pressure_cls(ir_graph *irg, const arch_register_class_t *cls) { - ir_graph *irg = be_get_birg_irg(birg); be_loopana_t *loop_ana = XMALLOC(be_loopana_t); loop_ana->data = new_set(cmp_loop_info, 16); - loop_ana->birg = birg; + loop_ana->irg = irg; DBG((dbg, LEVEL_1, "\n=====================================================\n", cls->name)); DBG((dbg, LEVEL_1, " Computing register pressure for class %s:\n", cls->name)); @@ -176,21 +177,20 @@ be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg, } /** - * Compute the register pressure for all classes of all loops in the birg. - * @param birg The backend irg object + * Compute the register pressure for all classes of all loops in the irg. + * @param irg The graph * @return The loop analysis object. */ -be_loopana_t *be_new_loop_pressure(be_irg_t *birg, +be_loopana_t *be_new_loop_pressure(ir_graph *irg, const arch_register_class_t *cls) { - ir_graph *irg = be_get_birg_irg(birg); be_loopana_t *loop_ana = XMALLOC(be_loopana_t); ir_loop *irg_loop = get_irg_loop(irg); const arch_env_t *arch_env = be_get_irg_arch_env(irg); int i; loop_ana->data = new_set(cmp_loop_info, 16); - loop_ana->birg = birg; + loop_ana->irg = irg; /* construct control flow loop tree */ if (! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) { @@ -200,8 +200,8 @@ be_loopana_t *be_new_loop_pressure(be_irg_t *birg, if (cls != NULL) { be_compute_loop_pressure(loop_ana, irg_loop, cls); } else { - for (i = arch_env_get_n_reg_class(arch_env) - 1; i >= 0; --i) { - const arch_register_class_t *cls = arch_env_get_reg_class(arch_env, i); + for (i = arch_env->n_register_classes - 1; i >= 0; --i) { + const arch_register_class_t *cls = &arch_env->register_classes[i]; DBG((dbg, LEVEL_1, "\n=====================================================\n", cls->name)); DBG((dbg, LEVEL_1, " Computing register pressure for class %s:\n", cls->name)); DBG((dbg, LEVEL_1, "=====================================================\n", cls->name)); @@ -225,7 +225,7 @@ unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_ key.loop = loop; key.cls = cls; - entry = set_find(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key)); + entry = (be_loop_info_t*)set_find(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key)); if (entry) pressure = entry->max_pressure;