Skip to content

Commit b7146ae

Browse files
[Transforms] Construct SmallVector with ArrayRef (NFC) (#101851)
1 parent 1a9acd7 commit b7146ae

File tree

11 files changed

+24
-32
lines changed

11 files changed

+24
-32
lines changed

llvm/include/llvm/Transforms/IPO/Attributor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2247,7 +2247,7 @@ struct Attributor {
22472247
CalleeRepairCBTy &&CalleeRepairCB,
22482248
ACSRepairCBTy &&ACSRepairCB)
22492249
: A(A), ReplacedFn(*Arg.getParent()), ReplacedArg(Arg),
2250-
ReplacementTypes(ReplacementTypes.begin(), ReplacementTypes.end()),
2250+
ReplacementTypes(ReplacementTypes),
22512251
CalleeRepairCB(std::move(CalleeRepairCB)),
22522252
ACSRepairCB(std::move(ACSRepairCB)) {}
22532253

llvm/lib/Transforms/Coroutines/CoroSplit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ struct SwitchCoroutineSplitter {
16051605
ArrayRef<Function *> Fns) {
16061606
// This only works under the switch-lowering ABI because coro elision
16071607
// only works on the switch-lowering ABI.
1608-
SmallVector<Constant *, 4> Args(Fns.begin(), Fns.end());
1608+
SmallVector<Constant *, 4> Args(Fns);
16091609
assert(!Args.empty());
16101610
Function *Part = *Fns.begin();
16111611
Module *M = Part->getParent();

llvm/lib/Transforms/IPO/PartialInlining.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,10 @@ struct FunctionOutliningMultiRegionInfo {
170170

171171
// Container for outline regions
172172
struct OutlineRegionInfo {
173-
OutlineRegionInfo(ArrayRef<BasicBlock *> Region,
174-
BasicBlock *EntryBlock, BasicBlock *ExitBlock,
175-
BasicBlock *ReturnBlock)
176-
: Region(Region.begin(), Region.end()), EntryBlock(EntryBlock),
177-
ExitBlock(ExitBlock), ReturnBlock(ReturnBlock) {}
173+
OutlineRegionInfo(ArrayRef<BasicBlock *> Region, BasicBlock *EntryBlock,
174+
BasicBlock *ExitBlock, BasicBlock *ReturnBlock)
175+
: Region(Region), EntryBlock(EntryBlock), ExitBlock(ExitBlock),
176+
ReturnBlock(ReturnBlock) {}
178177
SmallVector<BasicBlock *, 8> Region;
179178
BasicBlock *EntryBlock;
180179
BasicBlock *ExitBlock;

llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,7 @@ class CHRScope {
281281

282282
private:
283283
CHRScope(ArrayRef<RegInfo> RegInfosIn, ArrayRef<CHRScope *> SubsIn)
284-
: RegInfos(RegInfosIn.begin(), RegInfosIn.end()),
285-
Subs(SubsIn.begin(), SubsIn.end()), BranchInsertPoint(nullptr) {}
284+
: RegInfos(RegInfosIn), Subs(SubsIn), BranchInsertPoint(nullptr) {}
286285
};
287286

288287
class CHR {

llvm/lib/Transforms/Scalar/LoopInterchange.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ struct LoopInterchange {
383383
}
384384

385385
bool run(LoopNest &LN) {
386-
SmallVector<Loop *, 8> LoopList(LN.getLoops().begin(), LN.getLoops().end());
386+
SmallVector<Loop *, 8> LoopList(LN.getLoops());
387387
for (unsigned I = 1; I < LoopList.size(); ++I)
388388
if (LoopList[I]->getParentLoop() != LoopList[I - 1])
389389
return false;

llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ class LowerMatrixIntrinsics {
362362
public:
363363
MatrixTy() : IsColumnMajor(MatrixLayout == MatrixLayoutTy::ColumnMajor) {}
364364
MatrixTy(ArrayRef<Value *> Vectors)
365-
: Vectors(Vectors.begin(), Vectors.end()),
365+
: Vectors(Vectors),
366366
IsColumnMajor(MatrixLayout == MatrixLayoutTy::ColumnMajor) {}
367367
MatrixTy(unsigned NumRows, unsigned NumColumns, Type *EltTy)
368368
: IsColumnMajor(MatrixLayout == MatrixLayoutTy::ColumnMajor) {

llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -971,8 +971,7 @@ bool llvm::UnrollRuntimeLoopRemainder(
971971
// (e.g. breakLoopBackedgeAndSimplify) and reused in loop-deletion.
972972
BasicBlock *RemainderLatch = remainderLoop->getLoopLatch();
973973
assert(RemainderLatch);
974-
SmallVector<BasicBlock*> RemainderBlocks(remainderLoop->getBlocks().begin(),
975-
remainderLoop->getBlocks().end());
974+
SmallVector<BasicBlock *> RemainderBlocks(remainderLoop->getBlocks());
976975
breakLoopBackedge(remainderLoop, *DT, *SE, *LI, nullptr);
977976
remainderLoop = nullptr;
978977

llvm/lib/Transforms/Utils/LoopVersioning.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ LoopVersioning::LoopVersioning(const LoopAccessInfo &LAI,
4242
ArrayRef<RuntimePointerCheck> Checks, Loop *L,
4343
LoopInfo *LI, DominatorTree *DT,
4444
ScalarEvolution *SE)
45-
: VersionedLoop(L), AliasChecks(Checks.begin(), Checks.end()),
46-
Preds(LAI.getPSE().getPredicate()), LAI(LAI), LI(LI), DT(DT),
47-
SE(SE) {
48-
}
45+
: VersionedLoop(L), AliasChecks(Checks), Preds(LAI.getPSE().getPredicate()),
46+
LAI(LAI), LI(LI), DT(DT), SE(SE) {}
4947

5048
void LoopVersioning::versionLoop(
5149
const SmallVectorImpl<Instruction *> &DefsUsedOutside) {

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8219,7 +8219,7 @@ VPWidenRecipe *VPRecipeBuilder::tryToWiden(Instruction *I,
82198219
// If not provably safe, use a select to form a safe divisor before widening the
82208220
// div/rem operation itself. Otherwise fall through to general handling below.
82218221
if (CM.isPredicatedInst(I)) {
8222-
SmallVector<VPValue *> Ops(Operands.begin(), Operands.end());
8222+
SmallVector<VPValue *> Ops(Operands);
82238223
VPValue *Mask = getBlockInMask(I->getParent());
82248224
VPValue *One =
82258225
Plan.getOrAddLiveIn(ConstantInt::get(I->getType(), 1u, false));

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

+8-11
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ class BoUpSLP {
15751575
if (I1 && I2) {
15761576
if (I1->getParent() != I2->getParent())
15771577
return CheckSameEntryOrFail();
1578-
SmallVector<Value *, 4> Ops(MainAltOps.begin(), MainAltOps.end());
1578+
SmallVector<Value *, 4> Ops(MainAltOps);
15791579
Ops.push_back(I1);
15801580
Ops.push_back(I2);
15811581
InstructionsState S = getSameOpcode(Ops, TLI);
@@ -5236,7 +5236,7 @@ void BoUpSLP::reorderNodeWithReuses(TreeEntry &TE, ArrayRef<int> Mask) const {
52365236
TE.ReorderIndices.clear();
52375237
// Try to improve gathered nodes with clustered reuses, if possible.
52385238
ArrayRef<int> Slice = ArrayRef(NewMask).slice(0, Sz);
5239-
SmallVector<unsigned> NewOrder(Slice.begin(), Slice.end());
5239+
SmallVector<unsigned> NewOrder(Slice);
52405240
inversePermutation(NewOrder, NewMask);
52415241
reorderScalars(TE.Scalars, NewMask);
52425242
// Fill the reuses mask with the identity submasks.
@@ -7916,8 +7916,7 @@ class BaseShuffleAnalysis {
79167916
}
79177917
break;
79187918
}
7919-
SmallVector<int> ShuffleMask(SV->getShuffleMask().begin(),
7920-
SV->getShuffleMask().end());
7919+
SmallVector<int> ShuffleMask(SV->getShuffleMask());
79217920
combineMasks(LocalVF, ShuffleMask, Mask);
79227921
Mask.swap(ShuffleMask);
79237922
if (IsOp2Undef)
@@ -8017,15 +8016,13 @@ class BaseShuffleAnalysis {
80178016
isUndefVector(SV2->getOperand(1), UseMask2).all()) {
80188017
Op1 = SV1->getOperand(0);
80198018
Op2 = SV2->getOperand(0);
8020-
SmallVector<int> ShuffleMask1(SV1->getShuffleMask().begin(),
8021-
SV1->getShuffleMask().end());
8019+
SmallVector<int> ShuffleMask1(SV1->getShuffleMask());
80228020
int LocalVF = ShuffleMask1.size();
80238021
if (auto *FTy = dyn_cast<FixedVectorType>(Op1->getType()))
80248022
LocalVF = FTy->getNumElements();
80258023
combineMasks(LocalVF, ShuffleMask1, CombinedMask1);
80268024
CombinedMask1.swap(ShuffleMask1);
8027-
SmallVector<int> ShuffleMask2(SV2->getShuffleMask().begin(),
8028-
SV2->getShuffleMask().end());
8025+
SmallVector<int> ShuffleMask2(SV2->getShuffleMask());
80298026
LocalVF = ShuffleMask2.size();
80308027
if (auto *FTy = dyn_cast<FixedVectorType>(Op2->getType()))
80318028
LocalVF = FTy->getNumElements();
@@ -8062,7 +8059,7 @@ class BaseShuffleAnalysis {
80628059
if (isa<PoisonValue>(V1))
80638060
return Builder.createPoison(
80648061
cast<VectorType>(V1->getType())->getElementType(), Mask.size());
8065-
SmallVector<int> NewMask(Mask.begin(), Mask.end());
8062+
SmallVector<int> NewMask(Mask);
80668063
bool IsIdentity = peekThroughShuffles(V1, NewMask, /*SinglePermute=*/true);
80678064
assert(V1 && "Expected non-null value after looking through shuffles.");
80688065

@@ -8290,7 +8287,7 @@ class BoUpSLP::ShuffleCostEstimator : public BaseShuffleAnalysis {
82908287
return TTI::TCC_Free;
82918288
auto *VecTy = getWidenedType(ScalarTy, VL.size());
82928289
InstructionCost GatherCost = 0;
8293-
SmallVector<Value *> Gathers(VL.begin(), VL.end());
8290+
SmallVector<Value *> Gathers(VL);
82948291
// Improve gather cost for gather of loads, if we can group some of the
82958292
// loads into vector loads.
82968293
InstructionsState S = getSameOpcode(VL, *R.TLI);
@@ -8725,7 +8722,7 @@ class BoUpSLP::ShuffleCostEstimator : public BaseShuffleAnalysis {
87258722
const PointerUnion<Value *, const TreeEntry *> &P2,
87268723
ArrayRef<int> Mask) {
87278724
ShuffleCostBuilder Builder(TTI);
8728-
SmallVector<int> CommonMask(Mask.begin(), Mask.end());
8725+
SmallVector<int> CommonMask(Mask);
87298726
Value *V1 = P1.dyn_cast<Value *>(), *V2 = P2.dyn_cast<Value *>();
87308727
unsigned CommonVF = Mask.size();
87318728
InstructionCost ExtraCost = 0;

llvm/lib/Transforms/Vectorize/VectorCombine.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1434,15 +1434,15 @@ bool VectorCombine::foldShuffleOfBinops(Instruction &I) {
14341434
M -= NumSrcElts;
14351435
};
14361436

1437-
SmallVector<int> NewMask0(OldMask.begin(), OldMask.end());
1437+
SmallVector<int> NewMask0(OldMask);
14381438
TargetTransformInfo::ShuffleKind SK0 = TargetTransformInfo::SK_PermuteTwoSrc;
14391439
if (X == Z) {
14401440
llvm::for_each(NewMask0, ConvertToUnary);
14411441
SK0 = TargetTransformInfo::SK_PermuteSingleSrc;
14421442
Z = PoisonValue::get(BinOpTy);
14431443
}
14441444

1445-
SmallVector<int> NewMask1(OldMask.begin(), OldMask.end());
1445+
SmallVector<int> NewMask1(OldMask);
14461446
TargetTransformInfo::ShuffleKind SK1 = TargetTransformInfo::SK_PermuteTwoSrc;
14471447
if (Y == W) {
14481448
llvm::for_each(NewMask1, ConvertToUnary);
@@ -1624,7 +1624,7 @@ bool VectorCombine::foldShuffleOfShuffles(Instruction &I) {
16241624
return false;
16251625

16261626
// Merge shuffles - replace index to the RHS poison arg with PoisonMaskElem,
1627-
SmallVector<int, 16> NewMask(OuterMask.begin(), OuterMask.end());
1627+
SmallVector<int, 16> NewMask(OuterMask);
16281628
for (int &M : NewMask) {
16291629
if (0 <= M && M < (int)NumImmElts) {
16301630
M = (InnerMask0[M] >= (int)NumSrcElts) ? PoisonMaskElem : InnerMask0[M];

0 commit comments

Comments
 (0)