Skip to content

[mlir][NFC] update mlir/Dialect create APIs (19/n) #149926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions mlir/lib/Dialect/Index/IR/IndexOps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Operation *IndexDialect::materializeConstant(OpBuilder &b, Attribute value,
if (auto boolValue = dyn_cast<BoolAttr>(value)) {
if (!type.isSignlessInteger(1))
return nullptr;
return b.create<BoolConstantOp>(loc, type, boolValue);
return BoolConstantOp::create(b, loc, type, boolValue);
}

// Materialize integer attributes as `index`.
Expand All @@ -46,7 +46,7 @@ Operation *IndexDialect::materializeConstant(OpBuilder &b, Attribute value,
return nullptr;
assert(indexValue.getValue().getBitWidth() ==
IndexType::kInternalStorageBitWidth);
return b.create<ConstantOp>(loc, indexValue);
return ConstantOp::create(b, loc, indexValue);
}

return nullptr;
Expand Down Expand Up @@ -715,11 +715,11 @@ LogicalResult CmpOp::canonicalize(CmpOp op, PatternRewriter &rewriter) {

index::CmpOp newCmp;
if (rhsIsZero)
newCmp = rewriter.create<index::CmpOp>(op.getLoc(), op.getPred(),
subOp.getLhs(), subOp.getRhs());
newCmp = index::CmpOp::create(rewriter, op.getLoc(), op.getPred(),
subOp.getLhs(), subOp.getRhs());
else
newCmp = rewriter.create<index::CmpOp>(op.getLoc(), op.getPred(),
subOp.getRhs(), subOp.getLhs());
newCmp = index::CmpOp::create(rewriter, op.getLoc(), op.getPred(),
subOp.getRhs(), subOp.getLhs());
rewriter.replaceOp(op, newCmp);
return success();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,9 @@ struct GlobalStoreOpInterface
auto memrefType = getMemRefTypeWithStaticIdentityLayout(tensorType);

auto loc = globalStoreOp.getLoc();
auto targetMemref = rewriter.create<memref::GetGlobalOp>(
loc, memrefType, globalStoreOp.getGlobalAttr().getLeafReference());
auto targetMemref = memref::GetGlobalOp::create(
rewriter, loc, memrefType,
globalStoreOp.getGlobalAttr().getLeafReference());

auto sourceMemref =
getBuffer(rewriter, globalStoreOp.getValue(), options, state);
Expand Down
4 changes: 2 additions & 2 deletions mlir/lib/Dialect/MPI/IR/MPIOps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ struct FoldRank final : public mlir::OpRewritePattern<mlir::mpi::CommRankOp> {
if (!isa<IntegerAttr>(dltiAttr.value()))
return op->emitError()
<< "Expected an integer attribute for MPI:comm_world_rank";
Value res = b.create<arith::ConstantIndexOp>(
op.getLoc(), cast<IntegerAttr>(dltiAttr.value()).getInt());
Value res = arith::ConstantIndexOp::create(
b, op.getLoc(), cast<IntegerAttr>(dltiAttr.value()).getInt());
if (Value retVal = op.getRetval())
b.replaceOp(op, {retVal, res});
else
Expand Down
2 changes: 1 addition & 1 deletion mlir/lib/Dialect/Math/IR/MathOps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ Operation *math::MathDialect::materializeConstant(OpBuilder &builder,
Attribute value, Type type,
Location loc) {
if (auto poison = dyn_cast<ub::PoisonAttr>(value))
return builder.create<ub::PoisonOp>(loc, type, poison);
return ub::PoisonOp::create(builder, loc, type, poison);

return arith::ConstantOp::materialize(builder, value, type, loc);
}
27 changes: 14 additions & 13 deletions mlir/lib/Dialect/Math/Transforms/AlgebraicSimplification.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ PowFStrengthReduction::matchAndRewrite(math::PowFOp op,
// Maybe broadcasts scalar value into vector type compatible with `op`.
auto bcast = [&](Value value) -> Value {
if (auto vec = dyn_cast<VectorType>(op.getType()))
return rewriter.create<vector::BroadcastOp>(op.getLoc(), vec, value);
return vector::BroadcastOp::create(rewriter, op.getLoc(), vec, value);
return value;
};

Expand All @@ -84,15 +84,16 @@ PowFStrengthReduction::matchAndRewrite(math::PowFOp op,
// Replace `pow(x, 3.0)` with `x * x * x`.
if (isExponentValue(3.0)) {
Value square =
rewriter.create<arith::MulFOp>(op.getLoc(), ValueRange({x, x}));
arith::MulFOp::create(rewriter, op.getLoc(), ValueRange({x, x}));
rewriter.replaceOpWithNewOp<arith::MulFOp>(op, ValueRange({x, square}));
return success();
}

// Replace `pow(x, -1.0)` with `1.0 / x`.
if (isExponentValue(-1.0)) {
Value one = rewriter.create<arith::ConstantOp>(
loc, rewriter.getFloatAttr(getElementTypeOrSelf(op.getType()), 1.0));
Value one = arith::ConstantOp::create(
rewriter, loc,
rewriter.getFloatAttr(getElementTypeOrSelf(op.getType()), 1.0));
rewriter.replaceOpWithNewOp<arith::DivFOp>(op, ValueRange({bcast(one), x}));
return success();
}
Expand All @@ -111,8 +112,8 @@ PowFStrengthReduction::matchAndRewrite(math::PowFOp op,

// Replace `pow(x, 0.75)` with `sqrt(sqrt(x)) * sqrt(x)`.
if (isExponentValue(0.75)) {
Value powHalf = rewriter.create<math::SqrtOp>(op.getLoc(), x);
Value powQuarter = rewriter.create<math::SqrtOp>(op.getLoc(), powHalf);
Value powHalf = math::SqrtOp::create(rewriter, op.getLoc(), x);
Value powQuarter = math::SqrtOp::create(rewriter, op.getLoc(), powHalf);
rewriter.replaceOpWithNewOp<arith::MulFOp>(op,
ValueRange{powHalf, powQuarter});
return success();
Expand Down Expand Up @@ -168,18 +169,18 @@ PowIStrengthReduction<PowIOpTy, DivOpTy, MulOpTy>::matchAndRewrite(
// Maybe broadcasts scalar value into vector type compatible with `op`.
auto bcast = [&loc, &op, &rewriter](Value value) -> Value {
if (auto vec = dyn_cast<VectorType>(op.getType()))
return rewriter.create<vector::BroadcastOp>(loc, vec, value);
return vector::BroadcastOp::create(rewriter, loc, vec, value);
return value;
};

Value one;
Type opType = getElementTypeOrSelf(op.getType());
if constexpr (std::is_same_v<PowIOpTy, math::FPowIOp>)
one = rewriter.create<arith::ConstantOp>(
loc, rewriter.getFloatAttr(opType, 1.0));
one = arith::ConstantOp::create(rewriter, loc,
rewriter.getFloatAttr(opType, 1.0));
else
one = rewriter.create<arith::ConstantOp>(
loc, rewriter.getIntegerAttr(opType, 1));
one = arith::ConstantOp::create(rewriter, loc,
rewriter.getIntegerAttr(opType, 1));

// Replace `[fi]powi(x, 0)` with `1`.
if (exponentValue == 0) {
Expand Down Expand Up @@ -208,12 +209,12 @@ PowIStrengthReduction<PowIOpTy, DivOpTy, MulOpTy>::matchAndRewrite(
// with:
// (1 / x) * (1 / x) * (1 / x) * ...
for (unsigned i = 1; i < exponentValue; ++i)
result = rewriter.create<MulOpTy>(loc, result, base);
result = MulOpTy::create(rewriter, loc, result, base);

// Inverse the base for negative exponent, i.e. for
// `[fi]powi(x, negative_exponent)` set `x` to `1 / x`.
if (exponentIsNegative)
result = rewriter.create<DivOpTy>(loc, bcast(one), result);
result = DivOpTy::create(rewriter, loc, bcast(one), result);

rewriter.replaceOp(op, result);
return success();
Expand Down
Loading
Loading