projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
also allow reference mode in fild
[libfirm]
/
ir
/
be
/
bespillslots.c
diff --git
a/ir/be/bespillslots.c
b/ir/be/bespillslots.c
index
c69ecd0
..
eff37fd
100644
(file)
--- a/
ir/be/bespillslots.c
+++ b/
ir/be/bespillslots.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-24,9
+24,7
@@
* @date 26.07.2006
* @version $Id$
*/
* @date 26.07.2006
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif
#include <stdlib.h>
#include <stdlib.h>
@@
-39,33
+37,27
@@
#include "unionfind.h"
#include "irdump_t.h"
#include "unionfind.h"
#include "irdump_t.h"
-#include "benode
_t
.h"
+#include "benode.h"
#include "besched.h"
#include "besched.h"
+#include "bespill.h"
#include "bespillslots.h"
#include "bechordal_t.h"
#include "bespillslots.h"
#include "bechordal_t.h"
-#include "bejavacoal.h"
#include "bestatevent.h"
#include "bestatevent.h"
-#include "bespilloptions.h"
#include "bemodule.h"
#include "beintlive_t.h"
#include "bemodule.h"
#include "beintlive_t.h"
-#include "beirg
_t
.h"
-#include "bearch
_t
.h"
+#include "beirg.h"
+#include "bearch.h"
#define DBG_COALESCING 1
#define DBG_INTERFERENCES 2
#define DBG_COALESCING 1
#define DBG_INTERFERENCES 2
-DEBUG_ONLY(
-static firm_dbg_module_t *dbg = NULL;
-)
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
typedef struct _spill_t {
ir_node *spill;
typedef struct _spill_t {
ir_node *spill;
- /** mode of the spilled value */
- const ir_mode *mode;
- /** alignment for the spilled value */
- int alignment;
- /** index into spillslot_unionfind unionfind structure */
- int spillslot;
+ const ir_mode *mode; /**< mode of the spilled value */
+ int alignment; /**< alignment for the spilled value */
+ int spillslot; /**< index into spillslot_unionfind structure */
} spill_t;
typedef struct _affinity_edge_t {
} spill_t;
typedef struct _affinity_edge_t {
@@
-89,7
+81,7
@@
static int cmp_affinity(const void *d1, const void *d2)
const affinity_edge_t * const *e1 = d1;
const affinity_edge_t * const *e2 = d2;
const affinity_edge_t * const *e1 = d1;
const affinity_edge_t * const *e2 = d2;
- /
/ sort in descending order
+ /
* sort in descending order */
return (*e1)->affinity < (*e2)->affinity ? 1 : -1;
}
return (*e1)->affinity < (*e2)->affinity ? 1 : -1;
}
@@
-113,23
+105,15
@@
static spill_t *get_spill(be_fec_env_t *env, ir_node *node)
return res;
}
return res;
}
-/*
- * ____ _ _ _ ____ _ _ _
- * / ___|___ | | | ___ ___| |_ / ___| _ __ (_) | |___
- * | | / _ \| | |/ _ \/ __| __| \___ \| '_ \| | | / __|
- * | |__| (_) | | | __/ (__| |_ ___) | |_) | | | \__ \
- * \____\___/|_|_|\___|\___|\__| |____/| .__/|_|_|_|___/
- * |_|
- */
-static
INLINE
ir_node *get_memory_edge(const ir_node *node)
+static
inline
ir_node *get_memory_edge(const ir_node *node)
{
int i, arity;
arity = get_irn_arity(node);
{
int i, arity;
arity = get_irn_arity(node);
- for(i = arity - 1; i >= 0; --i) {
+ for
(i = arity - 1; i >= 0; --i) {
ir_node *arg = get_irn_n(node, i);
ir_node *arg = get_irn_n(node, i);
- if(get_irn_mode(arg) == mode_M)
+ if
(get_irn_mode(arg) == mode_M)
return arg;
}
return arg;
}
@@
-140,17
+124,18
@@
static spill_t *collect_spill(be_fec_env_t *env, ir_node *node,
const ir_mode *mode, int align)
{
spill_t spill, *res;
const ir_mode *mode, int align)
{
spill_t spill, *res;
- int hash = hash_irn(node);
+ int
hash = hash_irn(node);
/* insert into set of spills if not already there */
spill.spill = node;
res = set_find(env->spills, &spill, sizeof(spill), hash);
/* insert into set of spills if not already there */
spill.spill = node;
res = set_find(env->spills, &spill, sizeof(spill), hash);
- if(res == NULL) {
+ if
(res == NULL) {
spill.spillslot = set_count(env->spills);
spill.mode = mode;
spill.alignment = align;
res = set_insert(env->spills, &spill, sizeof(spill), hash);
spill.spillslot = set_count(env->spills);
spill.mode = mode;
spill.alignment = align;
res = set_insert(env->spills, &spill, sizeof(spill), hash);
+ DB((dbg, DBG_COALESCING, "Slot %d: %+F\n", spill.spillslot, node));
} else {
assert(res->mode == mode);
assert(res->alignment == align);
} else {
assert(res->mode == mode);
assert(res->alignment == align);
@@
-171,7
+156,7
@@
static spill_t *collect_memphi(be_fec_env_t *env, ir_node *node,
spill.spill = node;
res = set_find(env->spills, &spill, sizeof(spill), hash);
spill.spill = node;
res = set_find(env->spills, &spill, sizeof(spill), hash);
- if(res != NULL) {
+ if
(res != NULL) {
assert(res->mode == mode);
assert(res->alignment == align);
return res;
assert(res->mode == mode);
assert(res->alignment == align);
return res;
@@
-180,23
+165,24
@@
static spill_t *collect_memphi(be_fec_env_t *env, ir_node *node,
spill.spillslot = set_count(env->spills);
spill.mode = mode;
spill.alignment = align;
spill.spillslot = set_count(env->spills);
spill.mode = mode;
spill.alignment = align;
+ DB((dbg, DBG_COALESCING, "Slot %d: %+F\n", spill.spillslot, node));
res = set_insert(env->spills, &spill, sizeof(spill), hash);
res = set_insert(env->spills, &spill, sizeof(spill), hash);
- /
/ collect attached spills and mem-phis
+ /
* collect attached spills and mem-phis */
arity = get_irn_arity(node);
arity = get_irn_arity(node);
- for(i = 0; i < arity; ++i) {
+ for
(i = 0; i < arity; ++i) {
affinity_edge_t *affinty_edge;
ir_node *arg = get_irn_n(node, i);
spill_t *arg_spill;
affinity_edge_t *affinty_edge;
ir_node *arg = get_irn_n(node, i);
spill_t *arg_spill;
- if(is_Phi(arg)) {
+ if
(is_Phi(arg)) {
arg_spill = collect_memphi(env, arg, mode, align);
} else {
arg_spill = collect_spill(env, arg, mode, align);
}
arg_spill = collect_memphi(env, arg, mode, align);
} else {
arg_spill = collect_spill(env, arg, mode, align);
}
- /
/ add an affinity edge
- affinty_edge =
obstack_alloc(&env->obst, sizeof(affinty_edge[0])
);
+ /
* add an affinity edge */
+ affinty_edge =
OALLOC(&env->obst, affinity_edge_t
);
affinty_edge->affinity = get_block_execfreq(exec_freq, get_nodes_block(arg));
affinty_edge->slot1 = res->spillslot;
affinty_edge->slot2 = arg_spill->spillslot;
affinty_edge->affinity = get_block_execfreq(exec_freq, get_nodes_block(arg));
affinty_edge->slot1 = res->spillslot;
affinty_edge->slot2 = arg_spill->spillslot;
@@
-214,6
+200,7
@@
void be_node_needs_frame_entity(be_fec_env_t *env, ir_node *node,
assert(spillnode != NULL);
assert(spillnode != NULL);
+ /* walk upwards and collect all phis and spills on this way */
if (is_Phi(spillnode)) {
spill = collect_memphi(env, spillnode, mode, align);
} else {
if (is_Phi(spillnode)) {
spill = collect_memphi(env, spillnode, mode, align);
} else {
@@
-223,13
+210,7
@@
void be_node_needs_frame_entity(be_fec_env_t *env, ir_node *node,
ARR_APP1(ir_node *, env->reloads, node);
}
ARR_APP1(ir_node *, env->reloads, node);
}
-/*
- * ____ _ ____ _ _
- * / ___|___ __ _| | ___ ___ ___ ___ / ___|| | ___ | |_ ___
- * | | / _ \ / _` | |/ _ \/ __|/ __/ _ \ \___ \| |/ _ \| __/ __|
- * | |__| (_) | (_| | | __/\__ \ (_| __/ ___) | | (_) | |_\__ \
- * \____\___/ \__,_|_|\___||___/\___\___| |____/|_|\___/ \__|___/
- */
+
static int merge_interferences(be_fec_env_t *env, bitset_t** interferences,
int* spillslot_unionfind, int s1, int s2)
static int merge_interferences(be_fec_env_t *env, bitset_t** interferences,
int* spillslot_unionfind, int s1, int s2)
@@
-238,10
+219,10
@@
static int merge_interferences(be_fec_env_t *env, bitset_t** interferences,
int i;
int spillcount;
int i;
int spillcount;
- /
/ merge spillslots and interferences
+ /
* merge spillslots and interferences */
res = uf_union(spillslot_unionfind, s1, s2);
res = uf_union(spillslot_unionfind, s1, s2);
- /
/ we assume that we always merge s2 to s1 so swap s1, s2 if necessary
- if
(res != 0
) {
+ /
* we assume that we always merge s2 to s1 so swap s1, s2 if necessary */
+ if
(res != s1
) {
int t = s1;
s1 = s2;
s2 = t;
int t = s1;
s1 = s2;
s2 = t;
@@
-249,11
+230,11
@@
static int merge_interferences(be_fec_env_t *env, bitset_t** interferences,
bitset_or(interferences[s1], interferences[s2]);
bitset_or(interferences[s1], interferences[s2]);
- /
/ update other interferences
+ /
* update other interferences */
spillcount = set_count(env->spills);
spillcount = set_count(env->spills);
- for(i = 0; i < spillcount; ++i) {
+ for
(i = 0; i < spillcount; ++i) {
bitset_t *intfs = interferences[i];
bitset_t *intfs = interferences[i];
- if(bitset_is_set(intfs, s2))
+ if
(bitset_is_set(intfs, s2))
bitset_set(intfs, s1);
}
bitset_set(intfs, s1);
}
@@
-269,7
+250,7
@@
static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
int b2a = _value_dominates(b, a);
/* If there is no dominance relation, they do not interfere. */
int b2a = _value_dominates(b, a);
/* If there is no dominance relation, they do not interfere. */
- if((a2b | b2a) > 0) {
+ if
((a2b | b2a) > 0) {
const ir_edge_t *edge;
ir_node *bb;
const ir_edge_t *edge;
ir_node *bb;
@@
-277,7
+258,7
@@
static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
* Adjust a and b so, that a dominates b if
* a dominates b or vice versa.
*/
* Adjust a and b so, that a dominates b if
* a dominates b or vice versa.
*/
- if(b2a) {
+ if
(b2a) {
const ir_node *t = a;
a = b;
b = t;
const ir_node *t = a;
a = b;
b = t;
@@
-289,7
+270,7
@@
static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
* If a is live end in b's block it is
* live at b's definition (a dominates b)
*/
* If a is live end in b's block it is
* live at b's definition (a dominates b)
*/
- if(be_is_live_end(lv, bb, a))
+ if
(be_is_live_end(lv, bb, a))
return 1;
/*
return 1;
/*
@@
-305,17
+286,17
@@
static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
*/
foreach_out_edge(a, edge) {
const ir_node *user = get_edge_src_irn(edge);
*/
foreach_out_edge(a, edge) {
const ir_node *user = get_edge_src_irn(edge);
- if(is_Sync(user)) {
+ if
(is_Sync(user)) {
const ir_edge_t *edge2;
foreach_out_edge(user, edge2) {
const ir_node *user2 = get_edge_src_irn(edge2);
assert(!is_Sync(user2));
const ir_edge_t *edge2;
foreach_out_edge(user, edge2) {
const ir_node *user2 = get_edge_src_irn(edge2);
assert(!is_Sync(user2));
- if(get_nodes_block(user2) == bb && !is_Phi(user2) &&
+ if
(get_nodes_block(user2) == bb && !is_Phi(user2) &&
_value_strictly_dominates(b, user2))
return 1;
}
} else {
_value_strictly_dominates(b, user2))
return 1;
}
} else {
- if(get_nodes_block(user) == bb && !is_Phi(user) &&
+ if
(get_nodes_block(user) == bb && !is_Phi(user) &&
_value_strictly_dominates(b, user))
return 1;
}
_value_strictly_dominates(b, user))
return 1;
}
@@
-330,20
+311,20
@@
static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
*/
static int my_values_interfere(be_irg_t *birg, ir_node *a, ir_node *b)
{
*/
static int my_values_interfere(be_irg_t *birg, ir_node *a, ir_node *b)
{
- if(is_Sync(a)) {
+ if
(is_Sync(a)) {
int i, arity = get_irn_arity(a);
int i, arity = get_irn_arity(a);
- for(i = 0; i < arity; ++i) {
+ for
(i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(a, i);
ir_node *in = get_irn_n(a, i);
- if(my_values_interfere(birg, in, b))
+ if
(my_values_interfere(birg, in, b))
return 1;
}
return 0;
return 1;
}
return 0;
- } else if(is_Sync(b)) {
+ } else if
(is_Sync(b)) {
int i, arity = get_irn_arity(b);
int i, arity = get_irn_arity(b);
- for(i = 0; i < arity; ++i) {
+ for
(i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(b, i);
/* a is not a sync, so no need for my_values_interfere */
ir_node *in = get_irn_n(b, i);
/* a is not a sync, so no need for my_values_interfere */
- if(my_values_interfere2(birg, a, in))
+ if
(my_values_interfere2(birg, a, in))
return 1;
}
return 0;
return 1;
}
return 0;
@@
-367,30
+348,34
@@
static void do_greedy_coalescing(be_fec_env_t *env)
int affinity_edge_count;
bitset_t **interferences;
int* spillslot_unionfind;
int affinity_edge_count;
bitset_t **interferences;
int* spillslot_unionfind;
+ struct obstack data;
spillcount = set_count(env->spills);
spillcount = set_count(env->spills);
- if(spillcount == 0)
+ if
(spillcount == 0)
return;
return;
-
DBG((dbg, DBG_COALESCING, "Coalescing %d spillslots\n", spillcount)
);
+
obstack_init(&data
);
- interferences = alloca(spillcount * sizeof(interferences[0]));
- spillslot_unionfind = alloca(spillcount * sizeof(spillslot_unionfind[0]));
- spilllist = alloca(spillcount * sizeof(spilllist[0]));
+ DB((dbg, DBG_COALESCING, "Coalescing %d spillslots\n", spillcount));
- uf_init(spillslot_unionfind, 0, spillcount);
+ interferences = OALLOCN(&data, bitset_t*, spillcount);
+ spillslot_unionfind = OALLOCN(&data, int, spillcount);
+ spilllist = OALLOCN(&data, spill_t*, spillcount);
+
+ uf_init(spillslot_unionfind, spillcount);
DEBUG_ONLY(
memset(spilllist, 0, spillcount * sizeof(spilllist[0]));
);
DEBUG_ONLY(
memset(spilllist, 0, spillcount * sizeof(spilllist[0]));
);
- for(spill = set_first(env->spills), i = 0; spill != NULL; spill = set_next(env->spills), ++i) {
+ for (spill = set_first(env->spills), i = 0; spill != NULL;
+ spill = set_next(env->spills), ++i) {
assert(spill->spillslot < spillcount);
spilllist[spill->spillslot] = spill;
}
assert(spill->spillslot < spillcount);
spilllist[spill->spillslot] = spill;
}
- for(i = 0; i < spillcount; ++i) {
- interferences[i] = bitset_
alloca(
spillcount);
+ for
(i = 0; i < spillcount; ++i) {
+ interferences[i] = bitset_
obstack_alloc(&data,
spillcount);
}
/* construct interferences */
}
/* construct interferences */
@@
-400,14
+385,16
@@
static void do_greedy_coalescing(be_fec_env_t *env)
if (is_NoMem(spill1))
continue;
if (is_NoMem(spill1))
continue;
- for(i2 = i+1; i2 < spillcount; ++i2) {
+ for
(i2 = i+1; i2 < spillcount; ++i2) {
ir_node *spill2 = spilllist[i2]->spill;
if (is_NoMem(spill2))
continue;
if (my_values_interfere(env->birg, spill1, spill2)) {
ir_node *spill2 = spilllist[i2]->spill;
if (is_NoMem(spill2))
continue;
if (my_values_interfere(env->birg, spill1, spill2)) {
- DBG((dbg, DBG_INTERFERENCES, "Slot %d and %d interfere\n", i, i2));
+ DB((dbg, DBG_INTERFERENCES,
+ "Slot %d and %d interfere\n", i, i2));
+
bitset_set(interferences[i], i2);
bitset_set(interferences[i2], i);
}
bitset_set(interferences[i], i2);
bitset_set(interferences[i2], i);
}
@@
-416,12
+403,13
@@
static void do_greedy_coalescing(be_fec_env_t *env)
/* sort affinity edges */
affinity_edge_count = ARR_LEN(env->affinity_edges);
/* sort affinity edges */
affinity_edge_count = ARR_LEN(env->affinity_edges);
- qsort(env->affinity_edges, affinity_edge_count, sizeof(env->affinity_edges[0]), cmp_affinity);
+ qsort(env->affinity_edges, affinity_edge_count,
+ sizeof(env->affinity_edges[0]), cmp_affinity);
- /
/dump_interference_graph(env, interferences, "before");
+ /
*dump_interference_graph(env, interferences, "before"); */
/* try to merge affine nodes */
/* try to merge affine nodes */
- for(i = 0; i < affinity_edge_count; ++i) {
+ for
(i = 0; i < affinity_edge_count; ++i) {
const affinity_edge_t *edge = env->affinity_edges[i];
int s1 = uf_find(spillslot_unionfind, edge->slot1);
int s2 = uf_find(spillslot_unionfind, edge->slot2);
const affinity_edge_t *edge = env->affinity_edges[i];
int s1 = uf_find(spillslot_unionfind, edge->slot1);
int s2 = uf_find(spillslot_unionfind, edge->slot2);
@@
-432,59
+420,55
@@
static void do_greedy_coalescing(be_fec_env_t *env)
continue;
}
continue;
}
- DBG((dbg, DBG_COALESCING, "Merging %d and %d because of affinity edge\n", s1, s2));
+ DB((dbg, DBG_COALESCING,
+ "Merging %d and %d because of affinity edge\n", s1, s2));
merge_interferences(env, interferences, spillslot_unionfind, s1, s2);
}
merge_interferences(env, interferences, spillslot_unionfind, s1, s2);
}
- /
/ try to merge as much remaining spillslots as possible
- for(i = 0; i < spillcount; ++i) {
+ /
* try to merge as much remaining spillslots as possible */
+ for
(i = 0; i < spillcount; ++i) {
int s1 = uf_find(spillslot_unionfind, i);
int s1 = uf_find(spillslot_unionfind, i);
- if(s1 != i)
+ if
(s1 != i)
continue;
continue;
- for(i2 = i+1; i2 < spillcount; ++i2) {
+ for
(i2 = i+1; i2 < spillcount; ++i2) {
int s2 = uf_find(spillslot_unionfind, i2);
int s2 = uf_find(spillslot_unionfind, i2);
- if(s2 != i2)
+ if
(s2 != i2)
continue;
/* test if values interfere
* we have to test n1-n2 and n2-n1, because only 1 side gets updated
* when node merging occurs
*/
continue;
/* test if values interfere
* we have to test n1-n2 and n2-n1, because only 1 side gets updated
* when node merging occurs
*/
- if(bitset_is_set(interferences[s1], s2)) {
+ if
(bitset_is_set(interferences[s1], s2)) {
assert(bitset_is_set(interferences[s2], s1));
continue;
}
assert(bitset_is_set(interferences[s2], s1));
continue;
}
- DBG((dbg, DBG_COALESCING, "Merging %d and %d because it is possible\n", s1, s2));
+ DB((dbg, DBG_COALESCING,
+ "Merging %d and %d because it is possible\n", s1, s2));
- if(merge_interferences(env, interferences, spillslot_unionfind, s1, s2) != 0) {
- /
/ we can break the loop here, because s2 is the new supernode now
- // and we'll test s2 again later anyway
+ if
(merge_interferences(env, interferences, spillslot_unionfind, s1, s2) != 0) {
+ /
* we can break the loop here, because s2 is the new supernode
+ * now and we'll test s2 again later anyway */
break;
}
}
}
break;
}
}
}
- /
/ assign spillslots to spills
- for(i = 0; i < spillcount; ++i) {
+ /
* assign spillslots to spills */
+ for
(i = 0; i < spillcount; ++i) {
spill_t *spill = spilllist[i];
spill->spillslot = uf_find(spillslot_unionfind, i);
}
spill_t *spill = spilllist[i];
spill->spillslot = uf_find(spillslot_unionfind, i);
}
- //dump_interference_graph(env, interferences, "after");
+ /*dump_interference_graph(env, interferences, "after");*/
+ obstack_free(&data, 0);
}
}
-/*
- * _ _ _____ _ _ _ _
- * / \ ___ ___(_) __ _ _ __ | ____|_ __ | |_(_) |_(_) ___ ___
- * / _ \ / __/ __| |/ _` | '_ \ | _| | '_ \| __| | __| |/ _ \/ __|
- * / ___ \\__ \__ \ | (_| | | | | | |___| | | | |_| | |_| | __/\__ \
- * /_/ \_\___/___/_|\__, |_| |_| |_____|_| |_|\__|_|\__|_|\___||___/
- * |___/
- */
+
typedef struct _spill_slot_t {
int size;
typedef struct _spill_slot_t {
int size;
@@
-525,7
+509,7
@@
static memperm_t *get_memperm(be_fec_env_t *env, ir_node *block)
res = set_find(env->memperms, &entry, sizeof(entry), hash);
res = set_find(env->memperms, &entry, sizeof(entry), hash);
- if(res == NULL) {
+ if
(res == NULL) {
entry.entrycount = 0;
entry.entries = NULL;
res = set_insert(env->memperms, &entry, sizeof(entry), hash);
entry.entrycount = 0;
entry.entries = NULL;
res = set_insert(env->memperms, &entry, sizeof(entry), hash);
@@
-538,7
+522,10
@@
static ir_entity* create_stack_entity(be_fec_env_t *env, spill_slot_t *slot)
{
ir_graph *irg = be_get_birg_irg(env->birg);
ir_type *frame = get_irg_frame_type(irg);
{
ir_graph *irg = be_get_birg_irg(env->birg);
ir_type *frame = get_irg_frame_type(irg);
- ir_entity *res = frame_alloc_area(frame, slot->size, slot->align, 0);
+ /* TODO: backend should be able to specify wether we want spill slots
+ * at begin or end of frame */
+ int at_start = 1;
+ ir_entity *res = frame_alloc_area(frame, slot->size, slot->align, at_start);
/* adjust size of the entity type... */
ir_type *enttype = get_entity_type(res);
/* adjust size of the entity type... */
ir_type *enttype = get_entity_type(res);
@@
-555,39
+542,42
@@
static ir_entity* create_stack_entity(be_fec_env_t *env, spill_slot_t *slot)
*/
static void enlarge_spillslot(spill_slot_t *slot, int otheralign, int othersize)
{
*/
static void enlarge_spillslot(spill_slot_t *slot, int otheralign, int othersize)
{
- if(othersize > slot->size) {
+ if
(othersize > slot->size) {
slot->size = othersize;
}
slot->size = othersize;
}
- if(otheralign > slot->align) {
- if(otheralign % slot->align != 0)
+ if
(otheralign > slot->align) {
+ if
(otheralign % slot->align != 0)
slot->align *= otheralign;
else
slot->align = otheralign;
slot->align *= otheralign;
else
slot->align = otheralign;
- } else if(slot->align % otheralign != 0) {
+ } else if
(slot->align % otheralign != 0) {
slot->align *= otheralign;
}
}
slot->align *= otheralign;
}
}
-static void assign_spill_entity(
const arch_env_t *arch_env,
ir_node *node, ir_entity *entity)
+static void assign_spill_entity(ir_node *node, ir_entity *entity)
{
{
- if(is_NoMem(node))
+ if
(is_NoMem(node))
return;
return;
- if(is_Sync(node)) {
+ if
(is_Sync(node)) {
int i, arity;
arity = get_irn_arity(node);
int i, arity;
arity = get_irn_arity(node);
- for(i = 0; i < arity; ++i) {
+ for
(i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(node, i);
assert(!is_Phi(in));
ir_node *in = get_irn_n(node, i);
assert(!is_Phi(in));
- assign_spill_entity(
arch_env,
in, entity);
+ assign_spill_entity(in, entity);
}
return;
}
}
return;
}
- assert(arch_get_frame_entity(arch_env, node) == NULL);
- arch_set_frame_entity(arch_env, node, entity);
+ /* beware: we might have Stores with Memory Proj's, ia32 fisttp for
+ instance */
+ node = skip_Proj(node);
+ assert(arch_get_frame_entity(node) == NULL);
+ arch_set_frame_entity(node, entity);
}
/**
}
/**
@@
-596,26
+586,22
@@
static void assign_spill_entity(const arch_env_t *arch_env, ir_node *node, ir_en
*/
static void assign_spillslots(be_fec_env_t *env)
{
*/
static void assign_spillslots(be_fec_env_t *env)
{
- const arch_env_t *arch_env = env->arch_env;
- int i;
- int spillcount;
- spill_t *spill;
- spill_slot_t* spillslots;
-
- spillcount = set_count(env->spills);
- spillslots = alloca(spillcount * sizeof(spillslots[0]));
+ int spillcount = set_count(env->spills);
+ spill_slot_t *spillslots = ALLOCANZ(spill_slot_t, spillcount);
+ spill_t *spill;
+ int i;
- memset(spillslots, 0, spillcount * sizeof(spillslots[0]));
+ /* construct spillslots */
+ for (spill = set_first(env->spills); spill != NULL;
+ spill = set_next(env->spills)) {
- // construct spillslots
- for(spill = set_first(env->spills); spill != NULL; spill = set_next(env->spills)) {
int slotid = spill->spillslot;
const ir_mode *mode = spill->mode;
spill_slot_t *slot = & (spillslots[slotid]);
int size = get_mode_size_bytes(mode);
int align = spill->alignment;
int slotid = spill->spillslot;
const ir_mode *mode = spill->mode;
spill_slot_t *slot = & (spillslots[slotid]);
int size = get_mode_size_bytes(mode);
int align = spill->alignment;
- if(slot->align == 0 && slot->size == 0) {
+ if
(slot->align == 0 && slot->size == 0) {
slot->align = align;
slot->size = size;
} else {
slot->align = align;
slot->size = size;
} else {
@@
-623,24
+609,26
@@
static void assign_spillslots(be_fec_env_t *env)
}
}
}
}
- for(spill = set_first(env->spills); spill != NULL; spill = set_next(env->spills)) {
+ for (spill = set_first(env->spills); spill != NULL;
+ spill = set_next(env->spills)) {
+
+ ir_node *node = spill->spill;
+ int slotid = spill->spillslot;
spill_slot_t *slot;
spill_slot_t *slot;
- ir_node *node = spill->spill;
- int slotid = spill->spillslot;
slot = &spillslots[slotid];
slot = &spillslots[slotid];
- if(slot->entity == NULL) {
+ if
(slot->entity == NULL) {
create_stack_entity(env, slot);
}
create_stack_entity(env, slot);
}
- if(is_Phi(node)) {
+ if
(is_Phi(node)) {
int i, arity;
ir_node *block = get_nodes_block(node);
int i, arity;
ir_node *block = get_nodes_block(node);
- /
/ should be a PhiM
+ /
* should be a PhiM */
assert(is_Phi(node));
assert(is_Phi(node));
- for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
+ for
(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
ir_node *arg = get_irn_n(node, i);
ir_node *predblock = get_Block_cfgpred_block(block, i);
spill_t *argspill;
ir_node *arg = get_irn_n(node, i);
ir_node *predblock = get_Block_cfgpred_block(block, i);
spill_t *argspill;
@@
-650,17
+638,17
@@
static void assign_spillslots(be_fec_env_t *env)
assert(argspill != NULL);
argslotid = argspill->spillslot;
assert(argspill != NULL);
argslotid = argspill->spillslot;
- if(slotid != argslotid) {
+ if
(slotid != argslotid) {
memperm_t *memperm;
memperm_entry_t *entry;
spill_slot_t *argslot = &spillslots[argslotid];
memperm_t *memperm;
memperm_entry_t *entry;
spill_slot_t *argslot = &spillslots[argslotid];
- if(argslot->entity == NULL) {
+ if
(argslot->entity == NULL) {
create_stack_entity(env, argslot);
}
memperm = get_memperm(env, predblock);
create_stack_entity(env, argslot);
}
memperm = get_memperm(env, predblock);
- entry =
obstack_alloc(&env->obst, sizeof(entry[0])
);
+ entry =
OALLOC(&env->obst, memperm_entry_t
);
entry->node = node;
entry->pos = i;
entry->in = argslot->entity;
entry->node = node;
entry->pos = i;
entry->in = argslot->entity;
@@
-671,19
+659,19
@@
static void assign_spillslots(be_fec_env_t *env)
}
}
} else {
}
}
} else {
- assign_spill_entity(
arch_env,
node, slot->entity);
+ assign_spill_entity(node, slot->entity);
}
}
}
}
- for(i = 0; i < ARR_LEN(env->reloads); ++i) {
- ir_node
* reload
= env->reloads[i];
- ir_node
*
spillnode = get_memory_edge(reload);
- spill_t
*spill
= get_spill(env, spillnode);
- const spill_slot_t *slot = & spillslots[spill->spillslot];
+ for
(i = 0; i < ARR_LEN(env->reloads); ++i) {
+ ir_node
*reload
= env->reloads[i];
+ ir_node
*
spillnode = get_memory_edge(reload);
+ spill_t
*spill
= get_spill(env, spillnode);
+ const spill_slot_t *slot
= & spillslots[spill->spillslot];
assert(slot->entity != NULL);
assert(slot->entity != NULL);
- arch_set_frame_entity(
arch_env,
reload, slot->entity);
+ arch_set_frame_entity(reload, slot->entity);
}
}
}
}
@@
-693,15
+681,15
@@
static void assign_spillslots(be_fec_env_t *env)
static ir_node *get_end_of_block_insertion_point(ir_node* block)
{
ir_node* ins = sched_last(block);
static ir_node *get_end_of_block_insertion_point(ir_node* block)
{
ir_node* ins = sched_last(block);
- while(is_Proj(ins) && get_irn_mode(ins) == mode_X) {
+ while
(is_Proj(ins) && get_irn_mode(ins) == mode_X) {
ins = sched_prev(ins);
assert(ins != NULL);
}
ins = sched_prev(ins);
assert(ins != NULL);
}
- if(is_cfop(ins)) {
-
while(1
) {
+ if
(is_cfop(ins)) {
+
for (;;
) {
ir_node *prev = sched_prev(ins);
ir_node *prev = sched_prev(ins);
- if(!is_cfop(prev))
+ if
(!is_cfop(prev))
break;
ins = prev;
}
break;
ins = prev;
}
@@
-716,30
+704,30
@@
static void create_memperms(be_fec_env_t *env)
ir_graph *irg = be_get_birg_irg(env->birg);
memperm_t *memperm;
ir_graph *irg = be_get_birg_irg(env->birg);
memperm_t *memperm;
- for(memperm = set_first(env->memperms); memperm != NULL; memperm = set_next(env->memperms)) {
- i
nt i
;
- memperm_entry_t *entry;
- ir_node *blockend;
- ir_node
** nodes = alloca(memperm->entrycount * sizeof(nodes[0]))
;
- i
r_node* mempermnode
;
+ for
(memperm = set_first(env->memperms); memperm != NULL; memperm = set_next(env->memperms)) {
+ i
r_node **nodes = ALLOCAN(ir_node*, memperm->entrycount)
;
+ memperm_entry_t
*entry;
+ ir_node
*blockend;
+ ir_node
*mempermnode
;
+ i
nt i
;
assert(memperm->entrycount > 0);
assert(memperm->entrycount > 0);
- for(entry = memperm->entries, i = 0; entry != NULL; entry = entry->next, ++i) {
+ for
(entry = memperm->entries, i = 0; entry != NULL; entry = entry->next, ++i) {
ir_node* arg = get_irn_n(entry->node, entry->pos);
nodes[i] = arg;
}
ir_node* arg = get_irn_n(entry->node, entry->pos);
nodes[i] = arg;
}
- mempermnode = be_new_MemPerm(arch_env,
irg,
memperm->block,
+ mempermnode = be_new_MemPerm(arch_env, memperm->block,
memperm->entrycount, nodes);
memperm->entrycount, nodes);
- /
/ insert node into schedule
+ /
* insert node into schedule */
blockend = get_end_of_block_insertion_point(memperm->block);
sched_add_before(blockend, mempermnode);
stat_ev_dbl("mem_perm", memperm->entrycount);
i = 0;
blockend = get_end_of_block_insertion_point(memperm->block);
sched_add_before(blockend, mempermnode);
stat_ev_dbl("mem_perm", memperm->entrycount);
i = 0;
- for(entry = memperm->entries; entry != NULL; entry = entry->next, ++i) {
+ for
(entry = memperm->entries; entry != NULL; entry = entry->next, ++i) {
ir_node *proj;
ir_node* arg = get_irn_n(entry->node, entry->pos);
ir_node *proj;
ir_node* arg = get_irn_n(entry->node, entry->pos);
@@
-761,10
+749,10
@@
static int count_spillslots(const be_fec_env_t *env)
int slotcount;
slotcount = 0;
int slotcount;
slotcount = 0;
- for(spill = set_first(env->spills); spill != NULL;
+ for
(spill = set_first(env->spills); spill != NULL;
spill = set_next(env->spills)) {
int spillslot = spill->spillslot;
spill = set_next(env->spills)) {
int spillslot = spill->spillslot;
- if(!bitset_is_set(counted, spillslot)) {
+ if
(!bitset_is_set(counted, spillslot)) {
slotcount++;
bitset_set(counted, spillslot);
}
slotcount++;
bitset_set(counted, spillslot);
}
@@
-776,7
+764,7
@@
static int count_spillslots(const be_fec_env_t *env)
be_fec_env_t *be_new_frame_entity_coalescer(be_irg_t *birg)
{
const arch_env_t *arch_env = birg->main_env->arch_env;
be_fec_env_t *be_new_frame_entity_coalescer(be_irg_t *birg)
{
const arch_env_t *arch_env = birg->main_env->arch_env;
- be_fec_env_t *env =
xmalloc(sizeof(env[0])
);
+ be_fec_env_t *env =
XMALLOC(be_fec_env_t
);
be_liveness_assure_chk(be_assure_liveness(birg));
be_liveness_assure_chk(be_assure_liveness(birg));
@@
-806,7
+794,7
@@
void be_assign_entities(be_fec_env_t *env)
{
stat_ev_dbl("spillslots", set_count(env->spills));
{
stat_ev_dbl("spillslots", set_count(env->spills));
- if(be_coalesce_spill_slots) {
+ if
(be_coalesce_spill_slots) {
do_greedy_coalescing(env);
}
do_greedy_coalescing(env);
}
@@
-824,7
+812,6
@@
void be_assign_entities(be_fec_env_t *env)
static void collect_spills_walker(ir_node *node, void *data)
{
be_fec_env_t *env = data;
static void collect_spills_walker(ir_node *node, void *data)
{
be_fec_env_t *env = data;
- const arch_env_t *arch_env = env->arch_env;
const ir_mode *mode;
const arch_register_class_t *cls;
int align;
const ir_mode *mode;
const arch_register_class_t *cls;
int align;
@@
-833,12
+820,12
@@
static void collect_spills_walker(ir_node *node, void *data)
if (is_Proj(node))
return;
if (is_Proj(node))
return;
- if (!arch_irn_class_is(
arch_env,
node, reload))
+ if (!arch_irn_class_is(node, reload))
return;
mode = get_irn_mode(node);
return;
mode = get_irn_mode(node);
- cls = arch_get_irn_reg_class
(arch_env, node, -1
);
- align = arch_
isa_get_reg_class_alignment(arch_env_get_isa(arch_env)
, cls);
+ cls = arch_get_irn_reg_class
_out(node
);
+ align = arch_
env_get_reg_class_alignment(env->arch_env
, cls);
be_node_needs_frame_entity(env, node, mode, align);
}
be_node_needs_frame_entity(env, node, mode, align);
}
@@
-855,9
+842,8
@@
void be_coalesce_spillslots(be_irg_t *birg)
be_free_frame_entity_coalescer(env);
}
be_free_frame_entity_coalescer(env);
}
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillslots);
void be_init_spillslots(void)
{
FIRM_DBG_REGISTER(dbg, "firm.be.spillslots");
}
void be_init_spillslots(void)
{
FIRM_DBG_REGISTER(dbg, "firm.be.spillslots");
}
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillslots);