* @file
* @brief parallelizing Load/Store optimisation
* @author Christoph Mallon
- * @version $Id$
+ * @version $Id: $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include "iroptimize.h"
+
#include "array.h"
#include "debug.h"
#include "ircons.h"
#include "irmemory.h"
#include "irnode.h"
#include "irnodeset.h"
-#include "ldst2.h"
#include "obst.h"
-#include "return.h"
#include "irdump.h"
-
+#include "irflag_t.h"
#define OPTIMISE_LOAD_AFTER_LOAD
{
ir_nodeset_t* alias_set;
size_t i;
+ (void) env;
alias_set = NEW_ARR_D(ir_nodeset_t, &obst, count_addrs);
for (i = 0; i < count_addrs; i++) {
{
ir_nodeset_t* alias_set = get_irn_link(block);
size_t i;
+ (void) env;
for (i = 0; i < count_addrs; i++) {
ir_nodeset_destroy(&alias_set[i]);
ir_nodeset_iterator_init(&interfere_iter, interfere_set);
if (size == 1) {
ir_node* after = ir_nodeset_iterator_next(&interfere_iter);
- if (is_Proj(after)) {
- ir_node* pred = get_Proj_pred(after);
- if (is_Load(pred)) {
-#ifdef OPTIMISE_LOAD_AFTER_LOAD
- if (get_Load_ptr(pred) == addr && get_Load_mode(pred) == get_Load_mode(load)) {
- exchange(load, pred);
- return;
- }
-#endif
- after = get_Load_mem(pred);
- }
- }
+ assert(!is_Proj(after) || !is_Load(get_Proj_pred(after)));
DB((dbg, LEVEL_3, "===> %+F must be executed after %+F\n", load, after));
set_Load_mem(load, after);
} else {
ir_node** after_set;
- ir_node* sync;
+ ir_node* after;
+ ir_node* mem;
+ size_t i;
NEW_ARR_A(ir_node*, after_set, size);
- for (i = 0; i < size; i++) {
- ir_node* mem = ir_nodeset_iterator_next(&interfere_iter);
+ i = 0;
+ while ((mem = ir_nodeset_iterator_next(&interfere_iter)) != NULL) {
if (is_Proj(mem)) {
ir_node* pred = get_Proj_pred(mem);
if (is_Load(pred)) {
return;
}
#endif
- mem = get_Load_mem(pred);
+ continue;
}
}
- after_set[i] = mem;
- sync = new_r_Sync(irg, block, size, after_set);
+ DB((dbg, LEVEL_3, "===> %+F must be executed after %+F\n", load, mem));
+ after_set[i++] = mem;
+ }
+ assert(i != 0);
+ if (i == 1) {
+ after = after_set[0];
+ } else {
+ after = new_r_Sync(irg, block, i, after_set);
}
- set_Load_mem(load, sync);
+ set_Load_mem(load, after);
}
for (i = 0; i < count_addrs; i++) {
ir_node* other_addr = addrs[i];
ir_mode* other_mode = mode; // XXX second mode is nonsense
ir_alias_relation rel = get_alias_relation(irg, addr, mode, other_addr, other_mode);
- ir_node* other_node;
DB((dbg, LEVEL_3, "===> Testing for alias between %+F and %+F. Relation is %d\n", addr, other_addr, rel));
if (rel == no_alias) {
}
DB((dbg, LEVEL_3, "===> %+F potentially aliases address %+F\n", load, other_addr));
- ir_nodeset_iterator_init(&interfere_iter, &interfere_sets[i]);
- while ((other_node = ir_nodeset_iterator_next(&interfere_iter)) != NULL) {
- if (is_Proj(other_node) && is_Load(get_Proj_pred(other_node))) continue;
- if (AliasTest(irg, addr, mode, other_node) != no_alias) {
- DB((dbg, LEVEL_3, "===> Removing %+F from execute-after set of %+F due to %+F\n", other_node, addrs[i], load));
- ir_nodeset_remove_iterator(&interfere_sets[i], &interfere_iter);
- }
- }
-
ir_nodeset_insert(&interfere_sets[i], memory);
}
}
unknown = new_r_Unknown(irg, mode_M);
for (i = 0; i < count_addrs; i++) {
ir_node* phi_unk = new_r_Phi(irg, block, 1, &unknown, mode_M);
+ DB((dbg, LEVEL_3, "===> Placing unfinished %+F for %+F in %+F\n", phi_unk, addrs[i], block));
set_irn_link(phi_unk, unfinished_phis[i]);
unfinished_phis[i] = phi_unk;
ir_nodeset_insert(&thissets[i], phi_unk);
ir_node** in;
size_t count_preds;
size_t i;
+ (void) env;
if (!is_Sync(node)) return;
AddSyncPreds(&preds, node);
count_preds = ir_nodeset_size(&preds);
- if (count_preds != get_Sync_n_preds(node)) {
+ if (count_preds != (unsigned)get_Sync_n_preds(node)) {
NEW_ARR_A(ir_node*, in, count_preds);
ir_nodeset_iterator_init(&iter, &preds);
for (i = 0; i < count_preds; i++) {
DB((dbg, LEVEL_1, "===> Performing load/store optimisation on %+F\n", irg));
normalize_one_return(irg);
+ dump_ir_block_graph(irg, "-prefluffig");
obstack_init(&obst);
inc_irg_block_visited(irg);
SetStartAddressesTop(irg);
Detotalise(irg);
-
dump_ir_block_graph(irg, "-fluffig");
irg_block_walk_graph(irg, AliasSetDestroyer, NULL, NULL);
irg_walk_graph(irg, NormaliseSync, NULL, NULL);
optimize_graph_df(irg);
irg_walk_graph(irg, NormaliseSync, NULL, NULL);
+ dump_ir_block_graph(irg, "-postfluffig");
}