projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify and speedup belady/loopana a bit
[libfirm]
/
ir
/
be
/
beuses.c
diff --git
a/ir/be/beuses.c
b/ir/be/beuses.c
index
82cc71a
..
af5339b
100644
(file)
--- a/
ir/be/beuses.c
+++ b/
ir/be/beuses.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.
*
@@
-51,7
+51,6
@@
#include "beirgmod.h"
#include "bearch_t.h"
#include "beuses.h"
#include "beirgmod.h"
#include "bearch_t.h"
#include "beuses.h"
-#include "benodesets.h"
#define SCAN_INTERBLOCK_USES
#define SCAN_INTERBLOCK_USES
@@
-88,7
+87,7
@@
static const be_use_t *get_or_set_use_block(be_uses_t *env,
const ir_node *block,
const ir_node *def)
{
const ir_node *block,
const ir_node *def)
{
- unsigned hash = HASH_COMBINE(
nodeset_hash(block), nodeset_hash
(def));
+ unsigned hash = HASH_COMBINE(
hash_irn(block), hash_irn
(def));
be_use_t temp;
be_use_t* result;
be_use_t temp;
be_use_t* result;
@@
-127,10
+126,12
@@
static int be_is_phi_argument(const ir_node *block, const ir_node *def)
const ir_edge_t *edge;
int arity, i;
const ir_edge_t *edge;
int arity, i;
-#if 0
- if(get_irn_n_edges_kind(block, EDGE_KIND_BLOCK) > 1)
- return 0;
+#if 1
+ if (get_irn_n_edges_kind(block, EDGE_KIND_BLOCK) < 1)
+#else
+ if (get_irn_n_edges_kind(block, EDGE_KIND_BLOCK) != 1)
#endif
#endif
+ return 0;
foreach_block_succ(block, edge) {
succ_block = get_edge_src_irn(edge);
foreach_block_succ(block, edge) {
succ_block = get_edge_src_irn(edge);
@@
-171,7
+172,7
@@
static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
unsigned from_step, const ir_node *def,
int skip_from_uses)
{
unsigned from_step, const ir_node *def,
int skip_from_uses)
{
- unsigned step = from_step;
+ unsigned step
= from_step;
ir_node *block = get_nodes_block(from);
ir_node *next_use;
ir_node *node;
ir_node *block = get_nodes_block(from);
ir_node *next_use;
ir_node *node;
@@
-192,6
+193,8
@@
static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
ir_node *node = get_edge_src_irn(edge);
unsigned node_step;
ir_node *node = get_edge_src_irn(edge);
unsigned node_step;
+ if(is_Anchor(node))
+ continue;
if(get_nodes_block(node) != block)
continue;
if(is_Phi(node))
if(get_nodes_block(node) != block)
continue;
if(is_Phi(node))
@@
-210,6
+213,7
@@
static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
be_next_use_t result;
result.time = next_use_step - timestep + skip_from_uses;
result.outermost_loop = get_loop_depth(get_irn_loop(block));
be_next_use_t result;
result.time = next_use_step - timestep + skip_from_uses;
result.outermost_loop = get_loop_depth(get_irn_loop(block));
+ result.before = next_use;
return result;
}
return result;
}
@@
-247,8
+251,9
@@
static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
return be_get_next_use(env, node, step, node, 1);
}
return be_get_next_use(env, node, step, node, 1);
}
- result.time = step;
+ result.time
= step;
result.outermost_loop = get_loop_depth(get_irn_loop(block));
result.outermost_loop = get_loop_depth(get_irn_loop(block));
+ result.before = node;
return result;
}
}
return result;
}
}
@@
-265,6
+270,7
@@
static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
be_next_use_t result;
result.time = step;
result.outermost_loop = get_loop_depth(get_irn_loop(block));
be_next_use_t result;
result.time = step;
result.outermost_loop = get_loop_depth(get_irn_loop(block));
+ result.before = block;
return result;
}
return result;
}
@@
-280,6
+286,7
@@
static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
ir_graph *irg = get_irn_irg(block);
ir_node *startblock = get_irg_start_block(irg);
ir_graph *irg = get_irn_irg(block);
ir_node *startblock = get_irg_start_block(irg);
+ result.before = NULL;
outermost_loop = loopdepth;
foreach_block_succ(block, edge) {
const be_use_t *use;
outermost_loop = loopdepth;
foreach_block_succ(block, edge) {
const be_use_t *use;
@@
-319,15
+326,16
@@
static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
}
if(use_dist < next_use) {
}
if(use_dist < next_use) {
- next_use = use_dist;
+ next_use
= use_dist;
outermost_loop = use->outermost_loop;
outermost_loop = use->outermost_loop;
+ result.before = use->node;
}
}
if(loopdepth < outermost_loop)
outermost_loop = loopdepth;
}
}
if(loopdepth < outermost_loop)
outermost_loop = loopdepth;
- result.time = next_use + step;
+ result.time
= next_use + step;
result.outermost_loop = outermost_loop;
if(!found_use && found_visited) {
result.outermost_loop = outermost_loop;
if(!found_use && found_visited) {
@@
-362,8
+370,6
@@
void set_sched_step_walker(ir_node *block, void *data)
set_irn_link(node, INT_TO_PTR(step));
if(is_Phi(node))
continue;
set_irn_link(node, INT_TO_PTR(step));
if(is_Phi(node))
continue;
- if(is_Proj(node))
- continue;
++step;
}
}
++step;
}
}