[llvm] 05aae08 - Reland [AArch64][NFC] Call the API getVScaleRange directly
via llvm-commits
llvm-commits at lists.llvm.org
Wed Jul 26 03:55:40 PDT 2023
Author: Zhongyunde
Date: 2023-07-26T18:55:31+08:00
New Revision: 05aae0839f86957e6adf51fc2d7e4d0143568f25
URL: https://github.com/llvm/llvm-project/commit/05aae0839f86957e6adf51fc2d7e4d0143568f25
DIFF: https://github.com/llvm/llvm-project/commit/05aae0839f86957e6adf51fc2d7e4d0143568f25.diff
LOG: Reland [AArch64][NFC] Call the API getVScaleRange directly
Use the maximum 64 for BitWidth of getVScaleRange to avoid returning an empty range.
the previous changes bring in a Buildbot failure because MinSVEVectorSize = MinSVEVectorSize.
error: explicitly assigning value of variable of type 'unsigned int' to itself [-Werror,-Wself-assign]
Reviewed By: sdesmalen, nikic, dmgreen
Differential Revision: https://reviews.llvm.org/D155708
Added:
Modified:
llvm/lib/Analysis/InstructionSimplify.cpp
llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Analysis/InstructionSimplify.cpp b/llvm/lib/Analysis/InstructionSimplify.cpp
index 0bfea6140ab548..343a011119c196 100644
--- a/llvm/lib/Analysis/InstructionSimplify.cpp
+++ b/llvm/lib/Analysis/InstructionSimplify.cpp
@@ -6539,13 +6539,10 @@ static Value *simplifyIntrinsic(CallBase *Call, Value *Callee,
if (!NumOperands) {
switch (IID) {
case Intrinsic::vscale: {
- auto Attr = Call->getFunction()->getFnAttribute(Attribute::VScaleRange);
- if (!Attr.isValid())
- return nullptr;
- unsigned VScaleMin = Attr.getVScaleRangeMin();
- std::optional<unsigned> VScaleMax = Attr.getVScaleRangeMax();
- if (VScaleMax && VScaleMin == VScaleMax)
- return ConstantInt::get(F->getReturnType(), VScaleMin);
+ Type *RetTy = F->getReturnType();
+ ConstantRange CR = getVScaleRange(Call->getFunction(), 64);
+ if (const APInt *C = CR.getSingleElement())
+ return ConstantInt::get(RetTy, C->getZExtValue());
return nullptr;
}
default:
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 5c1b19eba1c1f0..ec84878f298854 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -1947,13 +1947,10 @@ SDValue SelectionDAG::getVScale(const SDLoc &DL, EVT VT, APInt MulImm,
if (ConstantFold) {
const MachineFunction &MF = getMachineFunction();
- auto Attr = MF.getFunction().getFnAttribute(Attribute::VScaleRange);
- if (Attr.isValid()) {
- unsigned VScaleMin = Attr.getVScaleRangeMin();
- if (std::optional<unsigned> VScaleMax = Attr.getVScaleRangeMax())
- if (*VScaleMax == VScaleMin)
- return getConstant(MulImm * VScaleMin, DL, VT);
- }
+ const Function &F = MF.getFunction();
+ ConstantRange CR = getVScaleRange(&F, 64);
+ if (const APInt *C = CR.getSingleElement())
+ return getConstant(MulImm * C->getZExtValue(), DL, VT);
}
return getNode(ISD::VSCALE, DL, VT, getConstant(MulImm, DL, VT));
diff --git a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
index 559879139758ba..9d03e65c979961 100644
--- a/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
+++ b/llvm/lib/Target/AArch64/AArch64TargetMachine.cpp
@@ -21,6 +21,7 @@
#include "TargetInfo/AArch64TargetInfo.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/Analysis/TargetTransformInfo.h"
+#include "llvm/Analysis/ValueTracking.h"
#include "llvm/CodeGen/CFIFixup.h"
#include "llvm/CodeGen/CSEConfigBase.h"
#include "llvm/CodeGen/GlobalISel/CSEInfo.h"
@@ -398,11 +399,10 @@ AArch64TargetMachine::getSubtargetImpl(const Function &F) const {
unsigned MinSVEVectorSize = 0;
unsigned MaxSVEVectorSize = 0;
- Attribute VScaleRangeAttr = F.getFnAttribute(Attribute::VScaleRange);
- if (VScaleRangeAttr.isValid()) {
- std::optional<unsigned> VScaleMax = VScaleRangeAttr.getVScaleRangeMax();
- MinSVEVectorSize = VScaleRangeAttr.getVScaleRangeMin() * 128;
- MaxSVEVectorSize = VScaleMax ? *VScaleMax * 128 : 0;
+ if (F.hasFnAttribute(Attribute::VScaleRange)) {
+ ConstantRange CR = getVScaleRange(&F, 64);
+ MinSVEVectorSize = CR.getUnsignedMin().getZExtValue() * 128;
+ MaxSVEVectorSize = CR.getUnsignedMax().getZExtValue() * 128;
} else {
MinSVEVectorSize = SVEVectorBitsMinOpt;
MaxSVEVectorSize = SVEVectorBitsMaxOpt;
@@ -416,13 +416,9 @@ AArch64TargetMachine::getSubtargetImpl(const Function &F) const {
"Minimum SVE vector size should not be larger than its maximum!");
// Sanitize user input in case of no asserts
- if (MaxSVEVectorSize == 0)
- MinSVEVectorSize = (MinSVEVectorSize / 128) * 128;
- else {
- MinSVEVectorSize =
- (std::min(MinSVEVectorSize, MaxSVEVectorSize) / 128) * 128;
- MaxSVEVectorSize =
- (std::max(MinSVEVectorSize, MaxSVEVectorSize) / 128) * 128;
+ if (MaxSVEVectorSize != 0) {
+ MinSVEVectorSize = std::min(MinSVEVectorSize, MaxSVEVectorSize);
+ MaxSVEVectorSize = std::max(MinSVEVectorSize, MaxSVEVectorSize);
}
SmallString<512> Key;
More information about the llvm-commits
mailing list