This is an archive of the discontinued LLVM Phabricator instance.

Differential D63148

[MIR] Skip hoisting to throwable or return machine basic blocks
ClosedPublic

Authored by anton-afanasyev on Jun 11 2019, 10:05 AM.

Details

Reviewers
john.brawn
RKSimon
MatzeB
Commits
rG339b39b77337: [MIR] Skip hoisting to basic block which may throw exception or return
rL363164: [MIR] Skip hoisting to basic block which may throw exception or return
Summary

Fix hoisting to basic block which are not legal for hoisting cause
it can be terminated by exception or it is return block.

Diff Detail

Event Timeline

anton-afanasyev created this revision.Jun 11 2019, 10:05 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 11 2019, 10:05 AM
Herald added subscribers: llvm-commits, hiraditya. · View Herald Transcript
Harbormaster completed remote builds in B33215: Diff 204094.Jun 11 2019, 10:05 AM
lebedev.ri added a subscriber: lebedev.ri.Jun 11 2019, 10:09 AM

Missing a test

anton-afanasyev added a comment.Jun 11 2019, 10:47 AM
In D63148#1538399, @lebedev.ri wrote:

Missing a test

Thanks, updating.

anton-afanasyev updated this revision to Diff 204109.Jun 11 2019, 10:47 AM

Add test

Herald added a subscriber: javed.absar. · View Herald TranscriptJun 11 2019, 10:47 AM
Harbormaster completed remote builds in B33223: Diff 204109.Jun 11 2019, 10:47 AM
anton-afanasyev updated this revision to Diff 204123.Jun 11 2019, 11:43 AM

Update description

Harbormaster completed remote builds in B33225: Diff 204123.Jun 11 2019, 11:43 AM
john.brawn accepted this revision.Jun 12 2019, 4:46 AM

LGTM.

This revision is now accepted and ready to land.Jun 12 2019, 4:46 AM
Closed by commit rL363164: [MIR] Skip hoisting to basic block which may throw exception or return (authored by anton-afanasyev). · Explain WhyJun 12 2019, 6:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
CodeGen/
2 lines

Diff 204094

llvm/lib/CodeGen/MachineCSE.cpp

Show First 20 Lines • Show All 793 Lines • ▼ Show 20 Lines if (!PREMap.count(MI)) {
continue; continue;
} }
auto MBB1 = PREMap[MI]; auto MBB1 = PREMap[MI];
assert( assert(
!DT->properlyDominates(MBB, MBB1) && !DT->properlyDominates(MBB, MBB1) &&
"MBB cannot properly dominate MBB1 while DFS through dominators tree!"); "MBB cannot properly dominate MBB1 while DFS through dominators tree!");
auto CMBB = DT->findNearestCommonDominator(MBB, MBB1); auto CMBB = DT->findNearestCommonDominator(MBB, MBB1);
if (!CMBB->isLegalToHoistInto())
continue;
// Two instrs are partial redundant if their basic blocks are reachable // Two instrs are partial redundant if their basic blocks are reachable
// from one to another but one doesn't dominate another. // from one to another but one doesn't dominate another.
if (CMBB != MBB1) { if (CMBB != MBB1) {
auto BB = MBB->getBasicBlock(), BB1 = MBB1->getBasicBlock(); auto BB = MBB->getBasicBlock(), BB1 = MBB1->getBasicBlock();
if (BB != nullptr && BB1 != nullptr && if (BB != nullptr && BB1 != nullptr &&
(isPotentiallyReachable(BB1, BB) || (isPotentiallyReachable(BB1, BB) ||
isPotentiallyReachable(BB, BB1))) { isPotentiallyReachable(BB, BB1))) {
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines