RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

Revert r56315. When the instruction to speculate is a load, this

Browse Source 
code can incorrectly move the load across a store. This never
happens in practice today, but only because the current
heuristics accidentally preclude it.

llvm-svn: 147623
This commit is contained in:
Dan Gohman 2012-01-05 22:54:35 +00:00
parent 509b7e6c60
commit 4fc691d9ef
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/Transforms/Utils/SimplifyCFG.cpp
View File

@ -1063,32 +1063,8 @@ static bool SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *BB1) {
return false;
}
// If we get here, we can hoist the instruction. Try to place it
// before the icmp instruction preceding the conditional branch.
BasicBlock::iterator InsertPos = BI;
if (InsertPos != BIParent->begin())
--InsertPos;
// Skip debug info between condition and branch.
while (InsertPos != BIParent->begin() && isa<DbgInfoIntrinsic>(InsertPos))
--InsertPos;
if (InsertPos == BrCond && !isa<PHINode>(BrCond)) {
SmallPtrSet<Instruction *, 4> BB1Insns;
for(BasicBlock::iterator BB1I = BB1->begin(), BB1E = BB1->end();
BB1I != BB1E; ++BB1I)
BB1Insns.insert(BB1I);
for(Value::use_iterator UI = BrCond->use_begin(), UE = BrCond->use_end();
UI != UE; ++UI) {
Instruction *Use = cast<Instruction>(*UI);
if (!BB1Insns.count(Use)) continue;
// If BrCond uses the instruction that place it just before
// branch instruction.
InsertPos = BI;
break;
}
} else
InsertPos = BI;
BIParent->getInstList().splice(InsertPos, BB1->getInstList(), HInst);
// If we get here, we can hoist the instruction.
BIParent->getInstList().splice(BI, BB1->getInstList(), HInst);
// Create a select whose true value is the speculatively executed value and
// false value is the previously determined FalseV.

2
test/Transforms/SimplifyCFG/SpeculativeExec.ll
View File

@ -13,8 +13,8 @@ bb1: ; preds = %entry
%tmp2 = icmp sgt i32 %c, 1
br i1 %tmp2, label %bb2, label %bb3
; CHECK: bb1:
; CHECK-NEXT: add i32 %a, 1
; CHECK-NEXT: icmp sgt i32 %c, 1
; CHECK-NEXT: add i32 %a, 1
; CHECK-NEXT: select i1 %tmp2, i32 %tmp3, i32 %a
; CHECK-NEXT: br label %bb3