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

Completely disable the optimization I added in r121680 until

Browse Source 
I can track down a miscompile.  This should bring the buildbots
back to life

llvm-svn: 121693
This commit is contained in:
Chris Lattner 2010-12-13 07:41:29 +00:00
parent 324f849088
commit caad324345
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,8 +331,8 @@ GatherConstantCompares(Value *V, std::vector<ConstantInt*> &Vals, Value *&Extra,
isEQ)) {
if (LHS == RHS)
return LHS;
Vals.resize(NumVals);
}
Vals.resize(NumVals);
// The RHS of the or/and can't be folded in and we haven't used "Extra" yet,
// set it and return success.
@ -348,12 +348,13 @@ GatherConstantCompares(Value *V, std::vector<ConstantInt*> &Vals, Value *&Extra,
// If the LHS can't be folded in, but Extra is available and RHS can, try to
// use LHS as Extra.
if (Extra == 0 || Extra == I->getOperand(0)) {
Value *OldExtra = Extra;
Extra = I->getOperand(0);
if (Value *RHS = GatherConstantCompares(I->getOperand(1), Vals, Extra, TD,
isEQ))
return RHS;
Vals.resize(NumValsBeforeLHS);
Extra = 0;
assert(Vals.size() == NumValsBeforeLHS);
Extra = OldExtra;
}
return 0;
@ -1908,6 +1909,8 @@ static bool SimplifyBranchOnICmpChain(BranchInst *BI, const TargetData *TD) {
// then we evaluate them with an explicit branch first. Split the block
// right before the condbr to handle it.
if (ExtraCase) {
return false;
BasicBlock *NewBB = BB->splitBasicBlock(BI, "switch.early.test");
// Remove the uncond branch added to the old block.
TerminatorInst *OldTI = BB->getTerminator();

53
test/Transforms/SimplifyCFG/switch_create.ll
View File

@ -168,13 +168,13 @@ if.end: ; preds = %entry
ret void
; CHECK: @test7
; CHECK: %cmp = icmp ult i32 %x, 32
; CHECK: br i1 %cmp, label %if.then, label %switch.early.test
; CHECK: switch.early.test:
; CHECK: switch i8 %c, label %if.end [
; CHECK: i8 99, label %if.then
; CHECK: i8 97, label %if.then
; CHECK: ]
; HECK: %cmp = icmp ult i32 %x, 32
; HECK: br i1 %cmp, label %if.then, label %switch.early.test
; HECK: switch.early.test:
; HECK: switch i8 %c, label %if.end [
; HECK: i8 99, label %if.then
; HECK: i8 97, label %if.then
; HECK: ]
}
define i32 @test8(i8 zeroext %c, i32 %x, i1 %C) nounwind ssp noredzone {
@ -197,14 +197,15 @@ if.end: ; preds = %entry
ret i32 0
; CHECK: @test8
; CHECK: switch.early.test:
; CHECK: switch i8 %c, label %if.end [
; CHECK: i8 99, label %if.then
; CHECK: i8 97, label %if.then
; CHECK: ]
; CHECK: %A = phi i32 [ 0, %entry ], [ 42, %switch.early.test ], [ 42, %N ], [ 42, %switch.early.test ]
; HECK: switch.early.test:
; HECK: switch i8 %c, label %if.end [
; HECK: i8 99, label %if.then
; HECK: i8 97, label %if.then
; HECK: ]
; HECK: %A = phi i32 [ 0, %entry ], [ 42, %switch.early.test ], [ 42, %N ], [ 42, %switch.early.test ]
}
;; This is "Example 7" from http://blog.regehr.org/archives/320
define i32 @test9(i8 zeroext %c) nounwind ssp noredzone {
entry:
%cmp = icmp ult i8 %c, 33
@ -253,20 +254,20 @@ lor.end: ; preds = %lor.rhs, %lor.lhs.f
; CHECK: @test9
; CHECK: %cmp = icmp ult i8 %c, 33
; CHECK: br i1 %cmp, label %lor.end, label %switch.early.test
; HECK: br i1 %cmp, label %lor.end, label %switch.early.test
; CHECK: switch.early.test:
; CHECK: switch i8 %c, label %lor.rhs [
; CHECK: i8 46, label %lor.end
; CHECK: i8 44, label %lor.end
; CHECK: i8 58, label %lor.end
; CHECK: i8 59, label %lor.end
; CHECK: i8 60, label %lor.end
; CHECK: i8 62, label %lor.end
; CHECK: i8 34, label %lor.end
; CHECK: i8 92, label %lor.end
; CHECK: i8 39, label %lor.end
; CHECK: ]
; HECK: switch.early.test:
; HECK: switch i8 %c, label %lor.rhs [
; HECK: i8 46, label %lor.end
; HECK: i8 44, label %lor.end
; HECK: i8 58, label %lor.end
; HECK: i8 59, label %lor.end
; HECK: i8 60, label %lor.end
; HECK: i8 62, label %lor.end
; HECK: i8 34, label %lor.end
; HECK: i8 92, label %lor.end
; HECK: i8 39, label %lor.end
; HECK: ]
}