/*
- * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*/
typedef struct quadruple {
ir_entity *ent; /**< The entity of our Call. */
- int pos; /**< Position of a constant argument of our Call. */
+ size_t pos; /**< Position of a constant argument of our Call. */
ir_tarval *tv; /**< The tarval of this argument if Const node. */
ir_node **calls; /**< The list of all calls with the same characteristics */
} quadruple_t;
*/
static int entry_cmp(const void *elt, const void *key)
{
- const entry_t *e1 = elt;
- const entry_t *e2 = key;
+ const entry_t *e1 = (const entry_t*)elt;
+ const entry_t *e2 = (const entry_t*)key;
return (e1->q.ent != e2->q.ent) || (e1->q.pos != e2->q.pos) || (e1->q.tv != e2->q.tv);
}
*
* @param entry The element to be hashed.
*/
-static int hash_entry(const entry_t *entry)
+static unsigned hash_entry(const entry_t *entry)
{
- return HASH_PTR(entry->q.ent) ^ HASH_PTR(entry->q.tv) ^ (entry->q.pos * 9);
+ return HASH_PTR(entry->q.ent) ^ HASH_PTR(entry->q.tv) ^ (unsigned)(entry->q.pos * 9);
}
/**
ir_type *mtp;
entry_t *key, *entry;
ir_node *call_param;
- int i, n_params;
+ size_t i, n_params;
n_params = get_Call_n_params(call);
* magic
*/
mtp = get_Call_type(call);
- if (get_method_variadicity(mtp) != variadicity_non_variadic) {
- n_params = get_method_first_variadic_param_index(mtp) - 1;
- }
/* In this for loop we collect the calls, that have
an constant parameter. */
- for (i = n_params - 1; i >= 0; --i) {
- call_param = get_Call_param(call, i);
+ for (i = n_params; i > 0;) {
+ call_param = get_Call_param(call, --i);
if (is_Const(call_param)) {
/* we have found a Call to collect and we save the informations,
which we need.*/
key->next = NULL;
/* We insert our information in the set, where we collect the calls.*/
- entry = pset_insert(hmap->map, key, hash_entry(key));
+ entry = (entry_t*)pset_insert(hmap->map, key, hash_entry(key));
if (entry != key)
obstack_free(&hmap->obst, key);
*/
static void collect_irg_calls(ir_node *call, void *env)
{
- q_set *hmap = env;
+ q_set *hmap = (q_set*)env;
ir_node *call_ptr;
ir_entity *callee;
* @param pos The "pos" from our quadruplet.
* @param nr A counter for the clones.
*/
-static ident *get_clone_ident(ident *id, int pos, unsigned nr)
+static ident *get_clone_ident(ident *id, size_t pos, size_t nr)
{
char clone_postfix[32];
- snprintf(clone_postfix, sizeof(clone_postfix), "_cl_%d_%u", pos, nr);
+ ir_snprintf(clone_postfix, sizeof(clone_postfix), "_cl_%zu_%zu", pos, nr);
return id_mangle(id, new_id_from_str(clone_postfix));
}
*/
static void copy_nodes(ir_node *irn, void *env)
{
- ir_node *arg, *irg_args, *irn_copy;
- int proj_nr;
- ir_graph *clone_irg = env;
-
- arg = get_irg_link(clone_irg);
- irg_args = get_Proj_pred(arg);
+ ir_graph *clone_irg = (ir_graph*)env;
+ ir_node *arg = (ir_node*)get_irg_link(clone_irg);
+ ir_node *irg_args = get_Proj_pred(arg);
+ ir_node *irn_copy;
+ long proj_nr;
/* Copy all nodes except the arg. */
if (irn != arg)
copy_irn_to_irg(irn, clone_irg);
- irn_copy = get_irn_link(irn);
+ irn_copy = (ir_node*)get_irn_link(irn);
/* Fix argument numbers */
if (is_Proj(irn) && get_Proj_pred(irn) == irg_args) {
*/
static void set_preds(ir_node *irn, void *env)
{
- int i;
- ir_node *irn_copy, *pred, *arg;
- ir_graph *clone_irg = env;
+ ir_graph *clone_irg = (ir_graph*)env;
+ ir_node *arg = (ir_node*)get_irg_link(clone_irg);
+ int i;
+ ir_node *irn_copy;
+ ir_node *pred;
- arg = get_irg_link(clone_irg);
/* Arg is the method argument, that we have replaced by a constant.*/
if (arg == irn)
return;
- irn_copy = get_irn_link(irn);
+ irn_copy = (ir_node*)get_irn_link(irn);
if (is_Block(irn)) {
- for (i = get_Block_n_cfgpreds(irn) - 1; i >= 0; i--) {
+ for (i = get_Block_n_cfgpreds(irn) - 1; i >= 0; --i) {
pred = get_Block_cfgpred(irn, i);
/* "End" block must be handled extra, because it is not matured.*/
if (get_irg_end_block(current_ir_graph) == irn)
- add_immBlock_pred(get_irg_end_block(clone_irg), get_irn_link(pred));
+ add_immBlock_pred(get_irg_end_block(clone_irg), (ir_node*)get_irn_link(pred));
else
- set_Block_cfgpred(irn_copy, i, get_irn_link(pred));
+ set_Block_cfgpred(irn_copy, i, (ir_node*)get_irn_link(pred));
}
} else {
/* First we set the block our copy if it is not a block.*/
- set_nodes_block(irn_copy, get_irn_link(get_nodes_block(irn)));
+ set_nodes_block(irn_copy, (ir_node*)get_irn_link(get_nodes_block(irn)));
if (is_End(irn)) {
/* Handle the keep-alives. This must be done separately, because
the End node was NOT copied */
for (i = 0; i < get_End_n_keepalives(irn); ++i)
- add_End_keepalive(irn_copy, get_irn_link(get_End_keepalive(irn, i)));
+ add_End_keepalive(irn_copy, (ir_node*)get_irn_link(get_End_keepalive(irn, i)));
} else {
for (i = get_irn_arity(irn) - 1; i >= 0; i--) {
pred = get_irn_n(irn, i);
- set_irn_n(irn_copy, i, get_irn_link(pred));
+ set_irn_n(irn_copy, i, (ir_node*)get_irn_link(pred));
}
}
}
* @param irg irg that must be cloned.
* @param pos The position of the argument.
*/
-static ir_node *get_irg_arg(ir_graph *irg, int pos)
+static ir_node *get_irg_arg(ir_graph *irg, size_t pos)
{
ir_node *irg_args = get_irg_args(irg), *arg = NULL;
int i;
/* Search the argument with the number pos.*/
for (i = get_irn_n_outs(irg_args) - 1; i >= 0; --i) {
ir_node *proj = get_irn_out(irg_args, i);
- if (pos == get_Proj_proj(proj)) {
+ if ((int)pos == get_Proj_proj(proj)) {
if (arg) {
/*
* More than one arg node found:
- * We rely on the fact the only one arg exists, so do
+ * We rely on the fact that only one arg exists, so do
* a cheap CSE in this case.
*/
set_irn_out(irg_args, i, arg, 0);
* @param ent The entity of the method that must be cloned.
* @param q Our quadruplet.
*/
-static void create_clone_proc_irg(ir_entity *ent, quadruple_t *q)
+static void create_clone_proc_irg(ir_entity *ent, const quadruple_t *q)
{
ir_graph *method_irg, *clone_irg;
ir_node *arg, *const_arg;
* @param ent The entity of the clone.
* @param nr A pointer to the counter of clones.
**/
-static void change_entity_type(quadruple_t *q, ir_entity *ent)
+static void change_entity_type(const quadruple_t *q, ir_entity *ent)
{
ir_type *mtp, *new_mtp, *tp;
- int i, j, n_params, n_ress;
+ size_t i, j, n_params, n_ress;
mtp = get_entity_type(q->ent);
n_params = get_method_n_params(mtp);
/* We must set the type of the methods parameters.*/
for (i = j = 0; i < n_params; ++i) {
- if (i == q->pos)
- /* This is the position of the argument, that we have
- replaced. */
- continue;
-
+ if (i == q->pos) {
+ /* This is the position of the argument, that we have
+ replaced. */
+ continue;
+ }
tp = get_method_param_type(mtp, i);
set_method_param_type(new_mtp, j++, tp);
}
*
* @param q Contains information for the method to clone.
*/
-static ir_entity *clone_method(quadruple_t *q)
+static ir_entity *clone_method(const quadruple_t *q)
{
ir_entity *new_entity;
ident *clone_ident;
symconst_symbol sym;
/* A counter for the clones.*/
- static unsigned nr = 0;
+ static size_t nr = 0;
/* We get a new ident for our clone method.*/
clone_ident = get_clone_ident(get_entity_ident(q->ent), q->pos, nr);
* @param new_entity The entity of the cloned function.
* @param pos The position of the replaced parameter of this call.
**/
-static ir_node *new_cl_Call(ir_node *call, ir_entity *new_entity, int pos)
+static ir_node *new_cl_Call(ir_node *call, ir_entity *new_entity, size_t pos)
{
ir_node **in;
- int i, n_params, new_params = 0;
+ size_t i, n_params, new_params = 0;
ir_node *callee;
symconst_symbol sym;
ir_graph *irg = get_irn_irg(call);
/* we save the parameters of the new call in the array "in" without the
* parameter in position "pos", that is replaced with a constant.*/
- for (i = 0; i < n_params; i++){
+ for (i = 0; i < n_params; ++i) {
if (pos != i)
in[new_params++] = get_Call_param(call, i);
}
*/
static void exchange_calls(quadruple_t *q, ir_entity *cloned_ent)
{
- int pos = q->pos;
+ size_t pos = q->pos;
ir_node *new_call, *call;
- int i;
+ size_t i;
/* We iterate the list of the "call".*/
for (i = 0; i < ARR_LEN(q->calls); ++i) {
static void reorder_weights(q_set *hmap, float threshold)
{
entry_t **adr, *p, *entry;
- int i, len;
+ size_t i, len;
ir_entity *callee;
restart:
void proc_cloning(float threshold)
{
entry_t *entry = NULL, *p;
- ir_graph *irg;
- int i;
+ size_t i, n;
q_set hmap;
+ DEBUG_ONLY(firm_dbg_module_t *dbg;)
+
+ /* register a debug mask */
+ FIRM_DBG_REGISTER(dbg, "firm.opt.proc_cloning");
+
obstack_init(&hmap.obst);
hmap.map = NULL;
hmap.heavy_uses = NULL;
/* initially fill our map by visiting all irgs */
- for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
- irg = get_irp_irg(i);
+ for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
+ ir_graph *irg = get_irp_irg(i);
irg_walk_graph(irg, collect_irg_calls, NULL, &hmap);
}
/* We iterate the set and arrange the element of the set in a list.
The elements are arranged dependent of their value descending.*/
if (hmap.map) {
- foreach_pset(hmap.map, entry) {
+ foreach_pset(hmap.map, entry_t*, entry) {
entry->weight = calculate_weight(entry);
/*
hmap.map = NULL;
}
+#ifdef DEBUG_libfirm
/* Print some information about the list. */
- printf("-----------------\n");
+ DB((dbg, LEVEL_2, "-----------------\n"));
for (entry = hmap.heavy_uses; entry; entry = entry->next) {
- printf("\nweight: is %f\n", entry->weight);
- ir_printf("Call for Method %E\n", entry->q.ent);
- printf("Position %i\n", entry->q.pos);
- ir_printf("Value %T\n", entry->q.tv);
+ DB((dbg, LEVEL_2, "\nweight: is %f\n", entry->weight));
+ DB((dbg, LEVEL_2, "Call for Method %E\n", entry->q.ent));
+ DB((dbg, LEVEL_2, "Position %zu\n", entry->q.pos));
+ DB((dbg, LEVEL_2, "Value %T\n", entry->q.tv));
}
-
+#endif
entry = hmap.heavy_uses;
if (entry) {
- ir_entity *ent = clone_method(&entry->q);
+ quadruple_t *qp = &entry->q;
+
+ ir_entity *ent = clone_method(qp);
+ DB((dbg, LEVEL_1, "Cloned <%+F, %zu, %T> info %+F\n", qp->ent, qp->pos, qp->tv, ent));
hmap.heavy_uses = entry->next;
obstack_free(&hmap.obst, NULL);
}
-struct pass_t {
+typedef struct pass_t {
ir_prog_pass_t pass;
float threshold;
-};
+} pass_t;
/**
* Wrapper to run proc_cloning() as an ir_prog pass.
*/
static int proc_cloning_wrapper(ir_prog *irp, void *context)
{
- struct pass_t *pass = context;
+ pass_t *pass = (pass_t*)context;
(void)irp;
proc_cloning(pass->threshold);
/* create a ir_prog pass */
ir_prog_pass_t *proc_cloning_pass(const char *name, float threshold)
{
- struct pass_t *pass = XMALLOCZ(struct pass_t);
+ pass_t *pass = XMALLOCZ(pass_t);
pass->threshold = threshold;
return def_prog_pass_constructor(