diff options
author | jamborm <jamborm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-22 09:33:11 +0000 |
---|---|---|
committer | jamborm <jamborm@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-22 09:33:11 +0000 |
commit | 1a036a3b458c7df845106c84ed9207bdd077c28f (patch) | |
tree | 172d88f971d14aa07a31e2593610ff9314ed5781 /gcc | |
parent | b2c57537b0ade16e4e274210dcf50eb465e4b6e8 (diff) | |
download | gcc-1a036a3b458c7df845106c84ed9207bdd077c28f.tar.gz |
2010-07-22 Martin Jambor <mjambor@suse.cz>
* cgraphunit.c (verify_edge_count_and_frequency): New function.
(verify_cgraph_node): Verify frequencies of indirect edges.
* tree-inline.c (tree_function_versioning): Update frequencies of
indirect edges.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@162406 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 7 | ||||
-rw-r--r-- | gcc/cgraphunit.c | 68 | ||||
-rw-r--r-- | gcc/tree-inline.c | 10 |
3 files changed, 57 insertions, 28 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2cb8a104e94..80744a1c8d5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-07-22 Martin Jambor <mjambor@suse.cz> + + * cgraphunit.c (verify_edge_count_and_frequency): New function. + (verify_cgraph_node): Verify frequencies of indirect edges. + * tree-inline.c (tree_function_versioning): Update frequencies of + indirect edges. + 2010-07-22 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> PR target/43698 diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index 7dce8e96799..0f3a6e23d00 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -570,6 +570,42 @@ clone_of_p (struct cgraph_node *node, struct cgraph_node *node2) } #endif +/* Verify edge E count and frequency. */ + +static bool +verify_edge_count_and_frequency (struct cgraph_edge *e) +{ + bool error_found = false; + if (e->count < 0) + { + error ("caller edge count is negative"); + error_found = true; + } + if (e->frequency < 0) + { + error ("caller edge frequency is negative"); + error_found = true; + } + if (e->frequency > CGRAPH_FREQ_MAX) + { + error ("caller edge frequency is too large"); + error_found = true; + } + if (gimple_has_body_p (e->caller->decl) + && !e->caller->global.inlined_to + && (e->frequency + != compute_call_stmt_bb_frequency (e->caller->decl, + gimple_bb (e->call_stmt)))) + { + error ("caller edge frequency %i does not match BB freqency %i", + e->frequency, + compute_call_stmt_bb_frequency (e->caller->decl, + gimple_bb (e->call_stmt))); + error_found = true; + } + return error_found; +} + /* Verify cgraph nodes of given cgraph node. */ DEBUG_FUNCTION void verify_cgraph_node (struct cgraph_node *node) @@ -635,33 +671,8 @@ verify_cgraph_node (struct cgraph_node *node) } for (e = node->callers; e; e = e->next_caller) { - if (e->count < 0) - { - error ("caller edge count is negative"); - error_found = true; - } - if (e->frequency < 0) - { - error ("caller edge frequency is negative"); - error_found = true; - } - if (e->frequency > CGRAPH_FREQ_MAX) - { - error ("caller edge frequency is too large"); - error_found = true; - } - if (gimple_has_body_p (e->caller->decl) - && !e->caller->global.inlined_to - && (e->frequency - != compute_call_stmt_bb_frequency (e->caller->decl, - gimple_bb (e->call_stmt)))) - { - error ("caller edge frequency %i does not match BB freqency %i", - e->frequency, - compute_call_stmt_bb_frequency (e->caller->decl, - gimple_bb (e->call_stmt))); - error_found = true; - } + if (verify_edge_count_and_frequency (e)) + error_found = true; if (!e->inline_failed) { if (node->global.inlined_to @@ -684,6 +695,9 @@ verify_cgraph_node (struct cgraph_node *node) error_found = true; } } + for (e = node->indirect_calls; e; e = e->next_callee) + if (verify_edge_count_and_frequency (e)) + error_found = true; if (!node->callers && node->global.inlined_to) { error ("inlined_to pointer is set but no predecessors found"); diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 5b429eb5485..dc09c29b6ea 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -5184,7 +5184,15 @@ tree_function_versioning (tree old_decl, tree new_decl, for (e = new_version_node->callees; e; e = e->next_callee) { basic_block bb = gimple_bb (e->call_stmt); - e->frequency = compute_call_stmt_bb_frequency (current_function_decl, bb); + e->frequency = compute_call_stmt_bb_frequency (current_function_decl, + bb); + e->count = bb->count; + } + for (e = new_version_node->indirect_calls; e; e = e->next_callee) + { + basic_block bb = gimple_bb (e->call_stmt); + e->frequency = compute_call_stmt_bb_frequency (current_function_decl, + bb); e->count = bb->count; } } |