diff options
| author | Diego Novillo <dnovillo@redhat.com> | 2006-12-12 01:48:51 +0000 |
|---|---|---|
| committer | Diego Novillo <dnovillo@redhat.com> | 2006-12-12 01:48:51 +0000 |
| commit | 8c511fca415c2857b52beb7fa772f7f257f4da13 (patch) | |
| tree | f22894dcace757df7efc32d1fcf9bd31217c3959 /gcc/tree-ssa-operands.c | |
| parent | e957102e6a10dcd8991691e9dc293a0dd1243155 (diff) | |
2006-12-11 Diego Novillo <dnovillo@redhat.com>
* doc/tree-ssa.texi: Update documentation for virtual operands
and the use of push_stmt_changes/pop_stmt_changes.
* doc/invoke.texi: Remove documentation for params
global-var-threshold.
Update documentation on max-aliased-vops.
* tree-into-ssa.c: Cleanup comments, variables and
spacing in various functions.
(regs_to_rename): Declare.
(mem_syms_to_rename): Declare.
(dump_update_ssa): Declare.
(debug_update_ssa): Declare.
(dump_names_replaced_by): Declare.
(debug_names_replaced_by): Declare.
(dump_def_blocks): Declare.
(debug_def_blocks): Declare.
(dump_defs_stack): Declare.
(debug_defs_stack): Declare.
(dump_currdefs): Declare.
(debug_currdefs): Declare.
(mark_def_sites): Do not handle virtual operands.
(compute_idf): Rename from find_idf. Update users.
(register_new_def): Make local. Convert second argument
to 'tree'.
Use BLOCK_DEFS_STACK directly.
If pushing a non-register, also push the underlying
symbol.
(rewrite_stmt): Do not handle virtual operands.
(dump_tree_ssa): Call dump_def_blocks, dump_defs_stack,
dump_currdefs and dump_tree_ssa_stats.
(dump_tree_ssa_stats): Also dump REPL_TBL.
(replace_use): Remove. Update all users to call SET_USE
instead.
(rewrite_blocks): Move code to free memory to
fini_ssa_renamer.
(mark_def_site_blocks): Move initialization code to
init_ssa_renamer.
(init_ssa_renamer): New.
(fini_ssa_renamer): New.
(rewrite_into_ssa): Call them.
(prepare_block_for_update): Process SSA_OP_ALL_USES first
and SSA_OP_ALL_DEFS later. Do not process virtual
operands separately.
(dump_update_ssa): Call dump_decl_set.
(init_update_ssa): Initialize regs_to_rename and
mem_syms_to_rename.
Call init_ssa_renamer.
(delete_update_ssa): Call fini_ssa_renamer.
Free blocks_with_phis_to_rewrite.
(mark_sym_for_renaming): If the variable has
sub-variables, also mark them.
If the variable belongs to a partition, also mark it.
(mark_set_for_renaming): Call mark_sym_for_renaming on
every symbol in the set.
(switch_virtuals_to_full_rewrite): Call
mark_set_for_renaming.
(update_ssa): Separate syms_to_rename into regs_to_rename
and mem_syms_to_rename.
* tree-dump.c (dump_options): Add TDF_MEMSYMS.
* tree-pretty-print.c (debug_generic_expr): Add TDF_MEMSYMS.
(debug_generic_stmt): Likewise.
(debug_tree_chain): Likewise.
(dump_symbols): New.
(dump_generic_node): Check for TDF_MEMSYMS.
Handle MEMORY_PARTITION_TAG.
If the statement references memory and TDF_MEMSYMS is
given, call dump_symbols.
Indicate default names with (D).
(dump_vops): Update for new virtual operator format.
* tree.c (init_ttree): Add MEMORY_PARTITION_TAG to
tree_contains_struct.
(tree_code_size): Handle MEMORY_PARTITION_TAG.
(tree_node_structure): Likewise.
(needs_to_live_in_memory): Handle SSA names.
* tree.h (MTAG_P): Likewise.
(struct tree_memory_partition_tag): Declare.
(MPT_SYMBOLS): Define.
(union tree_node): Add field 'mpt'.
* treestruct.def (TS_MEMORY_PARTITION_TAG): Define.
* tree.def (MEMORY_PARTITION_TAG): Define.
* tree-pass.h (TDF_MEMSYMS): Define.
* params.h (GLOBAL_VAR_THRESHOLD): Remove.
* tree-ssa-alias.c: Include pointer-set.h
(struct alias_map_d): Remove fields total_alias_vops,
grouped_p and may_aliases. Update all users.
(struct mp_info_def): Declare.
(mp_info_t): New type.
(get_smt_for): Rename from get_tmt_for. Update all
users.
(add_may_alias): Add argument ALREADY_ADDED. If given,
use it to avoid adding duplicate entries to alias sets.
(replace_may_alias): Remove. Update all users.
(total_alias_vops_cmp): Remove. Update all users.
(group_aliases_into): Remove. Update all users.
(tree_pointer_compare): Remove. Update all users.
(compact_name_tags): Remove. Update all users.
(group_aliases): Remove. Update all users.
(mark_non_addressable): Move from tree-flow-inline.h.
Remove the symbol from the partition holding it, if
needed.
(dump_mp_info): New.
(debug_mp_info): New.
(sort_mp_info): New.
(create_partition_for): New.
(rewrite_alias_set_for): New.
(compute_memory_partitions): New.
(compute_may_aliases): Call it.
(init_alias_info): If computing aliases for the first
time, mark every memory symbol for renaming.
(have_common_aliases_p): New.
(compute_flow_insensitive_aliasing): Call it.
(setup_pointers_and_addressables): Do not cache
num_referenced_vars.
For register promoted symbols, mark their former
partition for renaming.
(maybe_create_global_var): Only create .GLOBAL_VAR if
there are no call-clobbered variables and a mix of pure
and non-pure functions were found.
(may_alias_p): Tidy comments.
(create_tag_raw): Remove unused variable new_type.
(dump_alias_info): call dump_memory_partitions.
(dump_points_to_info_for): Call dump_decl_set.
(may_be_aliased): Tidy comments and formatting.
* timevar.def (TV_MEMORY_PARTITIONING): Define.
* tree-vectorizer.c (vect_memsyms_to_rename): Rename from
vect_vnames_to_rename. Set DECL_UIDs instead of SSA name
versions in it.
(slpeel_update_phi_nodes_for_guard1): Ignore memory PHIs.
* tree-vect-transform.c (vect_transform_loop): Call
mark_set_for_renaming with vect_memsyms_to_rename.
* tree-flow-inline.h (zero_imm_uses_p): New.
(memory_partition): New.
(set_memory_partition): New.
(factoring_name_p): New.
(symbol_mem_tag): New. Update every function that used
to access the annotation directly.
(set_symbol_mem_tag): Likewise.
* tree-ssa-copy.c (may_propagate_copy): Allow copies
between a partition and a symbol as long as the symbol
belongs to the partition.
(merge_alias_info): Ignore merge requests when memory
partitions are involved.
* tree-ssa.c (verify_ssa_name): Check that default
definitions have empty defining statements.
(verify_use): Remove argument IS_VIRTUAL.
Don't call verify_ssa_name.
(verify_phi_args): Call verify_ssa_name.
(verify_flow_insensitive_alias_info): Handle MPTs.
(verify_flow_sensitive_alias_info): Likewise.
(verify_name_tags): Likewise.
(verify_call_clobbering): Likewise.
(verify_ssa): Check for VOPs only after aliasing
information is available.
Check virtuals and real operands separately.
Call verify_ssa_name on every operand.
(stmt_references_memory_p): Move to tree-ssa-operands.c.
(walk_use_def_chains_1): Guard against NULL PHI
arguments.
* tree-ssa-operands.c (stmt_references_memory_p): Move from
tree-ssa.c.
(get_mpt_for): New.
(dump_memory_partitions): New.
(debug_memory_partitions): New.
* tree-flow.h (struct var_ann_d): Add field mpt.
(struct stmt_ann_d): Add bitfield references_memory.
* Makefile.in (tree-ssa-structalias.o): Include
pointer-set.h
(tree-ssa-alias.o): Likewise.
* tree-ssa-structalias.c: (update_alias_info): Use
STORED_SYMS to determine which variables are being
written to by the store operation.
* tree-ssa-structalias.h (struct alias_info)
<total_alias_vops>: Remove. Update all users.
<written_vars>: Change to a pointer set. Update all
users.
<dereferenced_ptrs_store>: Likewise.
<dereferenced_ptrs_load>: Likewise.
(NUM_REFERENCES): Remove. Update all users.
(NUM_REFERENCES_CLEAR): Remove. Update all users.
(NUM_REFERENCES_INC): Remove. Update all users.
(NUM_REFERENCES_SET): Remove. Update all users.
* params.def (PARAM_GLOBAL_VAR_THRESHOLD): Remove.
Update all users.
(PARAM_MAX_ALIASED_VOPS): Set to 10.
* tree-ssanames.c (make_ssa_name): Initialize
SSA_NAME_IS_DEFAULT_DEF to 0.
2006-12-11 Aldy Hernandez <aldyh@redhat.com>
* tree-ssa-dse.c (aggregate_vardecl_d): New.
(dse_global_data): Add aggregate_vardecl field.
(dse_possible_dead_store_p): New.
Add prev_defvar variable.
Allow immediate uses and previous immediate uses to differ
if they are setting different parts of the whole.
(get_aggregate_vardecl): New.
(dse_record_partial_aggregate_store): New.
(dse_whole_aggregate_clobbered_p): New.
(dse_partial_kill_p): New.
(dse_optimize_stmt): Abstract code checking a possible dead store
into new function dse_possible_dead_store_p().
Call dse_maybe_record_aggregate_store().
When checking whether a STMT and its USE_STMT refer to the
same memory address, check also for partial kills that clobber
the whole.
Move some variable definitions to the block where they are used.
(aggregate_vardecl_hash): New.
(aggregate_vardecl_eq): New.
(aggregate_vardecl_free): New.
(aggregate_whole_store_p): New.
(tree_ssa_dse): Initialize and free aggregate_vardecl.
Mark which aggregate stores we care about.
2006-12-11 Andrew Macleod <amacleod@redhat.com>
* tree-ssa-operands.h (struct vuse_element_d): Declare.
(vuse_element_t): Declare.
(struct vuse_vec_d): Declare.
(vuse_vec_p): Declare.
(VUSE_VECT_NUM_ELEM): Define.
(VUSE_VECT_ELEMENT_NC): Define.
(VUSE_ELEMENT_PTR_NC): Define.
(VUSE_ELEMENT_VAR_NC): Define.
(VUSE_VECT_ELEMENT): Define.
(VUSE_ELEMENT_PTR): Define.
(VUSE_ELEMENT_VAR): Define.
(struct maydef_optype_d) <use_var>: Remove.
<use_ptr>: Remove.
<usev>: Add.
(struct vuse_optype_d) <kill_var>: Remove.
<use_ptr>: Remove.
<usev>: Add.
(struct mustdef_optype_d) <kill_var>: Remove.
<use_ptr>: Remove.
<usev>: Add.
(VUSE_OP_PTR): Add argument. Use VUSE_ELEMENT_PTR.
(VUSE_OP): Add argument. Use VUSE_ELEMENT_PTR.
(VUSE_NUM): Define.
(VUSE_VECT): Define.
(MAYDEF_OP_PTR): Add argument. Use VUSE_OP_PTR.
(MAYDEF_OP): Add argument. Use VUSE_OP.
(MAYDEF_NUM): Define.
(MAYDEF_VECT): Define.
(MUSTDEF_KILL_PTR): Use VUSE_OP_PTR.
(MUSTDEF_KILL): Use VUSE_OP.
(MUSTDEF_NUM): Define.
(MUSTDEF_VECT): Define.
(realloc_maydef): Declare.
(realloc_vuse): Declare.
(struct ssa_operand_iterator_d) <vuse_index>: Add.
<mayuse_index>: Add.
(LOADED_SYMS): Define.
(STORED_SYMS): Define.
(FOR_EACH_SSA_MUSTDEF_OPERAND): Call op_iter_next_mustdef.
* tree-into-ssa.c: Adapt for multi-operand V_MAY_DEF and VUSE
operators.
* tree-pretty-print.c: Likewise.
* tree-ssa-dse.c: Likewise.
* tree-flow-inline.h: Likewise.
(op_iter_next_mustdef): New.
* tree-ssa-operands.c: Likewise.
(ALLOC_OPTYPE): Remove.
Update all users.
(alloc_def): New.
(alloc_use): New.
(alloc_maydef): New.
(alloc_vuse): New.
(alloc_mustdef): New.
(realloc_maydef): New.
(realloc_vuse): New.
2006-12-11 Aldy Hernandez <aldyh@redhat.com>
* tree-ssa-operands.c: Remove build_v_must_defs.
(init_ssa_operands): Delete build_v_must_defs.
(finalize_ssa_v_must_def_ops): Remove.
(finalize_ssa_v_must_defs): Remove.
(finalize_ssa_stmt_operands): Do not call
finalize_ssa_v_must_defs.
(start_ssa_stmt_operands): Do not check build_v_must_defs.
(append_v_must_def): Delete.
(copy_virtual_operands): Do not copy V_MUST_DEFs.
(get_modify_expr_operands): Remove reference to V_MUST_DEF from
comment. Remove opf_kill_def.
(build_ssa_operands): Remove references to v_must_defs.
(copy_virtual_operands): Same.
(copy_virtual_operands): Same.
(fini_ssa_operands): Same.
(free_ssa_operands): Same.
(add_mustdef_op): Remove.
Remove mustdef_optype_p.
(alloc_mustdef): Remove.
Remove references to V_MUST_DEFs in comment at top of file.
(get_expr_operands): Remove opf_kill_def.
(opf_kill_def): Remove.
(add_virtual_operand): Remove opf_kill_def.
(get_indirect_ref_operands): Same.
(get_tmr_operands): Same.
* tree-vectorizer.c (rename_variables_in_bb): Remove
SSA_OP_ALL_KILLS.
* tree-ssa-loop-manip.c (find_uses_to_rename_stmt): Remove
SSA_OP_ALL_KILLS.
(check_loop_closed_ssa_stmt): Same.
* tree-ssa.c (verify_def): Remove V_MUST_DEF from comment.
(verify_use): Same.
(verify_ssa): Remove V_MUST_DEFs traces.
(verify_ssa): Remove SSA_OP_ALL_KILLS.
* tree-into-ssa.c (mark_def_sites): Change SSA_OP_VMUSTDEF to
SSA_OP_VMAYDEF.
(rewrite_update_stmt): Remove SSA_OP_VIRTUAL_KILLS.
(rewrite_stmt): Remove SSA_OP_ALL_KILLS.
* tree-ssa-operands.h (struct stmt_operands_d): Remove V_MUST_DEF
references.
(MUSTDEF_OPS): Remove.
(SSA_OP_VMUSTDEF): Remove.
(FOR_EACH_SSA_MUSTDEF_OPERAND): Remove.
(struct mustdef_optype_d): Remove.
Remove mustdef_optype_p.
(struct stmt_operands_d): Remove mustdef_ops.
(ssa_operand_iterator_d): Remove mustdefs and mustkills.
(SSA_OP_VIRTUAL_DEFS): Remove SSA_OP_VMUSTDEF.
(MUSTDEF_RESULT_PTR): Remove.
(MUSTDEF_RESULT): Remove.
(MUSTDEF_KILL_PTR): Remove.
(MUSTDEF_KILL): Remove.
(MUSTDEF_NUM): Remove.
(MUSTDEF_VECT): Remove.
(SSA_OP_VIRTUAL_KILLS): Remove.
(SSA_OP_ALL_VIRTUALS): Remove SSA_OP_VIRTUAL_KILLS.
(SSA_OP_VMUSTKILL): Remove.
(SSA_OP_ALL_KILLS): Remove.
(SSA_OP_ALL_OPERANDS): Remove SSA_OP_ALL_KILLS.
* tree-flow-inline.h (op_iter_init_def): Remove
SSA_OP_VIRTUAL_KILLS.
(delink_stmt_imm_use): Remove SSA_OP_ALL_KILLS.
* tree-ssa-pre.c (compute_rvuse_and_antic_safe): Remove
SSA_OP_VIRTUAL_KILLS.
* tree-ssa-loop-im.c (determine_max_movement): Remove
SSA_OP_VIRTUAL_KILLS.
(gather_mem_refs_stmt): Same.
(gather_mem_refs_stmt): Same.
* tree-ssa-dce.c (mark_really_necessary_kill_operand_phis): Delete.
(perform_tree_ssa_dce): Remove call to
mark_really_necessary_kill_operand_phis.
* tree-flow-inline.h (op_iter_init): Remove setting of mustdefs
and mustkills.
(op_iter_next_use): Do not check mustkills.
(op_iter_next_def): Do not check mustdefs.
(op_iter_next_tree): Do not check mustkills or mustdefs.
(clear_and_done_ssa_iter): Do not set mustdefs or mustkills.
(op_iter_next_maymustdef): Do not check mustkills.
(op_iter_init_must_and_may_def): Remove SSA_OP_VMUSTKILL.
(op_iter_init_mustdef): Remove.
* tree-ssa-live.c (create_ssa_var_map): Change SSA_OP_VMUSTDEF to
SSA_OP_VMAYDEF.
* tree-ssa-dse.c (dse_optimize_stmt): Remove SSA_OP_VMUSTDEF.
* tree-ssa-ccp.c: Remove V_MUST_DEF traces from comments.
(visit_assignment): Same.
* tree-ssa-copy.c (copy_prop_visit_assignment): Same.
* tree-sra.c (mark_all_v_defs_1): Remove V_MUST_DEF from comment.
* tree-outof-ssa.c (check_replaceable): Remove SSA_OP_VMUSTDEF.
* tree-pretty-print.c (dump_vops): Remove printing of V_MUST_DEF.
Remove kill_p variable.
* tree-dfa.c (struct dfa_stats_d): Remove num_v_must_defs.
(dump_dfa_stats): Remove code related to V_MUST_DEFs.
(collect_dfa_stats_r): Do not set num_v_must_defs.
(mark_new_vars_to_rename): Remove v_must_defs_{before,after}
code.
* tree-into-ssa.c (mark_def_sites): Change SSA_OP_VMUSTKILL to
SSA_OP_VMAYUSE.
* tree-ssa-pre.c (compute_rvuse_and_antic_safe): Remove
SSA_OP_VMUSTDEF and SSA_OP_VMUSTKILL.
* tree-ssa-propagate.c (stmt_makes_single_store): Remove
SSA_OP_VMUSTDEF.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@119760 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-ssa-operands.c')
| -rw-r--r-- | gcc/tree-ssa-operands.c | 1424 |
1 files changed, 816 insertions, 608 deletions
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c index cac13ebf469..c11fe5b80f5 100644 --- a/gcc/tree-ssa-operands.c +++ b/gcc/tree-ssa-operands.c @@ -53,16 +53,15 @@ Boston, MA 02110-1301, USA. */ The operand tree is the parsed by the various get_* routines which look through the stmt tree for the occurrence of operands which may be of interest, and calls are made to the append_* routines whenever one is - found. There are 5 of these routines, each representing one of the - 5 types of operands. Defs, Uses, Virtual Uses, Virtual May Defs, and - Virtual Must Defs. + found. There are 4 of these routines, each representing one of the + 4 types of operands. Defs, Uses, Virtual Uses, and Virtual May Defs. The append_* routines check for duplication, and simply keep a list of unique objects for each operand type in the build_* extendable vectors. Once the stmt tree is completely parsed, the finalize_ssa_operands() routine is called, which proceeds to perform the finalization routine - on each of the 5 operand vectors which have been built up. + on each of the 4 operand vectors which have been built up. If the stmt had a previous operand cache, the finalization routines attempt to match up the new operands with the old ones. If it's a perfect @@ -76,17 +75,44 @@ Boston, MA 02110-1301, USA. */ vector for VUSE, then the new vector will also be modified such that it contains 'a_5' rather than 'a'. */ + +/* Structure storing statistics on how many call clobbers we have, and + how many where avoided. */ + +static struct +{ + /* Number of call-clobbered ops we attempt to add to calls in + add_call_clobbered_mem_symbols. */ + unsigned int clobbered_vars; + + /* Number of write-clobbers (VDEFs) avoided by using + not_written information. */ + unsigned int static_write_clobbers_avoided; + + /* Number of reads (VUSEs) avoided by using not_read information. */ + unsigned int static_read_clobbers_avoided; + + /* Number of write-clobbers avoided because the variable can't escape to + this call. */ + unsigned int unescapable_clobbers_avoided; + + /* Number of read-only uses we attempt to add to calls in + add_call_read_mem_symbols. */ + unsigned int readonly_clobbers; + + /* Number of read-only uses we avoid using not_read information. */ + unsigned int static_readonly_clobbers_avoided; +} clobber_stats; + + /* Flags to describe operand properties in helpers. */ /* By default, operands are loaded. */ -#define opf_none 0 +#define opf_use 0 /* Operand is the target of an assignment expression or a call-clobbered variable. */ -#define opf_is_def (1 << 0) - -/* Operand is the target of an assignment expression. */ -#define opf_kill_def (1 << 1) +#define opf_def (1 << 0) /* No virtual operands should be created in the expression. This is used when traversing ADDR_EXPR nodes which have different semantics than @@ -94,12 +120,12 @@ Boston, MA 02110-1301, USA. */ need to consider are indices into arrays. For instance, &a.b[i] should generate a USE of 'i' but it should not generate a VUSE for 'a' nor a VUSE for 'b'. */ -#define opf_no_vops (1 << 2) +#define opf_no_vops (1 << 1) -/* Operand is a "non-specific" kill for call-clobbers and such. This - is used to distinguish "reset the world" events from explicit - GIMPLE_MODIFY_STMTs. */ -#define opf_non_specific (1 << 3) +/* Operand is an implicit reference. This is used to distinguish + explicit assignments in the form of GIMPLE_MODIFY_STMT from + clobbering sites like function calls or ASM_EXPRs. */ +#define opf_implicit (1 << 2) /* Array for building all the def operands. */ static VEC(tree,heap) *build_defs; @@ -107,14 +133,17 @@ static VEC(tree,heap) *build_defs; /* Array for building all the use operands. */ static VEC(tree,heap) *build_uses; -/* Array for building all the V_MAY_DEF operands. */ -static VEC(tree,heap) *build_v_may_defs; +/* Set for building all the VDEF operands. */ +static VEC(tree,heap) *build_vdefs; -/* Array for building all the VUSE operands. */ +/* Set for building all the VUSE operands. */ static VEC(tree,heap) *build_vuses; -/* Array for building all the V_MUST_DEF operands. */ -static VEC(tree,heap) *build_v_must_defs; +/* Set for building all the loaded symbols. */ +static bitmap build_loads; + +/* Set for building all the stored symbols. */ +static bitmap build_stores; static void get_expr_operands (tree, tree *, int); @@ -164,22 +193,6 @@ DEF_VEC_ALLOC_P(scb_t,heap); of changes for the popped statement. */ static VEC(scb_t,heap) *scb_stack; -/* Allocates operand OP of given TYPE from the appropriate free list, - or of the new value if the list is empty. */ - -#define ALLOC_OPTYPE(OP, TYPE) \ - do \ - { \ - TYPE##_optype_p ret \ - = gimple_ssa_operands (cfun)->free_##TYPE##s; \ - if (ret) \ - gimple_ssa_operands (cfun)->free_##TYPE##s \ - = ret->next; \ - else \ - ret = ssa_operand_alloc (sizeof (*ret)); \ - (OP) = ret; \ - } while (0) - /* Return the DECL_UID of the base variable of T. */ static inline unsigned @@ -252,35 +265,6 @@ ssa_operands_active (void) } -/* Structure storing statistics on how many call clobbers we have, and - how many where avoided. */ - -static struct -{ - /* Number of call-clobbered ops we attempt to add to calls in - add_call_clobber_ops. */ - unsigned int clobbered_vars; - - /* Number of write-clobbers (V_MAY_DEFs) avoided by using - not_written information. */ - unsigned int static_write_clobbers_avoided; - - /* Number of reads (VUSEs) avoided by using not_read information. */ - unsigned int static_read_clobbers_avoided; - - /* Number of write-clobbers avoided because the variable can't escape to - this call. */ - unsigned int unescapable_clobbers_avoided; - - /* Number of read-only uses we attempt to add to calls in - add_call_read_ops. */ - unsigned int readonly_clobbers; - - /* Number of read-only uses we avoid using not_read information. */ - unsigned int static_readonly_clobbers_avoided; -} clobber_stats; - - /* Initialize the operand cache routines. */ void @@ -291,11 +275,14 @@ init_ssa_operands (void) build_defs = VEC_alloc (tree, heap, 5); build_uses = VEC_alloc (tree, heap, 10); build_vuses = VEC_alloc (tree, heap, 25); - build_v_may_defs = VEC_alloc (tree, heap, 25); - build_v_must_defs = VEC_alloc (tree, heap, 25); + build_vdefs = VEC_alloc (tree, heap, 25); + build_loads = BITMAP_ALLOC (NULL); + build_stores = BITMAP_ALLOC (NULL); + scb_stack = VEC_alloc (scb_t, heap, 20); } gcc_assert (gimple_ssa_operands (cfun)->operand_memory == NULL); + gcc_assert (gimple_ssa_operands (cfun)->mpt_table == NULL); gimple_ssa_operands (cfun)->operand_memory_index = SSA_OPERAND_MEMORY_SIZE; gimple_ssa_operands (cfun)->ops_active = true; memset (&clobber_stats, 0, sizeof (clobber_stats)); @@ -308,19 +295,29 @@ void fini_ssa_operands (void) { struct ssa_operand_memory_d *ptr; + unsigned ix; + tree mpt; + if (!--n_initialized) { VEC_free (tree, heap, build_defs); VEC_free (tree, heap, build_uses); - VEC_free (tree, heap, build_v_must_defs); - VEC_free (tree, heap, build_v_may_defs); + VEC_free (tree, heap, build_vdefs); VEC_free (tree, heap, build_vuses); + BITMAP_FREE (build_loads); + BITMAP_FREE (build_stores); + + /* The change buffer stack had better be empty. */ + gcc_assert (VEC_length (scb_t, scb_stack) == 0); + VEC_free (scb_t, heap, scb_stack); + scb_stack = NULL; } + gimple_ssa_operands (cfun)->free_defs = NULL; gimple_ssa_operands (cfun)->free_uses = NULL; gimple_ssa_operands (cfun)->free_vuses = NULL; - gimple_ssa_operands (cfun)->free_maydefs = NULL; - gimple_ssa_operands (cfun)->free_mustdefs = NULL; + gimple_ssa_operands (cfun)->free_vdefs = NULL; + while ((ptr = gimple_ssa_operands (cfun)->operand_memory) != NULL) { gimple_ssa_operands (cfun)->operand_memory @@ -328,21 +325,31 @@ fini_ssa_operands (void) ggc_free (ptr); } + for (ix = 0; + VEC_iterate (tree, gimple_ssa_operands (cfun)->mpt_table, ix, mpt); + ix++) + { + if (mpt) + BITMAP_FREE (MPT_SYMBOLS (mpt)); + } + + VEC_free (tree, heap, gimple_ssa_operands (cfun)->mpt_table); + gimple_ssa_operands (cfun)->ops_active = false; - + if (dump_file && (dump_flags & TDF_STATS)) { - fprintf (dump_file, "Original clobbered vars:%d\n", + fprintf (dump_file, "Original clobbered vars: %d\n", clobber_stats.clobbered_vars); - fprintf (dump_file, "Static write clobbers avoided:%d\n", + fprintf (dump_file, "Static write clobbers avoided: %d\n", clobber_stats.static_write_clobbers_avoided); - fprintf (dump_file, "Static read clobbers avoided:%d\n", + fprintf (dump_file, "Static read clobbers avoided: %d\n", clobber_stats.static_read_clobbers_avoided); - fprintf (dump_file, "Unescapable clobbers avoided:%d\n", + fprintf (dump_file, "Unescapable clobbers avoided: %d\n", clobber_stats.unescapable_clobbers_avoided); - fprintf (dump_file, "Original read-only clobbers:%d\n", + fprintf (dump_file, "Original read-only clobbers: %d\n", clobber_stats.readonly_clobbers); - fprintf (dump_file, "Static read-only clobbers avoided:%d\n", + fprintf (dump_file, "Static read-only clobbers avoided: %d\n", clobber_stats.static_readonly_clobbers_avoided); } } @@ -354,8 +361,11 @@ static inline void * ssa_operand_alloc (unsigned size) { char *ptr; + + gcc_assert (size <= SSA_OPERAND_MEMORY_SIZE); + if (gimple_ssa_operands (cfun)->operand_memory_index + size - >= SSA_OPERAND_MEMORY_SIZE) + >= SSA_OPERAND_MEMORY_SIZE) { struct ssa_operand_memory_d *ptr; ptr = GGC_NEW (struct ssa_operand_memory_d); @@ -370,6 +380,82 @@ ssa_operand_alloc (unsigned size) } +static inline struct def_optype_d * +alloc_def (void) +{ + struct def_optype_d *ret; + if (gimple_ssa_operands (cfun)->free_defs) + { + ret = gimple_ssa_operands (cfun)->free_defs; + gimple_ssa_operands (cfun)->free_defs + = gimple_ssa_operands (cfun)->free_defs->next; + } + else + ret = (struct def_optype_d *) + ssa_operand_alloc (sizeof (struct def_optype_d)); + return ret; +} + + +static inline struct use_optype_d * +alloc_use (void) +{ + struct use_optype_d *ret; + if (gimple_ssa_operands (cfun)->free_uses) + { + ret = gimple_ssa_operands (cfun)->free_uses; + gimple_ssa_operands (cfun)->free_uses + = gimple_ssa_operands (cfun)->free_uses->next; + } + else + ret = (struct use_optype_d *)ssa_operand_alloc (sizeof (struct use_optype_d)); + return ret; +} + + + + +static inline struct vdef_optype_d * +alloc_vdef (int num) +{ + struct vdef_optype_d *ret; + /* Eliminate free list for the moment. */ +#if 0 + if (free_vdefs) + { + ret = free_vdefs; + free_vdefs = free_vdefs->next; + } + else +#endif + ret = (struct vdef_optype_d *)ssa_operand_alloc ( + sizeof (struct vdef_optype_d) + (num - 1) * sizeof (vuse_element_t)); + VUSE_VECT_NUM_ELEM (ret->usev) = num; + return ret; +} + + + + +static inline struct vuse_optype_d * +alloc_vuse (int num) +{ + struct vuse_optype_d *ret; +/* No free list for the moment. */ +#if 0 + if (free_vuses) + { + ret = free_vuses; + free_vuses = free_vuses->next; + } + else +#endif + ret = (struct vuse_optype_d *)ssa_operand_alloc ( + sizeof (struct vuse_optype_d) + (num - 1) * sizeof (vuse_element_t)); + VUSE_VECT_NUM_ELEM (ret->usev) = num; + return ret; +} + /* This routine makes sure that PTR is in an immediate use list, and makes sure the stmt pointer is set to the current stmt. */ @@ -430,71 +516,191 @@ set_virtual_use_link (use_operand_p ptr, tree stmt) /* Adds OP to the list of defs after LAST, and moves LAST to the new element. */ -static inline void +static inline def_optype_p add_def_op (tree *op, def_optype_p *last) { def_optype_p new; - ALLOC_OPTYPE (new, def); + new = alloc_def (); DEF_OP_PTR (new) = op; APPEND_OP_AFTER (new, *last); + return new; } /* Adds OP to the list of uses of statement STMT after LAST, and moves LAST to the new element. */ -static inline void +static inline use_optype_p add_use_op (tree stmt, tree *op, use_optype_p *last) { use_optype_p new; - ALLOC_OPTYPE (new, use); + new = alloc_use (); INITIALIZE_USE (USE_OP_PTR (new), op, stmt); APPEND_OP_AFTER (new, *last); + return new; } /* Adds OP to the list of vuses of statement STMT after LAST, and moves LAST to the new element. */ -static inline void -add_vuse_op (tree stmt, tree op, vuse_optype_p *last) +static inline vuse_optype_p +add_vuse_op (tree stmt, tree op, int num, vuse_optype_p *last) { vuse_optype_p new; + int x; + + new = alloc_vuse (num); + for (x = 0; x < num; x++) + { + SET_VUSE_OP (new, x, op); + INITIALIZE_USE (VUSE_OP_PTR (new, x), &new->usev.uses[x].use_var, stmt); + } - ALLOC_OPTYPE (new, vuse); - VUSE_OP (new) = op; - INITIALIZE_USE (VUSE_OP_PTR (new), &VUSE_OP (new), stmt); APPEND_OP_AFTER (new, *last); + return new; } -/* Adds OP to the list of maydefs of statement STMT after LAST, and moves + +/* Adds OP to the list of vdefs of statement STMT after LAST, and moves LAST to the new element. */ -static inline void -add_maydef_op (tree stmt, tree op, maydef_optype_p *last) +static inline vdef_optype_p +add_vdef_op (tree stmt, tree op, int num, vdef_optype_p *last) { - maydef_optype_p new; + int x; + vdef_optype_p new; + + new = alloc_vdef (num); + VDEF_RESULT (new) = op; + for (x = 0; x < num; x++) + { + SET_VDEF_OP (new, x, op); + INITIALIZE_USE (VDEF_OP_PTR (new, x), &new->usev.uses[x].use_var, stmt); + } - ALLOC_OPTYPE (new, maydef); - MAYDEF_RESULT (new) = op; - MAYDEF_OP (new) = op; - INITIALIZE_USE (MAYDEF_OP_PTR (new), &MAYDEF_OP (new), stmt); APPEND_OP_AFTER (new, *last); + return new; } -/* Adds OP to the list of mustdefs of statement STMT after LAST, and moves - LAST to the new element. */ -static inline void -add_mustdef_op (tree stmt, tree op, mustdef_optype_p *last) +struct vdef_optype_d * +realloc_vdef (struct vdef_optype_d *ptr, int num_elem) { - mustdef_optype_p new; + int x, lim; + tree val, stmt; + struct vdef_optype_d *ret, *tmp; + + if (VUSE_VECT_NUM_ELEM (ptr->usev) == num_elem) + return ptr; + + val = VDEF_RESULT (ptr); + if (TREE_CODE (val) == SSA_NAME) + val = SSA_NAME_VAR (val); + + stmt = USE_STMT (VDEF_OP_PTR (ptr, 0)); + + /* Delink all the existing uses. */ + for (x = 0; x < VUSE_VECT_NUM_ELEM (ptr->usev); x++) + { + use_operand_p use_p = VDEF_OP_PTR (ptr, x); + delink_imm_use (use_p); + } + + /* If we want less space, simply use this one, and shrink the size. */ + if (VUSE_VECT_NUM_ELEM (ptr->usev) > num_elem) + { + VUSE_VECT_NUM_ELEM (ptr->usev) = num_elem; + return ptr; + } + + /* It is growing. Allocate a new one and replace the old one. */ + tmp = ptr; + ret = add_vdef_op (stmt, val, num_elem, &ptr); + ret->next = NULL; + ptr = tmp; + + lim = VUSE_VECT_NUM_ELEM (ptr->usev); + memset (ptr, 0, + sizeof (struct vdef_optype_d) + sizeof (vuse_element_t) * (lim- 1)); + + /* Now simply remove the old one. */ + if (VDEF_OPS (stmt) == ptr) + { + VDEF_OPS (stmt) = ret; + return ret; + } + else + for (tmp = VDEF_OPS (stmt); + tmp != NULL && tmp->next != ptr; + tmp = tmp->next) + { + tmp->next = ret; + return ret; + } + + /* The pointer passed in isn't in STMT's VDEF lists. */ + gcc_unreachable (); +} + + +struct vuse_optype_d * +realloc_vuse (struct vuse_optype_d *ptr, int num_elem) +{ + int x, lim; + tree val, stmt; + struct vuse_optype_d *ret, *tmp; + + if (VUSE_VECT_NUM_ELEM (ptr->usev) == num_elem) + return ptr; + + val = VUSE_OP (ptr, 0); + if (TREE_CODE (val) == SSA_NAME) + val = SSA_NAME_VAR (val); + + stmt = USE_STMT (VUSE_OP_PTR (ptr, 0)); + + /* Delink all the existing uses. */ + for (x = 0; x < VUSE_VECT_NUM_ELEM (ptr->usev); x++) + { + use_operand_p use_p = VUSE_OP_PTR (ptr, x); + delink_imm_use (use_p); + } + + /* If we want less space, simply use this one, and shrink the size. */ + if (VUSE_VECT_NUM_ELEM (ptr->usev) > num_elem) + { + VUSE_VECT_NUM_ELEM (ptr->usev) = num_elem; + return ptr; + } + + /* It is growing. Allocate a new one and replace the old one. */ + tmp = ptr; + ret = add_vuse_op (stmt, val, num_elem, &ptr); + ret->next = NULL; + ptr = tmp; + + lim = VUSE_VECT_NUM_ELEM (ptr->usev); + memset (ptr, 0, + sizeof (struct vuse_optype_d) + sizeof (vuse_element_t) * (lim - 1)); + + /* Now simply link it in, find the node which points to this one. */ + if (VUSE_OPS (stmt) == ptr) + { + VUSE_OPS (stmt) = ret; + return ret; + } + else + for (tmp = VUSE_OPS (stmt); + tmp != NULL && tmp->next != ptr; + tmp = tmp->next) + { + tmp->next = ret; + return ret; + } - ALLOC_OPTYPE (new, mustdef); - MUSTDEF_RESULT (new) = op; - MUSTDEF_KILL (new) = op; - INITIALIZE_USE (MUSTDEF_KILL_PTR (new), &MUSTDEF_KILL (new), stmt); - APPEND_OP_AFTER (new, *last); + /* The pointer passed in isn't in STMT's VUSE lists. */ + gcc_unreachable (); } /* Takes elements from build_defs and turns them into def operands of STMT. @@ -581,7 +787,6 @@ finalize_ssa_defs (tree stmt) /* If there is an old list, often the new list is identical, or close, so find the elements at the beginning that are the same as the vector. */ finalize_ssa_def_ops (stmt); - VEC_truncate (tree, build_defs, 0); } /* Takes elements from build_uses and turns them into use operands of STMT. @@ -647,58 +852,81 @@ finalize_ssa_uses (tree stmt) } #endif finalize_ssa_use_ops (stmt); - VEC_truncate (tree, build_uses, 0); } -/* Takes elements from build_v_may_defs and turns them into maydef operands of - STMT. */ +/* Takes elements from BUILD_VDEFS and turns them into vdef operands of + STMT. FIXME, for now VDEF operators should have a single operand + in their RHS. */ static inline void -finalize_ssa_v_may_def_ops (tree stmt) +finalize_ssa_vdef_ops (tree stmt) { unsigned new_i; - struct maydef_optype_d new_list; - maydef_optype_p old_ops, ptr, last; - tree act; - unsigned old_base, new_base; + struct vdef_optype_d new_list; + vdef_optype_p old_ops, ptr, last; + stmt_ann_t ann = stmt_ann (stmt); + + /* Set the symbols referenced by STMT. */ + if (!bitmap_empty_p (build_stores)) + { + if (ann->operands.stores == NULL) + ann->operands.stores = BITMAP_ALLOC (NULL); + + bitmap_copy (ann->operands.stores, build_stores); + } + else + BITMAP_FREE (ann->operands.stores); + + /* If aliases have not been computed, do not instantiate a virtual + operator on STMT. Initially, we only compute the SSA form on + GIMPLE registers. The virtual SSA form is only computed after + alias analysis, so virtual operators will remain unrenamed and + the verifier will complain. However, alias analysis needs to + access symbol load/store information, so we need to compute + those. */ + if (!gimple_aliases_computed_p (cfun)) + return; new_list.next = NULL; last = &new_list; - old_ops = MAYDEF_OPS (stmt); - + old_ops = VDEF_OPS (stmt); new_i = 0; - while (old_ops && new_i < VEC_length (tree, build_v_may_defs)) + while (old_ops && new_i < VEC_length (tree, build_vdefs)) { - act = VEC_index (tree, build_v_may_defs, new_i); - new_base = get_name_decl (act); - old_base = get_name_decl (MAYDEF_OP (old_ops)); + tree op = VEC_index (tree, build_vdefs, new_i); + unsigned new_uid = get_name_decl (op); + unsigned old_uid = get_name_decl (VDEF_RESULT (old_ops)); - if (old_base == new_base) + /* FIXME, for now each VDEF operator should have at most one + operand in their RHS. */ + gcc_assert (VDEF_NUM (old_ops) == 1); + + if (old_uid == new_uid) { - /* if variables are the same, reuse this node. */ + /* If the symbols are the same, reuse the existing operand. */ MOVE_HEAD_AFTER (old_ops, last); - set_virtual_use_link (MAYDEF_OP_PTR (last), stmt); + set_virtual_use_link (VDEF_OP_PTR (last, 0), stmt); new_i++; } - else if (old_base < new_base) + else if (old_uid < new_uid) { - /* if old is less than new, old goes to the free list. */ - delink_imm_use (MAYDEF_OP_PTR (old_ops)); - MOVE_HEAD_TO_FREELIST (old_ops, maydef); + /* If old is less than new, old goes to the free list. */ + delink_imm_use (VDEF_OP_PTR (old_ops, 0)); + MOVE_HEAD_TO_FREELIST (old_ops, vdef); } else { /* This is a new operand. */ - add_maydef_op (stmt, act, &last); + add_vdef_op (stmt, op, 1, &last); new_i++; } } - /* If there is anything remaining in the build_v_may_defs list, simply emit it. */ - for ( ; new_i < VEC_length (tree, build_v_may_defs); new_i++) - add_maydef_op (stmt, VEC_index (tree, build_v_may_defs, new_i), &last); + /* If there is anything remaining in BUILD_VDEFS, simply emit it. */ + for ( ; new_i < VEC_length (tree, build_vdefs); new_i++) + add_vdef_op (stmt, VEC_index (tree, build_vdefs, new_i), 1, &last); last->next = NULL; @@ -706,279 +934,221 @@ finalize_ssa_v_may_def_ops (tree stmt) if (old_ops) { for (ptr = old_ops; ptr; ptr = ptr->next) - delink_imm_use (MAYDEF_OP_PTR (ptr)); - old_ops->next = gimple_ssa_operands (cfun)->free_maydefs; - gimple_ssa_operands (cfun)->free_maydefs = old_ops; + delink_imm_use (VDEF_OP_PTR (ptr, 0)); + old_ops->next = gimple_ssa_operands (cfun)->free_vdefs; + gimple_ssa_operands (cfun)->free_vdefs = old_ops; } - /* Now set the stmt's operands. */ - MAYDEF_OPS (stmt) = new_list.next; + /* Now set STMT's operands. */ + VDEF_OPS (stmt) = new_list.next; #ifdef ENABLE_CHECKING { unsigned x = 0; - for (ptr = MAYDEF_OPS (stmt); ptr; ptr = ptr->next) + for (ptr = VDEF_OPS (stmt); ptr; ptr = ptr->next) x++; - gcc_assert (x == VEC_length (tree, build_v_may_defs)); + gcc_assert (x == VEC_length (tree, build_vdefs)); } #endif } + static void -finalize_ssa_v_may_defs (tree stmt) +finalize_ssa_vdefs (tree stmt) { - finalize_ssa_v_may_def_ops (stmt); + finalize_ssa_vdef_ops (stmt); } - -/* Clear the in_list bits and empty the build array for V_MAY_DEFs. */ -static inline void -cleanup_v_may_defs (void) -{ - unsigned x, num; - num = VEC_length (tree, build_v_may_defs); - for (x = 0; x < num; x++) - { - tree t = VEC_index (tree, build_v_may_defs, x); - if (TREE_CODE (t) != SSA_NAME) - { - var_ann_t ann = var_ann (t); - ann->in_v_may_def_list = 0; - } - } - VEC_truncate (tree, build_v_may_defs, 0); -} - - -/* Takes elements from build_vuses and turns them into vuse operands of +/* Takes elements from BUILD_VUSES and turns them into VUSE operands of STMT. */ static inline void finalize_ssa_vuse_ops (tree stmt) { unsigned new_i; + int old_i; struct vuse_optype_d new_list; - vuse_optype_p old_ops, ptr, last; - tree act; - unsigned old_base, new_base; + vuse_optype_p old_ops, last; + VEC(tree,heap) *new_ops; + stmt_ann_t ann; - new_list.next = NULL; - last = &new_list; + /* Set the symbols referenced by STMT. */ + ann = stmt_ann (stmt); + if (!bitmap_empty_p (build_loads)) + { + if (ann->operands.loads == NULL) + ann->operands.loads = BITMAP_ALLOC (NULL); + bitmap_copy (ann->operands.loads, build_loads); + } + else + BITMAP_FREE (ann->operands.loads); + + /* If aliases have not been computed, do not instantiate a virtual + operator on STMT. Initially, we only compute the SSA form on + GIMPLE registers. The virtual SSA form is only computed after + alias analysis, so virtual operators will remain unrenamed and + the verifier will complain. However, alias analysis needs to + access symbol load/store information, so we need to compute + those. */ + if (!gimple_aliases_computed_p (cfun)) + return; + + /* STMT should have at most one VUSE operator. */ old_ops = VUSE_OPS (stmt); + gcc_assert (old_ops == NULL || old_ops->next == NULL); - new_i = 0; - while (old_ops && new_i < VEC_length (tree, build_vuses)) + new_ops = NULL; + new_i = old_i = 0; + while (old_ops + && old_i < VUSE_NUM (old_ops) + && new_i < VEC_length (tree, build_vuses)) { - act = VEC_index (tree, build_vuses, new_i); - new_base = get_name_decl (act); - old_base = get_name_decl (VUSE_OP (old_ops)); + tree new_op = VEC_index (tree, build_vuses, new_i); + tree old_op = VUSE_OP (old_ops, old_i); + unsigned new_uid = get_name_decl (new_op); + unsigned old_uid = get_name_decl (old_op); - if (old_base == new_base) + if (old_uid == new_uid) { - /* if variables are the same, reuse this node. */ - MOVE_HEAD_AFTER (old_ops, last); - set_virtual_use_link (VUSE_OP_PTR (last), stmt); + /* If the symbols are the same, reuse the existing operand. */ + VEC_safe_push (tree, heap, new_ops, old_op); new_i++; + old_i++; } - else if (old_base < new_base) + else if (old_uid < new_uid) { - /* if old is less than new, old goes to the free list. */ - delink_imm_use (USE_OP_PTR (old_ops)); - MOVE_HEAD_TO_FREELIST (old_ops, vuse); + /* If OLD_UID is less than NEW_UID, the old operand has + disappeared, skip to the next old operand. */ + old_i++; } else { /* This is a new operand. */ - add_vuse_op (stmt, act, &last); + VEC_safe_push (tree, heap, new_ops, new_op); new_i++; } } /* If there is anything remaining in the build_vuses list, simply emit it. */ for ( ; new_i < VEC_length (tree, build_vuses); new_i++) - add_vuse_op (stmt, VEC_index (tree, build_vuses, new_i), &last); - - last->next = NULL; + VEC_safe_push (tree, heap, new_ops, VEC_index (tree, build_vuses, new_i)); /* If there is anything in the old list, free it. */ if (old_ops) { - for (ptr = old_ops; ptr; ptr = ptr->next) - delink_imm_use (VUSE_OP_PTR (ptr)); + for (old_i = 0; old_i < VUSE_NUM (old_ops); old_i++) + delink_imm_use (VUSE_OP_PTR (old_ops, old_i)); old_ops->next = gimple_ssa_operands (cfun)->free_vuses; gimple_ssa_operands (cfun)->free_vuses = old_ops; + + VUSE_OPS (stmt) = NULL; } - /* Now set the stmt's operands. */ - VUSE_OPS (stmt) = new_list.next; + /* If there are any operands, instantiate a VUSE operator for STMT. */ + if (new_ops) + { + tree op; + unsigned i; + + new_list.next = NULL; + last = &new_list; + add_vuse_op (stmt, NULL, VEC_length (tree, new_ops), &last); + last->next = NULL; + + for (i = 0; VEC_iterate (tree, new_ops, i, op); i++) + SET_USE (VUSE_OP_PTR (last, (int) i), op); + + VUSE_OPS (stmt) = new_list.next; + } #ifdef ENABLE_CHECKING { - unsigned x = 0; - for (ptr = VUSE_OPS (stmt); ptr; ptr = ptr->next) - x++; + unsigned x; + + if (VUSE_OPS (stmt)) + { + gcc_assert (VUSE_OPS (stmt)->next == NULL); + x = VUSE_NUM (VUSE_OPS (stmt)); + } + else + x = 0; gcc_assert (x == VEC_length (tree, build_vuses)); } #endif } - -/* Return a new VUSE operand vector, comparing to OLD_OPS_P. */ + +/* Return a new VUSE operand vector for STMT. */ static void finalize_ssa_vuses (tree stmt) { - unsigned num, num_v_may_defs; + unsigned num, num_vdefs; unsigned vuse_index; /* Remove superfluous VUSE operands. If the statement already has a - V_MAY_DEF operation for a variable 'a', then a VUSE for 'a' is - not needed because V_MAY_DEFs imply a VUSE of the variable. For - instance, suppose that variable 'a' is aliased: + VDEF operator for a variable 'a', then a VUSE for 'a' is not + needed because VDEFs imply a VUSE of the variable. For instance, + suppose that variable 'a' is pointed-to by p and q: # VUSE <a_2> - # a_3 = V_MAY_DEF <a_2> - a = a + 1; + # a_3 = VDEF <a_2> + *p = *q; The VUSE <a_2> is superfluous because it is implied by the - V_MAY_DEF operation. */ + VDEF operator. */ num = VEC_length (tree, build_vuses); - num_v_may_defs = VEC_length (tree, build_v_may_defs); + num_vdefs = VEC_length (tree, build_vdefs); - if (num > 0 && num_v_may_defs > 0) - { - for (vuse_index = 0; vuse_index < VEC_length (tree, build_vuses); ) - { - tree vuse; - vuse = VEC_index (tree, build_vuses, vuse_index); - if (TREE_CODE (vuse) != SSA_NAME) - { - var_ann_t ann = var_ann (vuse); - ann->in_vuse_list = 0; - if (ann->in_v_may_def_list) - { - VEC_ordered_remove (tree, build_vuses, vuse_index); - continue; - } - } - vuse_index++; - } - } - else - { - /* Clear out the in_list bits. */ - for (vuse_index = 0; - vuse_index < VEC_length (tree, build_vuses); - vuse_index++) - { - tree t = VEC_index (tree, build_vuses, vuse_index); - if (TREE_CODE (t) != SSA_NAME) - { - var_ann_t ann = var_ann (t); - ann->in_vuse_list = 0; - } - } - } + if (num > 0 && num_vdefs > 0) + for (vuse_index = 0; vuse_index < VEC_length (tree, build_vuses); ) + { + tree vuse; + vuse = VEC_index (tree, build_vuses, vuse_index); + if (TREE_CODE (vuse) != SSA_NAME) + { + var_ann_t ann = var_ann (vuse); + ann->in_vuse_list = 0; + if (ann->in_vdef_list) + { + VEC_ordered_remove (tree, build_vuses, vuse_index); + continue; + } + } + vuse_index++; + } finalize_ssa_vuse_ops (stmt); - - /* The V_MAY_DEF build vector wasn't cleaned up because we needed it. */ - cleanup_v_may_defs (); - - /* Free the VUSEs build vector. */ - VEC_truncate (tree, build_vuses, 0); - } -/* Takes elements from build_v_must_defs and turns them into mustdef operands of - STMT. */ + +/* Clear the in_list bits and empty the build array for VDEFs and + VUSEs. */ static inline void -finalize_ssa_v_must_def_ops (tree stmt) +cleanup_build_arrays (void) { - unsigned new_i; - struct mustdef_optype_d new_list; - mustdef_optype_p old_ops, ptr, last; - tree act; - unsigned old_base, new_base; - - new_list.next = NULL; - last = &new_list; - - old_ops = MUSTDEF_OPS (stmt); - - new_i = 0; - while (old_ops && new_i < VEC_length (tree, build_v_must_defs)) - { - act = VEC_index (tree, build_v_must_defs, new_i); - new_base = get_name_decl (act); - old_base = get_name_decl (MUSTDEF_KILL (old_ops)); - - if (old_base == new_base) - { - /* If variables are the same, reuse this node. */ - MOVE_HEAD_AFTER (old_ops, last); - set_virtual_use_link (MUSTDEF_KILL_PTR (last), stmt); - new_i++; - } - else if (old_base < new_base) - { - /* If old is less than new, old goes to the free list. */ - delink_imm_use (MUSTDEF_KILL_PTR (old_ops)); - MOVE_HEAD_TO_FREELIST (old_ops, mustdef); - } - else - { - /* This is a new operand. */ - add_mustdef_op (stmt, act, &last); - new_i++; - } - } - - /* If there is anything remaining in the build_v_must_defs list, simply emit it. */ - for ( ; new_i < VEC_length (tree, build_v_must_defs); new_i++) - add_mustdef_op (stmt, VEC_index (tree, build_v_must_defs, new_i), &last); - - last->next = NULL; - - /* If there is anything in the old list, free it. */ - if (old_ops) - { - for (ptr = old_ops; ptr; ptr = ptr->next) - delink_imm_use (MUSTDEF_KILL_PTR (ptr)); - old_ops->next = gimple_ssa_operands (cfun)->free_mustdefs; - gimple_ssa_operands (cfun)->free_mustdefs = old_ops; - } + unsigned i; + tree t; - /* Now set the stmt's operands. */ - MUSTDEF_OPS (stmt) = new_list.next; + for (i = 0; VEC_iterate (tree, build_vdefs, i, t); i++) + if (TREE_CODE (t) != SSA_NAME) + var_ann (t)->in_vdef_list = false; -#ifdef ENABLE_CHECKING - { - unsigned x = 0; - for (ptr = MUSTDEF_OPS (stmt); ptr; ptr = ptr->next) - x++; + for (i = 0; VEC_iterate (tree, build_vuses, i, t); i++) + if (TREE_CODE (t) != SSA_NAME) + var_ann (t)->in_vuse_list = false; - gcc_assert (x == VEC_length (tree, build_v_must_defs)); - } -#endif -} - -static void -finalize_ssa_v_must_defs (tree stmt) -{ - /* In the presence of subvars, there may be more than one V_MUST_DEF - per statement (one for each subvar). It is a bit expensive to - verify that all must-defs in a statement belong to subvars if - there is more than one must-def, so we don't do it. Suffice to - say, if you reach here without having subvars, and have num >1, - you have hit a bug. */ - finalize_ssa_v_must_def_ops (stmt); - VEC_truncate (tree, build_v_must_defs, 0); + VEC_truncate (tree, build_vdefs, 0); + VEC_truncate (tree, build_vuses, 0); + VEC_truncate (tree, build_defs, 0); + VEC_truncate (tree, build_uses, 0); + bitmap_clear (build_loads); + bitmap_clear (build_stores); } @@ -989,9 +1159,9 @@ finalize_ssa_stmt_operands (tree stmt) { finalize_ssa_defs (stmt); finalize_ssa_uses (stmt); - finalize_ssa_v_must_defs (stmt); - finalize_ssa_v_may_defs (stmt); + finalize_ssa_vdefs (stmt); finalize_ssa_vuses (stmt); + cleanup_build_arrays (); } @@ -1003,8 +1173,9 @@ start_ssa_stmt_operands (void) gcc_assert (VEC_length (tree, build_defs) == 0); gcc_assert (VEC_length (tree, build_uses) == 0); gcc_assert (VEC_length (tree, build_vuses) == 0); - gcc_assert (VEC_length (tree, build_v_may_defs) == 0); - gcc_assert (VEC_length (tree, build_v_must_defs) == 0); + gcc_assert (VEC_length (tree, build_vdefs) == 0); + gcc_assert (bitmap_empty_p (build_loads)); + gcc_assert (bitmap_empty_p (build_stores)); } @@ -1013,7 +1184,7 @@ start_ssa_stmt_operands (void) static inline void append_def (tree *def_p) { - VEC_safe_push (tree, heap, build_defs, (tree)def_p); + VEC_safe_push (tree, heap, build_defs, (tree) def_p); } @@ -1022,61 +1193,73 @@ append_def (tree *def_p) static inline void append_use (tree *use_p) { - VEC_safe_push (tree, heap, build_uses, (tree)use_p); + VEC_safe_push (tree, heap, build_uses, (tree) use_p); } -/* Add a new virtual may def for variable VAR to the build array. */ +/* Add VAR to the set of variables that require a VDEF operator. */ static inline void -append_v_may_def (tree var) +append_vdef (tree var) { + tree sym; + if (TREE_CODE (var) != SSA_NAME) { - var_ann_t ann = get_var_ann (var); + tree mpt; + var_ann_t ann; + + /* If VAR belongs to a memory partition, use it instead of VAR. */ + mpt = memory_partition (var); + if (mpt) + var = mpt; /* Don't allow duplicate entries. */ - if (ann->in_v_may_def_list) - return; - ann->in_v_may_def_list = 1; + ann = get_var_ann (var); + if (ann->in_vdef_list) + return; + + ann->in_vdef_list = true; + sym = var; } + else + sym = SSA_NAME_VAR (var); - VEC_safe_push (tree, heap, build_v_may_defs, (tree)var); + VEC_safe_push (tree, heap, build_vdefs, var); + bitmap_set_bit (build_stores, DECL_UID (sym)); } -/* Add VAR to the list of virtual uses. */ +/* Add VAR to the set of variables that require a VUSE operator. */ static inline void append_vuse (tree var) { - /* Don't allow duplicate entries. */ + tree sym; + if (TREE_CODE (var) != SSA_NAME) { - var_ann_t ann = get_var_ann (var); - - if (ann->in_vuse_list || ann->in_v_may_def_list) - return; - ann->in_vuse_list = 1; - } - - VEC_safe_push (tree, heap, build_vuses, (tree)var); -} + tree mpt; + var_ann_t ann; + /* If VAR belongs to a memory partition, use it instead of VAR. */ + mpt = memory_partition (var); + if (mpt) + var = mpt; -/* Add VAR to the list of virtual must definitions for INFO. */ - -static inline void -append_v_must_def (tree var) -{ - unsigned i; + /* Don't allow duplicate entries. */ + ann = get_var_ann (var); + if (ann->in_vuse_list || ann->in_vdef_list) + return; - /* Don't allow duplicate entries. */ - for (i = 0; i < VEC_length (tree, build_v_must_defs); i++) - if (var == VEC_index (tree, build_v_must_defs, i)) - return; + ann->in_vuse_list = true; + sym = var; + } + else + sym = SSA_NAME_VAR (var); - VEC_safe_push (tree, heap, build_v_must_defs, (tree)var); + VEC_safe_push (tree, heap, build_vuses, var); + bitmap_set_bit (build_loads, DECL_UID (sym)); } @@ -1088,7 +1271,7 @@ append_v_must_def (tree var) static bool access_can_touch_variable (tree ref, tree alias, HOST_WIDE_INT offset, HOST_WIDE_INT size) -{ +{ bool offsetgtz = offset > 0; unsigned HOST_WIDE_INT uoffset = (unsigned HOST_WIDE_INT) offset; tree base = ref ? get_base_address (ref) : NULL; @@ -1257,26 +1440,29 @@ add_virtual_operand (tree var, stmt_ann_t s_ann, int flags, sym = (TREE_CODE (var) == SSA_NAME ? SSA_NAME_VAR (var) : var); v_ann = var_ann (sym); + /* Mark the statement as having memory operands. */ + s_ann->references_memory = true; + /* Mark statements with volatile operands. Optimizers should back off from statements having volatile operands. */ if (TREE_THIS_VOLATILE (sym) && s_ann) s_ann->has_volatile_ops = true; - /* If the variable cannot be modified and this is a V_MAY_DEF change + /* If the variable cannot be modified and this is a VDEF change it into a VUSE. This happens when read-only variables are marked call-clobbered and/or aliased to writable variables. So we only check that this only happens on non-specific stores. Note that if this is a specific store, i.e. associated with a - gimple_modify_stmt, then we can't suppress the V_MAY_DEF, lest we run + GIMPLE_MODIFY_STMT, then we can't suppress the VDEF, lest we run into validation problems. This can happen when programs cast away const, leaving us with a store to read-only memory. If the statement is actually executed at runtime, then the program is ill formed. If the statement is not executed then all is well. At the very least, we cannot ICE. */ - if ((flags & opf_non_specific) && unmodifiable_var_p (var)) - flags &= ~(opf_is_def | opf_kill_def); + if ((flags & opf_implicit) && unmodifiable_var_p (var)) + flags &= ~opf_def; /* The variable is not a GIMPLE register. Add it (or its aliases) to virtual operands, unless the caller has specifically requested @@ -1289,23 +1475,8 @@ add_virtual_operand (tree var, stmt_ann_t s_ann, int flags, if (aliases == NULL) { /* The variable is not aliased or it is an alias tag. */ - if (flags & opf_is_def) - { - if (flags & opf_kill_def) - { - /* V_MUST_DEF for non-aliased, non-GIMPLE register - variable definitions. */ - gcc_assert (!MTAG_P (var) - || TREE_CODE (var) == STRUCT_FIELD_TAG); - append_v_must_def (var); - } - else - { - /* Add a V_MAY_DEF for call-clobbered variables and - memory tags. */ - append_v_may_def (var); - } - } + if (flags & opf_def) + append_vdef (var); else append_vuse (var); } @@ -1318,9 +1489,8 @@ add_virtual_operand (tree var, stmt_ann_t s_ann, int flags, operands. */ gcc_assert (VEC_length (tree, aliases) != 0); - if (flags & opf_is_def) + if (flags & opf_def) { - bool none_added = true; for (i = 0; VEC_iterate (tree, aliases, i, al); i++) @@ -1329,7 +1499,7 @@ add_virtual_operand (tree var, stmt_ann_t s_ann, int flags, continue; none_added = false; - append_v_may_def (al); + append_vdef (al); } /* If the variable is also an alias tag, add a virtual @@ -1348,7 +1518,7 @@ add_virtual_operand (tree var, stmt_ann_t s_ann, int flags, || (TREE_CODE (var) == SYMBOL_MEMORY_TAG && for_clobber)) { - append_v_may_def (var); + append_vdef (var); } } else @@ -1379,31 +1549,23 @@ add_virtual_operand (tree var, stmt_ann_t s_ann, int flags, static void add_stmt_operand (tree *var_p, stmt_ann_t s_ann, int flags) { - bool is_real_op; tree var, sym; var_ann_t v_ann; - var = *var_p; - gcc_assert (SSA_VAR_P (var)); - - is_real_op = is_gimple_reg (var); - - /* If this is a real operand, the operand is either an SSA name or a - decl. Virtual operands may only be decls. */ - gcc_assert (is_real_op || DECL_P (var)); + gcc_assert (SSA_VAR_P (*var_p) && s_ann); + var = *var_p; sym = (TREE_CODE (var) == SSA_NAME ? SSA_NAME_VAR (var) : var); v_ann = var_ann (sym); - /* Mark statements with volatile operands. Optimizers should back - off from statements having volatile operands. */ - if (TREE_THIS_VOLATILE (sym) && s_ann) + /* Mark statements with volatile operands. */ + if (TREE_THIS_VOLATILE (sym)) s_ann->has_volatile_ops = true; - if (is_real_op) + if (is_gimple_reg (sym)) { /* The variable is a GIMPLE register. Add it to real operands. */ - if (flags & opf_is_def) + if (flags & opf_def) append_def (var_p); else append_use (var_p); @@ -1441,8 +1603,7 @@ get_indirect_ref_operands (tree stmt, tree expr, int flags, tree ptr = *pptr; stmt_ann_t s_ann = stmt_ann (stmt); - /* Stores into INDIRECT_REF operands are never killing definitions. */ - flags &= ~opf_kill_def; + s_ann->references_memory = true; if (SSA_VAR_P (ptr)) { @@ -1504,7 +1665,7 @@ get_indirect_ref_operands (tree stmt, tree expr, int flags, /* If requested, add a USE operand for the base pointer. */ if (recurse_on_base) - get_expr_operands (stmt, pptr, opf_none); + get_expr_operands (stmt, pptr, opf_use); } @@ -1513,28 +1674,26 @@ get_indirect_ref_operands (tree stmt, tree expr, int flags, static void get_tmr_operands (tree stmt, tree expr, int flags) { - tree tag = TMR_TAG (expr), ref; + tree tag, ref; HOST_WIDE_INT offset, size, maxsize; subvar_t svars, sv; stmt_ann_t s_ann = stmt_ann (stmt); - /* First record the real operands. */ - get_expr_operands (stmt, &TMR_BASE (expr), opf_none); - get_expr_operands (stmt, &TMR_INDEX (expr), opf_none); + /* This statement references memory. */ + s_ann->references_memory = 1; - /* MEM_REFs should never be killing. */ - flags &= ~opf_kill_def; + /* First record the real operands. */ + get_expr_operands (stmt, &TMR_BASE (expr), opf_use); + get_expr_operands (stmt, &TMR_INDEX (expr), opf_use); if (TMR_SYMBOL (expr)) - { - stmt_ann_t ann = stmt_ann (stmt); - add_to_addressable_set (TMR_SYMBOL (expr), &ann->addresses_taken); - } + add_to_addressable_set (TMR_SYMBOL (expr), &s_ann->addresses_taken); + tag = TMR_TAG (expr); if (!tag) { /* Something weird, so ensure that we will be careful. */ - stmt_ann (stmt)->has_volatile_ops = true; + s_ann->has_volatile_ops = true; return; } @@ -1550,13 +1709,9 @@ get_tmr_operands (tree stmt, tree expr, int flags) for (sv = svars; sv; sv = sv->next) { bool exact; + if (overlap_subvar (offset, maxsize, sv->var, &exact)) - { - int subvar_flags = flags; - if (!exact || size != maxsize) - subvar_flags &= ~opf_kill_def; - add_stmt_operand (&sv->var, s_ann, subvar_flags); - } + add_stmt_operand (&sv->var, s_ann, flags); } } @@ -1582,7 +1737,7 @@ add_call_clobber_ops (tree stmt, tree callee) if (gimple_global_var (cfun)) { tree var = gimple_global_var (cfun); - add_stmt_operand (&var, s_ann, opf_is_def); + add_stmt_operand (&var, s_ann, opf_def); return; } @@ -1591,7 +1746,8 @@ add_call_clobber_ops (tree stmt, tree callee) or write that variable. */ not_read_b = callee ? ipa_reference_get_not_read_global (callee) : NULL; not_written_b = callee ? ipa_reference_get_not_written_global (callee) : NULL; - /* Add a V_MAY_DEF operand for every call clobbered variable. */ + + /* Add a VDEF operand for every call clobbered variable. */ EXECUTE_IF_SET_IN_BITMAP (gimple_call_clobbered_vars (cfun), 0, u, bi) { tree var = referenced_var_lookup (u); @@ -1622,7 +1778,7 @@ add_call_clobber_ops (tree stmt, tree callee) tree call = get_call_expr_in (stmt); if (call_expr_flags (call) & (ECF_CONST | ECF_PURE)) { - add_stmt_operand (&var, s_ann, opf_none); + add_stmt_operand (&var, s_ann, opf_use); clobber_stats.unescapable_clobbers_avoided++; continue; } @@ -1637,12 +1793,12 @@ add_call_clobber_ops (tree stmt, tree callee) { clobber_stats.static_write_clobbers_avoided++; if (!not_read) - add_stmt_operand (&var, s_ann, opf_none); + add_stmt_operand (&var, s_ann, opf_use); else clobber_stats.static_read_clobbers_avoided++; } else - add_virtual_operand (var, s_ann, opf_is_def, NULL, 0, -1, true); + add_virtual_operand (var, s_ann, opf_def, NULL, 0, -1, true); } } @@ -1664,7 +1820,7 @@ add_call_read_ops (tree stmt, tree callee) if (gimple_global_var (cfun)) { tree var = gimple_global_var (cfun); - add_stmt_operand (&var, s_ann, opf_none); + add_stmt_operand (&var, s_ann, opf_use); return; } @@ -1694,7 +1850,7 @@ add_call_read_ops (tree stmt, tree callee) continue; } - add_stmt_operand (&var, s_ann, opf_none | opf_non_specific); + add_stmt_operand (&var, s_ann, opf_use | opf_implicit); } } @@ -1706,19 +1862,14 @@ get_call_expr_operands (tree stmt, tree expr) { tree op; int call_flags = call_expr_flags (expr); + stmt_ann_t ann = stmt_ann (stmt); - /* If aliases have been computed already, add V_MAY_DEF or V_USE + ann->references_memory = true; + + /* If aliases have been computed already, add VDEF or VUSE operands for all the symbols that have been found to be - call-clobbered. - - Note that if aliases have not been computed, the global effects - of calls will not be included in the SSA web. This is fine - because no optimizer should run before aliases have been - computed. By not bothering with virtual operands for CALL_EXPRs - we avoid adding superfluous virtual operands, which can be a - significant compile time sink (See PR 15855). */ + call-clobbered. */ if (gimple_aliases_computed_p (cfun) - && !bitmap_empty_p (gimple_call_clobbered_vars (cfun)) && !(call_flags & ECF_NOVOPS)) { /* A 'pure' or a 'const' function never call-clobbers anything. @@ -1732,12 +1883,12 @@ get_call_expr_operands (tree stmt, tree expr) } /* Find uses in the called function. */ - get_expr_operands (stmt, &TREE_OPERAND (expr, 0), opf_none); + get_expr_operands (stmt, &TREE_OPERAND (expr, 0), opf_use); for (op = TREE_OPERAND (expr, 1); op; op = TREE_CHAIN (op)) - get_expr_operands (stmt, &TREE_VALUE (op), opf_none); + get_expr_operands (stmt, &TREE_VALUE (op), opf_use); - get_expr_operands (stmt, &TREE_OPERAND (expr, 2), opf_none); + get_expr_operands (stmt, &TREE_OPERAND (expr, 2), opf_use); } @@ -1746,16 +1897,19 @@ get_call_expr_operands (tree stmt, tree expr) static void get_asm_expr_operands (tree stmt) { - stmt_ann_t s_ann = stmt_ann (stmt); - int noutputs = list_length (ASM_OUTPUTS (stmt)); - const char **oconstraints - = (const char **) alloca ((noutputs) * sizeof (const char *)); - int i; - tree link; + stmt_ann_t s_ann; + int i, noutputs; + const char **oconstraints; const char *constraint; bool allows_mem, allows_reg, is_inout; + tree link; + + s_ann = stmt_ann (stmt); + noutputs = list_length (ASM_OUTPUTS (stmt)); + oconstraints = (const char **) alloca ((noutputs) * sizeof (const char *)); - for (i=0, link = ASM_OUTPUTS (stmt); link; ++i, link = TREE_CHAIN (link)) + /* Gather all output operands. */ + for (i = 0, link = ASM_OUTPUTS (stmt); link; i++, link = TREE_CHAIN (link)) { constraint = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (link))); oconstraints[i] = constraint; @@ -1774,14 +1928,15 @@ get_asm_expr_operands (tree stmt) add_to_addressable_set (t, &s_ann->addresses_taken); } - get_expr_operands (stmt, &TREE_VALUE (link), opf_is_def); + get_expr_operands (stmt, &TREE_VALUE (link), opf_def); } + /* Gather all input operands. */ for (link = ASM_INPUTS (stmt); link; link = TREE_CHAIN (link)) { constraint = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (link))); - parse_input_constraint (&constraint, 0, 0, noutputs, 0, - oconstraints, &allows_mem, &allows_reg); + parse_input_constraint (&constraint, 0, 0, noutputs, 0, oconstraints, + &allows_mem, &allows_reg); /* Memory operands are addressable. Note that STMT needs the address of this operand. */ @@ -1795,46 +1950,36 @@ get_asm_expr_operands (tree stmt) get_expr_operands (stmt, &TREE_VALUE (link), 0); } - - /* Clobber memory for asm ("" : : : "memory"); */ + /* Clobber all memory and addressable symbols for asm ("" : : : "memory"); */ for (link = ASM_CLOBBERS (stmt); link; link = TREE_CHAIN (link)) if (strcmp (TREE_STRING_POINTER (TREE_VALUE (link)), "memory") == 0) { unsigned i; bitmap_iterator bi; - /* Clobber all call-clobbered variables (or .GLOBAL_VAR if we - decided to group them). */ - if (gimple_global_var (cfun)) + s_ann->references_memory = true; + + EXECUTE_IF_SET_IN_BITMAP (gimple_call_clobbered_vars (cfun), 0, i, bi) { - tree var = gimple_global_var (cfun); - add_stmt_operand (&var, s_ann, opf_is_def); + tree var = referenced_var (i); + add_stmt_operand (&var, s_ann, opf_def | opf_implicit); } - else - EXECUTE_IF_SET_IN_BITMAP (gimple_call_clobbered_vars (cfun), 0, i, bi) - { - tree var = referenced_var (i); - add_stmt_operand (&var, s_ann, opf_is_def | opf_non_specific); - } - /* Now clobber all addressables. */ EXECUTE_IF_SET_IN_BITMAP (gimple_addressable_vars (cfun), 0, i, bi) - { - tree var = referenced_var (i); - - /* Subvars are explicitly represented in this list, so - we don't need the original to be added to the clobber - ops, but the original *will* be in this list because - we keep the addressability of the original - variable up-to-date so we don't screw up the rest of - the backend. */ - if (var_can_have_subvars (var) - && get_subvars_for_var (var) != NULL) - continue; - - add_stmt_operand (&var, s_ann, opf_is_def | opf_non_specific); - } - + { + tree var = referenced_var (i); + + /* Subvars are explicitly represented in this list, so we + don't need the original to be added to the clobber ops, + but the original *will* be in this list because we keep + the addressability of the original variable up-to-date + to avoid confusing the back-end. */ + if (var_can_have_subvars (var) + && get_subvars_for_var (var) != NULL) + continue; + + add_stmt_operand (&var, s_ann, opf_def | opf_implicit); + } break; } } @@ -1846,23 +1991,20 @@ static void get_modify_stmt_operands (tree stmt, tree expr) { /* First get operands from the RHS. */ - get_expr_operands (stmt, &GIMPLE_STMT_OPERAND (expr, 1), opf_none); + get_expr_operands (stmt, &GIMPLE_STMT_OPERAND (expr, 1), opf_use); - /* For the LHS, use a regular definition (OPF_IS_DEF) for GIMPLE - registers. If the LHS is a store to memory, we will either need - a preserving definition (V_MAY_DEF) or a killing definition - (V_MUST_DEF). + /* For the LHS, use a regular definition (opf_def) for GIMPLE + registers. If the LHS is a store to memory, we will need + a preserving definition (VDEF). Preserving definitions are those that modify a part of an aggregate object for which no subvars have been computed (or the reference does not correspond exactly to one of them). Stores - through a pointer are also represented with V_MAY_DEF operators. + through a pointer are also represented with VDEF operators. - The determination of whether to use a preserving or a killing - definition is done while scanning the LHS of the assignment. By - default, assume that we will emit a V_MUST_DEF. */ - get_expr_operands (stmt, &GIMPLE_STMT_OPERAND (expr, 0), - opf_is_def|opf_kill_def); + We used to distinguish between preserving and killing definitions. + We always emit preserving definitions now. */ + get_expr_operands (stmt, &GIMPLE_STMT_OPERAND (expr, 0), opf_def); } @@ -1979,8 +2121,6 @@ get_expr_operands (tree stmt, tree *expr_p, int flags) { int subvar_flags = flags; none = false; - if (!exact || size != maxsize) - subvar_flags &= ~opf_kill_def; add_stmt_operand (&sv->var, s_ann, subvar_flags); } } @@ -1998,20 +2138,19 @@ get_expr_operands (tree stmt, tree *expr_p, int flags) /* Even if we found subvars above we need to ensure to see immediate uses for d in s.a[d]. In case of s.a having a subvar or we would miss it otherwise. */ - get_expr_operands (stmt, &TREE_OPERAND (expr, 0), - flags & ~opf_kill_def); + get_expr_operands (stmt, &TREE_OPERAND (expr, 0), flags); if (code == COMPONENT_REF) { if (s_ann && TREE_THIS_VOLATILE (TREE_OPERAND (expr, 1))) s_ann->has_volatile_ops = true; - get_expr_operands (stmt, &TREE_OPERAND (expr, 2), opf_none); + get_expr_operands (stmt, &TREE_OPERAND (expr, 2), opf_use); } else if (code == ARRAY_REF || code == ARRAY_RANGE_REF) { - get_expr_operands (stmt, &TREE_OPERAND (expr, 1), opf_none); - get_expr_operands (stmt, &TREE_OPERAND (expr, 2), opf_none); - get_expr_operands (stmt, &TREE_OPERAND (expr, 3), opf_none); + get_expr_operands (stmt, &TREE_OPERAND (expr, 1), opf_use); + get_expr_operands (stmt, &TREE_OPERAND (expr, 2), opf_use); + get_expr_operands (stmt, &TREE_OPERAND (expr, 3), opf_use); } return; @@ -2020,7 +2159,7 @@ get_expr_operands (tree stmt, tree *expr_p, int flags) case WITH_SIZE_EXPR: /* WITH_SIZE_EXPR is a pass-through reference to its first argument, and an rvalue reference to its second argument. */ - get_expr_operands (stmt, &TREE_OPERAND (expr, 1), opf_none); + get_expr_operands (stmt, &TREE_OPERAND (expr, 1), opf_use); get_expr_operands (stmt, &TREE_OPERAND (expr, 0), flags); return; @@ -2030,9 +2169,9 @@ get_expr_operands (tree stmt, tree *expr_p, int flags) case COND_EXPR: case VEC_COND_EXPR: - get_expr_operands (stmt, &TREE_OPERAND (expr, 0), opf_none); - get_expr_operands (stmt, &TREE_OPERAND (expr, 1), opf_none); - get_expr_operands (stmt, &TREE_OPERAND (expr, 2), opf_none); + get_expr_operands (stmt, &TREE_OPERAND (expr, 0), opf_use); + get_expr_operands (stmt, &TREE_OPERAND (expr, 1), opf_use); + get_expr_operands (stmt, &TREE_OPERAND (expr, 2), opf_use); return; case GIMPLE_MODIFY_STMT: @@ -2049,17 +2188,12 @@ get_expr_operands (tree stmt, tree *expr_p, int flags) for (idx = 0; VEC_iterate (constructor_elt, CONSTRUCTOR_ELTS (expr), idx, ce); idx++) - get_expr_operands (stmt, &ce->value, opf_none); + get_expr_operands (stmt, &ce->value, opf_use); return; } case BIT_FIELD_REF: - /* Stores using BIT_FIELD_REF are always preserving definitions. */ - flags &= ~opf_kill_def; - - /* Fallthru */ - case TRUTH_NOT_EXPR: case VIEW_CONVERT_EXPR: do_unary: @@ -2141,11 +2275,11 @@ parse_ssa_operands (tree stmt) break; case COND_EXPR: - get_expr_operands (stmt, &COND_EXPR_COND (stmt), opf_none); + get_expr_operands (stmt, &COND_EXPR_COND (stmt), opf_use); break; case SWITCH_EXPR: - get_expr_operands (stmt, &SWITCH_COND (stmt), opf_none); + get_expr_operands (stmt, &SWITCH_COND (stmt), opf_use); break; case ASM_EXPR: @@ -2153,15 +2287,15 @@ parse_ssa_operands (tree stmt) break; case RETURN_EXPR: - get_expr_operands (stmt, &TREE_OPERAND (stmt, 0), opf_none); + get_expr_operands (stmt, &TREE_OPERAND (stmt, 0), opf_use); break; case GOTO_EXPR: - get_expr_operands (stmt, &GOTO_DESTINATION (stmt), opf_none); + get_expr_operands (stmt, &GOTO_DESTINATION (stmt), opf_use); break; case LABEL_EXPR: - get_expr_operands (stmt, &LABEL_EXPR_LABEL (stmt), opf_none); + get_expr_operands (stmt, &LABEL_EXPR_LABEL (stmt), opf_use); break; case BIND_EXPR: @@ -2172,7 +2306,7 @@ parse_ssa_operands (tree stmt) case CATCH_EXPR: case RESX_EXPR: /* These nodes contain no variable references. */ - break; + break; default: /* Notice that if get_expr_operands tries to use &STMT as the @@ -2180,7 +2314,7 @@ parse_ssa_operands (tree stmt) will fail in add_stmt_operand. This default will handle statements like empty statements, or CALL_EXPRs that may appear on the RHS of a statement or as statements themselves. */ - get_expr_operands (stmt, &stmt, opf_none); + get_expr_operands (stmt, &stmt, opf_use); break; } } @@ -2193,18 +2327,21 @@ build_ssa_operands (tree stmt) { stmt_ann_t ann = get_stmt_ann (stmt); - /* Initially assume that the statement has no volatile operands. */ - if (ann) - ann->has_volatile_ops = false; + /* Initially assume that the statement has no volatile operands and + makes no memory references. */ + ann->has_volatile_ops = false; + ann->references_memory = false; start_ssa_stmt_operands (); - parse_ssa_operands (stmt); operand_build_sort_virtual (build_vuses); - operand_build_sort_virtual (build_v_may_defs); - operand_build_sort_virtual (build_v_must_defs); - + operand_build_sort_virtual (build_vdefs); finalize_ssa_stmt_operands (stmt); + + /* For added safety, assume that statements with volatile operands + also reference memory. */ + if (ann->has_volatile_ops) + ann->references_memory = true; } @@ -2215,9 +2352,10 @@ free_ssa_operands (stmt_operands_p ops) { ops->def_ops = NULL; ops->use_ops = NULL; - ops->maydef_ops = NULL; - ops->mustdef_ops = NULL; + ops->vdef_ops = NULL; ops->vuse_ops = NULL; + BITMAP_FREE (ops->loads); + BITMAP_FREE (ops->stores); } @@ -2237,13 +2375,10 @@ update_stmt_operands (tree stmt) _DECL. This indicates a bug in the gimplifier. */ gcc_assert (!SSA_VAR_P (stmt)); - gcc_assert (ann->modified); - timevar_push (TV_TREE_OPS); + gcc_assert (ann->modified); build_ssa_operands (stmt); - - /* Clear the modified bit for STMT. */ ann->modified = 0; timevar_pop (TV_TREE_OPS); @@ -2255,61 +2390,60 @@ update_stmt_operands (tree stmt) void copy_virtual_operands (tree dest, tree src) { - tree t; - ssa_op_iter iter, old_iter; - use_operand_p use_p, u2; - def_operand_p def_p, d2; - - build_ssa_operands (dest); - - /* Copy all the virtual fields. */ - FOR_EACH_SSA_TREE_OPERAND (t, src, iter, SSA_OP_VUSE) - append_vuse (t); - FOR_EACH_SSA_TREE_OPERAND (t, src, iter, SSA_OP_VMAYDEF) - append_v_may_def (t); - FOR_EACH_SSA_TREE_OPERAND (t, src, iter, SSA_OP_VMUSTDEF) - append_v_must_def (t); - - if (VEC_length (tree, build_vuses) == 0 - && VEC_length (tree, build_v_may_defs) == 0 - && VEC_length (tree, build_v_must_defs) == 0) - return; + int i, n; + vuse_optype_p src_vuses, dest_vuses; + vdef_optype_p src_vdefs, dest_vdefs; + struct vuse_optype_d vuse; + struct vdef_optype_d vdef; + stmt_ann_t dest_ann; + + VDEF_OPS (dest) = NULL; + VUSE_OPS (dest) = NULL; - /* Now commit the virtual operands to this stmt. */ - finalize_ssa_v_must_defs (dest); - finalize_ssa_v_may_defs (dest); - finalize_ssa_vuses (dest); + dest_ann = get_stmt_ann (dest); + BITMAP_FREE (dest_ann->operands.loads); + BITMAP_FREE (dest_ann->operands.stores); - /* Finally, set the field to the same values as then originals. */ - t = op_iter_init_tree (&old_iter, src, SSA_OP_VUSE); - FOR_EACH_SSA_USE_OPERAND (use_p, dest, iter, SSA_OP_VUSE) + if (LOADED_SYMS (src)) { - gcc_assert (!op_iter_done (&old_iter)); - SET_USE (use_p, t); - t = op_iter_next_tree (&old_iter); + dest_ann->operands.loads = BITMAP_ALLOC (NULL); + bitmap_copy (dest_ann->operands.loads, LOADED_SYMS (src)); } - gcc_assert (op_iter_done (&old_iter)); - op_iter_init_maydef (&old_iter, src, &u2, &d2); - FOR_EACH_SSA_MAYDEF_OPERAND (def_p, use_p, dest, iter) + if (STORED_SYMS (src)) { - gcc_assert (!op_iter_done (&old_iter)); - SET_USE (use_p, USE_FROM_PTR (u2)); - SET_DEF (def_p, DEF_FROM_PTR (d2)); - op_iter_next_maymustdef (&u2, &d2, &old_iter); + dest_ann->operands.stores = BITMAP_ALLOC (NULL); + bitmap_copy (dest_ann->operands.stores, STORED_SYMS (src)); } - gcc_assert (op_iter_done (&old_iter)); - op_iter_init_mustdef (&old_iter, src, &u2, &d2); - FOR_EACH_SSA_MUSTDEF_OPERAND (def_p, use_p, dest, iter) + /* Copy all the VUSE operators and corresponding operands. */ + dest_vuses = &vuse; + for (src_vuses = VUSE_OPS (src); src_vuses; src_vuses = src_vuses->next) { - gcc_assert (!op_iter_done (&old_iter)); - SET_USE (use_p, USE_FROM_PTR (u2)); - SET_DEF (def_p, DEF_FROM_PTR (d2)); - op_iter_next_maymustdef (&u2, &d2, &old_iter); + n = VUSE_NUM (src_vuses); + dest_vuses = add_vuse_op (dest, NULL_TREE, n, &dest_vuses); + dest_vuses->next = NULL; + for (i = 0; i < n; i++) + SET_USE (VUSE_OP_PTR (dest_vuses, i), VUSE_OP (src_vuses, i)); + + if (VUSE_OPS (dest) == NULL) + VUSE_OPS (dest) = vuse.next; } - gcc_assert (op_iter_done (&old_iter)); + /* Copy all the VDEF operators and corresponding operands. */ + dest_vdefs = &vdef; + for (src_vdefs = VDEF_OPS (src); src_vdefs; src_vdefs = src_vdefs->next) + { + n = VUSE_NUM (src_vdefs); + dest_vdefs = add_vdef_op (dest, NULL_TREE, n, &dest_vdefs); + dest_vdefs->next = NULL; + VDEF_RESULT (dest_vdefs) = VDEF_RESULT (src_vdefs); + for (i = 0; i < n; i++) + SET_USE (VUSE_OP_PTR (dest_vdefs, i), VUSE_OP (src_vdefs, i)); + + if (VDEF_OPS (dest) == NULL) + VDEF_OPS (dest) = vdef.next; + } } @@ -2322,51 +2456,34 @@ copy_virtual_operands (tree dest, tree src) void create_ssa_artificial_load_stmt (tree new_stmt, tree old_stmt) { - stmt_ann_t ann; tree op; ssa_op_iter iter; use_operand_p use_p; - unsigned x; + unsigned i; - ann = get_stmt_ann (new_stmt); + get_stmt_ann (new_stmt); - /* Process the stmt looking for operands. */ + /* Process NEW_STMT looking for operands. */ start_ssa_stmt_operands (); parse_ssa_operands (new_stmt); - for (x = 0; x < VEC_length (tree, build_vuses); x++) - { - tree t = VEC_index (tree, build_vuses, x); - if (TREE_CODE (t) != SSA_NAME) - { - var_ann_t ann = var_ann (t); - ann->in_vuse_list = 0; - } - } + for (i = 0; VEC_iterate (tree, build_vuses, i, op); i++) + if (TREE_CODE (op) != SSA_NAME) + var_ann (op)->in_vuse_list = false; - for (x = 0; x < VEC_length (tree, build_v_may_defs); x++) - { - tree t = VEC_index (tree, build_v_may_defs, x); - if (TREE_CODE (t) != SSA_NAME) - { - var_ann_t ann = var_ann (t); - ann->in_v_may_def_list = 0; - } - } + for (i = 0; VEC_iterate (tree, build_vuses, i, op); i++) + if (TREE_CODE (op) != SSA_NAME) + var_ann (op)->in_vdef_list = false; /* Remove any virtual operands that were found. */ - VEC_truncate (tree, build_v_may_defs, 0); - VEC_truncate (tree, build_v_must_defs, 0); + VEC_truncate (tree, build_vdefs, 0); VEC_truncate (tree, build_vuses, 0); /* For each VDEF on the original statement, we want to create a - VUSE of the V_MAY_DEF result or V_MUST_DEF op on the new - statement. */ - FOR_EACH_SSA_TREE_OPERAND (op, old_stmt, iter, - (SSA_OP_VMAYDEF | SSA_OP_VMUSTDEF)) + VUSE of the VDEF result operand on the new statement. */ + FOR_EACH_SSA_TREE_OPERAND (op, old_stmt, iter, SSA_OP_VDEF) append_vuse (op); - - /* Now build the operands for this new stmt. */ + finalize_ssa_stmt_operands (new_stmt); /* All uses in this fake stmt must not be in the immediate use lists. */ @@ -2567,7 +2684,7 @@ dump_immediate_uses_for (FILE *file, tree var) fprintf (file, "***end of stmt iterator marker***\n"); else if (!is_gimple_reg (USE_FROM_PTR (use_p))) - print_generic_stmt (file, USE_STMT (use_p), TDF_VOPS); + print_generic_stmt (file, USE_STMT (use_p), TDF_VOPS|TDF_MEMSYMS); else print_generic_stmt (file, USE_STMT (use_p), TDF_SLIM); } @@ -2649,7 +2766,7 @@ push_stmt_changes (tree *stmt_p) bitmap_set_bit (buf->loads, DECL_UID (sym)); } - FOR_EACH_SSA_TREE_OPERAND (op, stmt, i, SSA_OP_VIRTUAL_DEFS) + FOR_EACH_SSA_TREE_OPERAND (op, stmt, i, SSA_OP_VDEF) { tree sym = TREE_CODE (op) == SSA_NAME ? SSA_NAME_VAR (op) : op; if (buf->stores == NULL) @@ -2737,19 +2854,12 @@ pop_stmt_changes (tree *stmt_p) bitmap_set_bit (loads, DECL_UID (sym)); } - FOR_EACH_SSA_TREE_OPERAND (op, stmt, i, SSA_OP_VIRTUAL_DEFS) + FOR_EACH_SSA_TREE_OPERAND (op, stmt, i, SSA_OP_VDEF) { tree sym = TREE_CODE (op) == SSA_NAME ? SSA_NAME_VAR (op) : op; if (stores == NULL) stores = BITMAP_ALLOC (NULL); bitmap_set_bit (stores, DECL_UID (sym)); - - /* If a V_MAY_DEF turned into a V_MUST_DEF, we will keep - referencing the same symbol, but we still need to mark it - for renaming since the operand scanner stripped its - SSA_NAME. */ - if (op == sym) - mark_sym_for_renaming (sym); } } @@ -2813,3 +2923,101 @@ discard_stmt_changes (tree *stmt_p) buf->stmt_p = NULL; free (buf); } + + +/* Returns true if statement STMT may access memory. */ + +bool +stmt_references_memory_p (tree stmt) +{ + if (!gimple_ssa_operands (cfun)->ops_active || TREE_CODE (stmt) == PHI_NODE) + return false; + + return stmt_ann (stmt)->references_memory; +} + + +/* Return the memory partition tag (MPT) associated with memory + symbol SYM. From a correctness standpoint, memory partitions can + be assigned in any arbitrary fashion as long as this rule is + observed: Given two memory partitions MPT.i and MPT.j, they must + not contain symbols in common. + + Memory partitions are used when putting the program into Memory-SSA + form. In particular, in Memory-SSA PHI nodes are not computed for + individual memory symbols. They are computed for memory + partitions. This reduces the amount of PHI nodes in the SSA graph + at the expense of precision (i.e., it makes unrelated stores affect + each other). + + However, it is possible to increase precision by changing this + partitioning scheme. For instance, if the partitioning scheme is + such that get_mpt_for is the identity function (that is, + get_mpt_for (s) = s), this will result in ultimate precision at the + expense of huge SSA webs. + + At the other extreme, a partitioning scheme that groups all the + symbols in the same set results in minimal SSA webs and almost + total loss of precision. */ + +tree +get_mpt_for (tree sym) +{ + tree mpt; + + /* Don't create a new tag unnecessarily. */ + mpt = memory_partition (sym); + if (mpt == NULL_TREE) + { + mpt = create_tag_raw (MEMORY_PARTITION_TAG, TREE_TYPE (sym), "MPT"); + TREE_ADDRESSABLE (mpt) = 0; + MTAG_GLOBAL (mpt) = 1; + add_referenced_var (mpt); + VEC_safe_push (tree, heap, gimple_ssa_operands (cfun)->mpt_table, mpt); + MPT_SYMBOLS (mpt) = BITMAP_ALLOC (NULL); + set_memory_partition (sym, mpt); + } + + return mpt; +} + + +/* Dump memory partition information to FILE. */ + +void +dump_memory_partitions (FILE *file) +{ + unsigned i, npart; + unsigned long nsyms; + tree mpt; + + fprintf (file, "\nMemory partitions\n\n"); + for (i = 0, npart = 0, nsyms = 0; + VEC_iterate (tree, gimple_ssa_operands (cfun)->mpt_table, i, mpt); + i++) + { + if (mpt) + { + bitmap syms = MPT_SYMBOLS (mpt); + unsigned long n = bitmap_count_bits (syms); + + fprintf (file, "#%u: ", i); + print_generic_expr (file, mpt, 0); + fprintf (file, ": %lu elements: ", n); + dump_decl_set (file, syms); + npart++; + nsyms += n; + } + } + + fprintf (file, "\n%u memory partitions holding %lu symbols\n", npart, nsyms); +} + + +/* Dump memory partition information to stderr. */ + +void +debug_memory_partitions (void) +{ + dump_memory_partitions (stderr); +} |