projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not mark the transformed as visited. It makes no sense at all.
[libfirm]
/
ir
/
be
/
beifg.c
diff --git
a/ir/be/beifg.c
b/ir/be/beifg.c
index
2b3715e
..
1827de1
100644
(file)
--- a/
ir/be/beifg.c
+++ b/
ir/be/beifg.c
@@
-30,10
+30,10
@@
#include <stdlib.h>
#include <stdlib.h>
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
-#include <libcore/lc_timing.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
+#include "timing.h"
#include "bitset.h"
#include "irgwalk.h"
#include "irnode_t.h"
#include "bitset.h"
#include "irgwalk.h"
#include "irnode_t.h"
@@
-184,7
+184,7
@@
int be_ifg_is_simplicial(const be_ifg_t *ifg, const ir_node *irn)
int degree = be_ifg_degree(ifg, irn);
void *iter = be_ifg_neighbours_iter_alloca(ifg);
int degree = be_ifg_degree(ifg, irn);
void *iter = be_ifg_neighbours_iter_alloca(ifg);
- ir_node **neighbours =
xmalloc(degree * sizeof(neighbours[0])
);
+ ir_node **neighbours =
XMALLOCN(ir_node*, degree
);
ir_node *curr;
int i, j;
ir_node *curr;
int i, j;
@@
-276,7
+276,7
@@
void be_ifg_check_sorted(const be_ifg_t *ifg)
const int node_count = be_ifg_check_get_node_count(ifg);
int i = 0;
const int node_count = be_ifg_check_get_node_count(ifg);
int i = 0;
- ir_node **all_nodes =
xmalloc(node_count * sizeof(all_nodes[0])
);
+ ir_node **all_nodes =
XMALLOCN(ir_node*, node_count
);
be_ifg_foreach_node(ifg, iter1, n)
{
be_ifg_foreach_node(ifg, iter1, n)
{
@@
-294,7
+294,7
@@
void be_ifg_check_sorted(const be_ifg_t *ifg)
for (i = 0; i < node_count; i++)
{
for (i = 0; i < node_count; i++)
{
- ir_node **neighbours =
xmalloc(node_count * sizeof(neighbours[0])
);
+ ir_node **neighbours =
XMALLOCN(ir_node*, node_count
);
int j = 0;
int k = 0;
int degree = 0;
int j = 0;
int k = 0;
int degree = 0;
@@
-334,7
+334,7
@@
void be_ifg_check_sorted_to_file(const be_ifg_t *ifg, FILE *f)
const int node_count = be_ifg_check_get_node_count(ifg);
int i = 0;
const int node_count = be_ifg_check_get_node_count(ifg);
int i = 0;
- ir_node **all_nodes =
xmalloc(node_count * sizeof(all_nodes[0])
);
+ ir_node **all_nodes =
XMALLOCN(ir_node*, node_count
);
be_ifg_foreach_node(ifg, iter1, n)
{
be_ifg_foreach_node(ifg, iter1, n)
{
@@
-352,7
+352,7
@@
void be_ifg_check_sorted_to_file(const be_ifg_t *ifg, FILE *f)
for (i = 0; i < node_count; i++)
{
for (i = 0; i < node_count; i++)
{
- ir_node **neighbours =
xmalloc(node_count * sizeof(neighbours[0])
);
+ ir_node **neighbours =
XMALLOCN(ir_node*, node_count
);
int j = 0;
int k = 0;
int degree = 0;
int j = 0;
int k = 0;
int degree = 0;
@@
-395,7
+395,7
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
copy_opt_t *co;
be_ifg_t *old_if = chordal_env->ifg;
copy_opt_t *co;
be_ifg_t *old_if = chordal_env->ifg;
-
lc_timer_t *timer = lc
_timer_register("getTime","get Time of copy minimization using the ifg");
+
ir_timer_t *timer = ir
_timer_register("getTime","get Time of copy minimization using the ifg");
unsigned long elapsed_usec = 0;
if (get_irg_estimated_node_cnt(chordal_env->irg) >= BE_CH_PERFORMANCETEST_MIN_NODES)
unsigned long elapsed_usec = 0;
if (get_irg_estimated_node_cnt(chordal_env->irg) >= BE_CH_PERFORMANCETEST_MIN_NODES)
@@
-403,22
+403,22
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
coloring_init(&coloring, chordal_env->irg, chordal_env->birg->main_env->arch_env);
coloring_save(&coloring);
coloring_init(&coloring, chordal_env->irg, chordal_env->birg->main_env->arch_env);
coloring_save(&coloring);
-
lc
_timer_reset(timer);
+
ir
_timer_reset(timer);
for (i = 0; i<tests; i++) /* performance test with std */
{
for (i = 0; i<tests; i++) /* performance test with std */
{
- used_memory =
lc
_get_heap_used_bytes();
+ used_memory =
ir
_get_heap_used_bytes();
- rt =
lc
_timer_enter_high_priority();
-
lc
_timer_start(timer);
+ rt =
ir
_timer_enter_high_priority();
+
ir
_timer_start(timer);
chordal_env->ifg = be_ifg_std_new(chordal_env);
chordal_env->ifg = be_ifg_std_new(chordal_env);
-
lc
_timer_stop(timer);
- rt =
lc
_timer_leave_high_priority();
+
ir
_timer_stop(timer);
+ rt =
ir
_timer_leave_high_priority();
- used_memory =
lc
_get_heap_used_bytes() - used_memory;
+ used_memory =
ir
_get_heap_used_bytes() - used_memory;
coloring_restore(&coloring);
coloring_restore(&coloring);
@@
-427,13
+427,13
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
co_build_ou_structure(co);
co_build_graph_structure(co);
co_build_ou_structure(co);
co_build_graph_structure(co);
- rt =
lc
_timer_enter_high_priority();
-
lc
_timer_start(timer);
+ rt =
ir
_timer_enter_high_priority();
+
ir
_timer_start(timer);
co_solve_heuristic_new(co);
co_solve_heuristic_new(co);
-
lc
_timer_stop(timer);
- rt =
lc
_timer_leave_high_priority();
+
ir
_timer_stop(timer);
+ rt =
ir
_timer_leave_high_priority();
co_free_graph_structure(co);
co_free_ou_structure(co);
co_free_graph_structure(co);
co_free_ou_structure(co);
@@
-442,7
+442,7
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
}
}
- elapsed_usec =
lc
_timer_elapsed_usec(timer);
+ elapsed_usec =
ir
_timer_elapsed_usec(timer);
/* calculating average */
elapsed_usec = elapsed_usec / tests;
/* calculating average */
elapsed_usec = elapsed_usec / tests;
@@
-453,17
+453,17
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
for (i = 0; i<tests; i++) /* performance test with clique */
{
for (i = 0; i<tests; i++) /* performance test with clique */
{
- used_memory =
lc
_get_heap_used_bytes();
+ used_memory =
ir
_get_heap_used_bytes();
- rt =
lc
_timer_enter_high_priority();
-
lc
_timer_start(timer);
+ rt =
ir
_timer_enter_high_priority();
+
ir
_timer_start(timer);
chordal_env->ifg = be_ifg_clique_new(chordal_env);
chordal_env->ifg = be_ifg_clique_new(chordal_env);
-
lc
_timer_stop(timer);
- rt =
lc
_timer_leave_high_priority();
+
ir
_timer_stop(timer);
+ rt =
ir
_timer_leave_high_priority();
- used_memory =
lc
_get_heap_used_bytes() - used_memory;
+ used_memory =
ir
_get_heap_used_bytes() - used_memory;
coloring_restore(&coloring);
coloring_restore(&coloring);
@@
-472,13
+472,13
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
co_build_ou_structure(co);
co_build_graph_structure(co);
co_build_ou_structure(co);
co_build_graph_structure(co);
- rt =
lc
_timer_enter_high_priority();
-
lc
_timer_start(timer);
+ rt =
ir
_timer_enter_high_priority();
+
ir
_timer_start(timer);
co_solve_heuristic_new(co);
co_solve_heuristic_new(co);
-
lc
_timer_stop(timer);
- rt =
lc
_timer_leave_high_priority();
+
ir
_timer_stop(timer);
+ rt =
ir
_timer_leave_high_priority();
co_free_graph_structure(co);
co_free_ou_structure(co);
co_free_graph_structure(co);
co_free_ou_structure(co);
@@
-487,7
+487,7
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
}
}
- elapsed_usec =
lc
_timer_elapsed_usec(timer);
+ elapsed_usec =
ir
_timer_elapsed_usec(timer);
/* calculating average */
elapsed_usec = elapsed_usec / tests;
/* calculating average */
elapsed_usec = elapsed_usec / tests;
@@
-498,17
+498,17
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
for (i = 0; i<tests; i++) /* performance test with list */
{
for (i = 0; i<tests; i++) /* performance test with list */
{
- used_memory =
lc
_get_heap_used_bytes();
+ used_memory =
ir
_get_heap_used_bytes();
- rt =
lc
_timer_enter_high_priority();
-
lc
_timer_start(timer);
+ rt =
ir
_timer_enter_high_priority();
+
ir
_timer_start(timer);
chordal_env->ifg = be_ifg_list_new(chordal_env);
chordal_env->ifg = be_ifg_list_new(chordal_env);
-
lc
_timer_stop(timer);
- rt =
lc
_timer_leave_high_priority();
+
ir
_timer_stop(timer);
+ rt =
ir
_timer_leave_high_priority();
- used_memory =
lc
_get_heap_used_bytes() - used_memory;
+ used_memory =
ir
_get_heap_used_bytes() - used_memory;
coloring_restore(&coloring);
coloring_restore(&coloring);
@@
-517,13
+517,13
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
co_build_ou_structure(co);
co_build_graph_structure(co);
co_build_ou_structure(co);
co_build_graph_structure(co);
- rt =
lc
_timer_enter_high_priority();
-
lc
_timer_start(timer);
+ rt =
ir
_timer_enter_high_priority();
+
ir
_timer_start(timer);
co_solve_heuristic_new(co);
co_solve_heuristic_new(co);
-
lc
_timer_stop(timer);
- rt =
lc
_timer_leave_high_priority();
+
ir
_timer_stop(timer);
+ rt =
ir
_timer_leave_high_priority();
co_free_graph_structure(co);
co_free_ou_structure(co);
co_free_graph_structure(co);
co_free_ou_structure(co);
@@
-532,7
+532,7
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
}
}
- elapsed_usec =
lc
_timer_elapsed_usec(timer);
+ elapsed_usec =
ir
_timer_elapsed_usec(timer);
/* calculating average */
elapsed_usec = elapsed_usec / tests;
/* calculating average */
elapsed_usec = elapsed_usec / tests;
@@
-543,17
+543,17
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
for (i = 0; i<tests; i++) /* performance test with pointer */
{
for (i = 0; i<tests; i++) /* performance test with pointer */
{
- used_memory =
lc
_get_heap_used_bytes();
+ used_memory =
ir
_get_heap_used_bytes();
- rt =
lc
_timer_enter_high_priority();
-
lc
_timer_start(timer);
+ rt =
ir
_timer_enter_high_priority();
+
ir
_timer_start(timer);
chordal_env->ifg = be_ifg_pointer_new(chordal_env);
chordal_env->ifg = be_ifg_pointer_new(chordal_env);
-
lc
_timer_stop(timer);
- rt =
lc
_timer_leave_high_priority();
+
ir
_timer_stop(timer);
+ rt =
ir
_timer_leave_high_priority();
- used_memory =
lc
_get_heap_used_bytes() - used_memory;
+ used_memory =
ir
_get_heap_used_bytes() - used_memory;
coloring_restore(&coloring);
coloring_restore(&coloring);
@@
-562,13
+562,13
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
co_build_ou_structure(co);
co_build_graph_structure(co);
co_build_ou_structure(co);
co_build_graph_structure(co);
- rt =
lc
_timer_enter_high_priority();
-
lc
_timer_start(timer);
+ rt =
ir
_timer_enter_high_priority();
+
ir
_timer_start(timer);
co_solve_heuristic_new(co);
co_solve_heuristic_new(co);
-
lc
_timer_stop(timer);
- rt =
lc
_timer_leave_high_priority();
+
ir
_timer_stop(timer);
+ rt =
ir
_timer_leave_high_priority();
co_free_graph_structure(co);
co_free_ou_structure(co);
co_free_graph_structure(co);
co_free_ou_structure(co);
@@
-577,7
+577,7
@@
void be_ifg_check_performance(be_chordal_env_t *chordal_env)
}
}
- elapsed_usec =
lc
_timer_elapsed_usec(timer);
+ elapsed_usec =
ir
_timer_elapsed_usec(timer);
/* calculating average */
elapsed_usec = elapsed_usec / tests;
/* calculating average */
elapsed_usec = elapsed_usec / tests;