projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup irouts
[libfirm]
/
ir
/
ir
/
irpass.c
diff --git
a/ir/ir/irpass.c
b/ir/ir/irpass.c
index
b34e015
..
d9862d5
100644
(file)
--- a/
ir/ir/irpass.c
+++ b/
ir/ir/irpass.c
@@
-21,7
+21,6
@@
* @file
* @brief Manager for optimization passes.
* @author Michael Beck
* @file
* @brief Manager for optimization passes.
* @author Michael Beck
- * @version $Id$
*/
#include "config.h"
*/
#include "config.h"
@@
-32,9
+31,13
@@
#include "irprog_t.h"
#include "irdump.h"
#include "irverify.h"
#include "irprog_t.h"
#include "irdump.h"
#include "irverify.h"
+#include "ircons.h"
#include "xmalloc.h"
#include "xmalloc.h"
-/*Add a graph pass to a graph pass manager. */
+typedef void (*void_pass_func_irg)(ir_graph *irg);
+typedef int (*int_pass_func_irg)(ir_graph *irg);
+typedef void (*void_pass_func)(void);
+
void ir_graph_pass_mgr_add(ir_graph_pass_manager_t *mgr, ir_graph_pass_t *pass)
{
list_add_tail(&pass->list, &mgr->passes);
void ir_graph_pass_mgr_add(ir_graph_pass_manager_t *mgr, ir_graph_pass_t *pass)
{
list_add_tail(&pass->list, &mgr->passes);
@@
-43,7
+46,6
@@
void ir_graph_pass_mgr_add(ir_graph_pass_manager_t *mgr, ir_graph_pass_t *pass)
pass->add_to_mgr(pass->context);
}
pass->add_to_mgr(pass->context);
}
-/* Add an irprog pass to an irprog pass manager. */
void ir_prog_pass_mgr_add(ir_prog_pass_manager_t *mgr, ir_prog_pass_t *pass)
{
list_add_tail(&pass->list, &mgr->passes);
void ir_prog_pass_mgr_add(ir_prog_pass_manager_t *mgr, ir_prog_pass_t *pass)
{
list_add_tail(&pass->list, &mgr->passes);
@@
-58,13
+60,12
@@
void ir_prog_pass_mgr_add(ir_prog_pass_manager_t *mgr, ir_prog_pass_t *pass)
*/
static int run_wrapper(ir_prog *prog, void *ctx)
{
*/
static int run_wrapper(ir_prog *prog, void *ctx)
{
- ir_graph_pass_manager_t *mgr = ctx;
+ ir_graph_pass_manager_t *mgr =
(ir_graph_pass_manager_t*)
ctx;
(void)prog;
return ir_graph_pass_mgr_run(mgr);
}
(void)prog;
return ir_graph_pass_mgr_run(mgr);
}
-/* Ensure that no verifier is run an ir_prog pass. */
int ir_prog_no_verify(ir_prog *prog, void *ctx)
{
(void)prog;
int ir_prog_no_verify(ir_prog *prog, void *ctx)
{
(void)prog;
@@
-72,7
+73,6
@@
int ir_prog_no_verify(ir_prog *prog, void *ctx)
return 0;
}
return 0;
}
-/* Ensure that no dumper is run from an ir_prog pass. */
void ir_prog_no_dump(ir_prog *prog, void *ctx, unsigned idx)
{
(void)prog;
void ir_prog_no_dump(ir_prog *prog, void *ctx, unsigned idx)
{
(void)prog;
@@
-85,7
+85,7
@@
void ir_prog_no_dump(ir_prog *prog, void *ctx, unsigned idx)
*/
static void term_wrapper(void *context)
{
*/
static void term_wrapper(void *context)
{
- ir_graph_pass_manager_t *mgr = context;
+ ir_graph_pass_manager_t *mgr =
(ir_graph_pass_manager_t*)
context;
term_graph_pass_mgr(mgr);
}
term_graph_pass_mgr(mgr);
}
@@
-113,7
+113,6
@@
static ir_prog_pass_t *create_wrapper_pass(ir_graph_pass_manager_t *graph_mgr)
return pass;
}
return pass;
}
-/* Add an ir_graph_pass as a pass to an ir_prog pass manager. */
void ir_prog_pass_mgr_add_graph_pass(
ir_prog_pass_manager_t *mgr, ir_graph_pass_t *pass)
{
void ir_prog_pass_mgr_add_graph_pass(
ir_prog_pass_manager_t *mgr, ir_graph_pass_t *pass)
{
@@
-124,7
+123,7
@@
void ir_prog_pass_mgr_add_graph_pass(
if (! list_empty(&mgr->passes)) {
wrapper = list_entry(mgr->passes.prev, ir_prog_pass_t, list);
if (wrapper->is_wrapper) {
if (! list_empty(&mgr->passes)) {
wrapper = list_entry(mgr->passes.prev, ir_prog_pass_t, list);
if (wrapper->is_wrapper) {
- graph_mgr = wrapper->context;
+ graph_mgr =
(ir_graph_pass_manager_t*)
wrapper->context;
ir_graph_pass_mgr_add(graph_mgr, pass);
++mgr->n_passes;
ir_graph_pass_mgr_add(graph_mgr, pass);
++mgr->n_passes;
@@
-143,7
+142,6
@@
void ir_prog_pass_mgr_add_graph_pass(
ir_prog_pass_mgr_add(mgr, wrapper);
}
ir_prog_pass_mgr_add(mgr, wrapper);
}
-/* Add an ir_graph_pass_manager as a pass to an ir_prog pass manager. */
void ir_prog_pass_mgr_add_graph_mgr(
ir_prog_pass_manager_t *mgr, ir_graph_pass_manager_t *graph_mgr)
{
void ir_prog_pass_mgr_add_graph_mgr(
ir_prog_pass_manager_t *mgr, ir_graph_pass_manager_t *graph_mgr)
{
@@
-163,12
+161,11
@@
static void create_suffix(char *suffix, size_t n, const char *pass_name)
snprintf(suffix, n, "%s.svg", pass_name);
}
snprintf(suffix, n, "%s.svg", pass_name);
}
-/* Run all passes of an ir_graph pass manager. */
int ir_graph_pass_mgr_run(ir_graph_pass_manager_t *mgr)
{
int ir_graph_pass_mgr_run(ir_graph_pass_manager_t *mgr)
{
-
ir_graph_pass_t *pass
;
- int
i,
res = 0;
- ir_graph
*rem = current_ir_graph;
+
size_t i
;
+ int res = 0;
+ ir_graph *rem = current_ir_graph;
/* on all graphs: beware: number of irgs might be changed */
for (i = 0; i < get_irp_n_irgs(); ++i) {
/* on all graphs: beware: number of irgs might be changed */
for (i = 0; i < get_irp_n_irgs(); ++i) {
@@
-209,18
+206,18
@@
int ir_graph_pass_mgr_run(ir_graph_pass_manager_t *mgr)
*/
static int irp_verify_irgs(void)
{
*/
static int irp_verify_irgs(void)
{
- int i, res = 1;
+ int res = 1;
+ size_t i;
+ size_t n_irgs = get_irp_n_irgs();
- for (i =
get_irp_n_irgs() - 1; i >= 0; --
i)
+ for (i =
0; i < n_irgs; ++
i)
res &= irg_verify(get_irp_irg(i), 0);
return res;
}
res &= irg_verify(get_irp_irg(i), 0);
return res;
}
-/* Run all passes of an ir_prog pass manager. */
int ir_prog_pass_mgr_run(ir_prog_pass_manager_t *mgr)
{
int ir_prog_pass_mgr_run(ir_prog_pass_manager_t *mgr)
{
- ir_prog_pass_t *pass;
- int res = 0;
+ int res = 0;
/* run every pass on every graph */
unsigned idx = mgr->run_idx;
/* run every pass on every graph */
unsigned idx = mgr->run_idx;
@@
-247,7
+244,7
@@
int ir_prog_pass_mgr_run(ir_prog_pass_manager_t *mgr)
}
}
if (pass->is_wrapper) {
}
}
if (pass->is_wrapper) {
- ir_graph_pass_manager_t *graph_mgr = pass->context;
+ ir_graph_pass_manager_t *graph_mgr =
(ir_graph_pass_manager_t*)
pass->context;
idx += graph_mgr->n_passes;
} else
++idx;
idx += graph_mgr->n_passes;
} else
++idx;
@@
-255,7
+252,6
@@
int ir_prog_pass_mgr_run(ir_prog_pass_manager_t *mgr)
return res;
}
return res;
}
-/* Creates a new ir_graph pass manager. */
ir_graph_pass_manager_t *new_graph_pass_mgr(
const char *name, int verify_all, int dump_all)
{
ir_graph_pass_manager_t *new_graph_pass_mgr(
const char *name, int verify_all, int dump_all)
{
@@
-271,7
+267,6
@@
ir_graph_pass_manager_t *new_graph_pass_mgr(
return res;
}
return res;
}
-/* Creates a new ir_prog pass manager. */
ir_prog_pass_manager_t *new_prog_pass_mgr(
const char *name, int verify_all, int dump_all)
{
ir_prog_pass_manager_t *new_prog_pass_mgr(
const char *name, int verify_all, int dump_all)
{
@@
-287,11
+282,8
@@
ir_prog_pass_manager_t *new_prog_pass_mgr(
return res;
}
return res;
}
-/* Terminate an ir_graph pass manager and all owned passes. */
void term_graph_pass_mgr(ir_graph_pass_manager_t *mgr)
{
void term_graph_pass_mgr(ir_graph_pass_manager_t *mgr)
{
- ir_graph_pass_t *pass, *next;
-
list_for_each_entry_safe(ir_graph_pass_t, pass, next, &mgr->passes, list) {
if (pass->rem_from_mgr)
pass->rem_from_mgr(pass->context);
list_for_each_entry_safe(ir_graph_pass_t, pass, next, &mgr->passes, list) {
if (pass->rem_from_mgr)
pass->rem_from_mgr(pass->context);
@@
-302,11
+294,8
@@
void term_graph_pass_mgr(ir_graph_pass_manager_t *mgr)
xfree(mgr);
}
xfree(mgr);
}
-/* Terminate an ir_prog pass manager and all owned passes. */
void term_prog_pass_mgr(ir_prog_pass_manager_t *mgr)
{
void term_prog_pass_mgr(ir_prog_pass_manager_t *mgr)
{
- ir_prog_pass_t *pass, *next;
-
list_for_each_entry_safe(ir_prog_pass_t, pass, next, &mgr->passes, list) {
if (pass->rem_from_mgr)
pass->rem_from_mgr(pass->context);
list_for_each_entry_safe(ir_prog_pass_t, pass, next, &mgr->passes, list) {
if (pass->rem_from_mgr)
pass->rem_from_mgr(pass->context);
@@
-317,24
+306,12
@@
void term_prog_pass_mgr(ir_prog_pass_manager_t *mgr)
xfree(mgr);
}
xfree(mgr);
}
-/**
- * Set the run index for an irgraph pass manager.
- *
- * @param mgr the manager
- * @param run_idx the index for the first pass of this manager
- */
void ir_graph_pass_mgr_set_run_idx(
ir_graph_pass_manager_t *mgr, unsigned run_idx)
{
mgr->run_idx = run_idx;
}
void ir_graph_pass_mgr_set_run_idx(
ir_graph_pass_manager_t *mgr, unsigned run_idx)
{
mgr->run_idx = run_idx;
}
-/**
- * Set the run index for an irprog pass manager.
- *
- * @param mgr the manager
- * @param run_idx the index for the first pass of this manager
- */
void ir_prog_pass_mgr_set_run_idx(
ir_prog_pass_manager_t *mgr, unsigned run_idx)
{
void ir_prog_pass_mgr_set_run_idx(
ir_prog_pass_manager_t *mgr, unsigned run_idx)
{
@@
-346,12
+323,11
@@
void ir_prog_pass_mgr_set_run_idx(
*/
static int void_graph_wrapper(ir_graph *irg, void *context)
{
*/
static int void_graph_wrapper(ir_graph *irg, void *context)
{
- void
(*function)(ir_graph *irg) =
context;
+ void
_pass_func_irg function = (void_pass_func_irg)
context;
function(irg);
return 0;
function(irg);
return 0;
-}
/* void_graph_wrapper */
+}
-/* Creates an ir_graph pass for running void function(ir_graph *irg). */
ir_graph_pass_t *def_graph_pass(
const char *name, void (*function)(ir_graph *irg))
{
ir_graph_pass_t *def_graph_pass(
const char *name, void (*function)(ir_graph *irg))
{
@@
-359,24
+335,23
@@
ir_graph_pass_t *def_graph_pass(
pass->kind = k_ir_graph_pass;
pass->run_on_irg = void_graph_wrapper;
pass->kind = k_ir_graph_pass;
pass->run_on_irg = void_graph_wrapper;
- pass->context = function;
+ pass->context =
(void*)
function;
pass->name = name;
INIT_LIST_HEAD(&pass->list);
return pass;
pass->name = name;
INIT_LIST_HEAD(&pass->list);
return pass;
-}
/* def_graph_pass */
+}
/**
/**
- * Wrapper for running
void
function(ir_graph *irg) as an ir_graph pass.
+ * Wrapper for running
int
function(ir_graph *irg) as an ir_graph pass.
*/
static int int_graph_wrapper(ir_graph *irg, void *context)
{
*/
static int int_graph_wrapper(ir_graph *irg, void *context)
{
- int
(*function)(ir_graph *irg) =
context;
+ int
_pass_func_irg function = (int_pass_func_irg)
context;
return function(irg);
return function(irg);
-}
/* int_graph_wrapper */
+}
-/* Creates an ir_graph pass for running void function(ir_graph *irg). */
ir_graph_pass_t *def_graph_pass_ret(
const char *name, int (*function)(ir_graph *irg))
{
ir_graph_pass_t *def_graph_pass_ret(
const char *name, int (*function)(ir_graph *irg))
{
@@
-384,15
+359,14
@@
ir_graph_pass_t *def_graph_pass_ret(
pass->kind = k_ir_graph_pass;
pass->run_on_irg = int_graph_wrapper;
pass->kind = k_ir_graph_pass;
pass->run_on_irg = int_graph_wrapper;
- pass->context = function;
+ pass->context =
(void*)
function;
pass->name = name;
INIT_LIST_HEAD(&pass->list);
return pass;
pass->name = name;
INIT_LIST_HEAD(&pass->list);
return pass;
-}
/* def_graph_pass_ret */
+}
-/* constructor for a default graph pass */
ir_graph_pass_t *def_graph_pass_constructor(
ir_graph_pass_t *pass,
const char *name, int (*function)(ir_graph *irg, void *context)) {
ir_graph_pass_t *def_graph_pass_constructor(
ir_graph_pass_t *pass,
const char *name, int (*function)(ir_graph *irg, void *context)) {
@@
-408,27
+382,25
@@
ir_graph_pass_t *def_graph_pass_constructor(
INIT_LIST_HEAD(&pass->list);
return pass;
INIT_LIST_HEAD(&pass->list);
return pass;
-}
/* def_graph_pass_constructor */
+}
-/* set the run parallel property */
void ir_graph_pass_set_parallel(ir_graph_pass_t *pass, int flag)
{
pass->run_parallel = flag != 0;
void ir_graph_pass_set_parallel(ir_graph_pass_t *pass, int flag)
{
pass->run_parallel = flag != 0;
-}
/* ir_graph_pass_set_parallel */
+}
/**
* Wrapper for running void function(void) as an ir_prog pass.
*/
static int void_prog_wrapper(ir_prog *irp, void *context)
{
/**
* Wrapper for running void function(void) as an ir_prog pass.
*/
static int void_prog_wrapper(ir_prog *irp, void *context)
{
- void
(*function)(void) =
context;
+ void
_pass_func function = (void_pass_func)
context;
(void)irp;
function();
return 0;
(void)irp;
function();
return 0;
-}
/* void_graph_wrapper */
+}
-/* Creates an ir_prog pass for running void function(void). */
ir_prog_pass_t *def_prog_pass(
const char *name,
void (*function)(void))
ir_prog_pass_t *def_prog_pass(
const char *name,
void (*function)(void))
@@
-437,15
+409,14
@@
ir_prog_pass_t *def_prog_pass(
pass->kind = k_ir_prog_pass;
pass->run_on_irprog = void_prog_wrapper;
pass->kind = k_ir_prog_pass;
pass->run_on_irprog = void_prog_wrapper;
- pass->context = function;
+ pass->context =
(void*)
function;
pass->name = name;
INIT_LIST_HEAD(&pass->list);
return pass;
pass->name = name;
INIT_LIST_HEAD(&pass->list);
return pass;
-}
/* def_prog_pass */
+}
-/* Creates an ir_prog pass for running void function(void). */
ir_prog_pass_t *def_prog_pass_constructor(
ir_prog_pass_t *pass,
const char *name,
ir_prog_pass_t *def_prog_pass_constructor(
ir_prog_pass_t *pass,
const char *name,
@@
-464,25
+435,25
@@
ir_prog_pass_t *def_prog_pass_constructor(
INIT_LIST_HEAD(&pass->list);
return pass;
INIT_LIST_HEAD(&pass->list);
return pass;
-}
/* def_prog_pass_constructor */
+}
-struct pass_t {
+
typedef
struct pass_t {
ir_prog_pass_t pass;
void *context;
void (*function)(void *context);
ir_prog_pass_t pass;
void *context;
void (*function)(void *context);
-};
+}
pass_t
;
/**
* Wrapper for the call_function pass.
*/
static int call_function_wrapper(ir_prog *irp, void *context)
{
/**
* Wrapper for the call_function pass.
*/
static int call_function_wrapper(ir_prog *irp, void *context)
{
-
struct pass_t *pass =
context;
+
pass_t *pass = (pass_t*)
context;
(void)irp;
pass->function(pass->context);
return 0;
(void)irp;
pass->function(pass->context);
return 0;
-}
/* call_function_wrapper */
+}
ir_prog_pass_t *call_function_pass(
const char *name, void (*function)(void *context), void *context) {
ir_prog_pass_t *call_function_pass(
const char *name, void (*function)(void *context), void *context) {
@@
-499,4
+470,4
@@
ir_prog_pass_t *call_function_pass(
pass->context = context;
return &pass->pass;
pass->context = context;
return &pass->pass;
-}
/* call_function_pass */
+}