Fix PR 53743 and other -freorder-blocks-and-partition failures

On Wed, May 22, 2013 at 2:05 PM, Teresa Johnson <tejohnson@google.com> wrote:
> Revised patch included below. The spacing of my pasted in patch text
> looks funky again, let me know if you want the patch as an attachment
> instead.
>
> I addressed all of Steven's comments, except for the suggestion to use
> gcc_assert
> instead of error() in verify_hot_cold_block_grouping() to keep this consistent
> with the rest of the verify_flow_info subroutines (let me know if this is ok).

I fixed this issue too, which was actually in
insert_section_boundary_note(), so that it gcc_asserts more
efficiently as suggested. Retested, latest patch below.

Honza, would you be able to review the patch?

Thanks!
Teresa

>
> The other main changes:
> (1) Added several test cases (cloned from the torture subdirectories,
> where I manually
> built/ran with FDO and -freorder-blocks-and-partition with both the
> current trunk and
> my fixed trunk compiler, and was able to expose some failures I fixed.
> (2) Changed existing tree-prof tests that used
> -freorder-blocks-and-partition to be
> built with -O2 instead of -O, so that partitioning actually kicks in.
> (3) Fixed a couple of failures in the new
> verify_hot_cold_block_grouping() checks
> exposed by the torture tests I ran manually with splitting (2 of the
> tests cloned
> to tree-prof in this patch). One was in computed goto where we were
> too aggressive
> about cloning crossing edges, and the other was in rtl_split_edge
> called from the "stack"
> pass which was not correctly inserting the new bb in the correct partition since
> bb layout is complete at that point.
>
> Re-tested on x86_64-unknown-linux-gnu with bootstrap and profiledbootstrap
> builds and regression testing. Re-built/ran cpu2006int with profile
> feedback and -freorder-blocks-and-partition enabled.
>
> Ok for trunk?
>
> Thanks!
> Teresa

2013-05-23  Teresa Johnson  <tejohnson@google.com>

* ifcvt.c (find_if_case_1): Replace BB_COPY_PARTITION with assert
        as this is now done by redirect_edge_and_branch_force.
* function.c (thread_prologue_and_epilogue_insns): Insert new bb after
        barriers, and fix interaction with splitting.
* emit-rtl.c (try_split): Copy REG_CROSSING_JUMP notes.
* cfgcleanup.c (try_forward_edges): Fix early return value to properly
        reflect changes made in the routine.
* bb-reorder.c (emit_barrier_after_bb): Move to cfgrtl.c.
(fix_up_fall_thru_edges): Remove incorrect check for bb layout order
        since this is called in cfglayout mode, and replace partition fixup
        with assert as that is now done by force_nonfallthru_and_redirect.
(add_reg_crossing_jump_notes): Handle the fact that some jumps may
        already be marked with region crossing note.
(insert_section_boundary_note): Make non-static, gate on flag
        has_bb_partition, rewrite to also check for multiple partitions.
(rest_of_handle_reorder_blocks): Remove call to
        insert_section_boundary_note, now done later during free_cfg.
        (duplicate_computed_gotos): Don't duplicate partition crossing edge.
* bb-reorder.h (insert_section_boundary_note): Declare.
* Makefile.in (cfgrtl.o): Depend on bb-reorder.h
* cfgrtl.c (rest_of_pass_free_cfg): If partitions exist
        invoke insert_section_boundary_note.
(try_redirect_by_replacing_jump): Remove unnecessary
        check for region crossing note.
(fixup_partition_crossing): New function.
(rtl_redirect_edge_and_branch): Fixup partition boundaries.
(emit_barrier_after_bb): Move here from bb-reorder.c, handle insertion
        in non-cfglayout mode.
(force_nonfallthru_and_redirect): Fixup partition boundaries,
        remove old code that tried to do this. Emit barrier correctly
        when we are in cfglayout mode.
        (last_bb_in_partition): New function.
(rtl_split_edge): Correctly fixup partition boundaries.
(commit_one_edge_insertion): Remove old code that tried to
        fixup region crossing edge since this is now handled in
        split_block, and set up insertion point correctly since
        block may now end in a jump.
        (verify_hot_cold_block_grouping): Guard against checking when not in
        linearized RTL mode.
(rtl_verify_edges): Add checks for incorrect/missing REG_CROSSING_JUMP
        notes.
        (rtl_verify_flow_info_1): Move verify_hot_cold_block_grouping to
        rtl_verify_flow_info, so not called in cfglayout mode.
        (rtl_verify_flow_info): Move verify_hot_cold_block_grouping here.
(fixup_reorder_chain): Remove old code that attempted to fixup region
        crossing note as this is now handled in force_nonfallthru_and_redirect.
(duplicate_insn_chain): Don't duplicate switch section notes.
(rtl_can_remove_branch_p): Remove unnecessary check for region crossing
        note.
* basic-block.h (emit_barrier_after_bb): Declare.
* testsuite/gcc.dg/tree-prof/va-arg-pack-1.c: Cloned from c-torture, made
        into -freorder-blocks-and-partition test.
* testsuite/gcc.dg/tree-prof/comp-goto-1.c: Ditto.
* testsuite/gcc.dg/tree-prof/20041218-1.c: Ditto.
* testsuite/gcc.dg/tree-prof/pr52027.c: Use -O2.
* testsuite/gcc.dg/tree-prof/pr50907.c: Ditto.
* testsuite/gcc.dg/tree-prof/pr45354.c: Ditto.
* testsuite/g++.dg/tree-prof/partition2.C: Ditto.
* testsuite/g++.dg/tree-prof/partition3.C: Ditto.

--
Teresa Johnson | Software Engineer | tejohnson@google.com | 408-460-2413

Fix PR 53743 and other -freorder-blocks-and-partition failures

Commit Message

Comments

Patch