[PATCH] D34099: [IfConversion] Maintain the CFG when predicating/merging blocks in IfConvert*

[Mikael Holmén via Phabricator via llvm-commits]

uabelho created this revision.
Herald added subscribers: kristof.beyls, javed.absar, nemanjai, aemerson.

This fixes PR32721 in IfConvertTriangle and possible similar problems in
IfConvertSimple, IfConvertDiamond and IfConvertForkedDiamond.

In PR32721 we had a triangle

  EBB
  | \
  |  |
  | TBB
  |  /
  FBB

where FBB didn't have any successors at all since it ended with an
unconditional return. Then TBB and FBB were be merged into EBB, but EBB
would still keep its successors, and the use of analyzeBranch and
CorrectExtraCFGEdges wouldn't help to remove them since the return
instruction is not analyzable (at least not on ARM).

The edge updating code and branch probability updating code is now pushed
into MergeBlocks() which allows us to share the same update logic between
more callsites. This lets us remove several dependencies on analyzeBranch
and completely eliminate RemoveExtraEdges.

One thing that showed up with this patch was that IfConversion sometimes
left a successor with 0% probability even if there was no branch or
fallthrough to the successor.

One such example from the test case ifcvt_bad_zero_prob_succ.mir. The
indirect branch tBRIND can only jump to bb.1, but without the patch we
got:

  bb.0:
    successors: %bb.1(0x80000000)
  
  bb.1:
    successors: %bb.1(0x80000000), %bb.2(0x00000000)
    tBRIND %r1, 1, %cpsr
    B %bb.1
  
  bb.2:

There is no way to jump from bb.1 to bb2, but still there is a 0% edge
from bb.1 to bb.2.

With the patch applied we instead get the expected:

  bb.0:
    successors: %bb.1(0x80000000)
  
  bb.1:
    successors: %bb.1(0x80000000)
    tBRIND %r1, 1, %cpsr
    B %bb.1

Since bb.2 had no predecessor at all, it was removed.

Several testcases had to be updated due to this since the removed
successor made the "Branch Probability Basic Block Placement" pass
sometimes place blocks in a different order.

Finally added a couple of new test cases:

- PR32721_ifcvt_triangle_unanalyzable.mir: Regression test for the original problem dexcribed in PR 32721.

- ifcvt_triangleWoCvtToNextEdge.mir: Regression test for problem that caused a revert of my first attempt to solve PR 32721.

- ifcvt_simple_bad_zero_prob_succ.mir: Test case showing the problem where a wrong successor with 0% probability was previously left.

- ifcvt_[diamond|forked_diamond|simple]_unanalyzable.mir Very simple test cases for the simple and (forked) diamond cases involving unanalyzable branches that can be nice to have as a base if wanting to write more complicated tests.


https://reviews.llvm.org/D34099

Files:
  lib/CodeGen/IfConversion.cpp
  test/CodeGen/ARM/ifcvt-branch-weight.ll
  test/CodeGen/ARM/indirectbr-3.ll
  test/CodeGen/ARM/struct-byval-frame-index.ll
  test/CodeGen/MIR/ARM/PR32721_ifcvt_triangle_unanalyzable.mir
  test/CodeGen/MIR/ARM/ifcvt_diamond_unanalyzable.mir
  test/CodeGen/MIR/ARM/ifcvt_forked_diamond_unanalyzable.mir
  test/CodeGen/MIR/ARM/ifcvt_simple_bad_zero_prob_succ.mir
  test/CodeGen/MIR/ARM/ifcvt_simple_unanalyzable.mir
  test/CodeGen/MIR/ARM/ifcvt_triangleWoCvtToNextEdge.mir
  test/CodeGen/PowerPC/logic-ops-on-compares.ll
  test/CodeGen/PowerPC/ppc-shrink-wrapping.ll
  test/CodeGen/SystemZ/atomicrmw-minmax-03.ll
  test/CodeGen/SystemZ/atomicrmw-minmax-04.ll

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D34099.102155.patch
Type: text/x-patch
Size: 22742 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170612/88818768/attachment.bin>