From 6fe906a33de7ad0679cbc4e070feed5809471462 Mon Sep 17 00:00:00 2001 From: Martin Jambor Date: Wed, 3 May 2017 18:48:20 +0200 Subject: [PATCH] Use call_summary in ipa-prop and ipa-cp 2017-05-03 Martin Jambor * ipa-prop.h (ipa_edge_args): Make a class. Mark with for_user GTY tag. Added a default constructor and a destructor. (ipa_edge_args_sum_t): New class; (ipa_edge_args_sum): Declare. (ipa_edge_args_vector): Remove declaration. (IPA_EDGE_REF): Use ipa_edge_args_sum. (ipa_free_edge_args_substructures): Remove declaration. (ipa_check_create_edge_args): Use ipa_edge_args_sum. (ipa_edge_args_info_available_for_edge_p): Likewise. * ipa-prop.c (ipa_edge_args_vector): Removed. (edge_removal_hook_holder): Likewise. (edge_duplication_hook_holder): Likewise. (ipa_edge_args_sum): New variable. (ipa_propagate_indirect_call_infos): Test ipa_edge_args_sum instead of ipa_edge_args_vector. (ipa_free_edge_args_substructures): Likewise. (ipa_free_all_edge_args): Free ipa_edge_args_sum instead of ipa_edge_args_vector. (ipa_edge_removal_hook): Turned into method ipa_edge_args_sum_t::remove. (ipa_edge_duplication_hook): Turned into method ipa_edge_args_sum_t::duplicate. (ipa_register_cgraph_hooks): Create ipa_edge_args_sum instead of registering edge hooks. (ipa_unregister_cgraph_hooks): Do not unregister edge hooks. * ipa-inline-analysis.c (estimate_function_body_sizes): Test ipa_edge_args_sum instead of ipa_edge_args_vector. * ipa-profile.c (ipa_profile): Likewise. From-SVN: r247558 --- gcc/ChangeLog | 31 +++++++++++++++++ gcc/ipa-inline-analysis.c | 2 +- gcc/ipa-profile.c | 2 +- gcc/ipa-prop.c | 70 ++++++++++++--------------------------- gcc/ipa-prop.h | 51 ++++++++++++++++++++++------ 5 files changed, 95 insertions(+), 61 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1fac63cf074..95aa18845fc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,34 @@ +2017-05-03 Martin Jambor + + * ipa-prop.h (ipa_edge_args): Make a class. Mark with for_user GTY + tag. Added a default constructor and a destructor. + (ipa_edge_args_sum_t): New class; + (ipa_edge_args_sum): Declare. + (ipa_edge_args_vector): Remove declaration. + (IPA_EDGE_REF): Use ipa_edge_args_sum. + (ipa_free_edge_args_substructures): Remove declaration. + (ipa_check_create_edge_args): Use ipa_edge_args_sum. + (ipa_edge_args_info_available_for_edge_p): Likewise. + * ipa-prop.c (ipa_edge_args_vector): Removed. + (edge_removal_hook_holder): Likewise. + (edge_duplication_hook_holder): Likewise. + (ipa_edge_args_sum): New variable. + (ipa_propagate_indirect_call_infos): Test ipa_edge_args_sum instead of + ipa_edge_args_vector. + (ipa_free_edge_args_substructures): Likewise. + (ipa_free_all_edge_args): Free ipa_edge_args_sum instead of + ipa_edge_args_vector. + (ipa_edge_removal_hook): Turned into method + ipa_edge_args_sum_t::remove. + (ipa_edge_duplication_hook): Turned into method + ipa_edge_args_sum_t::duplicate. + (ipa_register_cgraph_hooks): Create ipa_edge_args_sum instead of + registering edge hooks. + (ipa_unregister_cgraph_hooks): Do not unregister edge hooks. + * ipa-inline-analysis.c (estimate_function_body_sizes): Test + ipa_edge_args_sum instead of ipa_edge_args_vector. + * ipa-profile.c (ipa_profile): Likewise. + 2017-05-03 Martin Jambor * symbol-summary.h (function_summary): New method exists. diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c index 929de8e9791..47d50507f94 100644 --- a/gcc/ipa-inline-analysis.c +++ b/gcc/ipa-inline-analysis.c @@ -2998,7 +2998,7 @@ estimate_function_body_sizes (struct cgraph_node *node, bool early) { if (!early) loop_optimizer_finalize (); - else if (!ipa_edge_args_vector) + else if (!ipa_edge_args_sum) ipa_free_all_node_params (); free_dominance_info (CDI_DOMINATORS); } diff --git a/gcc/ipa-profile.c b/gcc/ipa-profile.c index ae1ca2f3762..0bfbfa1e447 100644 --- a/gcc/ipa-profile.c +++ b/gcc/ipa-profile.c @@ -620,7 +620,7 @@ ipa_profile (void) "Not speculating: target is overwritable " "and can be discarded.\n"); } - else if (ipa_node_params_sum && ipa_edge_args_vector + else if (ipa_node_params_sum && ipa_edge_args_sum && (!vec_safe_is_empty (IPA_NODE_REF (n2)->descriptors)) && ipa_get_param_count (IPA_NODE_REF (n2)) diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index b3d51595d3f..70990d6000b 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -57,8 +57,8 @@ along with GCC; see the file COPYING3. If not see ipa_node_params_t *ipa_node_params_sum = NULL; /* Vector of IPA-CP transformation data for each clone. */ vec *ipcp_transformations; -/* Vector where the parameter infos are actually stored. */ -vec *ipa_edge_args_vector; +/* Edge summary for IPA-CP edge information. */ +ipa_edge_args_sum_t *ipa_edge_args_sum; /* Traits for a hash table for reusing already existing ipa_bits. */ @@ -148,8 +148,6 @@ struct ipa_vr_ggc_hash_traits : public ggc_cache_remove static GTY ((cache)) hash_table *ipa_vr_hash_table; /* Holders of ipa cgraph hooks: */ -static struct cgraph_edge_hook_list *edge_removal_hook_holder; -static struct cgraph_2edge_hook_list *edge_duplication_hook_holder; static struct cgraph_node_hook_list *function_insertion_hook_holder; /* Description of a reference to an IPA constant. */ @@ -3700,7 +3698,7 @@ ipa_propagate_indirect_call_infos (struct cgraph_edge *cs, (i.e. during early inlining). */ if (!ipa_node_params_sum) return false; - gcc_assert (ipa_edge_args_vector); + gcc_assert (ipa_edge_args_sum); propagate_controlled_uses (cs); changed = propagate_info_to_inlined_callees (cs, cs->callee, new_edges); @@ -3715,9 +3713,10 @@ ipa_propagate_indirect_call_infos (struct cgraph_edge *cs, void ipa_check_create_edge_args (void) { - if (vec_safe_length (ipa_edge_args_vector) - <= (unsigned) symtab->edges_max_uid) - vec_safe_grow_cleared (ipa_edge_args_vector, symtab->edges_max_uid + 1); + if (!ipa_edge_args_sum) + ipa_edge_args_sum + = (new (ggc_cleared_alloc ()) + ipa_edge_args_sum_t (symtab, true)); if (!ipa_bits_hash_table) ipa_bits_hash_table = hash_table::create_ggc (37); if (!ipa_vr_hash_table) @@ -3739,16 +3738,11 @@ ipa_free_edge_args_substructures (struct ipa_edge_args *args) void ipa_free_all_edge_args (void) { - int i; - struct ipa_edge_args *args; - - if (!ipa_edge_args_vector) + if (!ipa_edge_args_sum) return; - FOR_EACH_VEC_ELT (*ipa_edge_args_vector, i, args) - ipa_free_edge_args_substructures (args); - - vec_free (ipa_edge_args_vector); + ipa_edge_args_sum->release (); + ipa_edge_args_sum = NULL; } /* Free all ipa_node_params structures. */ @@ -3785,18 +3779,12 @@ ipa_set_node_agg_value_chain (struct cgraph_node *node, (*ipcp_transformations)[node->uid].agg_values = aggvals; } -/* Hook that is called by cgraph.c when an edge is removed. */ +/* Hook that is called by cgraph.c when an edge is removed. Adjust reference + count data structures accordingly. */ -static void -ipa_edge_removal_hook (struct cgraph_edge *cs, void *data ATTRIBUTE_UNUSED) +void +ipa_edge_args_sum_t::remove (cgraph_edge *cs, ipa_edge_args *args) { - struct ipa_edge_args *args; - - /* During IPA-CP updating we can be called on not-yet analyzed clones. */ - if (vec_safe_length (ipa_edge_args_vector) <= (unsigned)cs->uid) - return; - - args = IPA_EDGE_REF (cs); if (args->jump_functions) { struct ipa_jump_func *jf; @@ -3811,24 +3799,17 @@ ipa_edge_removal_hook (struct cgraph_edge *cs, void *data ATTRIBUTE_UNUSED) rdesc->cs = NULL; } } - - ipa_free_edge_args_substructures (IPA_EDGE_REF (cs)); } -/* Hook that is called by cgraph.c when an edge is duplicated. */ +/* Method invoked when an edge is duplicated. Copy ipa_edge_args and adjust + reference count data strucutres accordingly. */ -static void -ipa_edge_duplication_hook (struct cgraph_edge *src, struct cgraph_edge *dst, - void *) +void +ipa_edge_args_sum_t::duplicate (cgraph_edge *src, cgraph_edge *dst, + ipa_edge_args *old_args, ipa_edge_args *new_args) { - struct ipa_edge_args *old_args, *new_args; unsigned int i; - ipa_check_create_edge_args (); - - old_args = IPA_EDGE_REF (src); - new_args = IPA_EDGE_REF (dst); - new_args->jump_functions = vec_safe_copy (old_args->jump_functions); if (old_args->polymorphic_call_contexts) new_args->polymorphic_call_contexts @@ -3989,13 +3970,8 @@ void ipa_register_cgraph_hooks (void) { ipa_check_create_node_params (); + ipa_check_create_edge_args (); - if (!edge_removal_hook_holder) - edge_removal_hook_holder = - symtab->add_edge_removal_hook (&ipa_edge_removal_hook, NULL); - if (!edge_duplication_hook_holder) - edge_duplication_hook_holder = - symtab->add_edge_duplication_hook (&ipa_edge_duplication_hook, NULL); function_insertion_hook_holder = symtab->add_cgraph_insertion_hook (&ipa_add_new_function, NULL); } @@ -4005,10 +3981,6 @@ ipa_register_cgraph_hooks (void) static void ipa_unregister_cgraph_hooks (void) { - symtab->remove_edge_removal_hook (edge_removal_hook_holder); - edge_removal_hook_holder = NULL; - symtab->remove_edge_duplication_hook (edge_duplication_hook_holder); - edge_duplication_hook_holder = NULL; symtab->remove_cgraph_insertion_hook (function_insertion_hook_holder); function_insertion_hook_holder = NULL; } @@ -5218,7 +5190,7 @@ ipa_prop_write_jump_functions (void) lto_symtab_encoder_iterator lsei; lto_symtab_encoder_t encoder; - if (!ipa_node_params_sum || !ipa_edge_args_vector) + if (!ipa_node_params_sum || !ipa_edge_args_sum) return; ob = create_output_block (LTO_section_jump_functions); diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h index 74234eb470d..db8f378acc7 100644 --- a/gcc/ipa-prop.h +++ b/gcc/ipa-prop.h @@ -559,9 +559,24 @@ void ipcp_grow_transformations_if_necessary (void); /* ipa_edge_args stores information related to a callsite and particularly its arguments. It can be accessed by the IPA_EDGE_REF macro. */ -struct GTY(()) ipa_edge_args + +class GTY((for_user)) ipa_edge_args { - /* Vector of the callsite's jump function of each parameter. */ + public: + + /* Default constructor. */ + ipa_edge_args () : jump_functions (NULL), polymorphic_call_contexts (NULL) + {} + + /* Destructor. */ + ~ipa_edge_args () + { + vec_free (jump_functions); + vec_free (polymorphic_call_contexts); + } + + /* Vectors of the callsite's jump function and polymorphic context + information of each parameter. */ vec *jump_functions; vec *polymorphic_call_contexts; }; @@ -611,19 +626,35 @@ public: ipa_node_params *data2); }; +/* Summary to manange ipa_edge_args structures. */ + +class GTY((user)) ipa_edge_args_sum_t : public call_summary +{ + public: + ipa_edge_args_sum_t (symbol_table *table, bool ggc) + : call_summary (table, ggc) { } + + /* Hook that is called by summary when an edge is duplicated. */ + virtual void remove (cgraph_edge *cs, ipa_edge_args *args); + /* Hook that is called by summary when an edge is duplicated. */ + virtual void duplicate (cgraph_edge *src, + cgraph_edge *dst, + ipa_edge_args *old_args, + ipa_edge_args *new_args); +}; + /* Function summary where the parameter infos are actually stored. */ extern GTY(()) ipa_node_params_t * ipa_node_params_sum; +/* Call summary to store information about edges such as jump functions. */ +extern GTY(()) ipa_edge_args_sum_t *ipa_edge_args_sum; /* Vector of IPA-CP transformation data for each clone. */ extern GTY(()) vec *ipcp_transformations; -/* Vector where the parameter infos are actually stored. */ -extern GTY(()) vec *ipa_edge_args_vector; - /* Return the associated parameter/argument info corresponding to the given node/edge. */ #define IPA_NODE_REF(NODE) (ipa_node_params_sum->get (NODE)) -#define IPA_EDGE_REF(EDGE) (&(*ipa_edge_args_vector)[(EDGE)->uid]) +#define IPA_EDGE_REF(EDGE) (ipa_edge_args_sum->get (EDGE)) /* This macro checks validity of index returned by ipa_get_param_decl_index function. */ #define IS_VALID_JUMP_FUNC_INDEX(I) ((I) != -1) @@ -653,14 +684,14 @@ ipa_check_create_node_params (void) ipa_node_params_t (symtab, true)); } -/* Returns true if the array of edge infos is large enough to accommodate an - info for EDGE. The main purpose of this function is that debug dumping - function can check info availability without causing reallocations. */ +/* Returns true if edge summary contains a record for EDGE. The main purpose + of this function is that debug dumping function can check info availability + without causing allocations. */ static inline bool ipa_edge_args_info_available_for_edge_p (struct cgraph_edge *edge) { - return ((unsigned) edge->uid < vec_safe_length (ipa_edge_args_vector)); + return ipa_edge_args_sum->exists (edge); } static inline ipcp_transformation_summary * -- 2.30.2