
gcc/ChangeLog: * doc/invoke.texi (-fvar-tracking-assignments): New. (-fvar-tracking-assignments-toggle): New. (-fdump-final-insns=file): Mark filename as optional. (--param min-nondebug-insn-uid): New. (-gdwarf-@{version}): Mention version 4. * opts.c (common_handle_option): Accept it. * tree-vrp.c (find_assert_locations_1): Skip debug stmts. * regrename.c (regrename_optimize): Drop last. Don't count debug insns as uses. Don't reject change because of debug insn. (do_replace): Reject DEBUG_INSN as chain starter. Take base_regno from the chain starter, and check for inexact matches in DEBUG_INSNS. (scan_rtx_reg): Accept inexact matches in DEBUG_INSNs. (build_def_use): Simplify and fix the marking of DEBUG_INSNs. * sched-ebb.c (schedule_ebbs): Skip boundary debug insns. * fwprop.c (forward_propagate_and_simplify): ...into debug insns. * doc/gimple.texi (is_gimple_debug): New. (gimple_debug_bind_p): New. (is_gimple_call, gimple_assign_cast_p): End sentence with period. * doc/install.texi (bootstrap-debug): More details. (bootstrap-debug-big, bootstrap-debug-lean): Document. (bootstrap-debug-lib): More details. (bootstrap-debug-ckovw): Update. (bootstrap-time): New. * tree-into-ssa.c (mark_def_sites): Skip debug stmts. (insert_phi_nodes_for): Insert debug stmts. (rewrite_stmt): Take iterator. Insert debug stmts. (rewrite_enter_block): Adjust. (maybe_replace_use_in_debug_stmt): New. (rewrite_update_stmt): Use it. (mark_use_interesting): Return early for debug stmts. * tree-ssa-loop-im.c (rewrite_bittest): Propagate DEFs into debug stmts before replacing stmt. (move_computations_stmt): Likewise. * ira-conflicts.c (add_copies): Skip debug insns. * regstat.c (regstat_init_n_sets_and_refs): Discount debug insns. (regstat_bb_compute_ri): Skip debug insns. * tree-ssa-threadupdate.c (redirection_block_p): Skip debug stmts. * tree-ssa-loop-manip.c (find_uses_to_rename_stmt, check_loop_closed_ssa_stmt): Skip debug stmts. * tree-tailcall.c (find_tail_calls): Likewise. * tree-ssa-loop-ch.c (should_duplicate_loop_header_p): Likewise. * tree.h (MAY_HAVE_DEBUG_STMTS): New. (build_var_debug_value_stat): Declare. (build_var_debug_value): Define. (target_for_debug_bind): Declare. * reload.c (find_equiv_reg): Skip debug insns. * rtlanal.c (reg_used_between_p): Skip debug insns. (side_effects_p): Likewise. (canonicalize_condition): Likewise. * ddg.c (create_ddg_dep_from_intra_loop_link): Check that non-debug insns never depend on debug insns. (create_ddg_dep_no_link): Likewise. (add_cross_iteration_register_deps): Use ANTI_DEP for debug insns. Don't add inter-loop dependencies for debug insns. (build_intra_loop_deps): Likewise. (create_ddg): Count debug insns. * ddg.h (struct ddg::num_debug): New. (num_backargs): Pair up with previous int field. * diagnostic.c (diagnostic_report_diagnostic): Skip notes on -fcompare-debug-second. * final.c (get_attr_length_1): Skip debug insns. (rest_of_clean-state): Don't dump CFA_RESTORE_STATE. * gcc.c (invoke_as): Call compare-debug-dump-opt. (driver_self_specs): Map -fdump-final-insns to -fdump-final-insns=.. (get_local_tick): New. (compare_debug_dump_opt_spec_function): Test for . argument and compute output name. Compute temp output spec without flag name. Compute -frandom-seed. (OPT): Undef after use. * cfgloopanal.c (num_loop_insns): Skip debug insns. (average_num_loop_insns): Likewise. * params.h (MIN_NONDEBUG_INSN_UID): New. * gimple.def (GIMPLE_DEBUG): New. * ipa-reference.c (scan_stmt_for_static_refs): Skip debug stmts. * auto-inc-dec.c (merge_in_block): Skip debug insns. (merge_in_block): Fix whitespace. * toplev.c (flag_var_tracking): Update comment. (flag_var_tracking_assignments): New. (flag_var_tracking_assignments_toggle): New. (process_options): Don't open final insns dump file if we're not going to write to it. Compute defaults for var_tracking. * df-scan.c (df_insn_rescan_debug_internal): New. (df_uses_record): Handle debug insns. * haifa-sched.c (ready): Initialize n_debug. (contributes_to_priority): Skip debug insns. (dep_list_size): New. (priority): Use it. (rank_for_schedule): Likewise. Schedule debug insns as soon as they're ready. Disregard previous debug insns to make decisions. (queue_insn): Never queue debug insns. (ready_add, ready_remove_first, ready_remove): Count debug insns. (schedule_insn): Don't reject debug insns because of issue rate. (get_ebb_head_tail, no_real_insns_p): Skip boundary debug insns. (queue_to_ready): Skip and discount debug insns. (choose_ready): Let debug insns through. (schedule_block): Check boundary debug insns. Discount debug insns, schedule them early. Adjust whitespace. (set_priorities): Check for boundary debug insns. (add_jump_dependencies): Use dep_list_size. (prev_non_location_insn): New. (check_cfg): Use it. * tree-ssa-loop-ivopts.c (find-interesting_users): Skip debug stmts. (remove_unused_ivs): Reset debug stmts. * modulo-sched.c (const_iteration_count): Skip debug insns. (res_MII): Discount debug insns. (loop_single_full_bb_p): Skip debug insns. (sms_schedule): Likewise. (sms_schedule_by_order): Likewise. (ps_has_conflicts): Likewise. * caller-save.c (refmarker_fn): New. (save_call_clobbered_regs): Replace regs with saved mem in debug insns. (mark_referenced_regs): Take pointer, mark and arg. Adjust. Call refmarker_fn mark for hardregnos. (mark_reg_as_referenced): New. (replace_reg_with_saved_mem): New. * ipa-pure-const.c (check_stmt): Skip debug stmts. * cse.c (cse_insn): Canonicalize debug insns. Skip them when searching back. (cse_extended_basic_block): Skip debug insns. (count_reg_usage): Likewise. (is_dead_reg): New, split out of... (set_live_p): ... here. (insn_live_p): Use it for debug insns. * tree-stdarg.c (check_all_va_list_escapes): Skip debug stmts. (execute_optimize_stdarg): Likewise. * tree-ssa-dom.c (propagate_rhs_into_lhs): Likewise. * tree-ssa-propagate.c (substitute_and_fold): Don't regard changes in debug stmts as changes. * sel-sched.c (moving_insn_creates_bookkeeping_block_p): New. (moveup_expr): Don't move across debug insns. Don't move debug insn if it would create a bookkeeping block. (moveup_expr_cached): Don't use cache for debug insns that are heads of blocks. (compute_av_set_inside_bb): Skip debug insns. (sel_rank_for_schedule): Schedule debug insns first. Remove dead code. (block_valid_for_bookkeeping_p); Support lax searches. (create_block_for_bookkeeping): Adjust block numbers when encountering debug-only blocks. (find_place_for_bookkeeping): Deal with debug-only blocks. (generate_bookkeeping_insn): Accept no place to insert. (remove_temp_moveop_nops): New argument full_tidying. (prepare_place_to_insert): Deal with debug insns. (advance_state_on_fence): Debug insns don't start cycles. (update_boundaries): Take fence as argument. Deal with debug insns. (schedule_expr_on_boundary): No full_tidying on debug insns. (fill_insns): Deal with debug insns. (track_scheduled_insns_and_blocks): Don't count debug insns. (need_nop_to_preserve_insn_bb): New, split out of... (remove_insn_from_stream): ... this. (fur_orig_expr_not_found): Skip debug insns. * rtl.def (VALUE): Move up. (DEBUG_INSN): New. * tree-ssa-sink.c (all_immediate_uses_same_place): Skip debug stmts. (nearest_common_dominator_of_uses): Take debug_stmts argument. Set it if debug stmts are found. (statement_sink_location): Skip debug stmts. Propagate moving defs into debug stmts. * ifcvt.c (first_active_insn): Skip debug insns. (last_active_insns): Likewise. (cond_exec_process_insns): Likewise. (noce_process_if_block): Likewise. (check_cond_move_block): Likewise. (cond_move_convert_if_block): Likewise. (block_jumps_and_fallthru_p): Likewise. (dead_or_predicable): Likewise. * dwarf2out.c (debug_str_hash_forced): New. (find_AT_string): Add comment. (gen_label_for_indirect_string): New. (get_debug_string_label): New. (AT_string_form): Use it. (mem_loc_descriptor): Handle non-TLS symbols. Handle MINUS , DIV, MOD, AND, IOR, XOR, NOT, ABS, NEG, and CONST_STRING. Accept but discard COMPARE, IF_THEN_ELSE, ROTATE, ROTATERT, TRUNCATE and several operations that cannot be represented with DWARF opcodes. (loc_descriptor): Ignore SIGN_EXTEND and ZERO_EXTEND. Require dwarf_version 4 for DW_OP_implicit_value and DW_OP_stack_value. (dwarf2out_var_location): Take during-call mark into account. (output_indirect_string): Update comment. Output if there are label and references. (prune_indirect_string): New. (prune_unused_types): Call it if debug_str_hash_forced. More in dwarf2out.c, from Jakub Jelinek <jakub@redhat.com>: (dw_long_long_const): Remove. (struct dw_val_struct): Change val_long_long type to rtx. (print_die, attr_checksum, same_dw_val_p, loc_descriptor): Adjust for val_long_long change to CONST_DOUBLE rtx from a long hi/lo pair. (output_die): Likewise. Use HOST_BITS_PER_WIDE_INT size of each component instead of HOST_BITS_PER_LONG. (output_loc_operands): Likewise. For const8* assert HOST_BITS_PER_WIDE_INT rather than HOST_BITS_PER_LONG is >= 64. (output_loc_operands_raw): For const8* assert HOST_BITS_PER_WIDE_INT rather than HOST_BITS_PER_LONG is >= 64. (add_AT_long_long): Remove val_hi and val_lo arguments, add val_const_double. (size_of_die): Use HOST_BITS_PER_WIDE_INT size multiplier instead of HOST_BITS_PER_LONG for dw_val_class_long_long. (add_const_value_attribute): Adjust add_AT_long_long caller. Don't handle TLS SYMBOL_REFs. If CONST wraps a constant, tail recurse. (dwarf_stack_op_name): Handle DW_OP_implicit_value and DW_OP_stack_value. (size_of_loc_descr, output_loc_operands, output_loc_operands_raw): Handle DW_OP_implicit_value. (extract_int): Move prototype earlier. (mem_loc_descriptor): For SUBREG punt if inner mode size is wider than DWARF2_ADDR_SIZE. Handle SIGN_EXTEND and ZERO_EXTEND by DW_OP_shl and DW_OP_shr{a,}. Handle EQ, NE, GT, GE, LT, LE, GTU, GEU, LTU, LEU, SMIN, SMAX, UMIN, UMAX, SIGN_EXTRACT, ZERO_EXTRACT. (loc_descriptor): Compare mode size with DWARF2_ADDR_SIZE instead of Pmode size. (loc_descriptor): Add MODE argument. Handle CONST_INT, CONST_DOUBLE, CONST_VECTOR, CONST, LABEL_REF and SYMBOL_REF if mode != VOIDmode, attempt to handle other expressions. Don't handle TLS SYMBOL_REFs. (concat_loc_descriptor, concatn_loc_descriptor, loc_descriptor_from_tree_1): Adjust loc_descriptor callers. (add_location_or_const_value_attribute): Likewise. For single location loc_lists attempt to use add_const_value_attribute for constant decls. Add DW_AT_const_value even if NOTE_VAR_LOCATION is VAR_LOCATION with CONSTANT_P or CONST_STRING in its expression. * cfgbuild.c (inside_basic_block_p): Handle debug insns. (control_flow_insn_p): Likewise. * tree-parloops.c (eliminate_local_variables_stmt): Handle debug stmt. (separate_decls_in_region_debug_bind): New. (separate_decls_in_region): Process debug bind stmts afterwards. * recog.c (verify_changes): Handle debug insns. (extract_insn): Likewise. (peephole2_optimize): Skip debug insns. * dse.c (scan_insn): Skip debug insns. * sel-sched-ir.c (return_nop_to_pool): Take full_tidying argument. Pass it on. (setup_id_for_insn): Handle debug insns. (maybe_tidy_empty_bb): Adjust whitespace. (tidy_control_flow): Skip debug insns. (sel_remove_insn): Adjust for debug insns. (sel_estimate_number_of_insns): Skip debug insns. (create_insn_rtx_from_pattern): Handle debug insns. (create_copy_of_insn_rtx): Likewise. * sel-sched-.h (sel_bb_end): Declare. (sel_bb_empty_or_nop_p): New. (get_all_loop_exits): Use it. (_eligible_successor_edge_p): Likewise. (return_nop_to_pool): Adjust. * tree-eh.c (tre_empty_eh_handler_p): Skip debug stmts. * ira-lives.c (process_bb_node_lives): Skip debug insns. * gimple-pretty-print.c (dump_gimple_debug): New. (dump_gimple_stmt): Use it. (dump_bb_header): Skip gimple debug stmts. * regmove.c (optimize_reg_copy_1): Discount debug insns. (fixup_match_2): Likewise. (regmove_backward_pass): Likewise. Simplify combined replacement. Handle debug insns. * function.c (instantiate_virtual_regs): Handle debug insns. * function.h (struct emit_status): Add x_cur_debug_insn_uid. * print-rtl.h: Include cselib.h. (print_rtx): Print VALUEs. Split out and recurse for VAR_LOCATIONs. * df.h (df_inns_rescan_debug_internal): Declare. * gcse.c (alloc_hash_table): Estimate n_insns. (cprop_insn): Don't regard debug insns as changes. (bypass_conditional_jumps): Skip debug insns. (one_pre_gcse_pass): Adjust. (one_code_hoisting_pass): Likewise. (compute_ld_motion_mems): Skip debug insns. (one_cprop_pass): Adjust. * tree-if-conv.c (tree_if_convert_stmt): Reset debug stmts. (if_convertible_stmt_p): Handle debug stmts. * init-regs.c (initialize_uninitialized_regs): Skip debug insns. * tree-vect-loop.c (vect_is_simple_reduction): Skip debug stmts. * ira-build.c (create_bb_allocnos): Skip debug insns. * tree-flow-inline.h (has_zero_uses): Discount debug stmts. (has_single_use): Likewise. (single_imm_use): Likewise. (num_imm_uses): Likewise. * tree-ssa-phiopt.c (empty_block_p): Skip debug stmts. * tree-ssa-coalesce.c (build_ssa_conflict_graph): Skip debug stmts. (create_outofssa_var_map): Likewise. * lower-subreg.c (adjust_decomposed_uses): New. (resolve_debug): New. (decompose_multiword_subregs): Use it. * tree-dfa.c (find_referenced_vars): Skip debug stmts. * emit-rtl.c: Include params.h. (cur_debug_insn_uid): Define. (set_new_first_and_last_insn): Set cur_debug_insn_uid too. (copy_rtx_if_shared_1): Handle debug insns. (reset_used_flags): Likewise. (set_used_flags): LIkewise. (get_max_insn_count): New. (next_nondebug_insn): New. (prev_nondebug_insn): New. (make_debug_insn_raw): New. (emit_insn_before_noloc): Handle debug insns. (emit_jump_insn_before_noloc): Likewise. (emit_call_insn_before_noloc): Likewise. (emit_debug_insn_before_noloc): New. (emit_insn_after_noloc): Handle debug insns. (emit_jump_insn_after_noloc): Likewise. (emit_call_insn_after_noloc): Likewise. (emit_debug_insn_after_noloc): Likewise. (emit_insn_after): Take loc from earlier non-debug insn. (emit_jump_insn_after): Likewise. (emit_call_insn_after): Likewise. (emit_debug_insn_after_setloc): New. (emit_debug_insn_after): New. (emit_insn_before): Take loc from later non-debug insn. (emit_jump_insn_before): Likewise. (emit_call_insn_before): Likewise. (emit_debug_insn_before_setloc): New. (emit_debug_insn_before): New. (emit_insn): Handle debug insns. (emit_debug_insn): New. (emit_jump_insn): Handle debug insns. (emit_call_insn): Likewise. (emit): Likewise. (init_emit): Take min-nondebug-insn-uid into account. Initialize cur_debug_insn_uid. (emit_copy_of_insn_after): Handle debug insns. * cfgexpand.c (gimple_assign_rhs_to_tree): Do not overwrite location of single rhs in place. (maybe_dump_rtl_for_gimple_stmt): Dump lineno. (floor_sdiv_adjust): New. (cell_sdiv_adjust): New. (cell_udiv_adjust): New. (round_sdiv_adjust): New. (round_udiv_adjust): New. (wrap_constant): Moved from cselib. (unwrap_constant): New. (expand_debug_expr): New. (expand_debug_locations): New. (expand_gimple_basic_block): Drop hiding redeclaration. Expand debug bind stmts. (gimple_expand_cfg): Expand debug locations. * cselib.c: Include tree-pass.h. (struct expand_value_data): New. (cselib_record_sets_hook): New. (PRESERVED_VALUE_P, LONG_TERM_PRESERVED_VALUE_P): New. (cselib_clear_table): Move, and implemnet in terms of... (cselib_reset_table_with_next_value): ... this. (cselib_get_next_unknown_value): New. (discard_useless_locs): Don't discard preserved values. (cselib_preserve_value): New. (cselib_preserved_value_p): New. (cselib_preserve_definitely): New. (cselib_clear_preserve): New. (cselib_preserve_only_values): New. (new_cselib_val): Take rtx argument. Dump it in details. (cselib_lookup_mem): Adjust. (expand_loc): Take regs_active in struct. Adjust. Silence dumps unless details are requested. (cselib_expand_value_rtx_cb): New. (cselib_expand_value_rtx): Rename and reimplment in terms of... (cselib_expand_value_rtx_1): ... this. Adjust. Silence dumps without details. Copy more subregs. Try to resolve values using a callback. Wrap constants. (cselib_subst_to_values): Adjust. (cselib_log_lookup): New. (cselib_lookup): Call it. (cselib_invalidate_regno): Don't count preserved values as useless. (cselib_invalidate_mem): Likewise. (cselib_record_set): Likewise. (struct set): Renamed to cselib_set, moved to cselib.h. (cselib_record_sets): Adjust. Call hook. (cselib_process_insn): Reset table when it would be cleared. (dump_cselib_val): New. (dump_cselib_table): New. * tree-cfgcleanup.c (tree_forwarded_block_p): Skip debug stmts. (remove_forwarder_block): Support moving debug stmts. * cselib.h (cselib_record_sets_hook): Declare. (cselib_expand_callback): New type. (cselib_expand_value_rtx_cb): Declare. (cselib_reset_table_with_next_value): Declare. (cselib_get_next_unknown_value): Declare. (cselib_preserve_value): Declare. (cselib_preserved_value_p): Declare. (cselib_preserve_only_values): Declare. (dump_cselib_table): Declare. * cfgcleanup.c (flow_find_cross_jump): Skip debug insns. (try_crossjump_to_edge): Likewise. (delete_unreachable_blocks): Remove dominant GIMPLE blocks after dominated blocks when debug stmts are present. * simplify-rtx.c (delegitimize_mem_from_attrs): New. * tree-ssa-live.c (remove_unused_locals): Skip debug stmts. (set_var_live_on_entry): Likewise. * loop-invariant.c (find_invariants_bb): Skip debug insns. * cfglayout.c (curr_location, last_location): Make static. (set_curr_insn_source_location): Don't avoid bouncing. (get_curr_insn_source_location): New. (get_curr_insn_block): New. (duplicate_insn_chain): Handle debug insns. * tree-ssa-forwprop.c (forward_propagate_addr_expr): Propagate into debug stmts. * common.opt (fcompare-debug): Move to sort order. (fdump-unnumbered-links): Likewise. (fvar-tracking-assignments): New. (fvar-tracking-assignments-toggle): New. * tree-ssa-dce.c (mark_stmt_necessary): Don't mark blocks because of debug stmts. (mark_stmt_if_obviously_necessary): Mark debug stmts. (eliminate_unnecessary_stmts): Walk dominated blocks before dominators. * tree-ssa-ter.c (find_replaceable_in_bb): Skip debug stmts. * ira.c (memref_used_between_p): Skip debug insns. (update_equiv_regs): Likewise. * sched-deps.c (sd_lists_size): Accept empty list. (sd_init_insn): Mark debug insns. (sd_finish_insn): Unmark them. (sd_add_dep): Reject non-debug deps on debug insns. (fixup_sched_groups): Give debug insns group treatment. Skip debug insns. (sched_analyze_reg): Don't mark debug insns for sched before call. (sched_analyze_2): Handle debug insns. (sched_analyze_insn): Compute next non-debug insn. Handle debug insns. (deps_analyze_insn): Handle debug insns. (deps_start_bb): Skip debug insns. (init_deps): Initialize last_debug_insn. * tree-ssa.c (target_for_debug_bind): New. (find_released_ssa_name): New. (propagate_var_def_into_debug_stmts): New. (propagate_defs_into_debug_stmts): New. (verify_ssa): Skip debug bind stmts without values. (warn_uninialized_vars): Skip debug stmts. * target-def.h (TARGET_DELEGITIMIZE_ADDRESS): Set default. * rtl.c (rtx_equal_p_cb): Handle VALUEs. (rtx_equal_p): Likewise. * ira-costs.c (scan_one_insn): Skip debug insns. (process_bb_node_for_hard_reg_moves): Likewise. * rtl.h (DEBUG_INSN_P): New. (NONDEBUG_INSN_P): New. (MAY_HAVE_DEBUG_INSNS): New. (INSN_P): Accept debug insns. (RTX_FRAME_RELATED_P): Likewise. (INSN_DELETED_P): Likewise (PAT_VAR_LOCATION_DECL): New. (PAT_VAR_LOCATION_LOC): New. (PAT_VAR_OCATION_STATUS): New. (NOTE_VAR_LOCATION_DECL): Reimplement. (NOTE_VAR_LOCATION_LOC): Likewise. (NOTE_VAR_LOCATION_STATUS): Likewise. (INSN_VAR_LOCATION): New. (INSN_VAR_LOCATION_DECL): New. (INSN_VAR_LOCATION_LOC): New. (INSN_VAR_LOCATION_STATUS): New. (gen_rtx_UNKNOWN_VAR_LOC): New. (VAR_LOC_UNKNOWN_P): New. (NOTE_DURING_CALL_P): New. (SCHED_GROUP_P): Accept debug insns. (emit_debug_insn_before): Declare. (emit_debug_insn_before_noloc): Declare. (emit_debug_insn_beore_setloc): Declare. (emit_debug_insn_after): Declare. (emit_debug_insn_after_noloc): Declare. (emit_debug_insn_after_setloc): Declare. (emit_debug_insn): Declare. (make_debug_insn_raw): Declare. (prev_nondebug_insn): Declare. (next_nondebug_insn): Declare. (delegitimize_mem_from_attrs): Declare. (get_max_insn_count): Declare. (wrap_constant): Declare. (unwrap_constant): Declare. (get_curr_insn_source_location): Declare. (get_curr_insn_block): Declare. * tree-inline.c (insert_debug_decl_map): New. (processing_debug_stmt): New. (remap_decl): Don't create new mappings in debug stmts. (remap_gimple_op_r): Don't add references in debug stmts. (copy_tree_body_r): Likewise. (remap_gimple_stmt): Handle debug bind stmts. (copy_bb): Skip debug stmts. (copy_edges_for_bb): Likewise. (copy_debug_stmt): New. (copy_debug_stmts): New. (copy_body): Copy debug stmts at the end. (insert_init_debug_bind): New. (insert_init_stmt): Take id. Skip and emit debug stmts. (setup_one_parameter): Remap variable earlier, register debug mapping. (estimate_num_insns): Skip debug stmts. (expand_call_inline): Preserve debug_map. (optimize_inline_calls): Check for no debug_stmts left-overs. (unsave_expr_now): Preserve debug_map. (copy_gimple_seq_and_replace_locals): Likewise. (tree_function_versioning): Check for no debug_stmts left-overs. Init and destroy debug_map as needed. Split edges unconditionally. (build_duplicate_type): Init and destroy debug_map as needed. * tree-inline.h: Include gimple.h instead of pointer-set.h. (struct copy_body_data): Add debug_stmts and debug_map. * sched-int.h (struct ready_list): Add n_debug. (struct deps): Add last_debug_insn. (DEBUG_INSN_SCHED_P): New. (BOUNDARY_DEBUG_INSN_P): New. (SCHEDULE_DEBUG_INSN_P): New. (sd_iterator_cond): Accept empty list. * combine.c (create_log_links): Skip debug insns. (combine_instructions): Likewise. (cleanup_auto_inc_dec): New. From Jakub Jelinek: Make sure the return value is always unshared. (struct rtx_subst_pair): New. (auto_adjust_pair): New. (propagate_for_debug_subst): New. (propagate_for_debug): New. (try_combine): Skip debug insns. Propagate removed defs into debug insns. (next_nonnote_nondebug_insn): New. (distribute_notes): Use it. Skip debug insns. (distribute_links): Skip debug insns. * tree-outof-ssa.c (set_location_for_edge): Likewise. * resource.c (mark_target_live_regs): Likewise. * var-tracking.c: Include cselib.h and target.h. (enum micro_operation_type): Add MO_VAL_USE, MO_VAL_LOC, and MO_VAL_SET. (micro_operation_type_name): New. (enum emit_note_where): Add EMIT_NOTE_AFTER_CALL_INSN. (struct micro_operation_def): Update comments. (decl_or_value): New type. Use instead of decls. (struct emit_note_data_def): Add vars. (struct attrs_def): Use decl_or_value. (struct variable_tracking_info_def): Add permp, flooded. (struct location_chain_def): Update comment. (struct variable_part_def): Use decl_or_value. (struct variable_def): Make var_part a variable length array. (valvar_pool): New. (scratch_regs): New. (cselib_hook_called): New. (dv_is_decl_p): New. (dv_is_value_p): New. (dv_as_decl): New. (dv_as_value): New. (dv_as_opaque): New. (dv_onepart_p): New. (dv_pool): New. (IS_DECL_CODE): New. (check_value_is_not_decl): New. (dv_from_decl): New. (dv_from_value): New. (dv_htab_hash): New. (variable_htab_hash): Use it. (variable_htab_eq): Support values. (variable_htab_free): Free from the right pool. (attrs_list_member, attrs_list_insert): Use decl_or_value. (attrs_list_union): Adjust. (attrs_list_mpdv_union): New. (tie_break_pointers): New. (canon_value_cmp): New. (unshare_variable): Return possibly-modified slot. (vars_copy_1): Adjust. (var_reg_decl_set): Adjust. Split out of... (var_reg_set): ... this. (get_init_value): Adjust. (var_reg_delete_and_set): Adjust. (var_reg_delete): Adjust. (var_regno_delete): Adjust. (var_mem_decl_set): Split out of... (var_mem_set): ... this. (var_mem_delete_and_set): Adjust. (var_mem_delete): Adjust. (val_store): New. (val_reset): New. (val_resolve): New. (variable_union): Adjust. Speed up merge of 1-part vars. (variable_canonicalize): Use unshared slot. (VALUED_RECURSED_INTO): New. (find_loc_in_1pdv): New. (struct dfset_merge): New. (insert_into_intersection): New. (intersect_loc_chains): New. (loc_cmp): New. (canonicalize_loc_order_check): New. (canonicalize_values_mark): New. (canonicalize_values_star): New. (variable_merge_over_cur): New. (variable_merge_over_src): New. (dataflow_set_merge): New. (dataflow_set_equiv_regs): New. (remove_duplicate_values): New. (struct dfset_post_merge): New. (variable_post_merge_new_vals): New. (variable_post_merge_perm_vals): New. (dataflow_post_merge_adjust): New. (find_mem_expr_in_1pdv): New. (dataflow_set_preserve_mem_locs): New. (dataflow_set_remove_mem_locs): New. (dataflow_set_clear_at_call): New. (onepart_variable_different_p): New. (variable_different_p): Use it. (dataflow_set_different_1): Adjust. Make detailed dump more verbose. (track_expr_p): Add need_rtl parameter. Don't generate rtl if not needed. (track_loc_p): Pass it true. (struct count_use_info): New. (find_use_val): New. (replace_expr_with_values): New. (log_op_type): New. (use_type): New, partially split out of... (count_uses): ... this. Count new micro-ops. (count_uses_1): Adjust. (count_stores): Adjust. (count_with_sets): New. (VAL_NEEDS_RESOLUTION): New. (VAL_HOLDS_TRACK_EXPR): New. (VAL_EXPR_IS_COPIED): New. (VAL_EXPR_IS_CLOBBERED): New. (add_uses): Adjust. Generate new micro-ops. (add_uses_1): Adjust. (add_stores): Generate new micro-ops. (add_with_sets): New. (find_src_status): Adjust. (find_src_set_src): Adjust. (compute_bb_dataflow): Use dataflow_set_clear_at_call. Handle new micro-ops. Canonicalize value equivalances. (vt_find_locations): Compute total size of hash tables for dumping. Perform merge for var-tracking-assignments. Don't disregard single-block loops. (dump_attrs_list): Handle decl_or_value. (dump_variable): Take variable. Deal with decl_or_value. (dump_variable_slot): New. (dump_vars): Use it. (dump_dataflow_sets): Adjust. (set_slot_part): New, extended to support one-part variables after splitting out of... (set_variable_part): ... this. (clobber_slot_part): New, split out of... (clobber_variable_part): ... this. (delete_slot_part): New, split out of... (delete_variable_part): .... this. (check_wrap_constant): New. (vt_expand_loc_callback): New. (vt_expand_loc): New. (emit_note_insn_var_location): Adjust. Handle values. Handle EMIT_NOTE_AFTER_CALL_INSN. (emit_notes_for_differences_1): Adjust. Handle values. (emit_notes_for_differences_2): Likewise. (emit_notes_for_differences): Adjust. (emit_notes_in_bb): Take pointer to set. Emit AFTER_CALL_INSN notes. Adjust. Handle new micro-ops. (vt_add_function_parameters): Adjust. Create and bind values. (vt_initialize): Adjust. Initialize scratch_regs and valvar_pool, flooded and perm.. Initialize and use cselib. Log operations. Move some code to count_with_sets and add_with_sets. (delete_debug_insns): New. (vt_debug_insns_local): New. (vt_finalize): Release permp, valvar_pool, scratch_regs. Finish cselib. (var_tracking_main): If var-tracking-assignments is enabled but var-tracking isn't, delete debug insns and leave. Likewise if we exceed limits or fail the stack adjustments tests, and after all var-tracking processing. More in var-tracking, from Jakub Jelinek <jakub@redhat.com>: (dataflow_set): Add traversed_vars. (value_chain, const_value_chain): New typedefs. (value_chain_pool, value_chains): New variables. (value_chain_htab_hash, value_chain_htab_eq, add_value_chain, add_value_chains, add_cselib_value_chains, remove_value_chain, remove_value_chains, remove_cselib_value_chains): New functions. (shared_hash_find_slot_unshare_1, shared_hash_find_slot_1, shared_hash_find_slot_noinsert_1, shared_hash_find_1): New static inlines. (shared_hash_find_slot_unshare, shared_hash_find_slot, shared_hash_find_slot_noinsert, shared_hash_find): Update. (dst_can_be_shared): New variable. (unshare_variable): Unshare set->vars if shared, use shared_hash_*. Clear dst_can_be_shared. If set->traversed_vars is non-NULL and different from set->vars, look up slot again instead of using the passed in slot. (dataflow_set_init): Initialize traversed_vars. (variable_union): Use shared_hash_*. Use initially NO_INSERT lookup if set->vars is shared. Don't keep slot cleared before calling unshare_variable. Unshare set->vars if needed. Adjust unshare_variable callers. Clear dst_can_be_shared if needed. Even ->refcount == 1 vars must be unshared if set->vars is shared and var needs to be modified. (dataflow_set_union): Set traversed_vars during canonicalization. (VALUE_CHANGED, DECL_CHANGED): Define. (set_dv_changed, dv_changed_p): New static inlines. (track_expr_p): Clear DECL_CHANGED. (dump_dataflow_sets): Set it. (variable_was_changed): Call set_dv_changed. (emit_note_insn_var_location): Likewise. (changed_variables_stack): New variable. (check_changed_vars_1, check_changed_vars_2): New functions. (emit_notes_for_changes): Do nothing if changed_variables is empty. Traverse changed_variables with check_changed_vars_1, call check_changed_vars_2 on each changed_variables_stack entry. (emit_notes_in_bb): Add SET argument. Just clear it at the beginning, use it instead of local &set, don't destroy it at the end. (vt_emit_notes): Call dataflow_set_clear early on all VTI(bb)->out sets, never use them, instead use emit_notes_in_bb computed set, dataflow_set_clear also VTI(bb)->in when we are done with the basic block. Initialize changed_variables_stack, free it afterwards. If ENABLE_CHECKING verify that after noting differences to an empty set value_chains hash table is empty. (vt_initialize): Initialize value_chains and value_chain_pool. (vt_finalize): Delete value_chains htab, free value_chain_pool. (variable_tracking_main): Call dump_dataflow_sets before calling vt_emit_notes, not after it. * tree-flow.h (propagate_defs_into_debug_stmts): Declare. (propagate_var_def_into_debug_stmts): Declare. * df-problems.c (df_lr_bb_local_compute): Skip debug insns. (df_set_note): Reject debug insns. (df_whole_mw_reg_dead_p): Take added_notes_p argument. Don't add notes to debug insns. (df_note_bb_compute): Adjust. Likewise. (df_simulate_uses): Skip debug insns. (df_simulate_initialize_backwards): Likewise. * reg-stack.c (subst_stack_regs_in_debug_insn): New. (subst_stack_regs_pat): Reject debug insns. (convert_regs_1): Handle debug insns. * Makefile.in (TREE_INLINE_H): Take pointer-set.h from GIMPLE_H. (print-rtl.o): Depend on cselib.h. (cselib.o): Depend on TREE_PASS_H. (var-tracking.o): Depend on cselib.h and TARGET_H. * sched-rgn.c (rgn_estimate_number_of_insns): Discount debug insns. (init_ready_list): Skip boundary debug insns. (add_branch_dependences): Skip debug insns. (free_block_dependencies): Check for blocks with only debug insns. (compute_priorities): Likewise. * gimple.c (gss_for_code): Handle GIMPLE_DEBUG. (gimple_build_with_ops_stat): Take subcode as unsigned. Adjust all callers. (gimple_build_debug_bind_stat): New. (empty_body_p): Skip debug stmts. (gimple_has_side_effects): Likewise. (gimple_rhs_has_side_effects): Likewise. * gimple.h (enum gimple_debug_subcode, GIMPLE_DEBUG_BIND): New. (gimple_build_debug_bind_stat): Declare. (gimple_build_debug_bind): Define. (is_gimple_debug): New. (gimple_debug_bind_p): New. (gimple_debug_bind_get_var): New. (gimple_debug_bind_get_value): New. (gimple_debug_bind_get_value_ptr): New. (gimple_debug_bind_set_var): New. (gimple_debug_bind_set_value): New. (GIMPLE_DEBUG_BIND_NOVALUE): New internal temporary macro. (gimple_debug_bind_reset_value): New. (gimple_debug_bind_has_value_p): New. (gsi_next_nondebug): New. (gsi_prev_nondebug): New. (gsi_start_nondebug_bb): New. (gsi_last_nondebug_bb): New. * sched-vis.c (print_pattern): Handle VAR_LOCATION. (print_insn): Handle DEBUG_INSN. * tree-cfg.c (remove_bb): Walk stmts backwards. Let loc of first insn prevail. (first_stmt): Skip debug stmts. (first_non_label_stmt): Likewise. (last_stmt): Likewise. (has_zero_uses_1): New. (single_imm_use_1): New. (verify_gimple_debug): New. (verify_types_in_gimple_stmt): Handle debug stmts. (verify_stmt): Likewise. (debug_loop_num): Skip debug stmts. (remove_edge_and_dominated_blocks): Remove dominators last. * tree-ssa-reasssoc.c (rewrite_expr_tree): Propagate into debug stmts. (linearize_expr): Likewise. * config/i386/i386.c (ix86_delegitimize_address): Call default implementation. * config/ia64/ia64.c (ia64_safe_itanium_class): Handle debug insns. (group_barrier_needed): Skip debug insns. (emit_insn_group_barriers): Likewise. (emit_all_insn_group_barriers): Likewise. (ia64_variable_issue): Handle debug insns. (ia64_dfa_new_cycle): Likewise. (final_emit_insn_group_barriers): Skip debug insns. (ia64_dwarf2out_def_steady_cfa): Take frame argument. Don't def cfa without frame. (process_set): Likewise. (process_for_unwind_directive): Pass frame on. * config/rs6000/rs6000.c (TARGET_DELEGITIMIZE_ADDRESS): Define. (rs6000_delegitimize_address): New. (rs6000_debug_adjust_cost): Handle debug insns. (is_microcoded_insn): Likewise. (is_cracked_insn): Likewise. (is_nonpipeline_insn): Likewise. (insn_must_be_first_in_group): Likewise. (insn_must_be_last_in_group): Likewise. (force_new_group): Likewise. * cfgrtl.c (rtl_split_block): Emit INSN_DELETED note if block contains only debug insns. (rtl_merge_blocks): Skip debug insns. (purge_dead_edges): Likewise. (rtl_block_ends_with_call_p): Skip debug insns. * dce.c (deletable_insn_p): Handle VAR_LOCATION. (mark_reg_dependencies): Skip debug insns. * params.def (PARAM_MIN_NONDEBUG_INSN_UID): New. * tree-ssanames.c (release_ssa_name): Propagate def into debug stmts. * tree-ssa-threadedge.c (record_temporary_equivalences_from_stmts): Skip debug stmts. * regcprop.c (replace_oldest_value_addr): Skip debug insns. (replace_oldest_value_mem): Use ALL_REGS for debug insns. (copyprop_hardreg_forward_1): Handle debug insns. * reload1.c (reload): Skip debug insns. Replace unassigned pseudos in debug insns with their equivalences. (eliminate_regs_in_insn): Skip debug insns. (emit_input_reload_insns): Skip debug insns at first, adjust them later. * tree-ssa-operands.c (add_virtual_operand): Reject debug stmts. (get_indirect_ref_operands): Pass opf_no_vops on. (get_expr_operands): Likewise. Skip debug stmts. (parse_ssa_operands): Scan debug insns with opf_no_vops. gcc/testsuite/ChangeLog: * gcc.dg/guality/guality.c: New. * gcc.dg/guality/guality.h: New. * gcc.dg/guality/guality.exp: New. * gcc.dg/guality/example.c: New. * lib/gcc-dg.exp (cleanup-dump): Remove .gk files. (cleanup-saved-temps): Likewise, .gkd files too. gcc/cp/ChangeLog: * cp-tree.h (TFF_NO_OMIT_DEFAULT_TEMPLATE_ARGUMENTS): New. * cp-lang.c (cxx_dwarf_name): Pass it. * error.c (count_non_default_template_args): Take flags as argument. Adjust all callers. Skip counting of default arguments if the new flag is given. ChangeLog: * Makefile.tpl (BUILD_CONFIG): Default to bootstrap-debug. * Makefile.in: Rebuilt. contrib/ChangeLog: * compare-debug: Look for .gkd files and compare them. config/ChangeLog: * bootstrap-debug.mk: Add comments. * bootstrap-debug-big.mk: New. * bootstrap-debug-lean.mk: New. * bootstrap-debug-ckovw.mk: Add comments. * bootstrap-debug-lib.mk: Drop CFLAGS for stages. Use -g0 for TFLAGS in stage1. Drop -fvar-tracking-assignments-toggle. From-SVN: r151312
1240 lines
36 KiB
C
1240 lines
36 KiB
C
/* High-level loop manipulation functions.
|
|
Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 3, or (at your option) any
|
|
later version.
|
|
|
|
GCC is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GCC; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
#include "tm.h"
|
|
#include "tree.h"
|
|
#include "rtl.h"
|
|
#include "tm_p.h"
|
|
#include "hard-reg-set.h"
|
|
#include "basic-block.h"
|
|
#include "output.h"
|
|
#include "diagnostic.h"
|
|
#include "tree-flow.h"
|
|
#include "tree-dump.h"
|
|
#include "timevar.h"
|
|
#include "cfgloop.h"
|
|
#include "tree-pass.h"
|
|
#include "cfglayout.h"
|
|
#include "tree-scalar-evolution.h"
|
|
#include "params.h"
|
|
#include "tree-inline.h"
|
|
#include "langhooks.h"
|
|
|
|
/* Creates an induction variable with value BASE + STEP * iteration in LOOP.
|
|
It is expected that neither BASE nor STEP are shared with other expressions
|
|
(unless the sharing rules allow this). Use VAR as a base var_decl for it
|
|
(if NULL, a new temporary will be created). The increment will occur at
|
|
INCR_POS (after it if AFTER is true, before it otherwise). INCR_POS and
|
|
AFTER can be computed using standard_iv_increment_position. The ssa versions
|
|
of the variable before and after increment will be stored in VAR_BEFORE and
|
|
VAR_AFTER (unless they are NULL). */
|
|
|
|
void
|
|
create_iv (tree base, tree step, tree var, struct loop *loop,
|
|
gimple_stmt_iterator *incr_pos, bool after,
|
|
tree *var_before, tree *var_after)
|
|
{
|
|
gimple stmt;
|
|
tree initial, step1;
|
|
gimple_seq stmts;
|
|
tree vb, va;
|
|
enum tree_code incr_op = PLUS_EXPR;
|
|
edge pe = loop_preheader_edge (loop);
|
|
|
|
if (!var)
|
|
{
|
|
var = create_tmp_var (TREE_TYPE (base), "ivtmp");
|
|
add_referenced_var (var);
|
|
}
|
|
|
|
vb = make_ssa_name (var, NULL);
|
|
if (var_before)
|
|
*var_before = vb;
|
|
va = make_ssa_name (var, NULL);
|
|
if (var_after)
|
|
*var_after = va;
|
|
|
|
/* For easier readability of the created code, produce MINUS_EXPRs
|
|
when suitable. */
|
|
if (TREE_CODE (step) == INTEGER_CST)
|
|
{
|
|
if (TYPE_UNSIGNED (TREE_TYPE (step)))
|
|
{
|
|
step1 = fold_build1 (NEGATE_EXPR, TREE_TYPE (step), step);
|
|
if (tree_int_cst_lt (step1, step))
|
|
{
|
|
incr_op = MINUS_EXPR;
|
|
step = step1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
bool ovf;
|
|
|
|
if (!tree_expr_nonnegative_warnv_p (step, &ovf)
|
|
&& may_negate_without_overflow_p (step))
|
|
{
|
|
incr_op = MINUS_EXPR;
|
|
step = fold_build1 (NEGATE_EXPR, TREE_TYPE (step), step);
|
|
}
|
|
}
|
|
}
|
|
if (POINTER_TYPE_P (TREE_TYPE (base)))
|
|
{
|
|
if (TREE_CODE (base) == ADDR_EXPR)
|
|
mark_addressable (TREE_OPERAND (base, 0));
|
|
step = fold_convert (sizetype, step);
|
|
if (incr_op == MINUS_EXPR)
|
|
step = fold_build1 (NEGATE_EXPR, sizetype, step);
|
|
incr_op = POINTER_PLUS_EXPR;
|
|
}
|
|
/* Gimplify the step if necessary. We put the computations in front of the
|
|
loop (i.e. the step should be loop invariant). */
|
|
step = force_gimple_operand (step, &stmts, true, NULL_TREE);
|
|
if (stmts)
|
|
gsi_insert_seq_on_edge_immediate (pe, stmts);
|
|
|
|
stmt = gimple_build_assign_with_ops (incr_op, va, vb, step);
|
|
if (after)
|
|
gsi_insert_after (incr_pos, stmt, GSI_NEW_STMT);
|
|
else
|
|
gsi_insert_before (incr_pos, stmt, GSI_NEW_STMT);
|
|
|
|
initial = force_gimple_operand (base, &stmts, true, var);
|
|
if (stmts)
|
|
gsi_insert_seq_on_edge_immediate (pe, stmts);
|
|
|
|
stmt = create_phi_node (vb, loop->header);
|
|
SSA_NAME_DEF_STMT (vb) = stmt;
|
|
add_phi_arg (stmt, initial, loop_preheader_edge (loop), UNKNOWN_LOCATION);
|
|
add_phi_arg (stmt, va, loop_latch_edge (loop), UNKNOWN_LOCATION);
|
|
}
|
|
|
|
/* Add exit phis for the USE on EXIT. */
|
|
|
|
static void
|
|
add_exit_phis_edge (basic_block exit, tree use)
|
|
{
|
|
gimple phi, def_stmt = SSA_NAME_DEF_STMT (use);
|
|
basic_block def_bb = gimple_bb (def_stmt);
|
|
struct loop *def_loop;
|
|
edge e;
|
|
edge_iterator ei;
|
|
|
|
/* Check that some of the edges entering the EXIT block exits a loop in
|
|
that USE is defined. */
|
|
FOR_EACH_EDGE (e, ei, exit->preds)
|
|
{
|
|
def_loop = find_common_loop (def_bb->loop_father, e->src->loop_father);
|
|
if (!flow_bb_inside_loop_p (def_loop, e->dest))
|
|
break;
|
|
}
|
|
|
|
if (!e)
|
|
return;
|
|
|
|
phi = create_phi_node (use, exit);
|
|
create_new_def_for (gimple_phi_result (phi), phi,
|
|
gimple_phi_result_ptr (phi));
|
|
FOR_EACH_EDGE (e, ei, exit->preds)
|
|
add_phi_arg (phi, use, e, UNKNOWN_LOCATION);
|
|
}
|
|
|
|
/* Add exit phis for VAR that is used in LIVEIN.
|
|
Exits of the loops are stored in EXITS. */
|
|
|
|
static void
|
|
add_exit_phis_var (tree var, bitmap livein, bitmap exits)
|
|
{
|
|
bitmap def;
|
|
unsigned index;
|
|
basic_block def_bb = gimple_bb (SSA_NAME_DEF_STMT (var));
|
|
bitmap_iterator bi;
|
|
|
|
if (is_gimple_reg (var))
|
|
bitmap_clear_bit (livein, def_bb->index);
|
|
else
|
|
bitmap_set_bit (livein, def_bb->index);
|
|
|
|
def = BITMAP_ALLOC (NULL);
|
|
bitmap_set_bit (def, def_bb->index);
|
|
compute_global_livein (livein, def);
|
|
BITMAP_FREE (def);
|
|
|
|
EXECUTE_IF_AND_IN_BITMAP (exits, livein, 0, index, bi)
|
|
{
|
|
add_exit_phis_edge (BASIC_BLOCK (index), var);
|
|
}
|
|
}
|
|
|
|
/* Add exit phis for the names marked in NAMES_TO_RENAME.
|
|
Exits of the loops are stored in EXITS. Sets of blocks where the ssa
|
|
names are used are stored in USE_BLOCKS. */
|
|
|
|
static void
|
|
add_exit_phis (bitmap names_to_rename, bitmap *use_blocks, bitmap loop_exits)
|
|
{
|
|
unsigned i;
|
|
bitmap_iterator bi;
|
|
|
|
EXECUTE_IF_SET_IN_BITMAP (names_to_rename, 0, i, bi)
|
|
{
|
|
add_exit_phis_var (ssa_name (i), use_blocks[i], loop_exits);
|
|
}
|
|
}
|
|
|
|
/* Returns a bitmap of all loop exit edge targets. */
|
|
|
|
static bitmap
|
|
get_loops_exits (void)
|
|
{
|
|
bitmap exits = BITMAP_ALLOC (NULL);
|
|
basic_block bb;
|
|
edge e;
|
|
edge_iterator ei;
|
|
|
|
FOR_EACH_BB (bb)
|
|
{
|
|
FOR_EACH_EDGE (e, ei, bb->preds)
|
|
if (e->src != ENTRY_BLOCK_PTR
|
|
&& !flow_bb_inside_loop_p (e->src->loop_father, bb))
|
|
{
|
|
bitmap_set_bit (exits, bb->index);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return exits;
|
|
}
|
|
|
|
/* For USE in BB, if it is used outside of the loop it is defined in,
|
|
mark it for rewrite. Record basic block BB where it is used
|
|
to USE_BLOCKS. Record the ssa name index to NEED_PHIS bitmap. */
|
|
|
|
static void
|
|
find_uses_to_rename_use (basic_block bb, tree use, bitmap *use_blocks,
|
|
bitmap need_phis)
|
|
{
|
|
unsigned ver;
|
|
basic_block def_bb;
|
|
struct loop *def_loop;
|
|
|
|
if (TREE_CODE (use) != SSA_NAME)
|
|
return;
|
|
|
|
/* We don't need to keep virtual operands in loop-closed form. */
|
|
if (!is_gimple_reg (use))
|
|
return;
|
|
|
|
ver = SSA_NAME_VERSION (use);
|
|
def_bb = gimple_bb (SSA_NAME_DEF_STMT (use));
|
|
if (!def_bb)
|
|
return;
|
|
def_loop = def_bb->loop_father;
|
|
|
|
/* If the definition is not inside a loop, it is not interesting. */
|
|
if (!loop_outer (def_loop))
|
|
return;
|
|
|
|
/* If the use is not outside of the loop it is defined in, it is not
|
|
interesting. */
|
|
if (flow_bb_inside_loop_p (def_loop, bb))
|
|
return;
|
|
|
|
if (!use_blocks[ver])
|
|
use_blocks[ver] = BITMAP_ALLOC (NULL);
|
|
bitmap_set_bit (use_blocks[ver], bb->index);
|
|
|
|
bitmap_set_bit (need_phis, ver);
|
|
}
|
|
|
|
/* For uses in STMT, mark names that are used outside of the loop they are
|
|
defined to rewrite. Record the set of blocks in that the ssa
|
|
names are defined to USE_BLOCKS and the ssa names themselves to
|
|
NEED_PHIS. */
|
|
|
|
static void
|
|
find_uses_to_rename_stmt (gimple stmt, bitmap *use_blocks, bitmap need_phis)
|
|
{
|
|
ssa_op_iter iter;
|
|
tree var;
|
|
basic_block bb = gimple_bb (stmt);
|
|
|
|
if (is_gimple_debug (stmt))
|
|
return;
|
|
|
|
FOR_EACH_SSA_TREE_OPERAND (var, stmt, iter, SSA_OP_ALL_USES)
|
|
find_uses_to_rename_use (bb, var, use_blocks, need_phis);
|
|
}
|
|
|
|
/* Marks names that are used in BB and outside of the loop they are
|
|
defined in for rewrite. Records the set of blocks in that the ssa
|
|
names are defined to USE_BLOCKS. Record the SSA names that will
|
|
need exit PHIs in NEED_PHIS. */
|
|
|
|
static void
|
|
find_uses_to_rename_bb (basic_block bb, bitmap *use_blocks, bitmap need_phis)
|
|
{
|
|
gimple_stmt_iterator bsi;
|
|
edge e;
|
|
edge_iterator ei;
|
|
|
|
FOR_EACH_EDGE (e, ei, bb->succs)
|
|
for (bsi = gsi_start_phis (e->dest); !gsi_end_p (bsi); gsi_next (&bsi))
|
|
find_uses_to_rename_use (bb, PHI_ARG_DEF_FROM_EDGE (gsi_stmt (bsi), e),
|
|
use_blocks, need_phis);
|
|
|
|
for (bsi = gsi_start_bb (bb); !gsi_end_p (bsi); gsi_next (&bsi))
|
|
find_uses_to_rename_stmt (gsi_stmt (bsi), use_blocks, need_phis);
|
|
}
|
|
|
|
/* Marks names that are used outside of the loop they are defined in
|
|
for rewrite. Records the set of blocks in that the ssa
|
|
names are defined to USE_BLOCKS. If CHANGED_BBS is not NULL,
|
|
scan only blocks in this set. */
|
|
|
|
static void
|
|
find_uses_to_rename (bitmap changed_bbs, bitmap *use_blocks, bitmap need_phis)
|
|
{
|
|
basic_block bb;
|
|
unsigned index;
|
|
bitmap_iterator bi;
|
|
|
|
if (changed_bbs && !bitmap_empty_p (changed_bbs))
|
|
{
|
|
EXECUTE_IF_SET_IN_BITMAP (changed_bbs, 0, index, bi)
|
|
{
|
|
find_uses_to_rename_bb (BASIC_BLOCK (index), use_blocks, need_phis);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
FOR_EACH_BB (bb)
|
|
{
|
|
find_uses_to_rename_bb (bb, use_blocks, need_phis);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Rewrites the program into a loop closed ssa form -- i.e. inserts extra
|
|
phi nodes to ensure that no variable is used outside the loop it is
|
|
defined in.
|
|
|
|
This strengthening of the basic ssa form has several advantages:
|
|
|
|
1) Updating it during unrolling/peeling/versioning is trivial, since
|
|
we do not need to care about the uses outside of the loop.
|
|
2) The behavior of all uses of an induction variable is the same.
|
|
Without this, you need to distinguish the case when the variable
|
|
is used outside of the loop it is defined in, for example
|
|
|
|
for (i = 0; i < 100; i++)
|
|
{
|
|
for (j = 0; j < 100; j++)
|
|
{
|
|
k = i + j;
|
|
use1 (k);
|
|
}
|
|
use2 (k);
|
|
}
|
|
|
|
Looking from the outer loop with the normal SSA form, the first use of k
|
|
is not well-behaved, while the second one is an induction variable with
|
|
base 99 and step 1.
|
|
|
|
If CHANGED_BBS is not NULL, we look for uses outside loops only in
|
|
the basic blocks in this set.
|
|
|
|
UPDATE_FLAG is used in the call to update_ssa. See
|
|
TODO_update_ssa* for documentation. */
|
|
|
|
void
|
|
rewrite_into_loop_closed_ssa (bitmap changed_bbs, unsigned update_flag)
|
|
{
|
|
bitmap loop_exits;
|
|
bitmap *use_blocks;
|
|
unsigned i, old_num_ssa_names;
|
|
bitmap names_to_rename;
|
|
|
|
loops_state_set (LOOP_CLOSED_SSA);
|
|
if (number_of_loops () <= 1)
|
|
return;
|
|
|
|
loop_exits = get_loops_exits ();
|
|
names_to_rename = BITMAP_ALLOC (NULL);
|
|
|
|
/* If the pass has caused the SSA form to be out-of-date, update it
|
|
now. */
|
|
update_ssa (update_flag);
|
|
|
|
old_num_ssa_names = num_ssa_names;
|
|
use_blocks = XCNEWVEC (bitmap, old_num_ssa_names);
|
|
|
|
/* Find the uses outside loops. */
|
|
find_uses_to_rename (changed_bbs, use_blocks, names_to_rename);
|
|
|
|
/* Add the PHI nodes on exits of the loops for the names we need to
|
|
rewrite. */
|
|
add_exit_phis (names_to_rename, use_blocks, loop_exits);
|
|
|
|
for (i = 0; i < old_num_ssa_names; i++)
|
|
BITMAP_FREE (use_blocks[i]);
|
|
free (use_blocks);
|
|
BITMAP_FREE (loop_exits);
|
|
BITMAP_FREE (names_to_rename);
|
|
|
|
/* Fix up all the names found to be used outside their original
|
|
loops. */
|
|
update_ssa (TODO_update_ssa);
|
|
}
|
|
|
|
/* Check invariants of the loop closed ssa form for the USE in BB. */
|
|
|
|
static void
|
|
check_loop_closed_ssa_use (basic_block bb, tree use)
|
|
{
|
|
gimple def;
|
|
basic_block def_bb;
|
|
|
|
if (TREE_CODE (use) != SSA_NAME || !is_gimple_reg (use))
|
|
return;
|
|
|
|
def = SSA_NAME_DEF_STMT (use);
|
|
def_bb = gimple_bb (def);
|
|
gcc_assert (!def_bb
|
|
|| flow_bb_inside_loop_p (def_bb->loop_father, bb));
|
|
}
|
|
|
|
/* Checks invariants of loop closed ssa form in statement STMT in BB. */
|
|
|
|
static void
|
|
check_loop_closed_ssa_stmt (basic_block bb, gimple stmt)
|
|
{
|
|
ssa_op_iter iter;
|
|
tree var;
|
|
|
|
if (is_gimple_debug (stmt))
|
|
return;
|
|
|
|
FOR_EACH_SSA_TREE_OPERAND (var, stmt, iter, SSA_OP_ALL_USES)
|
|
check_loop_closed_ssa_use (bb, var);
|
|
}
|
|
|
|
/* Checks that invariants of the loop closed ssa form are preserved. */
|
|
|
|
void
|
|
verify_loop_closed_ssa (void)
|
|
{
|
|
basic_block bb;
|
|
gimple_stmt_iterator bsi;
|
|
gimple phi;
|
|
edge e;
|
|
edge_iterator ei;
|
|
|
|
if (number_of_loops () <= 1)
|
|
return;
|
|
|
|
verify_ssa (false);
|
|
|
|
FOR_EACH_BB (bb)
|
|
{
|
|
for (bsi = gsi_start_phis (bb); !gsi_end_p (bsi); gsi_next (&bsi))
|
|
{
|
|
phi = gsi_stmt (bsi);
|
|
FOR_EACH_EDGE (e, ei, bb->preds)
|
|
check_loop_closed_ssa_use (e->src,
|
|
PHI_ARG_DEF_FROM_EDGE (phi, e));
|
|
}
|
|
|
|
for (bsi = gsi_start_bb (bb); !gsi_end_p (bsi); gsi_next (&bsi))
|
|
check_loop_closed_ssa_stmt (bb, gsi_stmt (bsi));
|
|
}
|
|
}
|
|
|
|
/* Split loop exit edge EXIT. The things are a bit complicated by a need to
|
|
preserve the loop closed ssa form. The newly created block is returned. */
|
|
|
|
basic_block
|
|
split_loop_exit_edge (edge exit)
|
|
{
|
|
basic_block dest = exit->dest;
|
|
basic_block bb = split_edge (exit);
|
|
gimple phi, new_phi;
|
|
tree new_name, name;
|
|
use_operand_p op_p;
|
|
gimple_stmt_iterator psi;
|
|
source_location locus;
|
|
|
|
for (psi = gsi_start_phis (dest); !gsi_end_p (psi); gsi_next (&psi))
|
|
{
|
|
phi = gsi_stmt (psi);
|
|
op_p = PHI_ARG_DEF_PTR_FROM_EDGE (phi, single_succ_edge (bb));
|
|
locus = gimple_phi_arg_location_from_edge (phi, single_succ_edge (bb));
|
|
|
|
name = USE_FROM_PTR (op_p);
|
|
|
|
/* If the argument of the PHI node is a constant, we do not need
|
|
to keep it inside loop. */
|
|
if (TREE_CODE (name) != SSA_NAME)
|
|
continue;
|
|
|
|
/* Otherwise create an auxiliary phi node that will copy the value
|
|
of the SSA name out of the loop. */
|
|
new_name = duplicate_ssa_name (name, NULL);
|
|
new_phi = create_phi_node (new_name, bb);
|
|
SSA_NAME_DEF_STMT (new_name) = new_phi;
|
|
add_phi_arg (new_phi, name, exit, locus);
|
|
SET_USE (op_p, new_name);
|
|
}
|
|
|
|
return bb;
|
|
}
|
|
|
|
/* Returns the basic block in that statements should be emitted for induction
|
|
variables incremented at the end of the LOOP. */
|
|
|
|
basic_block
|
|
ip_end_pos (struct loop *loop)
|
|
{
|
|
return loop->latch;
|
|
}
|
|
|
|
/* Returns the basic block in that statements should be emitted for induction
|
|
variables incremented just before exit condition of a LOOP. */
|
|
|
|
basic_block
|
|
ip_normal_pos (struct loop *loop)
|
|
{
|
|
gimple last;
|
|
basic_block bb;
|
|
edge exit;
|
|
|
|
if (!single_pred_p (loop->latch))
|
|
return NULL;
|
|
|
|
bb = single_pred (loop->latch);
|
|
last = last_stmt (bb);
|
|
if (!last
|
|
|| gimple_code (last) != GIMPLE_COND)
|
|
return NULL;
|
|
|
|
exit = EDGE_SUCC (bb, 0);
|
|
if (exit->dest == loop->latch)
|
|
exit = EDGE_SUCC (bb, 1);
|
|
|
|
if (flow_bb_inside_loop_p (loop, exit->dest))
|
|
return NULL;
|
|
|
|
return bb;
|
|
}
|
|
|
|
/* Stores the standard position for induction variable increment in LOOP
|
|
(just before the exit condition if it is available and latch block is empty,
|
|
end of the latch block otherwise) to BSI. INSERT_AFTER is set to true if
|
|
the increment should be inserted after *BSI. */
|
|
|
|
void
|
|
standard_iv_increment_position (struct loop *loop, gimple_stmt_iterator *bsi,
|
|
bool *insert_after)
|
|
{
|
|
basic_block bb = ip_normal_pos (loop), latch = ip_end_pos (loop);
|
|
gimple last = last_stmt (latch);
|
|
|
|
if (!bb
|
|
|| (last && gimple_code (last) != GIMPLE_LABEL))
|
|
{
|
|
*bsi = gsi_last_bb (latch);
|
|
*insert_after = true;
|
|
}
|
|
else
|
|
{
|
|
*bsi = gsi_last_bb (bb);
|
|
*insert_after = false;
|
|
}
|
|
}
|
|
|
|
/* Copies phi node arguments for duplicated blocks. The index of the first
|
|
duplicated block is FIRST_NEW_BLOCK. */
|
|
|
|
static void
|
|
copy_phi_node_args (unsigned first_new_block)
|
|
{
|
|
unsigned i;
|
|
|
|
for (i = first_new_block; i < (unsigned) last_basic_block; i++)
|
|
BASIC_BLOCK (i)->flags |= BB_DUPLICATED;
|
|
|
|
for (i = first_new_block; i < (unsigned) last_basic_block; i++)
|
|
add_phi_args_after_copy_bb (BASIC_BLOCK (i));
|
|
|
|
for (i = first_new_block; i < (unsigned) last_basic_block; i++)
|
|
BASIC_BLOCK (i)->flags &= ~BB_DUPLICATED;
|
|
}
|
|
|
|
|
|
/* The same as cfgloopmanip.c:duplicate_loop_to_header_edge, but also
|
|
updates the PHI nodes at start of the copied region. In order to
|
|
achieve this, only loops whose exits all lead to the same location
|
|
are handled.
|
|
|
|
Notice that we do not completely update the SSA web after
|
|
duplication. The caller is responsible for calling update_ssa
|
|
after the loop has been duplicated. */
|
|
|
|
bool
|
|
gimple_duplicate_loop_to_header_edge (struct loop *loop, edge e,
|
|
unsigned int ndupl, sbitmap wont_exit,
|
|
edge orig, VEC (edge, heap) **to_remove,
|
|
int flags)
|
|
{
|
|
unsigned first_new_block;
|
|
|
|
if (!loops_state_satisfies_p (LOOPS_HAVE_SIMPLE_LATCHES))
|
|
return false;
|
|
if (!loops_state_satisfies_p (LOOPS_HAVE_PREHEADERS))
|
|
return false;
|
|
|
|
#ifdef ENABLE_CHECKING
|
|
if (loops_state_satisfies_p (LOOP_CLOSED_SSA))
|
|
verify_loop_closed_ssa ();
|
|
#endif
|
|
|
|
first_new_block = last_basic_block;
|
|
if (!duplicate_loop_to_header_edge (loop, e, ndupl, wont_exit,
|
|
orig, to_remove, flags))
|
|
return false;
|
|
|
|
/* Readd the removed phi args for e. */
|
|
flush_pending_stmts (e);
|
|
|
|
/* Copy the phi node arguments. */
|
|
copy_phi_node_args (first_new_block);
|
|
|
|
scev_reset ();
|
|
|
|
return true;
|
|
}
|
|
|
|
/* Returns true if we can unroll LOOP FACTOR times. Number
|
|
of iterations of the loop is returned in NITER. */
|
|
|
|
bool
|
|
can_unroll_loop_p (struct loop *loop, unsigned factor,
|
|
struct tree_niter_desc *niter)
|
|
{
|
|
edge exit;
|
|
|
|
/* Check whether unrolling is possible. We only want to unroll loops
|
|
for that we are able to determine number of iterations. We also
|
|
want to split the extra iterations of the loop from its end,
|
|
therefore we require that the loop has precisely one
|
|
exit. */
|
|
|
|
exit = single_dom_exit (loop);
|
|
if (!exit)
|
|
return false;
|
|
|
|
if (!number_of_iterations_exit (loop, exit, niter, false)
|
|
|| niter->cmp == ERROR_MARK
|
|
/* Scalar evolutions analysis might have copy propagated
|
|
the abnormal ssa names into these expressions, hence
|
|
emitting the computations based on them during loop
|
|
unrolling might create overlapping life ranges for
|
|
them, and failures in out-of-ssa. */
|
|
|| contains_abnormal_ssa_name_p (niter->may_be_zero)
|
|
|| contains_abnormal_ssa_name_p (niter->control.base)
|
|
|| contains_abnormal_ssa_name_p (niter->control.step)
|
|
|| contains_abnormal_ssa_name_p (niter->bound))
|
|
return false;
|
|
|
|
/* And of course, we must be able to duplicate the loop. */
|
|
if (!can_duplicate_loop_p (loop))
|
|
return false;
|
|
|
|
/* The final loop should be small enough. */
|
|
if (tree_num_loop_insns (loop, &eni_size_weights) * factor
|
|
> (unsigned) PARAM_VALUE (PARAM_MAX_UNROLLED_INSNS))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
/* Determines the conditions that control execution of LOOP unrolled FACTOR
|
|
times. DESC is number of iterations of LOOP. ENTER_COND is set to
|
|
condition that must be true if the main loop can be entered.
|
|
EXIT_BASE, EXIT_STEP, EXIT_CMP and EXIT_BOUND are set to values describing
|
|
how the exit from the unrolled loop should be controlled. */
|
|
|
|
static void
|
|
determine_exit_conditions (struct loop *loop, struct tree_niter_desc *desc,
|
|
unsigned factor, tree *enter_cond,
|
|
tree *exit_base, tree *exit_step,
|
|
enum tree_code *exit_cmp, tree *exit_bound)
|
|
{
|
|
gimple_seq stmts;
|
|
tree base = desc->control.base;
|
|
tree step = desc->control.step;
|
|
tree bound = desc->bound;
|
|
tree type = TREE_TYPE (step);
|
|
tree bigstep, delta;
|
|
tree min = lower_bound_in_type (type, type);
|
|
tree max = upper_bound_in_type (type, type);
|
|
enum tree_code cmp = desc->cmp;
|
|
tree cond = boolean_true_node, assum;
|
|
|
|
/* For pointers, do the arithmetics in the type of step (sizetype). */
|
|
base = fold_convert (type, base);
|
|
bound = fold_convert (type, bound);
|
|
|
|
*enter_cond = boolean_false_node;
|
|
*exit_base = NULL_TREE;
|
|
*exit_step = NULL_TREE;
|
|
*exit_cmp = ERROR_MARK;
|
|
*exit_bound = NULL_TREE;
|
|
gcc_assert (cmp != ERROR_MARK);
|
|
|
|
/* We only need to be correct when we answer question
|
|
"Do at least FACTOR more iterations remain?" in the unrolled loop.
|
|
Thus, transforming BASE + STEP * i <> BOUND to
|
|
BASE + STEP * i < BOUND is ok. */
|
|
if (cmp == NE_EXPR)
|
|
{
|
|
if (tree_int_cst_sign_bit (step))
|
|
cmp = GT_EXPR;
|
|
else
|
|
cmp = LT_EXPR;
|
|
}
|
|
else if (cmp == LT_EXPR)
|
|
{
|
|
gcc_assert (!tree_int_cst_sign_bit (step));
|
|
}
|
|
else if (cmp == GT_EXPR)
|
|
{
|
|
gcc_assert (tree_int_cst_sign_bit (step));
|
|
}
|
|
else
|
|
gcc_unreachable ();
|
|
|
|
/* The main body of the loop may be entered iff:
|
|
|
|
1) desc->may_be_zero is false.
|
|
2) it is possible to check that there are at least FACTOR iterations
|
|
of the loop, i.e., BOUND - step * FACTOR does not overflow.
|
|
3) # of iterations is at least FACTOR */
|
|
|
|
if (!integer_zerop (desc->may_be_zero))
|
|
cond = fold_build2 (TRUTH_AND_EXPR, boolean_type_node,
|
|
invert_truthvalue (desc->may_be_zero),
|
|
cond);
|
|
|
|
bigstep = fold_build2 (MULT_EXPR, type, step,
|
|
build_int_cst_type (type, factor));
|
|
delta = fold_build2 (MINUS_EXPR, type, bigstep, step);
|
|
if (cmp == LT_EXPR)
|
|
assum = fold_build2 (GE_EXPR, boolean_type_node,
|
|
bound,
|
|
fold_build2 (PLUS_EXPR, type, min, delta));
|
|
else
|
|
assum = fold_build2 (LE_EXPR, boolean_type_node,
|
|
bound,
|
|
fold_build2 (PLUS_EXPR, type, max, delta));
|
|
cond = fold_build2 (TRUTH_AND_EXPR, boolean_type_node, assum, cond);
|
|
|
|
bound = fold_build2 (MINUS_EXPR, type, bound, delta);
|
|
assum = fold_build2 (cmp, boolean_type_node, base, bound);
|
|
cond = fold_build2 (TRUTH_AND_EXPR, boolean_type_node, assum, cond);
|
|
|
|
cond = force_gimple_operand (unshare_expr (cond), &stmts, false, NULL_TREE);
|
|
if (stmts)
|
|
gsi_insert_seq_on_edge_immediate (loop_preheader_edge (loop), stmts);
|
|
/* cond now may be a gimple comparison, which would be OK, but also any
|
|
other gimple rhs (say a && b). In this case we need to force it to
|
|
operand. */
|
|
if (!is_gimple_condexpr (cond))
|
|
{
|
|
cond = force_gimple_operand (cond, &stmts, true, NULL_TREE);
|
|
if (stmts)
|
|
gsi_insert_seq_on_edge_immediate (loop_preheader_edge (loop), stmts);
|
|
}
|
|
*enter_cond = cond;
|
|
|
|
base = force_gimple_operand (unshare_expr (base), &stmts, true, NULL_TREE);
|
|
if (stmts)
|
|
gsi_insert_seq_on_edge_immediate (loop_preheader_edge (loop), stmts);
|
|
bound = force_gimple_operand (unshare_expr (bound), &stmts, true, NULL_TREE);
|
|
if (stmts)
|
|
gsi_insert_seq_on_edge_immediate (loop_preheader_edge (loop), stmts);
|
|
|
|
*exit_base = base;
|
|
*exit_step = bigstep;
|
|
*exit_cmp = cmp;
|
|
*exit_bound = bound;
|
|
}
|
|
|
|
/* Scales the frequencies of all basic blocks in LOOP that are strictly
|
|
dominated by BB by NUM/DEN. */
|
|
|
|
static void
|
|
scale_dominated_blocks_in_loop (struct loop *loop, basic_block bb,
|
|
int num, int den)
|
|
{
|
|
basic_block son;
|
|
|
|
if (den == 0)
|
|
return;
|
|
|
|
for (son = first_dom_son (CDI_DOMINATORS, bb);
|
|
son;
|
|
son = next_dom_son (CDI_DOMINATORS, son))
|
|
{
|
|
if (!flow_bb_inside_loop_p (loop, son))
|
|
continue;
|
|
scale_bbs_frequencies_int (&son, 1, num, den);
|
|
scale_dominated_blocks_in_loop (loop, son, num, den);
|
|
}
|
|
}
|
|
|
|
/* Unroll LOOP FACTOR times. DESC describes number of iterations of LOOP.
|
|
EXIT is the exit of the loop to that DESC corresponds.
|
|
|
|
If N is number of iterations of the loop and MAY_BE_ZERO is the condition
|
|
under that loop exits in the first iteration even if N != 0,
|
|
|
|
while (1)
|
|
{
|
|
x = phi (init, next);
|
|
|
|
pre;
|
|
if (st)
|
|
break;
|
|
post;
|
|
}
|
|
|
|
becomes (with possibly the exit conditions formulated a bit differently,
|
|
avoiding the need to create a new iv):
|
|
|
|
if (MAY_BE_ZERO || N < FACTOR)
|
|
goto rest;
|
|
|
|
do
|
|
{
|
|
x = phi (init, next);
|
|
|
|
pre;
|
|
post;
|
|
pre;
|
|
post;
|
|
...
|
|
pre;
|
|
post;
|
|
N -= FACTOR;
|
|
|
|
} while (N >= FACTOR);
|
|
|
|
rest:
|
|
init' = phi (init, x);
|
|
|
|
while (1)
|
|
{
|
|
x = phi (init', next);
|
|
|
|
pre;
|
|
if (st)
|
|
break;
|
|
post;
|
|
}
|
|
|
|
Before the loop is unrolled, TRANSFORM is called for it (only for the
|
|
unrolled loop, but not for its versioned copy). DATA is passed to
|
|
TRANSFORM. */
|
|
|
|
/* Probability in % that the unrolled loop is entered. Just a guess. */
|
|
#define PROB_UNROLLED_LOOP_ENTERED 90
|
|
|
|
void
|
|
tree_transform_and_unroll_loop (struct loop *loop, unsigned factor,
|
|
edge exit, struct tree_niter_desc *desc,
|
|
transform_callback transform,
|
|
void *data)
|
|
{
|
|
gimple exit_if;
|
|
tree ctr_before, ctr_after;
|
|
tree enter_main_cond, exit_base, exit_step, exit_bound;
|
|
enum tree_code exit_cmp;
|
|
gimple phi_old_loop, phi_new_loop, phi_rest;
|
|
gimple_stmt_iterator psi_old_loop, psi_new_loop;
|
|
tree init, next, new_init, var;
|
|
struct loop *new_loop;
|
|
basic_block rest, exit_bb;
|
|
edge old_entry, new_entry, old_latch, precond_edge, new_exit;
|
|
edge new_nonexit, e;
|
|
gimple_stmt_iterator bsi;
|
|
use_operand_p op;
|
|
bool ok;
|
|
unsigned est_niter, prob_entry, scale_unrolled, scale_rest, freq_e, freq_h;
|
|
unsigned new_est_niter, i, prob;
|
|
unsigned irr = loop_preheader_edge (loop)->flags & EDGE_IRREDUCIBLE_LOOP;
|
|
sbitmap wont_exit;
|
|
VEC (edge, heap) *to_remove = NULL;
|
|
|
|
est_niter = expected_loop_iterations (loop);
|
|
determine_exit_conditions (loop, desc, factor,
|
|
&enter_main_cond, &exit_base, &exit_step,
|
|
&exit_cmp, &exit_bound);
|
|
|
|
/* Let us assume that the unrolled loop is quite likely to be entered. */
|
|
if (integer_nonzerop (enter_main_cond))
|
|
prob_entry = REG_BR_PROB_BASE;
|
|
else
|
|
prob_entry = PROB_UNROLLED_LOOP_ENTERED * REG_BR_PROB_BASE / 100;
|
|
|
|
/* The values for scales should keep profile consistent, and somewhat close
|
|
to correct.
|
|
|
|
TODO: The current value of SCALE_REST makes it appear that the loop that
|
|
is created by splitting the remaining iterations of the unrolled loop is
|
|
executed the same number of times as the original loop, and with the same
|
|
frequencies, which is obviously wrong. This does not appear to cause
|
|
problems, so we do not bother with fixing it for now. To make the profile
|
|
correct, we would need to change the probability of the exit edge of the
|
|
loop, and recompute the distribution of frequencies in its body because
|
|
of this change (scale the frequencies of blocks before and after the exit
|
|
by appropriate factors). */
|
|
scale_unrolled = prob_entry;
|
|
scale_rest = REG_BR_PROB_BASE;
|
|
|
|
new_loop = loop_version (loop, enter_main_cond, NULL,
|
|
prob_entry, scale_unrolled, scale_rest, true);
|
|
gcc_assert (new_loop != NULL);
|
|
update_ssa (TODO_update_ssa);
|
|
|
|
/* Determine the probability of the exit edge of the unrolled loop. */
|
|
new_est_niter = est_niter / factor;
|
|
|
|
/* Without profile feedback, loops for that we do not know a better estimate
|
|
are assumed to roll 10 times. When we unroll such loop, it appears to
|
|
roll too little, and it may even seem to be cold. To avoid this, we
|
|
ensure that the created loop appears to roll at least 5 times (but at
|
|
most as many times as before unrolling). */
|
|
if (new_est_niter < 5)
|
|
{
|
|
if (est_niter < 5)
|
|
new_est_niter = est_niter;
|
|
else
|
|
new_est_niter = 5;
|
|
}
|
|
|
|
/* Prepare the cfg and update the phi nodes. Move the loop exit to the
|
|
loop latch (and make its condition dummy, for the moment). */
|
|
rest = loop_preheader_edge (new_loop)->src;
|
|
precond_edge = single_pred_edge (rest);
|
|
split_edge (loop_latch_edge (loop));
|
|
exit_bb = single_pred (loop->latch);
|
|
|
|
/* Since the exit edge will be removed, the frequency of all the blocks
|
|
in the loop that are dominated by it must be scaled by
|
|
1 / (1 - exit->probability). */
|
|
scale_dominated_blocks_in_loop (loop, exit->src,
|
|
REG_BR_PROB_BASE,
|
|
REG_BR_PROB_BASE - exit->probability);
|
|
|
|
bsi = gsi_last_bb (exit_bb);
|
|
exit_if = gimple_build_cond (EQ_EXPR, integer_zero_node,
|
|
integer_zero_node,
|
|
NULL_TREE, NULL_TREE);
|
|
|
|
gsi_insert_after (&bsi, exit_if, GSI_NEW_STMT);
|
|
new_exit = make_edge (exit_bb, rest, EDGE_FALSE_VALUE | irr);
|
|
rescan_loop_exit (new_exit, true, false);
|
|
|
|
/* Set the probability of new exit to the same of the old one. Fix
|
|
the frequency of the latch block, by scaling it back by
|
|
1 - exit->probability. */
|
|
new_exit->count = exit->count;
|
|
new_exit->probability = exit->probability;
|
|
new_nonexit = single_pred_edge (loop->latch);
|
|
new_nonexit->probability = REG_BR_PROB_BASE - exit->probability;
|
|
new_nonexit->flags = EDGE_TRUE_VALUE;
|
|
new_nonexit->count -= exit->count;
|
|
if (new_nonexit->count < 0)
|
|
new_nonexit->count = 0;
|
|
scale_bbs_frequencies_int (&loop->latch, 1, new_nonexit->probability,
|
|
REG_BR_PROB_BASE);
|
|
|
|
old_entry = loop_preheader_edge (loop);
|
|
new_entry = loop_preheader_edge (new_loop);
|
|
old_latch = loop_latch_edge (loop);
|
|
for (psi_old_loop = gsi_start_phis (loop->header),
|
|
psi_new_loop = gsi_start_phis (new_loop->header);
|
|
!gsi_end_p (psi_old_loop);
|
|
gsi_next (&psi_old_loop), gsi_next (&psi_new_loop))
|
|
{
|
|
phi_old_loop = gsi_stmt (psi_old_loop);
|
|
phi_new_loop = gsi_stmt (psi_new_loop);
|
|
|
|
init = PHI_ARG_DEF_FROM_EDGE (phi_old_loop, old_entry);
|
|
op = PHI_ARG_DEF_PTR_FROM_EDGE (phi_new_loop, new_entry);
|
|
gcc_assert (operand_equal_for_phi_arg_p (init, USE_FROM_PTR (op)));
|
|
next = PHI_ARG_DEF_FROM_EDGE (phi_old_loop, old_latch);
|
|
|
|
/* Prefer using original variable as a base for the new ssa name.
|
|
This is necessary for virtual ops, and useful in order to avoid
|
|
losing debug info for real ops. */
|
|
if (TREE_CODE (next) == SSA_NAME
|
|
&& useless_type_conversion_p (TREE_TYPE (next),
|
|
TREE_TYPE (init)))
|
|
var = SSA_NAME_VAR (next);
|
|
else if (TREE_CODE (init) == SSA_NAME
|
|
&& useless_type_conversion_p (TREE_TYPE (init),
|
|
TREE_TYPE (next)))
|
|
var = SSA_NAME_VAR (init);
|
|
else if (useless_type_conversion_p (TREE_TYPE (next), TREE_TYPE (init)))
|
|
{
|
|
var = create_tmp_var (TREE_TYPE (next), "unrinittmp");
|
|
add_referenced_var (var);
|
|
}
|
|
else
|
|
{
|
|
var = create_tmp_var (TREE_TYPE (init), "unrinittmp");
|
|
add_referenced_var (var);
|
|
}
|
|
|
|
new_init = make_ssa_name (var, NULL);
|
|
phi_rest = create_phi_node (new_init, rest);
|
|
SSA_NAME_DEF_STMT (new_init) = phi_rest;
|
|
|
|
add_phi_arg (phi_rest, init, precond_edge, UNKNOWN_LOCATION);
|
|
add_phi_arg (phi_rest, next, new_exit, UNKNOWN_LOCATION);
|
|
SET_USE (op, new_init);
|
|
}
|
|
|
|
remove_path (exit);
|
|
|
|
/* Transform the loop. */
|
|
if (transform)
|
|
(*transform) (loop, data);
|
|
|
|
/* Unroll the loop and remove the exits in all iterations except for the
|
|
last one. */
|
|
wont_exit = sbitmap_alloc (factor);
|
|
sbitmap_ones (wont_exit);
|
|
RESET_BIT (wont_exit, factor - 1);
|
|
|
|
ok = gimple_duplicate_loop_to_header_edge
|
|
(loop, loop_latch_edge (loop), factor - 1,
|
|
wont_exit, new_exit, &to_remove, DLTHE_FLAG_UPDATE_FREQ);
|
|
free (wont_exit);
|
|
gcc_assert (ok);
|
|
|
|
for (i = 0; VEC_iterate (edge, to_remove, i, e); i++)
|
|
{
|
|
ok = remove_path (e);
|
|
gcc_assert (ok);
|
|
}
|
|
VEC_free (edge, heap, to_remove);
|
|
update_ssa (TODO_update_ssa);
|
|
|
|
/* Ensure that the frequencies in the loop match the new estimated
|
|
number of iterations, and change the probability of the new
|
|
exit edge. */
|
|
freq_h = loop->header->frequency;
|
|
freq_e = EDGE_FREQUENCY (loop_preheader_edge (loop));
|
|
if (freq_h != 0)
|
|
scale_loop_frequencies (loop, freq_e * (new_est_niter + 1), freq_h);
|
|
|
|
exit_bb = single_pred (loop->latch);
|
|
new_exit = find_edge (exit_bb, rest);
|
|
new_exit->count = loop_preheader_edge (loop)->count;
|
|
new_exit->probability = REG_BR_PROB_BASE / (new_est_niter + 1);
|
|
|
|
rest->count += new_exit->count;
|
|
rest->frequency += EDGE_FREQUENCY (new_exit);
|
|
|
|
new_nonexit = single_pred_edge (loop->latch);
|
|
prob = new_nonexit->probability;
|
|
new_nonexit->probability = REG_BR_PROB_BASE - new_exit->probability;
|
|
new_nonexit->count = exit_bb->count - new_exit->count;
|
|
if (new_nonexit->count < 0)
|
|
new_nonexit->count = 0;
|
|
if (prob > 0)
|
|
scale_bbs_frequencies_int (&loop->latch, 1, new_nonexit->probability,
|
|
prob);
|
|
|
|
/* Finally create the new counter for number of iterations and add the new
|
|
exit instruction. */
|
|
bsi = gsi_last_bb (exit_bb);
|
|
exit_if = gsi_stmt (bsi);
|
|
create_iv (exit_base, exit_step, NULL_TREE, loop,
|
|
&bsi, false, &ctr_before, &ctr_after);
|
|
gimple_cond_set_code (exit_if, exit_cmp);
|
|
gimple_cond_set_lhs (exit_if, ctr_after);
|
|
gimple_cond_set_rhs (exit_if, exit_bound);
|
|
update_stmt (exit_if);
|
|
|
|
#ifdef ENABLE_CHECKING
|
|
verify_flow_info ();
|
|
verify_dominators (CDI_DOMINATORS);
|
|
verify_loop_structure ();
|
|
verify_loop_closed_ssa ();
|
|
#endif
|
|
}
|
|
|
|
/* Wrapper over tree_transform_and_unroll_loop for case we do not
|
|
want to transform the loop before unrolling. The meaning
|
|
of the arguments is the same as for tree_transform_and_unroll_loop. */
|
|
|
|
void
|
|
tree_unroll_loop (struct loop *loop, unsigned factor,
|
|
edge exit, struct tree_niter_desc *desc)
|
|
{
|
|
tree_transform_and_unroll_loop (loop, factor, exit, desc,
|
|
NULL, NULL);
|
|
}
|
|
|
|
/* Rewrite the phi node at position PSI in function of the main
|
|
induction variable MAIN_IV and insert the generated code at GSI. */
|
|
|
|
static void
|
|
rewrite_phi_with_iv (loop_p loop,
|
|
gimple_stmt_iterator *psi,
|
|
gimple_stmt_iterator *gsi,
|
|
tree main_iv)
|
|
{
|
|
affine_iv iv;
|
|
gimple stmt, phi = gsi_stmt (*psi);
|
|
tree atype, mtype, val, res = PHI_RESULT (phi);
|
|
|
|
if (!is_gimple_reg (res) || res == main_iv)
|
|
{
|
|
gsi_next (psi);
|
|
return;
|
|
}
|
|
|
|
if (!simple_iv (loop, loop, res, &iv, true))
|
|
{
|
|
gsi_next (psi);
|
|
return;
|
|
}
|
|
|
|
remove_phi_node (psi, false);
|
|
|
|
atype = TREE_TYPE (res);
|
|
mtype = POINTER_TYPE_P (atype) ? sizetype : atype;
|
|
val = fold_build2 (MULT_EXPR, mtype, unshare_expr (iv.step),
|
|
fold_convert (mtype, main_iv));
|
|
val = fold_build2 (POINTER_TYPE_P (atype)
|
|
? POINTER_PLUS_EXPR : PLUS_EXPR,
|
|
atype, unshare_expr (iv.base), val);
|
|
val = force_gimple_operand_gsi (gsi, val, false, NULL_TREE, true,
|
|
GSI_SAME_STMT);
|
|
stmt = gimple_build_assign (res, val);
|
|
gsi_insert_before (gsi, stmt, GSI_SAME_STMT);
|
|
SSA_NAME_DEF_STMT (res) = stmt;
|
|
}
|
|
|
|
/* Rewrite all the phi nodes of LOOP in function of the main induction
|
|
variable MAIN_IV. */
|
|
|
|
static void
|
|
rewrite_all_phi_nodes_with_iv (loop_p loop, tree main_iv)
|
|
{
|
|
unsigned i;
|
|
basic_block *bbs = get_loop_body_in_dom_order (loop);
|
|
gimple_stmt_iterator psi;
|
|
|
|
for (i = 0; i < loop->num_nodes; i++)
|
|
{
|
|
basic_block bb = bbs[i];
|
|
gimple_stmt_iterator gsi = gsi_after_labels (bb);
|
|
|
|
if (bb->loop_father != loop)
|
|
continue;
|
|
|
|
for (psi = gsi_start_phis (bb); !gsi_end_p (psi); )
|
|
rewrite_phi_with_iv (loop, &psi, &gsi, main_iv);
|
|
}
|
|
|
|
free (bbs);
|
|
}
|
|
|
|
/* Bases all the induction variables in LOOP on a single induction
|
|
variable (unsigned with base 0 and step 1), whose final value is
|
|
compared with *NIT. When the IV type precision has to be larger
|
|
than *NIT type precision, *NIT is converted to the larger type, the
|
|
conversion code is inserted before the loop, and *NIT is updated to
|
|
the new definition. The induction variable is incremented in the
|
|
loop latch. Return the induction variable that was created. */
|
|
|
|
tree
|
|
canonicalize_loop_ivs (struct loop *loop, tree *nit)
|
|
{
|
|
unsigned precision = TYPE_PRECISION (TREE_TYPE (*nit));
|
|
unsigned original_precision = precision;
|
|
tree type, var_before;
|
|
gimple_stmt_iterator gsi, psi;
|
|
gimple stmt;
|
|
edge exit = single_dom_exit (loop);
|
|
gimple_seq stmts;
|
|
|
|
for (psi = gsi_start_phis (loop->header);
|
|
!gsi_end_p (psi); gsi_next (&psi))
|
|
{
|
|
gimple phi = gsi_stmt (psi);
|
|
tree res = PHI_RESULT (phi);
|
|
|
|
if (is_gimple_reg (res) && TYPE_PRECISION (TREE_TYPE (res)) > precision)
|
|
precision = TYPE_PRECISION (TREE_TYPE (res));
|
|
}
|
|
|
|
type = lang_hooks.types.type_for_size (precision, 1);
|
|
|
|
if (original_precision != precision)
|
|
{
|
|
*nit = fold_convert (type, *nit);
|
|
*nit = force_gimple_operand (*nit, &stmts, true, NULL_TREE);
|
|
if (stmts)
|
|
gsi_insert_seq_on_edge_immediate (loop_preheader_edge (loop), stmts);
|
|
}
|
|
|
|
gsi = gsi_last_bb (loop->latch);
|
|
create_iv (build_int_cst_type (type, 0), build_int_cst (type, 1), NULL_TREE,
|
|
loop, &gsi, true, &var_before, NULL);
|
|
|
|
rewrite_all_phi_nodes_with_iv (loop, var_before);
|
|
|
|
stmt = last_stmt (exit->src);
|
|
/* Make the loop exit if the control condition is not satisfied. */
|
|
if (exit->flags & EDGE_TRUE_VALUE)
|
|
{
|
|
edge te, fe;
|
|
|
|
extract_true_false_edges_from_block (exit->src, &te, &fe);
|
|
te->flags = EDGE_FALSE_VALUE;
|
|
fe->flags = EDGE_TRUE_VALUE;
|
|
}
|
|
gimple_cond_set_code (stmt, LT_EXPR);
|
|
gimple_cond_set_lhs (stmt, var_before);
|
|
gimple_cond_set_rhs (stmt, *nit);
|
|
update_stmt (stmt);
|
|
|
|
return var_before;
|
|
}
|