[PatternMatch] Allow m_ConstantInt to match integer splats
#153692
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
... but for which the match is only used for `*->getZExtValue`
llvmbot
added
backend:Hexagon
vectorizers
llvm:instcombine
Member
|
@llvm/pr-subscribers-vectorizers @llvm/pr-subscribers-llvm-ir Author: None (zGoldthorpe) ChangesWhen matching integers, const APInt *IntC;
if (match(V, m_APInt(IntC))) {
if (IntC->ule(UINT64_MAX)) {
uint64_t Int = IntC->getZExtValue();
// ...
}
}to uint64_t Int;
if (match(V, m_ConstantInt(Int))) {
// ...
}However, this simplification is only true if This patch ensures that the matching behaviour of Full diff: https://github.com/llvm/llvm-project/pull/153692.diff 6 Files Affected:
diff --git a/llvm/include/llvm/IR/PatternMatch.h b/llvm/include/llvm/IR/PatternMatch.h
index 27c5d5ca08cd6..4f62fe93fb6f9 100644
--- a/llvm/include/llvm/IR/PatternMatch.h
+++ b/llvm/include/llvm/IR/PatternMatch.h
@@ -1013,12 +1013,13 @@ struct bind_const_intval_ty {
bind_const_intval_ty(uint64_t &V) : VR(V) {}
template <typename ITy> bool match(ITy *V) const {
- if (const auto *CV = dyn_cast<ConstantInt>(V))
- if (CV->getValue().ule(UINT64_MAX)) {
- VR = CV->getZExtValue();
- return true;
- }
- return false;
+ const APInt *ConstInt;
+ if (!apint_match(ConstInt, /*AllowPoison=*/false).match(V))
+ return false;
+ if (ConstInt->ugt(UINT64_MAX))
+ return false;
+ VR = ConstInt->getZExtValue();
+ return true;
}
};
diff --git a/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp b/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
index 3de6df568c9f4..33f916c76524e 100644
--- a/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
@@ -1677,9 +1677,9 @@ auto HvxIdioms::matchFxpMul(Instruction &In) const -> std::optional<FxpOp> {
return m_CombineOr(m_LShr(V, S), m_AShr(V, S));
};
- const APInt *Qn = nullptr;
- if (Value * T; match(Exp, m_Shr(m_Value(T), m_APInt(Qn)))) {
- Op.Frac = Qn->getZExtValue();
+ uint64_t Qn = 0;
+ if (Value * T; match(Exp, m_Shr(m_Value(T), m_ConstantInt(Qn)))) {
+ Op.Frac = Qn;
Exp = T;
} else {
Op.Frac = 0;
@@ -1689,9 +1689,9 @@ auto HvxIdioms::matchFxpMul(Instruction &In) const -> std::optional<FxpOp> {
return std::nullopt;
// Check if there is rounding added.
- const APInt *C = nullptr;
- if (Value * T; Op.Frac > 0 && match(Exp, m_Add(m_Value(T), m_APInt(C)))) {
- uint64_t CV = C->getZExtValue();
+ uint64_t CV;
+ if (Value * T;
+ Op.Frac > 0 && match(Exp, m_Add(m_Value(T), m_ConstantInt(CV)))) {
if (CV != 0 && !isPowerOf2_64(CV))
return std::nullopt;
if (CV != 0)
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
index a43a6ee1f58b0..801ac00fa8fa8 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
@@ -1131,11 +1131,10 @@ static bool canEvaluateZExtd(Value *V, Type *Ty, unsigned &BitsToClear,
case Instruction::Shl: {
// We can promote shl(x, cst) if we can promote x. Since shl overwrites the
// upper bits we can reduce BitsToClear by the shift amount.
- const APInt *Amt;
- if (match(I->getOperand(1), m_APInt(Amt))) {
+ uint64_t ShiftAmt;
+ if (match(I->getOperand(1), m_ConstantInt(ShiftAmt))) {
if (!canEvaluateZExtd(I->getOperand(0), Ty, BitsToClear, IC, CxtI))
return false;
- uint64_t ShiftAmt = Amt->getZExtValue();
BitsToClear = ShiftAmt < BitsToClear ? BitsToClear - ShiftAmt : 0;
return true;
}
@@ -1144,11 +1143,11 @@ static bool canEvaluateZExtd(Value *V, Type *Ty, unsigned &BitsToClear,
case Instruction::LShr: {
// We can promote lshr(x, cst) if we can promote x. This requires the
// ultimate 'and' to clear out the high zero bits we're clearing out though.
- const APInt *Amt;
- if (match(I->getOperand(1), m_APInt(Amt))) {
+ uint64_t ShiftAmt;
+ if (match(I->getOperand(1), m_ConstantInt(ShiftAmt))) {
if (!canEvaluateZExtd(I->getOperand(0), Ty, BitsToClear, IC, CxtI))
return false;
- BitsToClear += Amt->getZExtValue();
+ BitsToClear += ShiftAmt;
if (BitsToClear > V->getType()->getScalarSizeInBits())
BitsToClear = V->getType()->getScalarSizeInBits();
return true;
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
index a64f422c3eede..2386e7ad47fb7 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
@@ -1550,11 +1550,11 @@ Instruction *InstCombinerImpl::foldICmpTruncConstant(ICmpInst &Cmp,
// trunc iN (ShOp >> ShAmtC) to i[N - ShAmtC] < 0 --> ShOp < 0
// trunc iN (ShOp >> ShAmtC) to i[N - ShAmtC] > -1 --> ShOp > -1
Value *ShOp;
- const APInt *ShAmtC;
+ uint64_t ShAmt;
bool TrueIfSigned;
if (isSignBitCheck(Pred, C, TrueIfSigned) &&
- match(X, m_Shr(m_Value(ShOp), m_APInt(ShAmtC))) &&
- DstBits == SrcBits - ShAmtC->getZExtValue()) {
+ match(X, m_Shr(m_Value(ShOp), m_ConstantInt(ShAmt))) &&
+ DstBits == SrcBits - ShAmt) {
return TrueIfSigned ? new ICmpInst(ICmpInst::ICMP_SLT, ShOp,
ConstantInt::getNullValue(SrcTy))
: new ICmpInst(ICmpInst::ICMP_SGT, ShOp,
diff --git a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
index 737321daa9109..cc4eb2d1df8ca 100644
--- a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
@@ -319,10 +319,10 @@ static void annotateNonNullAndDereferenceable(CallInst *CI, ArrayRef<unsigned> A
annotateDereferenceableBytes(CI, ArgNos, LenC->getZExtValue());
} else if (isKnownNonZero(Size, DL)) {
annotateNonNullNoUndefBasedOnAccess(CI, ArgNos);
- const APInt *X, *Y;
+ uint64_t X, Y;
uint64_t DerefMin = 1;
- if (match(Size, m_Select(m_Value(), m_APInt(X), m_APInt(Y)))) {
- DerefMin = std::min(X->getZExtValue(), Y->getZExtValue());
+ if (match(Size, m_Select(m_Value(), m_ConstantInt(X), m_ConstantInt(Y)))) {
+ DerefMin = std::min(X, Y);
annotateDereferenceableBytes(CI, ArgNos, DerefMin);
}
}
diff --git a/llvm/lib/Transforms/Vectorize/VectorCombine.cpp b/llvm/lib/Transforms/Vectorize/VectorCombine.cpp
index 4a681cbdab8ca..45f208493cfae 100644
--- a/llvm/lib/Transforms/Vectorize/VectorCombine.cpp
+++ b/llvm/lib/Transforms/Vectorize/VectorCombine.cpp
@@ -1863,15 +1863,15 @@ bool VectorCombine::scalarizeExtExtract(Instruction &I) {
unsigned ExtCnt = 0;
bool ExtLane0 = false;
for (User *U : Ext->users()) {
- const APInt *Idx;
- if (!match(U, m_ExtractElt(m_Value(), m_APInt(Idx))))
+ uint64_t Idx;
+ if (!match(U, m_ExtractElt(m_Value(), m_ConstantInt(Idx))))
return false;
if (cast<Instruction>(U)->use_empty())
continue;
ExtCnt += 1;
- ExtLane0 |= Idx->isZero();
+ ExtLane0 |= !Idx;
VectorCost += TTI.getVectorInstrCost(Instruction::ExtractElement, DstTy,
- CostKind, Idx->getZExtValue(), U);
+ CostKind, Idx, U);
}
InstructionCost ScalarCost =
|
Member
|
@llvm/pr-subscribers-backend-hexagon Author: None (zGoldthorpe) ChangesWhen matching integers, const APInt *IntC;
if (match(V, m_APInt(IntC))) {
if (IntC->ule(UINT64_MAX)) {
uint64_t Int = IntC->getZExtValue();
// ...
}
}to uint64_t Int;
if (match(V, m_ConstantInt(Int))) {
// ...
}However, this simplification is only true if This patch ensures that the matching behaviour of Full diff: https://github.com/llvm/llvm-project/pull/153692.diff 6 Files Affected:
diff --git a/llvm/include/llvm/IR/PatternMatch.h b/llvm/include/llvm/IR/PatternMatch.h
index 27c5d5ca08cd6..4f62fe93fb6f9 100644
--- a/llvm/include/llvm/IR/PatternMatch.h
+++ b/llvm/include/llvm/IR/PatternMatch.h
@@ -1013,12 +1013,13 @@ struct bind_const_intval_ty {
bind_const_intval_ty(uint64_t &V) : VR(V) {}
template <typename ITy> bool match(ITy *V) const {
- if (const auto *CV = dyn_cast<ConstantInt>(V))
- if (CV->getValue().ule(UINT64_MAX)) {
- VR = CV->getZExtValue();
- return true;
- }
- return false;
+ const APInt *ConstInt;
+ if (!apint_match(ConstInt, /*AllowPoison=*/false).match(V))
+ return false;
+ if (ConstInt->ugt(UINT64_MAX))
+ return false;
+ VR = ConstInt->getZExtValue();
+ return true;
}
};
diff --git a/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp b/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
index 3de6df568c9f4..33f916c76524e 100644
--- a/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
@@ -1677,9 +1677,9 @@ auto HvxIdioms::matchFxpMul(Instruction &In) const -> std::optional<FxpOp> {
return m_CombineOr(m_LShr(V, S), m_AShr(V, S));
};
- const APInt *Qn = nullptr;
- if (Value * T; match(Exp, m_Shr(m_Value(T), m_APInt(Qn)))) {
- Op.Frac = Qn->getZExtValue();
+ uint64_t Qn = 0;
+ if (Value * T; match(Exp, m_Shr(m_Value(T), m_ConstantInt(Qn)))) {
+ Op.Frac = Qn;
Exp = T;
} else {
Op.Frac = 0;
@@ -1689,9 +1689,9 @@ auto HvxIdioms::matchFxpMul(Instruction &In) const -> std::optional<FxpOp> {
return std::nullopt;
// Check if there is rounding added.
- const APInt *C = nullptr;
- if (Value * T; Op.Frac > 0 && match(Exp, m_Add(m_Value(T), m_APInt(C)))) {
- uint64_t CV = C->getZExtValue();
+ uint64_t CV;
+ if (Value * T;
+ Op.Frac > 0 && match(Exp, m_Add(m_Value(T), m_ConstantInt(CV)))) {
if (CV != 0 && !isPowerOf2_64(CV))
return std::nullopt;
if (CV != 0)
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
index a43a6ee1f58b0..801ac00fa8fa8 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
@@ -1131,11 +1131,10 @@ static bool canEvaluateZExtd(Value *V, Type *Ty, unsigned &BitsToClear,
case Instruction::Shl: {
// We can promote shl(x, cst) if we can promote x. Since shl overwrites the
// upper bits we can reduce BitsToClear by the shift amount.
- const APInt *Amt;
- if (match(I->getOperand(1), m_APInt(Amt))) {
+ uint64_t ShiftAmt;
+ if (match(I->getOperand(1), m_ConstantInt(ShiftAmt))) {
if (!canEvaluateZExtd(I->getOperand(0), Ty, BitsToClear, IC, CxtI))
return false;
- uint64_t ShiftAmt = Amt->getZExtValue();
BitsToClear = ShiftAmt < BitsToClear ? BitsToClear - ShiftAmt : 0;
return true;
}
@@ -1144,11 +1143,11 @@ static bool canEvaluateZExtd(Value *V, Type *Ty, unsigned &BitsToClear,
case Instruction::LShr: {
// We can promote lshr(x, cst) if we can promote x. This requires the
// ultimate 'and' to clear out the high zero bits we're clearing out though.
- const APInt *Amt;
- if (match(I->getOperand(1), m_APInt(Amt))) {
+ uint64_t ShiftAmt;
+ if (match(I->getOperand(1), m_ConstantInt(ShiftAmt))) {
if (!canEvaluateZExtd(I->getOperand(0), Ty, BitsToClear, IC, CxtI))
return false;
- BitsToClear += Amt->getZExtValue();
+ BitsToClear += ShiftAmt;
if (BitsToClear > V->getType()->getScalarSizeInBits())
BitsToClear = V->getType()->getScalarSizeInBits();
return true;
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
index a64f422c3eede..2386e7ad47fb7 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
@@ -1550,11 +1550,11 @@ Instruction *InstCombinerImpl::foldICmpTruncConstant(ICmpInst &Cmp,
// trunc iN (ShOp >> ShAmtC) to i[N - ShAmtC] < 0 --> ShOp < 0
// trunc iN (ShOp >> ShAmtC) to i[N - ShAmtC] > -1 --> ShOp > -1
Value *ShOp;
- const APInt *ShAmtC;
+ uint64_t ShAmt;
bool TrueIfSigned;
if (isSignBitCheck(Pred, C, TrueIfSigned) &&
- match(X, m_Shr(m_Value(ShOp), m_APInt(ShAmtC))) &&
- DstBits == SrcBits - ShAmtC->getZExtValue()) {
+ match(X, m_Shr(m_Value(ShOp), m_ConstantInt(ShAmt))) &&
+ DstBits == SrcBits - ShAmt) {
return TrueIfSigned ? new ICmpInst(ICmpInst::ICMP_SLT, ShOp,
ConstantInt::getNullValue(SrcTy))
: new ICmpInst(ICmpInst::ICMP_SGT, ShOp,
diff --git a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
index 737321daa9109..cc4eb2d1df8ca 100644
--- a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
@@ -319,10 +319,10 @@ static void annotateNonNullAndDereferenceable(CallInst *CI, ArrayRef<unsigned> A
annotateDereferenceableBytes(CI, ArgNos, LenC->getZExtValue());
} else if (isKnownNonZero(Size, DL)) {
annotateNonNullNoUndefBasedOnAccess(CI, ArgNos);
- const APInt *X, *Y;
+ uint64_t X, Y;
uint64_t DerefMin = 1;
- if (match(Size, m_Select(m_Value(), m_APInt(X), m_APInt(Y)))) {
- DerefMin = std::min(X->getZExtValue(), Y->getZExtValue());
+ if (match(Size, m_Select(m_Value(), m_ConstantInt(X), m_ConstantInt(Y)))) {
+ DerefMin = std::min(X, Y);
annotateDereferenceableBytes(CI, ArgNos, DerefMin);
}
}
diff --git a/llvm/lib/Transforms/Vectorize/VectorCombine.cpp b/llvm/lib/Transforms/Vectorize/VectorCombine.cpp
index 4a681cbdab8ca..45f208493cfae 100644
--- a/llvm/lib/Transforms/Vectorize/VectorCombine.cpp
+++ b/llvm/lib/Transforms/Vectorize/VectorCombine.cpp
@@ -1863,15 +1863,15 @@ bool VectorCombine::scalarizeExtExtract(Instruction &I) {
unsigned ExtCnt = 0;
bool ExtLane0 = false;
for (User *U : Ext->users()) {
- const APInt *Idx;
- if (!match(U, m_ExtractElt(m_Value(), m_APInt(Idx))))
+ uint64_t Idx;
+ if (!match(U, m_ExtractElt(m_Value(), m_ConstantInt(Idx))))
return false;
if (cast<Instruction>(U)->use_empty())
continue;
ExtCnt += 1;
- ExtLane0 |= Idx->isZero();
+ ExtLane0 |= !Idx;
VectorCost += TTI.getVectorInstrCost(Instruction::ExtractElement, DstTy,
- CostKind, Idx->getZExtValue(), U);
+ CostKind, Idx, U);
}
InstructionCost ScalarCost =
|
Member
|
@llvm/pr-subscribers-llvm-transforms Author: None (zGoldthorpe) ChangesWhen matching integers, const APInt *IntC;
if (match(V, m_APInt(IntC))) {
if (IntC->ule(UINT64_MAX)) {
uint64_t Int = IntC->getZExtValue();
// ...
}
}to uint64_t Int;
if (match(V, m_ConstantInt(Int))) {
// ...
}However, this simplification is only true if This patch ensures that the matching behaviour of Full diff: https://github.com/llvm/llvm-project/pull/153692.diff 6 Files Affected:
diff --git a/llvm/include/llvm/IR/PatternMatch.h b/llvm/include/llvm/IR/PatternMatch.h
index 27c5d5ca08cd6..4f62fe93fb6f9 100644
--- a/llvm/include/llvm/IR/PatternMatch.h
+++ b/llvm/include/llvm/IR/PatternMatch.h
@@ -1013,12 +1013,13 @@ struct bind_const_intval_ty {
bind_const_intval_ty(uint64_t &V) : VR(V) {}
template <typename ITy> bool match(ITy *V) const {
- if (const auto *CV = dyn_cast<ConstantInt>(V))
- if (CV->getValue().ule(UINT64_MAX)) {
- VR = CV->getZExtValue();
- return true;
- }
- return false;
+ const APInt *ConstInt;
+ if (!apint_match(ConstInt, /*AllowPoison=*/false).match(V))
+ return false;
+ if (ConstInt->ugt(UINT64_MAX))
+ return false;
+ VR = ConstInt->getZExtValue();
+ return true;
}
};
diff --git a/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp b/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
index 3de6df568c9f4..33f916c76524e 100644
--- a/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp
@@ -1677,9 +1677,9 @@ auto HvxIdioms::matchFxpMul(Instruction &In) const -> std::optional<FxpOp> {
return m_CombineOr(m_LShr(V, S), m_AShr(V, S));
};
- const APInt *Qn = nullptr;
- if (Value * T; match(Exp, m_Shr(m_Value(T), m_APInt(Qn)))) {
- Op.Frac = Qn->getZExtValue();
+ uint64_t Qn = 0;
+ if (Value * T; match(Exp, m_Shr(m_Value(T), m_ConstantInt(Qn)))) {
+ Op.Frac = Qn;
Exp = T;
} else {
Op.Frac = 0;
@@ -1689,9 +1689,9 @@ auto HvxIdioms::matchFxpMul(Instruction &In) const -> std::optional<FxpOp> {
return std::nullopt;
// Check if there is rounding added.
- const APInt *C = nullptr;
- if (Value * T; Op.Frac > 0 && match(Exp, m_Add(m_Value(T), m_APInt(C)))) {
- uint64_t CV = C->getZExtValue();
+ uint64_t CV;
+ if (Value * T;
+ Op.Frac > 0 && match(Exp, m_Add(m_Value(T), m_ConstantInt(CV)))) {
if (CV != 0 && !isPowerOf2_64(CV))
return std::nullopt;
if (CV != 0)
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
index a43a6ee1f58b0..801ac00fa8fa8 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp
@@ -1131,11 +1131,10 @@ static bool canEvaluateZExtd(Value *V, Type *Ty, unsigned &BitsToClear,
case Instruction::Shl: {
// We can promote shl(x, cst) if we can promote x. Since shl overwrites the
// upper bits we can reduce BitsToClear by the shift amount.
- const APInt *Amt;
- if (match(I->getOperand(1), m_APInt(Amt))) {
+ uint64_t ShiftAmt;
+ if (match(I->getOperand(1), m_ConstantInt(ShiftAmt))) {
if (!canEvaluateZExtd(I->getOperand(0), Ty, BitsToClear, IC, CxtI))
return false;
- uint64_t ShiftAmt = Amt->getZExtValue();
BitsToClear = ShiftAmt < BitsToClear ? BitsToClear - ShiftAmt : 0;
return true;
}
@@ -1144,11 +1143,11 @@ static bool canEvaluateZExtd(Value *V, Type *Ty, unsigned &BitsToClear,
case Instruction::LShr: {
// We can promote lshr(x, cst) if we can promote x. This requires the
// ultimate 'and' to clear out the high zero bits we're clearing out though.
- const APInt *Amt;
- if (match(I->getOperand(1), m_APInt(Amt))) {
+ uint64_t ShiftAmt;
+ if (match(I->getOperand(1), m_ConstantInt(ShiftAmt))) {
if (!canEvaluateZExtd(I->getOperand(0), Ty, BitsToClear, IC, CxtI))
return false;
- BitsToClear += Amt->getZExtValue();
+ BitsToClear += ShiftAmt;
if (BitsToClear > V->getType()->getScalarSizeInBits())
BitsToClear = V->getType()->getScalarSizeInBits();
return true;
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
index a64f422c3eede..2386e7ad47fb7 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
@@ -1550,11 +1550,11 @@ Instruction *InstCombinerImpl::foldICmpTruncConstant(ICmpInst &Cmp,
// trunc iN (ShOp >> ShAmtC) to i[N - ShAmtC] < 0 --> ShOp < 0
// trunc iN (ShOp >> ShAmtC) to i[N - ShAmtC] > -1 --> ShOp > -1
Value *ShOp;
- const APInt *ShAmtC;
+ uint64_t ShAmt;
bool TrueIfSigned;
if (isSignBitCheck(Pred, C, TrueIfSigned) &&
- match(X, m_Shr(m_Value(ShOp), m_APInt(ShAmtC))) &&
- DstBits == SrcBits - ShAmtC->getZExtValue()) {
+ match(X, m_Shr(m_Value(ShOp), m_ConstantInt(ShAmt))) &&
+ DstBits == SrcBits - ShAmt) {
return TrueIfSigned ? new ICmpInst(ICmpInst::ICMP_SLT, ShOp,
ConstantInt::getNullValue(SrcTy))
: new ICmpInst(ICmpInst::ICMP_SGT, ShOp,
diff --git a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
index 737321daa9109..cc4eb2d1df8ca 100644
--- a/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp
@@ -319,10 +319,10 @@ static void annotateNonNullAndDereferenceable(CallInst *CI, ArrayRef<unsigned> A
annotateDereferenceableBytes(CI, ArgNos, LenC->getZExtValue());
} else if (isKnownNonZero(Size, DL)) {
annotateNonNullNoUndefBasedOnAccess(CI, ArgNos);
- const APInt *X, *Y;
+ uint64_t X, Y;
uint64_t DerefMin = 1;
- if (match(Size, m_Select(m_Value(), m_APInt(X), m_APInt(Y)))) {
- DerefMin = std::min(X->getZExtValue(), Y->getZExtValue());
+ if (match(Size, m_Select(m_Value(), m_ConstantInt(X), m_ConstantInt(Y)))) {
+ DerefMin = std::min(X, Y);
annotateDereferenceableBytes(CI, ArgNos, DerefMin);
}
}
diff --git a/llvm/lib/Transforms/Vectorize/VectorCombine.cpp b/llvm/lib/Transforms/Vectorize/VectorCombine.cpp
index 4a681cbdab8ca..45f208493cfae 100644
--- a/llvm/lib/Transforms/Vectorize/VectorCombine.cpp
+++ b/llvm/lib/Transforms/Vectorize/VectorCombine.cpp
@@ -1863,15 +1863,15 @@ bool VectorCombine::scalarizeExtExtract(Instruction &I) {
unsigned ExtCnt = 0;
bool ExtLane0 = false;
for (User *U : Ext->users()) {
- const APInt *Idx;
- if (!match(U, m_ExtractElt(m_Value(), m_APInt(Idx))))
+ uint64_t Idx;
+ if (!match(U, m_ExtractElt(m_Value(), m_ConstantInt(Idx))))
return false;
if (cast<Instruction>(U)->use_empty())
continue;
ExtCnt += 1;
- ExtLane0 |= Idx->isZero();
+ ExtLane0 |= !Idx;
VectorCost += TTI.getVectorInstrCost(Instruction::ExtractElement, DstTy,
- CostKind, Idx->getZExtValue(), U);
+ CostKind, Idx, U);
}
InstructionCost ScalarCost =
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
My local `clang-format` doesn't seem to like this... my mistake.
dtcxzyw
reviewed
Aug 15, 2025
Member
dtcxzyw
left a comment
dtcxzyw
left a comment
There was a problem hiding this comment.
m_ConstantInt is intended to match a scalar. We may need a separate matcher to handle constant splats.
Contributor
Whenever UseConstantIntForScalableSplat is enabled, and my understanding is that it will eventually be turned on by default, I think m_ConstantInt also matches constant splats? I wonder if we should just put more focus on enabling it by default. Is there much work left to do? cc @paulwalker-arm |
nikic
reviewed
Aug 15, 2025
Contributor
From a cursory review, m_ConstantInt is mostly used in cases where it's known that the value is scalar (extractelement index, SCEV, branch condition), so those would be unaffected if it started accepting splats as well. I don't think there is a lot of value in having a matcher that specifically forbids vectors... if that is a constraint of the transform, it would be better to make that explicit. |
Collaborator
Yes,
I agree, it would be nice to not increase the tech debt that will require removing once the default changes. The scalable vector side is very close. I'm down to my last couple of fixes, which I'll create PRs for next week. One is a global-isel unit test and the other is something caught by the llvm-test-suite (assert fires in SelectOptimize.cpp). Once those have landed I could do with somebody running the llvm-test-suite on RISCV hardware at which point I think we'll be good to try switching it on by default. My only reservation is whether any of the remaining fixed-length failures (25, of which at least 3 are positive differences) are actually vector agnostic [1], so just highlight missing test coverage on the scalable vector side. That said, from a purely functional point of view the fixed-length side of things isn't far away either. [1] I'm pretty sure |
searlmc1
pushed a commit
to ROCm/llvm-project
that referenced
this pull request
Sep 18, 2025
…3692) When matching integers, `m_ConstantInt` is a convenient alternative to `m_APInt` for matching unsigned 64-bit integers, allowing one to simplify ```cpp const APInt *IntC; if (match(V, m_APInt(IntC))) { if (IntC->ule(UINT64_MAX)) { uint64_t Int = IntC->getZExtValue(); // ... } } ``` to ```cpp uint64_t Int; if (match(V, m_ConstantInt(Int))) { // ... } ``` However, this simplification is only true if `V` is a scalar type. Specifically, `m_APInt` also matches integer splats, but `m_ConstantInt` does not. This patch ensures that the matching behaviour of `m_ConstantInt` parallels that of `m_APInt`, and also incorporates it in some obvious places.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When matching integers,
m_ConstantIntis a convenient alternative tom_APIntfor matching unsigned 64-bit integers, allowing one to simplifyto
However, this simplification is only true if
Vis a scalar type. Specifically,m_APIntalso matches integer splats, butm_ConstantIntdoes not.This patch ensures that the matching behaviour of
m_ConstantIntparallels that ofm_APInt, and also incorporates it in some obvious places.