diff options
author | Richard Sandiford <rdsandiford@googlemail.com> | 2014-06-15 07:32:28 +0000 |
---|---|---|
committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2014-06-15 07:32:28 +0000 |
commit | bfac633a90588e96050f8767052d59efd7307cb1 (patch) | |
tree | 00fa07671c5adda4b362c1895d5e45e61ae0175b /gcc/web.c | |
parent | 2c73339ae90070d7b33cb64a6d7461fbf676a53e (diff) | |
download | gcc-bfac633a90588e96050f8767052d59efd7307cb1.zip gcc-bfac633a90588e96050f8767052d59efd7307cb1.tar.gz gcc-bfac633a90588e96050f8767052d59efd7307cb1.tar.bz2 |
df.h (DF_INSN_INFO_MWS, [...]): New macros.
gcc/
* df.h (DF_INSN_INFO_MWS, FOR_EACH_INSN_INFO_DEF): New macros.
(FOR_EACH_INSN_INFO_USE, FOR_EACH_INSN_INFO_EQ_USE): Likewise.
(FOR_EACH_INSN_DEF, FOR_EACH_INSN_USE, FOR_EACH_INSN_EQ_USE): Likewise.
* auto-inc-dec.c (find_inc, merge_in_block): Use them.
* combine.c (create_log_links): Likewise.
* compare-elim.c (find_flags_uses_in_insn): Likewise.
(try_eliminate_compare): Likewise.
* cprop.c (make_set_regs_unavailable, mark_oprs_set): Likewise.
* dce.c (deletable_insn_p, find_call_stack_args): Likewise.
(remove_reg_equal_equiv_notes_for_defs): Likewise.
(reset_unmarked_insns_debug_uses, mark_reg_dependencies): Likewise.
(word_dce_process_block, dce_process_block): Likewise.
* ddg.c (def_has_ccmode_p): Likewise.
* df-core.c (df_bb_regno_first_def_find): Likewise.
(df_bb_regno_last_def_find, df_find_def, df_find_use): Likewise.
* df-problems.c (df_rd_simulate_one_insn): Likewise.
(df_lr_bb_local_compute, df_live_bb_local_compute): Likewise.
(df_chain_remove_problem, df_chain_insn_top_dump): Likewise.
(df_chain_insn_bottom_dump, df_word_lr_bb_local_compute): Likewise.
(df_word_lr_simulate_defs, df_word_lr_simulate_uses): Likewise.
(df_remove_dead_eq_notes, df_note_bb_compute): Likewise.
(df_simulate_find_defs, df_simulate_find_uses): Likewise.
(df_simulate_find_noclobber_defs, df_simulate_defs): Likewise.
(df_simulate_uses, df_md_simulate_one_insn): Likewise.
* df-scan.c (df_reorganize_refs_by_reg_by_insn): Likewise.
* fwprop.c (local_ref_killed_between_p): Likewise.
(all_uses_available_at, free_load_extend): Likewise.
* gcse.c (update_bb_reg_pressure, calculate_bb_reg_pressure): Likewise.
* hw-doloop.c (scan_loop): Likewise.
* ifcvt.c (dead_or_predicable): Likewise.
* init-regs.c (initialize_uninitialized_regs): Likewise.
* ira-lives.c (mark_hard_reg_early_clobbers): Likewise.
(process_bb_node_lives): Likewise.
* ira.c (compute_regs_asm_clobbered, build_insn_chain): Likewise.
(find_moveable_pseudos): Likewise.
* loop-invariant.c (check_dependencies, record_uses): Likewise.
* recog.c (peep2_find_free_register): Likewise.
* ree.c (get_defs): Likewise.
* regstat.c (regstat_bb_compute_ri): Likewise.
(regstat_bb_compute_calls_crossed): Likewise.
* sched-deps.c (find_inc, find_mem): Likewise.
* sel-sched-ir.c (maybe_downgrade_id_to_use): Likewise.
(maybe_downgrade_id_to_use, setup_id_reg_sets): Likewise.
* shrink-wrap.c (requires_stack_frame_p): Likewise.
(prepare_shrink_wrap): Likewise.
* store-motion.c (compute_store_table, build_store_vectors): Likewise.
* web.c (union_defs, pass_web::execute): Likewise.
* config/i386/i386.c (increase_distance, insn_defines_reg): Likewise.
(insn_uses_reg_mem, ix86_ok_to_clobber_flags): Likewise.
From-SVN: r211678
Diffstat (limited to 'gcc/web.c')
-rw-r--r-- | gcc/web.c | 150 |
1 files changed, 50 insertions, 100 deletions
@@ -173,51 +173,34 @@ union_defs (df_ref use, struct web_entry *def_entry, { struct df_insn_info *insn_info = DF_REF_INSN_INFO (use); struct df_link *link = DF_REF_CHAIN (use); - df_ref *eq_use_link; - df_ref *def_link; rtx set; if (insn_info) { - rtx insn = insn_info->insn; - eq_use_link = DF_INSN_INFO_EQ_USES (insn_info); - def_link = DF_INSN_INFO_DEFS (insn_info); - set = single_set (insn); + df_ref eq_use; + + set = single_set (insn_info->insn); + FOR_EACH_INSN_INFO_EQ_USE (eq_use, insn_info) + if (use != eq_use + && DF_REF_REAL_REG (use) == DF_REF_REAL_REG (eq_use)) + (*fun) (use_entry + DF_REF_ID (use), use_entry + DF_REF_ID (eq_use)); } else - { - /* An artificial use. It links up with nothing. */ - eq_use_link = NULL; - def_link = NULL; - set = NULL; - } + set = NULL; /* Union all occurrences of the same register in reg notes. */ - if (eq_use_link) - while (*eq_use_link) - { - if (use != *eq_use_link - && DF_REF_REAL_REG (use) == DF_REF_REAL_REG (*eq_use_link)) - (*fun) (use_entry + DF_REF_ID (use), - use_entry + DF_REF_ID (*eq_use_link)); - eq_use_link++; - } - /* Recognize trivial noop moves and attempt to keep them as noop. */ if (set && SET_SRC (set) == DF_REF_REG (use) && SET_SRC (set) == SET_DEST (set)) { - if (def_link) - while (*def_link) - { - if (DF_REF_REAL_REG (use) == DF_REF_REAL_REG (*def_link)) - (*fun) (use_entry + DF_REF_ID (use), - def_entry + DF_REF_ID (*def_link)); - def_link++; - } + df_ref def; + + FOR_EACH_INSN_INFO_DEF (def, insn_info) + if (DF_REF_REAL_REG (use) == DF_REF_REAL_REG (def)) + (*fun) (use_entry + DF_REF_ID (use), def_entry + DF_REF_ID (def)); } /* UD chains of uninitialized REGs are empty. Keeping all uses of @@ -248,23 +231,14 @@ union_defs (df_ref use, struct web_entry *def_entry, /* A READ_WRITE use requires the corresponding def to be in the same register. Find it and union. */ if (DF_REF_FLAGS (use) & DF_REF_READ_WRITE) - { - df_ref *link; + if (insn_info) + { + df_ref def; - if (insn_info) - link = DF_INSN_INFO_DEFS (insn_info); - else - link = NULL; - - if (link) - while (*link) - { - if (DF_REF_REAL_REG (*link) == DF_REF_REAL_REG (use)) - (*fun) (use_entry + DF_REF_ID (use), - def_entry + DF_REF_ID (*link)); - link++; - } - } + FOR_EACH_INSN_INFO_DEF (def, insn_info) + if (DF_REF_REAL_REG (use) == DF_REF_REAL_REG (def)) + (*fun) (use_entry + DF_REF_ID (use), def_entry + DF_REF_ID (def)); + } } /* Find the corresponding register for the given entry. */ @@ -375,22 +349,16 @@ pass_web::execute (function *fun) FOR_ALL_BB_FN (bb, fun) FOR_BB_INSNS (bb, insn) { - unsigned int uid = INSN_UID (insn); if (NONDEBUG_INSN_P (insn)) { - df_ref *use_rec; - for (use_rec = DF_INSN_UID_USES (uid); *use_rec; use_rec++) - { - df_ref use = *use_rec; - if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) - DF_REF_ID (use) = uses_num++; - } - for (use_rec = DF_INSN_UID_EQ_USES (uid); *use_rec; use_rec++) - { - df_ref use = *use_rec; - if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) - DF_REF_ID (use) = uses_num++; - } + struct df_insn_info *insn_info = DF_INSN_INFO_GET (insn); + df_ref use; + FOR_EACH_INSN_INFO_USE (use, insn_info) + if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) + DF_REF_ID (use) = uses_num++; + FOR_EACH_INSN_INFO_EQ_USE (use, insn_info) + if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) + DF_REF_ID (use) = uses_num++; } } @@ -402,34 +370,23 @@ pass_web::execute (function *fun) /* Produce the web. */ FOR_ALL_BB_FN (bb, fun) FOR_BB_INSNS (bb, insn) - { - unsigned int uid = INSN_UID (insn); if (NONDEBUG_INSN_P (insn)) { - df_ref *use_rec; + struct df_insn_info *insn_info = DF_INSN_INFO_GET (insn); + df_ref use; union_match_dups (insn, def_entry, use_entry, unionfind_union); - for (use_rec = DF_INSN_UID_USES (uid); *use_rec; use_rec++) - { - df_ref use = *use_rec; - if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) - union_defs (use, def_entry, used, use_entry, unionfind_union); - } - for (use_rec = DF_INSN_UID_EQ_USES (uid); *use_rec; use_rec++) - { - df_ref use = *use_rec; - if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) - union_defs (use, def_entry, used, use_entry, unionfind_union); - } + FOR_EACH_INSN_INFO_USE (use, insn_info) + if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) + union_defs (use, def_entry, used, use_entry, unionfind_union); + FOR_EACH_INSN_INFO_EQ_USE (use, insn_info) + if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) + union_defs (use, def_entry, used, use_entry, unionfind_union); } - } /* Update the instruction stream, allocating new registers for split pseudos in progress. */ FOR_ALL_BB_FN (bb, fun) FOR_BB_INSNS (bb, insn) - { - unsigned int uid = INSN_UID (insn); - if (NONDEBUG_INSN_P (insn) /* Ignore naked clobber. For example, reg 134 in the second insn of the following sequence will not be replaced. @@ -441,28 +398,21 @@ pass_web::execute (function *fun) Thus the later passes can optimize them away. */ && GET_CODE (PATTERN (insn)) != CLOBBER) { - df_ref *use_rec; - df_ref *def_rec; - for (use_rec = DF_INSN_UID_USES (uid); *use_rec; use_rec++) - { - df_ref use = *use_rec; - if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) - replace_ref (use, entry_register (use_entry + DF_REF_ID (use), use, used)); - } - for (use_rec = DF_INSN_UID_EQ_USES (uid); *use_rec; use_rec++) - { - df_ref use = *use_rec; - if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) - replace_ref (use, entry_register (use_entry + DF_REF_ID (use), use, used)); - } - for (def_rec = DF_INSN_UID_DEFS (uid); *def_rec; def_rec++) - { - df_ref def = *def_rec; - if (DF_REF_REGNO (def) >= FIRST_PSEUDO_REGISTER) - replace_ref (def, entry_register (def_entry + DF_REF_ID (def), def, used)); - } + struct df_insn_info *insn_info = DF_INSN_INFO_GET (insn); + df_ref def, use; + FOR_EACH_INSN_INFO_USE (use, insn_info) + if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) + replace_ref (use, entry_register (use_entry + DF_REF_ID (use), + use, used)); + FOR_EACH_INSN_INFO_EQ_USE (use, insn_info) + if (DF_REF_REGNO (use) >= FIRST_PSEUDO_REGISTER) + replace_ref (use, entry_register (use_entry + DF_REF_ID (use), + use, used)); + FOR_EACH_INSN_INFO_DEF (def, insn_info) + if (DF_REF_REGNO (def) >= FIRST_PSEUDO_REGISTER) + replace_ref (def, entry_register (def_entry + DF_REF_ID (def), + def, used)); } - } free (def_entry); free (use_entry); |