From: Kazu Hirata Date: Wed, 15 Mar 2023 04:48:49 +0000 (-0700) Subject: [mlir] Use Use *{Set,Map}::contains (NFC) X-Git-Tag: upstream/17.0.6~14763 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce14f7b18fe137d862604a1959ff80cfa87ba844;p=platform%2Fupstream%2Fllvm.git [mlir] Use Use *{Set,Map}::contains (NFC) --- diff --git a/mlir/lib/Conversion/PDLToPDLInterp/PredicateTree.cpp b/mlir/lib/Conversion/PDLToPDLInterp/PredicateTree.cpp index 076e2a2..8ba1205 100644 --- a/mlir/lib/Conversion/PDLToPDLInterp/PredicateTree.cpp +++ b/mlir/lib/Conversion/PDLToPDLInterp/PredicateTree.cpp @@ -815,7 +815,7 @@ static void propagatePattern(std::unique_ptr &node, std::make_unique(list.pattern, list.root, std::move(node)); // If the pattern doesn't contain this predicate, ignore it. - } else if (list.predicates.find(*current) == list.predicates.end()) { + } else if (!list.predicates.contains(*current)) { propagatePattern(node, list, std::next(current), end); // If the current matcher node is invalid, create a new one for this diff --git a/mlir/lib/Conversion/SCFToGPU/SCFToGPU.cpp b/mlir/lib/Conversion/SCFToGPU/SCFToGPU.cpp index 03cf661..54ae158 100644 --- a/mlir/lib/Conversion/SCFToGPU/SCFToGPU.cpp +++ b/mlir/lib/Conversion/SCFToGPU/SCFToGPU.cpp @@ -513,7 +513,7 @@ static LogicalResult processParallelLoop( ensureLaunchIndependent(cloningMap.lookupOrDefault(step))}); // todo(herhut,ravishankarm): Update the behavior of setMappingAttr // when this condition is relaxed. - if (bounds.find(processor) != bounds.end()) { + if (bounds.contains(processor)) { return rewriter.notifyMatchFailure( parallelOp, "cannot redefine the bound for processor " + Twine(static_cast(processor))); diff --git a/mlir/lib/Dialect/Affine/Transforms/PipelineDataTransfer.cpp b/mlir/lib/Dialect/Affine/Transforms/PipelineDataTransfer.cpp index cd07b27..fc2ded3 100644 --- a/mlir/lib/Dialect/Affine/Transforms/PipelineDataTransfer.cpp +++ b/mlir/lib/Dialect/Affine/Transforms/PipelineDataTransfer.cpp @@ -346,7 +346,7 @@ void PipelineDataTransfer::runOnAffineForOp(AffineForOp forOp) { } // Everything else (including compute ops and dma finish) are shifted by one. for (auto &op : forOp.getBody()->without_terminator()) - if (instShiftMap.find(&op) == instShiftMap.end()) + if (!instShiftMap.contains(&op)) instShiftMap[&op] = 1; // Get shifts stored in map. diff --git a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp index f6a5879..f766ab6 100644 --- a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp +++ b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp @@ -1983,7 +1983,7 @@ static void createNewOperandWithStaticSizes( for (unsigned i = 0; i < sourceShape.size(); i++) { int64_t dimShape = sourceShape[i]; AffineExpr dimExpr = sourceMap.getResult(i); - if (affineExprToSize.find(dimExpr) == affineExprToSize.end() || + if (!affineExprToSize.contains(dimExpr) || !sourceType.isDynamicDim(i)) { newShape.push_back(dimShape); continue; diff --git a/mlir/lib/Dialect/SCF/Transforms/LoopPipelining.cpp b/mlir/lib/Dialect/SCF/Transforms/LoopPipelining.cpp index b76fe15..6a9f725 100644 --- a/mlir/lib/Dialect/SCF/Transforms/LoopPipelining.cpp +++ b/mlir/lib/Dialect/SCF/Transforms/LoopPipelining.cpp @@ -116,7 +116,7 @@ bool LoopPipelinerInternal::initializeLoopInfo( // All operations need to have a stage. for (Operation &op : forOp.getBody()->without_terminator()) { - if (stages.find(&op) == stages.end()) { + if (!stages.contains(&op)) { op.emitOpError("not assigned a pipeline stage"); return false; } @@ -144,7 +144,7 @@ bool LoopPipelinerInternal::initializeLoopInfo( if (llvm::any_of(forOp.getBody()->getTerminator()->getOperands(), [this](Value operand) { Operation *def = operand.getDefiningOp(); - return !def || stages.find(def) == stages.end(); + return !def || !stages.contains(def); })) return false; annotateFn = options.annotateFn; diff --git a/mlir/lib/TableGen/Operator.cpp b/mlir/lib/TableGen/Operator.cpp index 77e27cc..6855dce 100644 --- a/mlir/lib/TableGen/Operator.cpp +++ b/mlir/lib/TableGen/Operator.cpp @@ -693,7 +693,7 @@ void Operator::populateOpStructure() { auto verifyTraitValidity = [&](Record *trait) { auto *dependentTraits = trait->getValueAsListInit("dependentTraits"); for (auto *traitInit : *dependentTraits) - if (traitSet.find(traitInit) == traitSet.end()) + if (!traitSet.contains(traitInit)) PrintFatalError( def.getLoc(), trait->getValueAsString("trait") + " requires " +