maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CGP] Make several static functions member functions (NFC) 

This is extracted from D59696 as suggested in the review. It is
preparation for making the DominatorTree a member variable.

llvm-svn: 356857
This commit is contained in:
Teresa Johnson 2019-03-24 15:18:50 +00:00
parent 272571718c
commit 4dc851964c
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
llvm/lib/CodeGen/CodeGenPrepare.cpp
View File

@ -374,6 +374,13 @@ class TypePromotionTransaction;
bool simplifyOffsetableRelocate(Instruction &I);
bool tryToSinkFreeOperands(Instruction *I);
bool replaceMathCmpWithIntrinsic(BinaryOperator *BO, CmpInst *Cmp,
Intrinsic::ID IID, DominatorTree &DT);
bool optimizeCmp(CmpInst *Cmp, DominatorTree &DT, bool &ModifiedDT);
bool combineToUSubWithOverflow(CmpInst *Cmp, DominatorTree &DT,
bool &ModifiedDT);
bool combineToUAddWithOverflow(CmpInst *Cmp, DominatorTree &DT,
bool &ModifiedDT);
};
} // end anonymous namespace
@ -1157,8 +1164,10 @@ static bool OptimizeNoopCopyExpression(CastInst *CI, const TargetLowering &TLI,
return SinkCast(CI);
}
static bool replaceMathCmpWithIntrinsic(BinaryOperator *BO, CmpInst *Cmp,
Intrinsic::ID IID, DominatorTree &DT) {
bool CodeGenPrepare::replaceMathCmpWithIntrinsic(BinaryOperator *BO,
CmpInst *Cmp,
Intrinsic::ID IID,
DominatorTree &DT) {
// We allow matching the canonical IR (add X, C) back to (usubo X, -C).
Value *Arg0 = BO->getOperand(0);
Value *Arg1 = BO->getOperand(1);
@ -1242,8 +1251,7 @@ static bool matchUAddWithOverflowConstantEdgeCases(CmpInst *Cmp,
/// Try to combine the compare into a call to the llvm.uadd.with.overflow
/// intrinsic. Return true if any changes were made.
static bool combineToUAddWithOverflow(CmpInst *Cmp, const TargetLowering &TLI,
const DataLayout &DL, DominatorTree &DT,
bool CodeGenPrepare::combineToUAddWithOverflow(CmpInst *Cmp, DominatorTree &DT,
bool &ModifiedDT) {
Value *A, *B;
BinaryOperator *Add;
@ -1251,8 +1259,8 @@ static bool combineToUAddWithOverflow(CmpInst *Cmp, const TargetLowering &TLI,
if (!matchUAddWithOverflowConstantEdgeCases(Cmp, Add))
return false;
if (!TLI.shouldFormOverflowOp(ISD::UADDO,
TLI.getValueType(DL, Add->getType())))
if (!TLI->shouldFormOverflowOp(ISD::UADDO,
TLI->getValueType(*DL, Add->getType())))
return false;
// We don't want to move around uses of condition values this late, so we
@ -1269,8 +1277,7 @@ static bool combineToUAddWithOverflow(CmpInst *Cmp, const TargetLowering &TLI,
return true;
}
static bool combineToUSubWithOverflow(CmpInst *Cmp, const TargetLowering &TLI,
const DataLayout &DL, DominatorTree &DT,
bool CodeGenPrepare::combineToUSubWithOverflow(CmpInst *Cmp, DominatorTree &DT,
bool &ModifiedDT) {
// We are not expecting non-canonical/degenerate code. Just bail out.
Value *A = Cmp->getOperand(0), *B = Cmp->getOperand(1);
@ -1319,8 +1326,8 @@ static bool combineToUSubWithOverflow(CmpInst *Cmp, const TargetLowering &TLI,
if (!Sub)
return false;
if (!TLI.shouldFormOverflowOp(ISD::USUBO,
TLI.getValueType(DL, Sub->getType())))
if (!TLI->shouldFormOverflowOp(ISD::USUBO,
TLI->getValueType(*DL, Sub->getType())))
return false;
if (!replaceMathCmpWithIntrinsic(Sub, Cmp, Intrinsic::usub_with_overflow, DT))
@ -1397,16 +1404,15 @@ static bool sinkCmpExpression(CmpInst *Cmp, const TargetLowering &TLI) {
return MadeChange;
}
static bool optimizeCmp(CmpInst *Cmp, const TargetLowering &TLI,
const DataLayout &DL, DominatorTree &DT,
bool CodeGenPrepare::optimizeCmp(CmpInst *Cmp, DominatorTree &DT,
bool &ModifiedDT) {
if (sinkCmpExpression(Cmp, TLI))
if (sinkCmpExpression(Cmp, *TLI))
return true;
if (combineToUAddWithOverflow(Cmp, TLI, DL, DT, ModifiedDT))
if (combineToUAddWithOverflow(Cmp, DT, ModifiedDT))
return true;
if (combineToUSubWithOverflow(Cmp, TLI, DL, DT, ModifiedDT))
if (combineToUSubWithOverflow(Cmp, DT, ModifiedDT))
return true;
return false;
@ -6926,7 +6932,7 @@ bool CodeGenPrepare::optimizeInst(Instruction *I, DominatorTree &DT,
}
if (auto *Cmp = dyn_cast<CmpInst>(I))
if (TLI && optimizeCmp(Cmp, *TLI, *DL, DT, ModifiedDT))
if (TLI && optimizeCmp(Cmp, DT, ModifiedDT))
return true;
if (LoadInst *LI = dyn_cast<LoadInst>(I)) {