Some whitespace fixes

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123033 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Tobias Grosser 2011-01-07 21:33:13 +00:00
parent 1dea232624
commit 8d088bd1e4

View File

@ -24,14 +24,14 @@ static SelectPatternFlavor
MatchSelectPattern(Value *V, Value *&LHS, Value *&RHS) { MatchSelectPattern(Value *V, Value *&LHS, Value *&RHS) {
SelectInst *SI = dyn_cast<SelectInst>(V); SelectInst *SI = dyn_cast<SelectInst>(V);
if (SI == 0) return SPF_UNKNOWN; if (SI == 0) return SPF_UNKNOWN;
ICmpInst *ICI = dyn_cast<ICmpInst>(SI->getCondition()); ICmpInst *ICI = dyn_cast<ICmpInst>(SI->getCondition());
if (ICI == 0) return SPF_UNKNOWN; if (ICI == 0) return SPF_UNKNOWN;
LHS = ICI->getOperand(0); LHS = ICI->getOperand(0);
RHS = ICI->getOperand(1); RHS = ICI->getOperand(1);
// (icmp X, Y) ? X : Y // (icmp X, Y) ? X : Y
if (SI->getTrueValue() == ICI->getOperand(0) && if (SI->getTrueValue() == ICI->getOperand(0) &&
SI->getFalseValue() == ICI->getOperand(1)) { SI->getFalseValue() == ICI->getOperand(1)) {
switch (ICI->getPredicate()) { switch (ICI->getPredicate()) {
@ -46,8 +46,8 @@ MatchSelectPattern(Value *V, Value *&LHS, Value *&RHS) {
case ICmpInst::ICMP_SLE: return SPF_SMIN; case ICmpInst::ICMP_SLE: return SPF_SMIN;
} }
} }
// (icmp X, Y) ? Y : X // (icmp X, Y) ? Y : X
if (SI->getTrueValue() == ICI->getOperand(1) && if (SI->getTrueValue() == ICI->getOperand(1) &&
SI->getFalseValue() == ICI->getOperand(0)) { SI->getFalseValue() == ICI->getOperand(0)) {
switch (ICI->getPredicate()) { switch (ICI->getPredicate()) {
@ -62,9 +62,9 @@ MatchSelectPattern(Value *V, Value *&LHS, Value *&RHS) {
case ICmpInst::ICMP_SLE: return SPF_SMAX; case ICmpInst::ICMP_SLE: return SPF_SMAX;
} }
} }
// TODO: (X > 4) ? X : 5 --> (X >= 5) ? X : 5 --> MAX(X, 5) // TODO: (X > 4) ? X : 5 --> (X >= 5) ? X : 5 --> MAX(X, 5)
return SPF_UNKNOWN; return SPF_UNKNOWN;
} }
@ -136,7 +136,7 @@ Instruction *InstCombiner::FoldSelectOpOp(SelectInst &SI, Instruction *TI,
SelectInst *NewSI = SelectInst::Create(SI.getCondition(), TI->getOperand(0), SelectInst *NewSI = SelectInst::Create(SI.getCondition(), TI->getOperand(0),
FI->getOperand(0), SI.getName()+".v"); FI->getOperand(0), SI.getName()+".v");
InsertNewInstBefore(NewSI, SI); InsertNewInstBefore(NewSI, SI);
return CastInst::Create(Instruction::CastOps(TI->getOpcode()), NewSI, return CastInst::Create(Instruction::CastOps(TI->getOpcode()), NewSI,
TI->getType()); TI->getType());
} }
@ -402,28 +402,28 @@ static bool CanSelectOperandBeMappingIntoPredBlock(const Value *V,
// can always be mapped. // can always be mapped.
const Instruction *I = dyn_cast<Instruction>(V); const Instruction *I = dyn_cast<Instruction>(V);
if (I == 0) return true; if (I == 0) return true;
// If V is a PHI node defined in the same block as the condition PHI, we can // If V is a PHI node defined in the same block as the condition PHI, we can
// map the arguments. // map the arguments.
const PHINode *CondPHI = cast<PHINode>(SI.getCondition()); const PHINode *CondPHI = cast<PHINode>(SI.getCondition());
if (const PHINode *VP = dyn_cast<PHINode>(I)) if (const PHINode *VP = dyn_cast<PHINode>(I))
if (VP->getParent() == CondPHI->getParent()) if (VP->getParent() == CondPHI->getParent())
return true; return true;
// Otherwise, if the PHI and select are defined in the same block and if V is // Otherwise, if the PHI and select are defined in the same block and if V is
// defined in a different block, then we can transform it. // defined in a different block, then we can transform it.
if (SI.getParent() == CondPHI->getParent() && if (SI.getParent() == CondPHI->getParent() &&
I->getParent() != CondPHI->getParent()) I->getParent() != CondPHI->getParent())
return true; return true;
// Otherwise we have a 'hard' case and we can't tell without doing more // Otherwise we have a 'hard' case and we can't tell without doing more
// detailed dominator based analysis, punt. // detailed dominator based analysis, punt.
return false; return false;
} }
/// FoldSPFofSPF - We have an SPF (e.g. a min or max) of an SPF of the form: /// FoldSPFofSPF - We have an SPF (e.g. a min or max) of an SPF of the form:
/// SPF2(SPF1(A, B), C) /// SPF2(SPF1(A, B), C)
Instruction *InstCombiner::FoldSPFofSPF(Instruction *Inner, Instruction *InstCombiner::FoldSPFofSPF(Instruction *Inner,
SelectPatternFlavor SPF1, SelectPatternFlavor SPF1,
Value *A, Value *B, Value *A, Value *B,
@ -434,7 +434,7 @@ Instruction *InstCombiner::FoldSPFofSPF(Instruction *Inner,
// MIN(MIN(a, b), a) -> MIN(a, b) // MIN(MIN(a, b), a) -> MIN(a, b)
if (SPF1 == SPF2) if (SPF1 == SPF2)
return ReplaceInstUsesWith(Outer, Inner); return ReplaceInstUsesWith(Outer, Inner);
// MAX(MIN(a, b), a) -> a // MAX(MIN(a, b), a) -> a
// MIN(MAX(a, b), a) -> a // MIN(MAX(a, b), a) -> a
if ((SPF1 == SPF_SMIN && SPF2 == SPF_SMAX) || if ((SPF1 == SPF_SMIN && SPF2 == SPF_SMAX) ||
@ -443,7 +443,7 @@ Instruction *InstCombiner::FoldSPFofSPF(Instruction *Inner,
(SPF1 == SPF_UMAX && SPF2 == SPF_UMIN)) (SPF1 == SPF_UMAX && SPF2 == SPF_UMIN))
return ReplaceInstUsesWith(Outer, C); return ReplaceInstUsesWith(Outer, C);
} }
// TODO: MIN(MIN(A, 23), 97) // TODO: MIN(MIN(A, 23), 97)
return 0; return 0;
} }
@ -550,7 +550,7 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
"not."+CondVal->getName()), SI); "not."+CondVal->getName()), SI);
return BinaryOperator::CreateOr(NotCond, TrueVal); return BinaryOperator::CreateOr(NotCond, TrueVal);
} }
// select a, b, a -> a&b // select a, b, a -> a&b
// select a, a, b -> a|b // select a, a, b -> a|b
if (CondVal == TrueVal) if (CondVal == TrueVal)
@ -569,7 +569,7 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
// select C, -1, 0 -> sext C to int // select C, -1, 0 -> sext C to int
if (FalseValC->isZero() && TrueValC->isAllOnesValue()) if (FalseValC->isZero() && TrueValC->isAllOnesValue())
return new SExtInst(CondVal, SI.getType()); return new SExtInst(CondVal, SI.getType());
// select C, 0, 1 -> zext !C to int // select C, 0, 1 -> zext !C to int
if (TrueValC->isZero() && FalseValC->getValue() == 1) { if (TrueValC->isZero() && FalseValC->getValue() == 1) {
Value *NotCond = Builder->CreateNot(CondVal, "not."+CondVal->getName()); Value *NotCond = Builder->CreateNot(CondVal, "not."+CondVal->getName());
@ -591,7 +591,7 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
if (FCI->getOperand(0) == TrueVal && FCI->getOperand(1) == FalseVal) { if (FCI->getOperand(0) == TrueVal && FCI->getOperand(1) == FalseVal) {
// Transform (X == Y) ? X : Y -> Y // Transform (X == Y) ? X : Y -> Y
if (FCI->getPredicate() == FCmpInst::FCMP_OEQ) { if (FCI->getPredicate() == FCmpInst::FCMP_OEQ) {
// This is not safe in general for floating point: // This is not safe in general for floating point:
// consider X== -0, Y== +0. // consider X== -0, Y== +0.
// It becomes safe if either operand is a nonzero constant. // It becomes safe if either operand is a nonzero constant.
ConstantFP *CFPt, *CFPf; ConstantFP *CFPt, *CFPf;
@ -603,7 +603,7 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
} }
// Transform (X une Y) ? X : Y -> X // Transform (X une Y) ? X : Y -> X
if (FCI->getPredicate() == FCmpInst::FCMP_UNE) { if (FCI->getPredicate() == FCmpInst::FCMP_UNE) {
// This is not safe in general for floating point: // This is not safe in general for floating point:
// consider X== -0, Y== +0. // consider X== -0, Y== +0.
// It becomes safe if either operand is a nonzero constant. // It becomes safe if either operand is a nonzero constant.
ConstantFP *CFPt, *CFPf; ConstantFP *CFPt, *CFPf;
@ -618,7 +618,7 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
} else if (FCI->getOperand(0) == FalseVal && FCI->getOperand(1) == TrueVal){ } else if (FCI->getOperand(0) == FalseVal && FCI->getOperand(1) == TrueVal){
// Transform (X == Y) ? Y : X -> X // Transform (X == Y) ? Y : X -> X
if (FCI->getPredicate() == FCmpInst::FCMP_OEQ) { if (FCI->getPredicate() == FCmpInst::FCMP_OEQ) {
// This is not safe in general for floating point: // This is not safe in general for floating point:
// consider X== -0, Y== +0. // consider X== -0, Y== +0.
// It becomes safe if either operand is a nonzero constant. // It becomes safe if either operand is a nonzero constant.
ConstantFP *CFPt, *CFPf; ConstantFP *CFPt, *CFPf;
@ -630,7 +630,7 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
} }
// Transform (X une Y) ? Y : X -> Y // Transform (X une Y) ? Y : X -> Y
if (FCI->getPredicate() == FCmpInst::FCMP_UNE) { if (FCI->getPredicate() == FCmpInst::FCMP_UNE) {
// This is not safe in general for floating point: // This is not safe in general for floating point:
// consider X== -0, Y== +0. // consider X== -0, Y== +0.
// It becomes safe if either operand is a nonzero constant. // It becomes safe if either operand is a nonzero constant.
ConstantFP *CFPt, *CFPf; ConstantFP *CFPt, *CFPf;
@ -719,7 +719,7 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
if (SI.getType()->isIntegerTy()) { if (SI.getType()->isIntegerTy()) {
if (Instruction *FoldI = FoldSelectIntoOp(SI, TrueVal, FalseVal)) if (Instruction *FoldI = FoldSelectIntoOp(SI, TrueVal, FalseVal))
return FoldI; return FoldI;
// MAX(MAX(a, b), a) -> MAX(a, b) // MAX(MAX(a, b), a) -> MAX(a, b)
// MIN(MIN(a, b), a) -> MIN(a, b) // MIN(MIN(a, b), a) -> MIN(a, b)
// MAX(MIN(a, b), a) -> a // MAX(MIN(a, b), a) -> a
@ -742,7 +742,7 @@ Instruction *InstCombiner::visitSelectInst(SelectInst &SI) {
} }
// See if we can fold the select into a phi node if the condition is a select. // See if we can fold the select into a phi node if the condition is a select.
if (isa<PHINode>(SI.getCondition())) if (isa<PHINode>(SI.getCondition()))
// The true/false values have to be live in the PHI predecessor's blocks. // The true/false values have to be live in the PHI predecessor's blocks.
if (CanSelectOperandBeMappingIntoPredBlock(TrueVal, SI) && if (CanSelectOperandBeMappingIntoPredBlock(TrueVal, SI) &&
CanSelectOperandBeMappingIntoPredBlock(FalseVal, SI)) CanSelectOperandBeMappingIntoPredBlock(FalseVal, SI))