[llvm] ba149f6 - [ValueTracking] Add SimplifyQuery ctor without TLI (NFC)
Nikita Popov via llvm-commits
llvm-commits at lists.llvm.org
Thu Oct 5 00:55:10 PDT 2023
Author: Nikita Popov
Date: 2023-10-05T09:55:00+02:00
New Revision: ba149f6e097242dd41aacf747bef35ba374ac467
URL: https://github.com/llvm/llvm-project/commit/ba149f6e097242dd41aacf747bef35ba374ac467
DIFF: https://github.com/llvm/llvm-project/commit/ba149f6e097242dd41aacf747bef35ba374ac467.diff
LOG: [ValueTracking] Add SimplifyQuery ctor without TLI (NFC)
While we pretty much always want to pass DT, AC and CxtI, most
places don't care about TLI. Add an overload where this is not
one of the first parameters.
Added:
Modified:
llvm/include/llvm/Analysis/InstructionSimplify.h
llvm/lib/Analysis/ValueTracking.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/Analysis/InstructionSimplify.h b/llvm/include/llvm/Analysis/InstructionSimplify.h
index 401119b3cb85247..92f199ba77d6e4b 100644
--- a/llvm/include/llvm/Analysis/InstructionSimplify.h
+++ b/llvm/include/llvm/Analysis/InstructionSimplify.h
@@ -118,6 +118,14 @@ struct SimplifyQuery {
bool CanUseUndef = true)
: DL(DL), TLI(TLI), DT(DT), AC(AC), CxtI(CXTI), IIQ(UseInstrInfo),
CanUseUndef(CanUseUndef) {}
+
+ SimplifyQuery(const DataLayout &DL, const DominatorTree *DT,
+ AssumptionCache *AC = nullptr,
+ const Instruction *CXTI = nullptr, bool UseInstrInfo = true,
+ bool CanUseUndef = true)
+ : DL(DL), DT(DT), AC(AC), CxtI(CXTI), IIQ(UseInstrInfo),
+ CanUseUndef(CanUseUndef) {}
+
SimplifyQuery getWithInstruction(Instruction *I) const {
SimplifyQuery Copy(*this);
Copy.CxtI = I;
diff --git a/llvm/lib/Analysis/ValueTracking.cpp b/llvm/lib/Analysis/ValueTracking.cpp
index eb9747d4a309f1e..b76becf24d10fc9 100644
--- a/llvm/lib/Analysis/ValueTracking.cpp
+++ b/llvm/lib/Analysis/ValueTracking.cpp
@@ -163,9 +163,9 @@ void llvm::computeKnownBits(const Value *V, KnownBits &Known,
const DataLayout &DL, unsigned Depth,
AssumptionCache *AC, const Instruction *CxtI,
const DominatorTree *DT, bool UseInstrInfo) {
- ::computeKnownBits(V, Known, Depth,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC,
- safeCxtI(V, CxtI), UseInstrInfo));
+ ::computeKnownBits(
+ V, Known, Depth,
+ SimplifyQuery(DL, DT, AC, safeCxtI(V, CxtI), UseInstrInfo));
}
void llvm::computeKnownBits(const Value *V, const APInt &DemandedElts,
@@ -173,9 +173,9 @@ void llvm::computeKnownBits(const Value *V, const APInt &DemandedElts,
unsigned Depth, AssumptionCache *AC,
const Instruction *CxtI, const DominatorTree *DT,
bool UseInstrInfo) {
- ::computeKnownBits(V, DemandedElts, Known, Depth,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC,
- safeCxtI(V, CxtI), UseInstrInfo));
+ ::computeKnownBits(
+ V, DemandedElts, Known, Depth,
+ SimplifyQuery(DL, DT, AC, safeCxtI(V, CxtI), UseInstrInfo));
}
static KnownBits computeKnownBits(const Value *V, const APInt &DemandedElts,
@@ -188,18 +188,17 @@ KnownBits llvm::computeKnownBits(const Value *V, const DataLayout &DL,
unsigned Depth, AssumptionCache *AC,
const Instruction *CxtI,
const DominatorTree *DT, bool UseInstrInfo) {
- return ::computeKnownBits(V, Depth,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC,
- safeCxtI(V, CxtI), UseInstrInfo));
+ return ::computeKnownBits(
+ V, Depth, SimplifyQuery(DL, DT, AC, safeCxtI(V, CxtI), UseInstrInfo));
}
KnownBits llvm::computeKnownBits(const Value *V, const APInt &DemandedElts,
const DataLayout &DL, unsigned Depth,
AssumptionCache *AC, const Instruction *CxtI,
const DominatorTree *DT, bool UseInstrInfo) {
- return ::computeKnownBits(V, DemandedElts, Depth,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC,
- safeCxtI(V, CxtI), UseInstrInfo));
+ return ::computeKnownBits(
+ V, DemandedElts, Depth,
+ SimplifyQuery(DL, DT, AC, safeCxtI(V, CxtI), UseInstrInfo));
}
bool llvm::haveNoCommonBitsSet(const Value *LHS, const Value *RHS,
@@ -275,10 +274,9 @@ bool llvm::isKnownToBeAPowerOfTwo(const Value *V, const DataLayout &DL,
bool OrZero, unsigned Depth,
AssumptionCache *AC, const Instruction *CxtI,
const DominatorTree *DT, bool UseInstrInfo) {
- return ::isKnownToBeAPowerOfTwo(V, OrZero, Depth,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC,
- safeCxtI(V, CxtI),
- UseInstrInfo));
+ return ::isKnownToBeAPowerOfTwo(
+ V, OrZero, Depth,
+ SimplifyQuery(DL, DT, AC, safeCxtI(V, CxtI), UseInstrInfo));
}
static bool isKnownNonZero(const Value *V, const APInt &DemandedElts,
@@ -290,9 +288,8 @@ static bool isKnownNonZero(const Value *V, unsigned Depth,
bool llvm::isKnownNonZero(const Value *V, const DataLayout &DL, unsigned Depth,
AssumptionCache *AC, const Instruction *CxtI,
const DominatorTree *DT, bool UseInstrInfo) {
- return ::isKnownNonZero(V, Depth,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC,
- safeCxtI(V, CxtI), UseInstrInfo));
+ return ::isKnownNonZero(
+ V, Depth, SimplifyQuery(DL, DT, AC, safeCxtI(V, CxtI), UseInstrInfo));
}
bool llvm::isKnownNonNegative(const Value *V, const DataLayout &DL,
@@ -329,9 +326,9 @@ bool llvm::isKnownNonEqual(const Value *V1, const Value *V2,
const DataLayout &DL, AssumptionCache *AC,
const Instruction *CxtI, const DominatorTree *DT,
bool UseInstrInfo) {
- return ::isKnownNonEqual(V1, V2, 0,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC,
- safeCxtI(V2, V1, CxtI), UseInstrInfo));
+ return ::isKnownNonEqual(
+ V1, V2, 0,
+ SimplifyQuery(DL, DT, AC, safeCxtI(V2, V1, CxtI), UseInstrInfo));
}
static bool MaskedValueIsZero(const Value *V, const APInt &Mask, unsigned Depth,
@@ -341,9 +338,9 @@ bool llvm::MaskedValueIsZero(const Value *V, const APInt &Mask,
const DataLayout &DL, unsigned Depth,
AssumptionCache *AC, const Instruction *CxtI,
const DominatorTree *DT, bool UseInstrInfo) {
- return ::MaskedValueIsZero(V, Mask, Depth,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC,
- safeCxtI(V, CxtI), UseInstrInfo));
+ return ::MaskedValueIsZero(
+ V, Mask, Depth,
+ SimplifyQuery(DL, DT, AC, safeCxtI(V, CxtI), UseInstrInfo));
}
static unsigned ComputeNumSignBits(const Value *V, const APInt &DemandedElts,
@@ -361,9 +358,8 @@ unsigned llvm::ComputeNumSignBits(const Value *V, const DataLayout &DL,
unsigned Depth, AssumptionCache *AC,
const Instruction *CxtI,
const DominatorTree *DT, bool UseInstrInfo) {
- return ::ComputeNumSignBits(V, Depth,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC,
- safeCxtI(V, CxtI), UseInstrInfo));
+ return ::ComputeNumSignBits(
+ V, Depth, SimplifyQuery(DL, DT, AC, safeCxtI(V, CxtI), UseInstrInfo));
}
unsigned llvm::ComputeMaxSignificantBits(const Value *V, const DataLayout &DL,
@@ -956,10 +952,9 @@ KnownBits llvm::analyzeKnownBitsFromAndXorOr(
APInt DemandedElts =
FVTy ? APInt::getAllOnes(FVTy->getNumElements()) : APInt(1, 1);
- return getKnownBitsFromAndXorOr(I, DemandedElts, KnownLHS, KnownRHS, Depth,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC,
- safeCxtI(I, CxtI),
- UseInstrInfo));
+ return getKnownBitsFromAndXorOr(
+ I, DemandedElts, KnownLHS, KnownRHS, Depth,
+ SimplifyQuery(DL, DT, AC, safeCxtI(I, CxtI), UseInstrInfo));
}
ConstantRange llvm::getVScaleRange(const Function *F, unsigned BitWidth) {
@@ -6383,9 +6378,8 @@ static OverflowResult computeOverflowForSignedAdd(const Value *LHS,
(LHSRange.isAllNegative() || RHSRange.isAllNegative());
if (LHSOrRHSKnownNonNegative || LHSOrRHSKnownNegative) {
KnownBits AddKnown(LHSRange.getBitWidth());
- computeKnownBitsFromAssume(
- Add, AddKnown, /*Depth=*/0,
- SimplifyQuery(DL, /*TLI*/ nullptr, DT, AC, CxtI, DT));
+ computeKnownBitsFromAssume(Add, AddKnown, /*Depth=*/0,
+ SimplifyQuery(DL, DT, AC, CxtI, DT));
if ((AddKnown.isNonNegative() && LHSOrRHSKnownNonNegative) ||
(AddKnown.isNegative() && LHSOrRHSKnownNegative))
return OverflowResult::NeverOverflows;
More information about the llvm-commits
mailing list