Skip to content

Commit 8e247b8

Browse files
committed
Replace TypeSize::{getFixed,getScalable} with canonical TypeSize::{Fixed,Scalable}. NFC
1 parent 58d4fe2 commit 8e247b8

23 files changed

+65
-67
lines changed

llvm/include/llvm/Analysis/TargetTransformInfoImpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ class TargetTransformInfoImplBase {
443443
}
444444

445445
TypeSize getRegisterBitWidth(TargetTransformInfo::RegisterKind K) const {
446-
return TypeSize::getFixed(32);
446+
return TypeSize::Fixed(32);
447447
}
448448

449449
unsigned getMinVectorRegisterBitWidth() const { return 128; }

llvm/include/llvm/CodeGen/BasicTTIImpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ class BasicTTIImplBase : public TargetTransformInfoImplCRTPBase<T> {
714714
/// @{
715715

716716
TypeSize getRegisterBitWidth(TargetTransformInfo::RegisterKind K) const {
717-
return TypeSize::getFixed(32);
717+
return TypeSize::Fixed(32);
718718
}
719719

720720
std::optional<unsigned> getMaxVScale() const { return std::nullopt; }

llvm/lib/Analysis/BasicAliasAnalysis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static std::optional<TypeSize> getObjectSize(const Value *V,
111111
Opts.RoundToAlign = RoundToAlign;
112112
Opts.NullIsUnknownSize = NullIsValidLoc;
113113
if (getObjectSize(V, Size, DL, &TLI, Opts))
114-
return TypeSize::getFixed(Size);
114+
return TypeSize::Fixed(Size);
115115
return std::nullopt;
116116
}
117117

@@ -177,7 +177,7 @@ static TypeSize getMinimalExtentFrom(const Value &V,
177177
// accessed, thus valid.
178178
if (LocSize.isPrecise())
179179
DerefBytes = std::max(DerefBytes, LocSize.getValue().getKnownMinValue());
180-
return TypeSize::getFixed(DerefBytes);
180+
return TypeSize::Fixed(DerefBytes);
181181
}
182182

183183
/// Returns true if we can prove that the object specified by V has size Size.

llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4422,7 +4422,7 @@ void DAGTypeLegalizer::ExpandIntRes_ShiftThroughStack(SDNode *N, SDValue &Lo,
44224422
// FIXME: should we be more picky about alignment?
44234423
Align StackSlotAlignment(1);
44244424
SDValue StackPtr = DAG.CreateStackTemporary(
4425-
TypeSize::getFixed(StackSlotByteWidth), StackSlotAlignment);
4425+
TypeSize::Fixed(StackSlotByteWidth), StackSlotAlignment);
44264426
EVT PtrTy = StackPtr.getValueType();
44274427
SDValue Ch = DAG.getEntryNode();
44284428

llvm/lib/IR/DebugInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1947,7 +1947,7 @@ std::optional<AssignmentInfo> at::getAssignmentInfo(const DataLayout &DL,
19471947
// We can't use a non-const size, bail.
19481948
return std::nullopt;
19491949
uint64_t SizeInBits = 8 * ConstLengthInBytes->getZExtValue();
1950-
return getAssignmentInfoImpl(DL, StoreDest, TypeSize::getFixed(SizeInBits));
1950+
return getAssignmentInfoImpl(DL, StoreDest, TypeSize::Fixed(SizeInBits));
19511951
}
19521952

19531953
std::optional<AssignmentInfo> at::getAssignmentInfo(const DataLayout &DL,

llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,21 +1961,20 @@ TypeSize
19611961
AArch64TTIImpl::getRegisterBitWidth(TargetTransformInfo::RegisterKind K) const {
19621962
switch (K) {
19631963
case TargetTransformInfo::RGK_Scalar:
1964-
return TypeSize::getFixed(64);
1964+
return TypeSize::Fixed(64);
19651965
case TargetTransformInfo::RGK_FixedWidthVector:
19661966
if (!ST->isNeonAvailable() && !EnableFixedwidthAutovecInStreamingMode)
1967-
return TypeSize::getFixed(0);
1967+
return TypeSize::Fixed(0);
19681968

19691969
if (ST->hasSVE())
1970-
return TypeSize::getFixed(
1971-
std::max(ST->getMinSVEVectorSizeInBits(), 128u));
1970+
return TypeSize::Fixed(std::max(ST->getMinSVEVectorSizeInBits(), 128u));
19721971

1973-
return TypeSize::getFixed(ST->hasNEON() ? 128 : 0);
1972+
return TypeSize::Fixed(ST->hasNEON() ? 128 : 0);
19741973
case TargetTransformInfo::RGK_ScalableVector:
19751974
if (!ST->isSVEAvailable() && !EnableScalableAutovecInStreamingMode)
1976-
return TypeSize::getScalable(0);
1975+
return TypeSize::Scalable(0);
19771976

1978-
return TypeSize::getScalable(ST->hasSVE() ? 128 : 0);
1977+
return TypeSize::Scalable(ST->hasSVE() ? 128 : 0);
19791978
}
19801979
llvm_unreachable("Unsupported register kind");
19811980
}

llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,11 @@ TypeSize
321321
GCNTTIImpl::getRegisterBitWidth(TargetTransformInfo::RegisterKind K) const {
322322
switch (K) {
323323
case TargetTransformInfo::RGK_Scalar:
324-
return TypeSize::getFixed(32);
324+
return TypeSize::Fixed(32);
325325
case TargetTransformInfo::RGK_FixedWidthVector:
326-
return TypeSize::getFixed(ST->hasPackedFP32Ops() ? 64 : 32);
326+
return TypeSize::Fixed(ST->hasPackedFP32Ops() ? 64 : 32);
327327
case TargetTransformInfo::RGK_ScalableVector:
328-
return TypeSize::getScalable(0);
328+
return TypeSize::Scalable(0);
329329
}
330330
llvm_unreachable("Unsupported register kind");
331331
}

llvm/lib/Target/AMDGPU/R600TargetTransformInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ unsigned R600TTIImpl::getNumberOfRegisters(bool Vec) const {
3838

3939
TypeSize
4040
R600TTIImpl::getRegisterBitWidth(TargetTransformInfo::RegisterKind K) const {
41-
return TypeSize::getFixed(32);
41+
return TypeSize::Fixed(32);
4242
}
4343

4444
unsigned R600TTIImpl::getMinVectorRegisterBitWidth() const { return 32; }

llvm/lib/Target/ARM/ARMTargetTransformInfo.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,15 @@ class ARMTTIImpl : public BasicTTIImplBase<ARMTTIImpl> {
165165
TypeSize getRegisterBitWidth(TargetTransformInfo::RegisterKind K) const {
166166
switch (K) {
167167
case TargetTransformInfo::RGK_Scalar:
168-
return TypeSize::getFixed(32);
168+
return TypeSize::Fixed(32);
169169
case TargetTransformInfo::RGK_FixedWidthVector:
170170
if (ST->hasNEON())
171-
return TypeSize::getFixed(128);
171+
return TypeSize::Fixed(128);
172172
if (ST->hasMVEIntegerOps())
173-
return TypeSize::getFixed(128);
174-
return TypeSize::getFixed(0);
173+
return TypeSize::Fixed(128);
174+
return TypeSize::Fixed(0);
175175
case TargetTransformInfo::RGK_ScalableVector:
176-
return TypeSize::getScalable(0);
176+
return TypeSize::Scalable(0);
177177
}
178178
llvm_unreachable("Unsupported register kind");
179179
}

llvm/lib/Target/DirectX/CBufferDataLayout.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ TypeSize LegacyCBufferLayout::getTypeAllocSize(Type *Ty) {
7676
} else if (auto *AT = dyn_cast<ArrayType>(Ty)) {
7777
unsigned NumElts = AT->getNumElements();
7878
if (NumElts == 0)
79-
return TypeSize::getFixed(0);
79+
return TypeSize::Fixed(0);
8080

8181
TypeSize EltSize = getTypeAllocSize(AT->getElementType());
8282
TypeSize AlignedEltSize = alignTo4Dwords(EltSize);
8383
// Each new element start 4 dwords aligned.
84-
return TypeSize::getFixed(AlignedEltSize * (NumElts - 1) + EltSize);
84+
return TypeSize::Fixed(AlignedEltSize * (NumElts - 1) + EltSize);
8585
} else {
8686
// NOTE: Use type store size, not align to ABI on basic types for legacy
8787
// layout.

0 commit comments

Comments
 (0)