1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00

[SimplifyCFG] Add a workaround to fix PR30188

We're sinking stores, which is a good thing, but in the process creating selects for the store address operand, which SROA/Mem2Reg can't look through, which caused serious regressions.

The real fix is in SROA, which I'll be looking into.

llvm-svn: 280470
This commit is contained in:
James Molloy 2016-09-02 07:29:00 +00:00
parent aab0faf5c9
commit bf62f7d3c4
2 changed files with 33 additions and 0 deletions

View File

@ -1425,6 +1425,16 @@ static bool canSinkInstructions(
// FIXME: if the call was *already* indirect, we should do this.
return false;
}
// Because SROA can't handle speculating stores of selects, try not
// to sink stores of allocas when we'd have to create a PHI for the
// address operand.
// FIXME: This is a workaround for a deficiency in SROA - see
// https://llvm.org/bugs/show_bug.cgi?id=30188
if (OI == 1 && isa<StoreInst>(I0) &&
any_of(Insts, [](const Instruction *I) {
return isa<AllocaInst>(I->getOperand(1));
}))
return false;
for (auto *I : Insts)
PHIOperands[I].push_back(I->getOperand(OI));
}

View File

@ -562,6 +562,29 @@ if.end:
; CHECK-DAG: [ %cmp3, %if.then3 ]
; CHECK-NEXT: zext i1 %[[x]] to i8
define i32 @test_pr30188(i1 zeroext %flag, i32 %x) {
entry:
%y = alloca i32
%z = alloca i32
br i1 %flag, label %if.then, label %if.else
if.then:
store i32 %x, i32* %y
br label %if.end
if.else:
store i32 %x, i32* %z
br label %if.end
if.end:
ret i32 1
}
; CHECK-LABEL: test_pr30188
; CHECK-NOT: select
; CHECK: store
; CHECK: store
; CHECK: !0 = !{!1, !1, i64 0}
; CHECK: !1 = !{!"float", !2}
; CHECK: !2 = !{!"an example type tree"}