Skip to content

Commit 3041fa6

Browse files
[mlir] Use *Set::insert_range (NFC) (llvm#132326)
DenseSet, SmallPtrSet, SmallSet, SetVector, and StringSet recently gained C++23-style insert_range. This patch replaces: Dest.insert(Src.begin(), Src.end()); with: Dest.insert_range(Src); This patch does not touch custom begin like succ_begin for now.
1 parent 5990056 commit 3041fa6

File tree

24 files changed

+33
-43
lines changed

24 files changed

+33
-43
lines changed

mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ struct LinalgPromotionOptions {
356356
std::optional<DenseSet<unsigned>> operandsToPromote;
357357
LinalgPromotionOptions &setOperandsToPromote(ArrayRef<int64_t> operands) {
358358
operandsToPromote = DenseSet<unsigned>();
359-
operandsToPromote->insert(operands.begin(), operands.end());
359+
operandsToPromote->insert_range(operands);
360360
return *this;
361361
}
362362
/// If ith element of `useFullTiles` is true the full view should be used

mlir/lib/Analysis/SliceAnalysis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ mlir::getSlice(Operation *op, const BackwardSliceOptions &backwardSliceOptions,
171171
// Compute and insert the backwardSlice starting from currentOp.
172172
backwardSlice.clear();
173173
getBackwardSlice(currentOp, &backwardSlice, backwardSliceOptions);
174-
slice.insert(backwardSlice.begin(), backwardSlice.end());
174+
slice.insert_range(backwardSlice);
175175

176176
// Compute and insert the forwardSlice starting from currentOp.
177177
forwardSlice.clear();
178178
getForwardSlice(currentOp, &forwardSlice, forwardSliceOptions);
179-
slice.insert(forwardSlice.begin(), forwardSlice.end());
179+
slice.insert_range(forwardSlice);
180180
++currentIndex;
181181
}
182182
return topologicalSort(slice);

mlir/lib/Analysis/TopologicalSortUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ SetVector<Block *> mlir::getBlocksSortedByDominance(Region &region) {
159159
for (Block &b : region) {
160160
if (blocks.count(&b) == 0) {
161161
llvm::ReversePostOrderTraversal<Block *> traversal(&b);
162-
blocks.insert(traversal.begin(), traversal.end());
162+
blocks.insert_range(traversal);
163163
}
164164
}
165165
assert(blocks.size() == region.getBlocks().size() &&
@@ -222,7 +222,7 @@ class TopoSortHelper {
222222
}
223223
}
224224
auto firstRange = llvm::make_first_range(regionCounts);
225-
ancestorRegions.insert(firstRange.begin(), firstRange.end());
225+
ancestorRegions.insert_range(firstRange);
226226
return res;
227227
}
228228

mlir/lib/Conversion/VectorToGPU/VectorToGPU.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ getSliceContract(Operation *op,
318318
// Compute and insert the backwardSlice starting from currentOp.
319319
backwardSlice.clear();
320320
getBackwardSlice(currentOp, &backwardSlice, backwardSliceOptions);
321-
slice.insert(backwardSlice.begin(), backwardSlice.end());
321+
slice.insert_range(backwardSlice);
322322

323323
// Compute and insert the forwardSlice starting from currentOp.
324324
forwardSlice.clear();
@@ -334,7 +334,7 @@ getSliceContract(Operation *op,
334334
} else {
335335
getForwardSlice(currentOp, &forwardSlice, forwardSliceOptions);
336336
}
337-
slice.insert(forwardSlice.begin(), forwardSlice.end());
337+
slice.insert_range(forwardSlice);
338338
++currentIndex;
339339
}
340340
return slice;
@@ -374,7 +374,7 @@ static SetVector<Operation *> getOpToConvert(mlir::Operation *op,
374374
}))
375375
return;
376376

377-
opToConvert.insert(dependentOps.begin(), dependentOps.end());
377+
opToConvert.insert_range(dependentOps);
378378
});
379379
// Sort the operations so that we can convert them in topological order.
380380
return topologicalSort(opToConvert);

mlir/lib/Dialect/Async/Transforms/AsyncToAsyncRuntime.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,7 @@ outlineExecuteOp(SymbolTable &symbolTable, ExecuteOp execute) {
306306
// Collect all outlined function inputs.
307307
SetVector<mlir::Value> functionInputs(execute.getDependencies().begin(),
308308
execute.getDependencies().end());
309-
functionInputs.insert(execute.getBodyOperands().begin(),
310-
execute.getBodyOperands().end());
309+
functionInputs.insert_range(execute.getBodyOperands());
311310
getUsedValuesDefinedAbove(execute.getBodyRegion(), functionInputs);
312311

313312
// Collect types for the outlined function inputs and outputs.

mlir/lib/Dialect/GPU/TransformOps/GPUTransformOps.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,7 @@ static DiagnosedSilenceableFailure rewriteOneForallCommonImpl(
426426
"requires statically sized, normalized forall op");
427427
SmallVector<int64_t> tmpMappingSizes = numParallelIterations.value();
428428
SetVector<Attribute> forallMappingAttrs;
429-
forallMappingAttrs.insert(forallOp.getMapping()->getValue().begin(),
430-
forallOp.getMapping()->getValue().end());
429+
forallMappingAttrs.insert_range(forallOp.getMapping()->getValue());
431430
auto comparator = [](Attribute a, Attribute b) -> bool {
432431
return cast<DeviceMappingAttrInterface>(a).getMappingId() <
433432
cast<DeviceMappingAttrInterface>(b).getMappingId();

mlir/lib/Dialect/GPU/Transforms/KernelOutlining.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ gpu::GPUFuncOp mlir::outlineKernelFunc(gpu::LaunchOp launchOp,
266266
StringRef kernelFnName,
267267
llvm::SmallVectorImpl<Value> &operands) {
268268
DenseSet<Value> inputOperandSet;
269-
inputOperandSet.insert(operands.begin(), operands.end());
269+
inputOperandSet.insert_range(operands);
270270
SetVector<Value> operandSet(operands.begin(), operands.end());
271271
auto funcOp = outlineKernelFuncImpl(launchOp, kernelFnName, operandSet);
272272
for (auto operand : operandSet) {

mlir/lib/Dialect/GPU/Utils/DistributionUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ WarpDistributionPattern::moveRegionToNewWarpOpAndAppendReturns(
7373
}
7474
}
7575
}
76-
yieldValues.insert(newYieldedValues.begin(), newYieldedValues.end());
76+
yieldValues.insert_range(newYieldedValues);
7777
WarpExecuteOnLane0Op newWarpOp = moveRegionToNewWarpOpAndReplaceReturns(
7878
rewriter, warpOp, yieldValues.getArrayRef(), types);
7979
rewriter.replaceOp(warpOp,

mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ void GenericOp::print(OpAsmPrinter &p) {
10871087
auto genericAttrNames = linalgTraitAttrNames();
10881088

10891089
llvm::StringSet<> genericAttrNamesSet;
1090-
genericAttrNamesSet.insert(genericAttrNames.begin(), genericAttrNames.end());
1090+
genericAttrNamesSet.insert_range(genericAttrNames);
10911091
SmallVector<NamedAttribute, 8> genericAttrs;
10921092
for (auto attr : (*this)->getAttrs()) {
10931093
if (attr.getName() == getIteratorTypesAttrName()) {
@@ -4884,8 +4884,7 @@ static bool inferStaticShape(PackOp packOp, SmallVectorImpl<int64_t> &srcShape,
48844884
destShape.assign(packOp.getDestType().getShape().begin(),
48854885
packOp.getDestType().getShape().end());
48864886
llvm::SmallSetVector<int64_t, 4> innerDims;
4887-
innerDims.insert(packOp.getInnerDimsPos().begin(),
4888-
packOp.getInnerDimsPos().end());
4887+
innerDims.insert_range(packOp.getInnerDimsPos());
48894888
SmallVector<int64_t> inverseOuterDimsPerm;
48904889
if (!packOp.getOuterDimsPerm().empty())
48914890
inverseOuterDimsPerm = invertPermutationVector(packOp.getOuterDimsPerm());
@@ -5197,7 +5196,7 @@ static bool inferStaticShape(UnPackOp op, SmallVectorImpl<int64_t> &srcShape,
51975196
destShape.assign(op.getDestType().getShape().begin(),
51985197
op.getDestType().getShape().end());
51995198
llvm::SmallSetVector<int64_t, 4> innerDims;
5200-
innerDims.insert(op.getInnerDimsPos().begin(), op.getInnerDimsPos().end());
5199+
innerDims.insert_range(op.getInnerDimsPos());
52015200
SmallVector<int64_t> inverseOuterDimsPerm;
52025201
if (!op.getOuterDimsPerm().empty())
52035202
inverseOuterDimsPerm = invertPermutationVector(op.getOuterDimsPerm());

mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,8 +1251,7 @@ transform::MatchOp::apply(transform::TransformRewriter &rewriter,
12511251
transform::TransformState &state) {
12521252
llvm::StringSet<> strs;
12531253
if (getOps().has_value())
1254-
strs.insert(getOps()->getAsValueRange<StringAttr>().begin(),
1255-
getOps()->getAsValueRange<StringAttr>().end());
1254+
strs.insert_range(getOps()->getAsValueRange<StringAttr>());
12561255

12571256
auto payloadOps = state.getPayloadOps(getTarget());
12581257
if (!llvm::hasSingleElement(payloadOps)) {

mlir/lib/Dialect/Linalg/Transforms/ElementwiseOpFusion.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ bool mlir::linalg::isDimSequencePreserved(AffineMap indexingMap,
12051205
"expected indexing map to be projected permutation");
12061206

12071207
llvm::SmallDenseSet<unsigned, 4> sequenceElements;
1208-
sequenceElements.insert(dimSequence.begin(), dimSequence.end());
1208+
sequenceElements.insert_range(dimSequence);
12091209

12101210
unsigned dimSequenceStart = dimSequence[0];
12111211
for (const auto &expr : enumerate(indexingMap.getResults())) {
@@ -1381,8 +1381,7 @@ getCollapsableIterationSpaceDims(GenericOp genericOp, OpOperand *fusableOperand,
13811381
}))
13821382
continue;
13831383

1384-
processedIterationDims.insert(foldedIterationSpaceDims.begin(),
1385-
foldedIterationSpaceDims.end());
1384+
processedIterationDims.insert_range(foldedIterationSpaceDims);
13861385
iterationSpaceReassociation.emplace_back(
13871386
std::move(foldedIterationSpaceDims));
13881387
}

mlir/lib/Dialect/Utils/StructuredOpsUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ Operation *mlir::cloneWithoutRegions(OpBuilder &b, Operation *op,
219219
SmallVector<NamedAttribute>
220220
mlir::getPrunedAttributeList(Operation *op, ArrayRef<StringRef> elidedAttrs) {
221221
llvm::StringSet<> elidedAttrsSet;
222-
elidedAttrsSet.insert(elidedAttrs.begin(), elidedAttrs.end());
222+
elidedAttrsSet.insert_range(elidedAttrs);
223223
SmallVector<NamedAttribute> attrs;
224224
for (auto attr : op->getAttrs()) {
225225
if (elidedAttrsSet.count(attr.getName()))

mlir/lib/Dialect/Vector/IR/VectorOps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ void ContractionOp::print(OpAsmPrinter &p) {
838838
// TODO: Unify printing code with linalg ops.
839839
auto attrNames = getTraitAttrNames();
840840
llvm::StringSet<> traitAttrsSet;
841-
traitAttrsSet.insert(attrNames.begin(), attrNames.end());
841+
traitAttrsSet.insert_range(attrNames);
842842
SmallVector<NamedAttribute, 8> attrs;
843843
for (auto attr : (*this)->getAttrs()) {
844844
if (attr.getName() == getIteratorTypesAttrName()) {

mlir/lib/IR/Location.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,7 @@ Location FusedLoc::get(ArrayRef<Location> locs, Attribute metadata,
219219
if (fusedLoc.getMetadata() == metadata) {
220220
// UnknownLoc's have already been removed from FusedLocs so we can
221221
// simply add all of the internal locations.
222-
decomposedLocs.insert(fusedLoc.getLocations().begin(),
223-
fusedLoc.getLocations().end());
222+
decomposedLocs.insert_range(fusedLoc.getLocations());
224223
continue;
225224
}
226225
}

mlir/lib/Rewrite/FrozenRewritePatternSet.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,8 @@ FrozenRewritePatternSet::FrozenRewritePatternSet(
6565
ArrayRef<std::string> enabledPatternLabels)
6666
: impl(std::make_shared<Impl>()) {
6767
DenseSet<StringRef> disabledPatterns, enabledPatterns;
68-
disabledPatterns.insert(disabledPatternLabels.begin(),
69-
disabledPatternLabels.end());
70-
enabledPatterns.insert(enabledPatternLabels.begin(),
71-
enabledPatternLabels.end());
68+
disabledPatterns.insert_range(disabledPatternLabels);
69+
enabledPatterns.insert_range(enabledPatternLabels);
7270

7371
// Functor used to walk all of the operations registered in the context. This
7472
// is useful for patterns that get applied to multiple operations, such as

mlir/lib/Target/LLVMIR/ModuleImport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ getTopologicallySortedBlocks(ArrayRef<llvm::BasicBlock *> basicBlocks) {
152152
for (llvm::BasicBlock *basicBlock : basicBlocks) {
153153
if (!blocks.contains(basicBlock)) {
154154
llvm::ReversePostOrderTraversal<llvm::BasicBlock *> traversal(basicBlock);
155-
blocks.insert(traversal.begin(), traversal.end());
155+
blocks.insert_range(traversal);
156156
}
157157
}
158158
assert(blocks.size() == basicBlocks.size() && "some blocks are not sorted");

mlir/lib/Transforms/Mem2Reg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ void MemorySlotPromotionAnalyzer::computeMergePoints(
408408
SmallVector<Block *> mergePointsVec;
409409
idfCalculator.calculate(mergePointsVec);
410410

411-
mergePoints.insert(mergePointsVec.begin(), mergePointsVec.end());
411+
mergePoints.insert_range(mergePointsVec);
412412
}
413413

414414
bool MemorySlotPromotionAnalyzer::areMergePointsUsable(

mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,11 +961,11 @@ MultiOpPatternRewriteDriver::MultiOpPatternRewriteDriver(
961961
: GreedyPatternRewriteDriver(ctx, patterns, config),
962962
survivingOps(survivingOps) {
963963
if (config.strictMode != GreedyRewriteStrictness::AnyOp)
964-
strictModeFilteredOps.insert(ops.begin(), ops.end());
964+
strictModeFilteredOps.insert_range(ops);
965965

966966
if (survivingOps) {
967967
survivingOps->clear();
968-
survivingOps->insert(ops.begin(), ops.end());
968+
survivingOps->insert_range(ops);
969969
}
970970
}
971971

mlir/test/lib/Analysis/DataFlow/TestDenseDataFlowAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class AdjacentAccess {
7676
}
7777

7878
size_t sizeBefore = accesses.size();
79-
accesses.insert(other.accesses.begin(), other.accesses.end());
79+
accesses.insert_range(other.accesses);
8080
return accesses.size() == sizeBefore ? ChangeResult::NoChange
8181
: ChangeResult::Change;
8282
}

mlir/test/lib/Analysis/DataFlow/TestSparseBackwardDataFlowAnalysis.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct WrittenToLatticeValue {
4141

4242
ChangeResult addWrites(const SetVector<StringAttr> &writes) {
4343
int sizeBefore = this->writes.size();
44-
this->writes.insert(writes.begin(), writes.end());
44+
this->writes.insert_range(writes);
4545
int sizeAfter = this->writes.size();
4646
return sizeBefore == sizeAfter ? ChangeResult::NoChange
4747
: ChangeResult::Change;

mlir/test/lib/Dialect/Linalg/TestLinalgElementwiseFusion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static void addOperands(Operation *op, SetVector<Value> &operandSet) {
2727
TypeSwitch<Operation *, void>(op)
2828
.Case<linalg::LinalgOp>([&](linalg::LinalgOp linalgOp) {
2929
SmallVector<Value> inputOperands = linalgOp.getDpsInputs();
30-
operandSet.insert(inputOperands.begin(), inputOperands.end());
30+
operandSet.insert_range(inputOperands);
3131
})
3232
.Default([&](Operation *operation) {
3333
operandSet.insert(operation->operand_begin(), operation->operand_end());

mlir/test/lib/Dialect/Vector/TestVectorTransforms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ struct TestCreateVectorBroadcast
753753
cast<DenseI64ArrayAttr>(op->getDiscardableAttr("broadcast_dims"))
754754
.asArrayRef();
755755
llvm::SetVector<int64_t> broadcastedDims;
756-
broadcastedDims.insert(arrayAttr.begin(), arrayAttr.end());
756+
broadcastedDims.insert_range(arrayAttr);
757757
OpBuilder b(op);
758758
Value bcast = vector::BroadcastOp::createOrFoldBroadcastOp(
759759
b, op->getOperand(0), targetShape, broadcastedDims);

mlir/tools/mlir-tblgen/AttrOrTypeDefGen.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,7 @@ void DefGen::emitTraitMethods(const InterfaceTrait &trait) {
551551
// Get the set of methods that should always be declared.
552552
auto alwaysDeclaredMethods = trait.getAlwaysDeclaredMethods();
553553
StringSet<> alwaysDeclared;
554-
alwaysDeclared.insert(alwaysDeclaredMethods.begin(),
555-
alwaysDeclaredMethods.end());
554+
alwaysDeclared.insert_range(alwaysDeclaredMethods);
556555

557556
Interface iface = trait.getInterface(); // causes strange bugs if elided
558557
for (auto &method : iface.getMethods()) {

mlir/tools/mlir-tblgen/OpDefinitionsGen.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3570,8 +3570,7 @@ void OpEmitter::genOpInterfaceMethods(const tblgen::InterfaceTrait *opTrait) {
35703570
// Get the set of methods that should always be declared.
35713571
auto alwaysDeclaredMethodsVec = opTrait->getAlwaysDeclaredMethods();
35723572
llvm::StringSet<> alwaysDeclaredMethods;
3573-
alwaysDeclaredMethods.insert(alwaysDeclaredMethodsVec.begin(),
3574-
alwaysDeclaredMethodsVec.end());
3573+
alwaysDeclaredMethods.insert_range(alwaysDeclaredMethodsVec);
35753574

35763575
for (const InterfaceMethod &method : interface.getMethods()) {
35773576
// Don't declare if the method has a body.

0 commit comments

Comments
 (0)