diff options
author | Martin Liska <mliska@suse.cz> | 2014-08-01 10:20:57 +0200 |
---|---|---|
committer | Martin Liska <marxin@gcc.gnu.org> | 2014-08-01 08:20:57 +0000 |
commit | fd29c0247aa4af7492782e6c933c713c6732b4b0 (patch) | |
tree | 34ecf6784681ee0ad5b65f264b03ec52f19e5524 /gcc | |
parent | 0ef40c649bd668717cb99a0dfc90a7218bdfbc29 (diff) | |
download | gcc-fd29c0247aa4af7492782e6c933c713c6732b4b0.zip gcc-fd29c0247aa4af7492782e6c933c713c6732b4b0.tar.gz gcc-fd29c0247aa4af7492782e6c933c713c6732b4b0.tar.bz2 |
IPA ICF pass 1/N
* gimple-iterator.h (gsi_next_nonvirtual_phi): New function.
* ipa-prop.h (count_formal_params): Global function created from static.
* ipa-prop.c (count_formal_params): Likewise.
* ipa-utils.c (ipa_merge_profiles): Be more tolerant if we merge
profiles for semantically equivalent functions.
* passes.c (do_per_function): If we load body of a function
during WPA, this condition should behave same.
* varpool.c (ctor_for_folding): More tolerant assert for variable
aliases created during WPA.
From-SVN: r213417
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 12 | ||||
-rw-r--r-- | gcc/gimple-iterator.h | 24 | ||||
-rw-r--r-- | gcc/ipa-prop.c | 2 | ||||
-rw-r--r-- | gcc/ipa-prop.h | 1 | ||||
-rw-r--r-- | gcc/ipa-utils.c | 9 | ||||
-rw-r--r-- | gcc/passes.c | 2 | ||||
-rw-r--r-- | gcc/varpool.c | 1 |
7 files changed, 42 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index be9c572..d451160 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,17 @@ 2014-08-01 Martin Liska <mliska@suse.cz> + * gimple-iterator.h (gsi_next_nonvirtual_phi): New function. + * ipa-prop.h (count_formal_params): Global function created from static. + * ipa-prop.c (count_formal_params): Likewise. + * ipa-utils.c (ipa_merge_profiles): Be more tolerant if we merge + profiles for semantically equivalent functions. + * passes.c (do_per_function): If we load body of a function + during WPA, this condition should behave same. + * varpool.c (ctor_for_folding): More tolerant assert for variable + aliases created during WPA. + +2014-08-01 Martin Liska <mliska@suse.cz> + * doc/invoke.texi (Options That Control Optimization): Documentation for -foptimize-strlen introduced. Optimization levels default options fixed. diff --git a/gcc/gimple-iterator.h b/gcc/gimple-iterator.h index 909d58b..47168b9 100644 --- a/gcc/gimple-iterator.h +++ b/gcc/gimple-iterator.h @@ -281,6 +281,30 @@ gsi_last_nondebug_bb (basic_block bb) return i; } +/* Iterates I statement iterator to the next non-virtual statement. */ + +static inline void +gsi_next_nonvirtual_phi (gimple_stmt_iterator *i) +{ + gimple phi; + + if (gsi_end_p (*i)) + return; + + phi = gsi_stmt (*i); + gcc_assert (phi != NULL); + + while (virtual_operand_p (gimple_phi_result (phi))) + { + gsi_next (i); + + if (gsi_end_p (*i)) + return; + + phi = gsi_stmt (*i); + } +} + /* Return the basic block associated with this iterator. */ static inline basic_block diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index 576e59a..4b309b9 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -212,7 +212,7 @@ ipa_populate_param_decls (struct cgraph_node *node, /* Return how many formal parameters FNDECL has. */ -static inline int +int count_formal_params (tree fndecl) { tree parm; diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h index 3717394..e5e8268 100644 --- a/gcc/ipa-prop.h +++ b/gcc/ipa-prop.h @@ -529,6 +529,7 @@ void ipa_free_all_edge_args (void); void ipa_free_all_structures_after_ipa_cp (void); void ipa_free_all_structures_after_iinln (void); void ipa_register_cgraph_hooks (void); +int count_formal_params (tree fndecl); /* This function ensures the array of node param infos is big enough to accommodate a structure for all nodes and reallocates it if not. */ diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c index 7810e55..482fc22 100644 --- a/gcc/ipa-utils.c +++ b/gcc/ipa-utils.c @@ -660,13 +660,8 @@ ipa_merge_profiles (struct cgraph_node *dst, if (dst->tp_first_run > src->tp_first_run && src->tp_first_run) dst->tp_first_run = src->tp_first_run; - if (src->profile_id) - { - if (!dst->profile_id) - dst->profile_id = src->profile_id; - else - gcc_assert (src->profile_id == dst->profile_id); - } + if (src->profile_id && !dst->profile_id) + dst->profile_id = src->profile_id; if (!dst->count) return; diff --git a/gcc/passes.c b/gcc/passes.c index 38485a7..dea9de1 100644 --- a/gcc/passes.c +++ b/gcc/passes.c @@ -1478,7 +1478,7 @@ do_per_function (void (*callback) (function *, void *data), void *data) { struct cgraph_node *node; FOR_EACH_DEFINED_FUNCTION (node) - if (node->analyzed && gimple_has_body_p (node->decl) + if (node->analyzed && (gimple_has_body_p (node->decl) && !in_lto_p) && (!node->clone_of || node->decl != node->clone_of->decl)) callback (DECL_STRUCT_FUNCTION (node->decl), data); } diff --git a/gcc/varpool.c b/gcc/varpool.c index 74117e2..f1f6a31 100644 --- a/gcc/varpool.c +++ b/gcc/varpool.c @@ -405,6 +405,7 @@ ctor_for_folding (tree decl) if (decl != real_decl) { gcc_assert (!DECL_INITIAL (decl) + || (node->alias && node->get_alias_target () == real_node) || DECL_INITIAL (decl) == error_mark_node); if (node->weakref) { |