diff --git a/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp b/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp index e6a19fb5f57be..830ae5414c6bd 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp @@ -922,8 +922,7 @@ static bool isLoopInvariantIdx(LinalgOp &linalgOp, Value &val, // TODO: We could try analysing the corresponding affine map here. auto *block = linalgOp.getBlock(); if (isa(val)) - return llvm::all_of(block->getArguments(), - [&val](Value v) { return (v != val); }); + return !llvm::is_contained(block->getArguments(), val); Operation *defOp = val.getDefiningOp(); assert(defOp && "This is neither a block argument nor an operation result"); @@ -982,8 +981,7 @@ static bool isContiguousLoadIdx(LinalgOp &linalgOp, Value &val, // TODO: We could try analysing the corresponding affine map here. auto *block = linalgOp.getBlock(); if (isa(val)) - return llvm::all_of(block->getArguments(), - [&val](Value v) { return (v != val); }); + return !llvm::is_contained(block->getArguments(), val); Operation *defOp = val.getDefiningOp(); assert(defOp && "This is neither a block argument nor an operation result"); diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp b/mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp index 84129edee3753..9e41c8ec19bcd 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp +++ b/mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp @@ -929,7 +929,7 @@ std::pair sparse_tensor::genCoIteration( ivs.push_back(uniIdx); // Ensures all operands are valid. - assert(llvm::all_of(ivs, [](Value v) { return v != nullptr; })); + assert(!llvm::is_contained(ivs, nullptr)); TypeRange types = ValueRange(ivs).getTypes(); auto whileOp = builder.create(loc, types, ivs); diff --git a/mlir/lib/Dialect/Vector/Utils/VectorUtils.cpp b/mlir/lib/Dialect/Vector/Utils/VectorUtils.cpp index 0c7cfc13f87da..674a93d7c520e 100644 --- a/mlir/lib/Dialect/Vector/Utils/VectorUtils.cpp +++ b/mlir/lib/Dialect/Vector/Utils/VectorUtils.cpp @@ -321,8 +321,7 @@ Value vector::createReadOrMaskedRead(OpBuilder &builder, Location loc, ArrayRef inputVectorSizes, Value padValue, bool useInBoundsInsteadOfMasking) { - assert(llvm::none_of(inputVectorSizes, - [](int64_t s) { return s == ShapedType::kDynamic; }) && + assert(!llvm::is_contained(inputVectorSizes, ShapedType::kDynamic) && "invalid input vector sizes"); auto sourceShapedType = cast(source.getType()); auto sourceShape = sourceShapedType.getShape(); diff --git a/mlir/tools/mlir-tblgen/AttrOrTypeDefGen.cpp b/mlir/tools/mlir-tblgen/AttrOrTypeDefGen.cpp index defd1fa12ca1a..728a9819ca0d1 100644 --- a/mlir/tools/mlir-tblgen/AttrOrTypeDefGen.cpp +++ b/mlir/tools/mlir-tblgen/AttrOrTypeDefGen.cpp @@ -253,9 +253,8 @@ void DefGen::createParentWithTraits() { // method. std::string opAsmInterfaceTraitName = strfmt("::mlir::OpAsm{0}Interface::Trait", defType); - if (def.genMnemonicAlias() && llvm::none_of(traitNames, [&](auto &traitName) { - return traitName == opAsmInterfaceTraitName; - })) { + if (def.genMnemonicAlias() && + !llvm::is_contained(traitNames, opAsmInterfaceTraitName)) { defParent.addTemplateParam(opAsmInterfaceTraitName); } defCls.addParent(std::move(defParent));