[mlir] remove dangling builders from td#147619
Conversation
| OpBuilder<(ins "mlir::ValueRange":$inputs), [{ | ||
| build($_builder, $_state, $_builder.getType<smt::IntType>(), inputs); | ||
| }]>, |
There was a problem hiding this comment.
This one is not actually dangling (clearly) but it is ambiguous/collides with build($_builder, $_state, inputs, attributes = {}). Luckily it is unused upstream. @maerhart - I grepped through CIRCT downstream and didn't come up with any hits - can you double check (i.e., can you try a build off this PR).
There was a problem hiding this comment.
Looks good to merge from my side. Thanks!
|
@llvm/pr-subscribers-mlir-linalg @llvm/pr-subscribers-mlir-openmp Author: Maksim Levental (makslevental) ChangesThese are "dangling" builders (decls are emitted but there are no defns anywhere). Full diff: https://github.com/llvm/llvm-project/pull/147619.diff 7 Files Affected:
diff --git a/flang/include/flang/Optimizer/Dialect/FIROps.td b/flang/include/flang/Optimizer/Dialect/FIROps.td
index b96c0360316ad..f440580f0878a 100644
--- a/flang/include/flang/Optimizer/Dialect/FIROps.td
+++ b/flang/include/flang/Optimizer/Dialect/FIROps.td
@@ -3624,12 +3624,6 @@ def fir_LocalitySpecifierOp : fir_Op<"local", [IsolatedFromAbove]> {
attr-dict
}];
- let builders = [
- OpBuilder<(ins CArg<"mlir::TypeRange">:$result,
- CArg<"mlir::StringAttr">:$sym_name,
- CArg<"mlir::TypeAttr">:$type)>
- ];
-
let extraClassDeclaration = [{
mlir::BlockArgument getInitMoldArg() {
auto ®ion = getInitRegion();
diff --git a/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td b/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td
index 4360055e78691..b4dde776822a1 100644
--- a/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td
+++ b/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td
@@ -582,9 +582,6 @@ def LinalgCopyToMemrefOp :
let assemblyFormat = "$target attr-dict `:` "
"functional-type(operands, results) ";
- let builders = [
- OpBuilder<(ins "Value":$target)>,
- ];
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -997,13 +994,6 @@ def PackGreedilyOp : Op<Transform_Dialect, "structured.pack_greedily", [
[DenseArrayCount<3>]>:$matmul_inner_dims_order);
let results = (outs TransformHandleTypeInterface:$packed_op);
- let builders = [
- OpBuilder<(ins "Value":$target,
- "ArrayRef<OpFoldResult>":$mixedMatmulPackedSizes,
- "ArrayRef<int64_t>":$matmulPaddededSizesNextMultipleOf,
- CArg<"ArrayRef<int64_t>", "{}">:$matmulDimsInnerDimsOrder)>
- ];
-
let assemblyFormat = [{
$target
oilist(
@@ -2509,10 +2499,6 @@ def HoistRedundantVectorTransfersOp :
let assemblyFormat = "$target attr-dict `:` functional-type(operands, results) ";
- let builders = [
- OpBuilder<(ins "Value":$target,
- CArg<"bool", "false">:$verify_non_zero_trip)>,
- ];
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2546,9 +2532,6 @@ def HoistRedundantVectorBroadcastsOp :
let assemblyFormat = "$target attr-dict `:` functional-type(operands, results) ";
- let builders = [
- OpBuilder<(ins "Value":$target)>,
- ];
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2623,10 +2606,6 @@ def ConvertConv2DToImg2ColOp : Op<Transform_Dialect,
let assemblyFormat =
"$target attr-dict `:` functional-type($target, results)";
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2666,10 +2645,6 @@ def FlattenElementwiseLinalgOp : Op<Transform_Dialect,
let assemblyFormat =
"$target attr-dict `:` functional-type($target, results)";
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2715,10 +2690,6 @@ def TransposeConv2DOp : Op<Transform_Dialect,
let assemblyFormat =
"$target attr-dict `:` functional-type($target, results)";
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2761,10 +2732,6 @@ def TransposeMatmulOp : Op<Transform_Dialect,
attr-dict `:` functional-type($target, results)
}];
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2801,9 +2768,6 @@ def InsertSliceToCopyOp :
let assemblyFormat = "$target attr-dict `:` functional-type(operands, results) ";
- let builders = [
- OpBuilder<(ins "Value":$target)>,
- ];
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2859,9 +2823,6 @@ def MapCopyToThreadsOp :
`:` functional-type(operands, results)
}];
- let builders = [
- OpBuilder<(ins "Value":$target)>,
- ];
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2910,10 +2871,6 @@ def WinogradConv2DOp : Op<Transform_Dialect,
let assemblyFormat =
"$target attr-dict `:` functional-type($target, results)";
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2947,10 +2904,6 @@ def DecomposeWinogradOp : Op<Transform_Dialect,
let assemblyFormat =
"$target attr-dict `:` functional-type($target, results)";
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
diff --git a/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td b/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
index ac80926053a2d..dffb3c5e14b62 100644
--- a/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
+++ b/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
@@ -1751,10 +1751,6 @@ def DeclareMapperInfoOp : OpenMP_Op<"declare_mapper.info", [
parent DeclareMapperOp.
}] # clausesDescription;
- let builders = [
- OpBuilder<(ins CArg<"const DeclareMapperInfoOperands &">:$clauses)>
- ];
-
let extraClassDeclaration = [{
// Override BlockArgOpenMPOpInterface method because `map` clauses have no
// associated entry block arguments in this operation.
diff --git a/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td b/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
index 1523762efc18f..440f6e571eec5 100644
--- a/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
+++ b/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
@@ -171,9 +171,6 @@ def Ptr_TypeOffsetOp : Pointer_Op<"type_offset", [Pure]> {
let arguments = (ins TypeAttr:$elementType);
let results = (outs AnySignlessIntegerOrIndex:$result);
- let builders = [
- OpBuilder<(ins "Type":$elementType)>
- ];
let assemblyFormat = [{
$elementType attr-dict `:` type($result)
}];
diff --git a/mlir/include/mlir/Dialect/SMT/IR/SMTIntOps.td b/mlir/include/mlir/Dialect/SMT/IR/SMTIntOps.td
index ea94dfd8fbd2a..4aa07a1283461 100644
--- a/mlir/include/mlir/Dialect/SMT/IR/SMTIntOps.td
+++ b/mlir/include/mlir/Dialect/SMT/IR/SMTIntOps.td
@@ -52,12 +52,6 @@ class VariadicIntOp<string mnemonic> : SMTIntOp<mnemonic, [Pure, Commutative]> {
let arguments = (ins Variadic<IntType>:$inputs);
let results = (outs IntType:$result);
let assemblyFormat = "$inputs attr-dict";
-
- let builders = [
- OpBuilder<(ins "mlir::ValueRange":$inputs), [{
- build($_builder, $_state, $_builder.getType<smt::IntType>(), inputs);
- }]>,
- ];
}
class BinaryIntOp<string mnemonic> : SMTIntOp<mnemonic, [Pure]> {
diff --git a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
index ec2c87ca1cf44..cbe490f6e4dd1 100644
--- a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
+++ b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
@@ -3011,12 +3011,7 @@ def Vector_ScanOp :
vector<4x8x16x32xf32>, vector<4x16x32xf32>
```
}];
- let builders = [
- OpBuilder<(ins "Value":$source, "Value":$initial_value,
- "CombiningKind":$kind,
- CArg<"int64_t", "0">:$reduction_dim,
- CArg<"bool", "true">:$inclusive)>
- ];
+
let extraClassDeclaration = [{
VectorType getSourceType() {
return ::llvm::cast<VectorType>(getSource().getType());
diff --git a/mlir/test/lib/Dialect/Test/TestOps.td b/mlir/test/lib/Dialect/Test/TestOps.td
index 535f5e9b4a15d..ab3f847ca2acf 100644
--- a/mlir/test/lib/Dialect/Test/TestOps.td
+++ b/mlir/test/lib/Dialect/Test/TestOps.td
@@ -1192,7 +1192,6 @@ def OpFuncRef : TEST_Op<"op_funcref"> {
let description = [{
The "test.op_funcref" is a test op with a reference to a function symbol.
}];
- let builders = [OpBuilder<(ins "::mlir::func::FuncOp":$function)>];
}
// Pattern add the argument plus a increasing static number hidden in
|
|
@llvm/pr-subscribers-flang-openmp Author: Maksim Levental (makslevental) ChangesThese are "dangling" builders (decls are emitted but there are no defns anywhere). Full diff: https://github.com/llvm/llvm-project/pull/147619.diff 7 Files Affected:
diff --git a/flang/include/flang/Optimizer/Dialect/FIROps.td b/flang/include/flang/Optimizer/Dialect/FIROps.td
index b96c0360316ad..f440580f0878a 100644
--- a/flang/include/flang/Optimizer/Dialect/FIROps.td
+++ b/flang/include/flang/Optimizer/Dialect/FIROps.td
@@ -3624,12 +3624,6 @@ def fir_LocalitySpecifierOp : fir_Op<"local", [IsolatedFromAbove]> {
attr-dict
}];
- let builders = [
- OpBuilder<(ins CArg<"mlir::TypeRange">:$result,
- CArg<"mlir::StringAttr">:$sym_name,
- CArg<"mlir::TypeAttr">:$type)>
- ];
-
let extraClassDeclaration = [{
mlir::BlockArgument getInitMoldArg() {
auto ®ion = getInitRegion();
diff --git a/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td b/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td
index 4360055e78691..b4dde776822a1 100644
--- a/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td
+++ b/mlir/include/mlir/Dialect/Linalg/TransformOps/LinalgTransformOps.td
@@ -582,9 +582,6 @@ def LinalgCopyToMemrefOp :
let assemblyFormat = "$target attr-dict `:` "
"functional-type(operands, results) ";
- let builders = [
- OpBuilder<(ins "Value":$target)>,
- ];
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -997,13 +994,6 @@ def PackGreedilyOp : Op<Transform_Dialect, "structured.pack_greedily", [
[DenseArrayCount<3>]>:$matmul_inner_dims_order);
let results = (outs TransformHandleTypeInterface:$packed_op);
- let builders = [
- OpBuilder<(ins "Value":$target,
- "ArrayRef<OpFoldResult>":$mixedMatmulPackedSizes,
- "ArrayRef<int64_t>":$matmulPaddededSizesNextMultipleOf,
- CArg<"ArrayRef<int64_t>", "{}">:$matmulDimsInnerDimsOrder)>
- ];
-
let assemblyFormat = [{
$target
oilist(
@@ -2509,10 +2499,6 @@ def HoistRedundantVectorTransfersOp :
let assemblyFormat = "$target attr-dict `:` functional-type(operands, results) ";
- let builders = [
- OpBuilder<(ins "Value":$target,
- CArg<"bool", "false">:$verify_non_zero_trip)>,
- ];
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2546,9 +2532,6 @@ def HoistRedundantVectorBroadcastsOp :
let assemblyFormat = "$target attr-dict `:` functional-type(operands, results) ";
- let builders = [
- OpBuilder<(ins "Value":$target)>,
- ];
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2623,10 +2606,6 @@ def ConvertConv2DToImg2ColOp : Op<Transform_Dialect,
let assemblyFormat =
"$target attr-dict `:` functional-type($target, results)";
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2666,10 +2645,6 @@ def FlattenElementwiseLinalgOp : Op<Transform_Dialect,
let assemblyFormat =
"$target attr-dict `:` functional-type($target, results)";
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2715,10 +2690,6 @@ def TransposeConv2DOp : Op<Transform_Dialect,
let assemblyFormat =
"$target attr-dict `:` functional-type($target, results)";
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2761,10 +2732,6 @@ def TransposeMatmulOp : Op<Transform_Dialect,
attr-dict `:` functional-type($target, results)
}];
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2801,9 +2768,6 @@ def InsertSliceToCopyOp :
let assemblyFormat = "$target attr-dict `:` functional-type(operands, results) ";
- let builders = [
- OpBuilder<(ins "Value":$target)>,
- ];
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2859,9 +2823,6 @@ def MapCopyToThreadsOp :
`:` functional-type(operands, results)
}];
- let builders = [
- OpBuilder<(ins "Value":$target)>,
- ];
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2910,10 +2871,6 @@ def WinogradConv2DOp : Op<Transform_Dialect,
let assemblyFormat =
"$target attr-dict `:` functional-type($target, results)";
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
@@ -2947,10 +2904,6 @@ def DecomposeWinogradOp : Op<Transform_Dialect,
let assemblyFormat =
"$target attr-dict `:` functional-type($target, results)";
- let builders = [
- OpBuilder<(ins "Value":$target)>
- ];
-
let extraClassDeclaration = [{
::mlir::DiagnosedSilenceableFailure applyToOne(
::mlir::transform::TransformRewriter &rewriter,
diff --git a/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td b/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
index ac80926053a2d..dffb3c5e14b62 100644
--- a/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
+++ b/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
@@ -1751,10 +1751,6 @@ def DeclareMapperInfoOp : OpenMP_Op<"declare_mapper.info", [
parent DeclareMapperOp.
}] # clausesDescription;
- let builders = [
- OpBuilder<(ins CArg<"const DeclareMapperInfoOperands &">:$clauses)>
- ];
-
let extraClassDeclaration = [{
// Override BlockArgOpenMPOpInterface method because `map` clauses have no
// associated entry block arguments in this operation.
diff --git a/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td b/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
index 1523762efc18f..440f6e571eec5 100644
--- a/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
+++ b/mlir/include/mlir/Dialect/Ptr/IR/PtrOps.td
@@ -171,9 +171,6 @@ def Ptr_TypeOffsetOp : Pointer_Op<"type_offset", [Pure]> {
let arguments = (ins TypeAttr:$elementType);
let results = (outs AnySignlessIntegerOrIndex:$result);
- let builders = [
- OpBuilder<(ins "Type":$elementType)>
- ];
let assemblyFormat = [{
$elementType attr-dict `:` type($result)
}];
diff --git a/mlir/include/mlir/Dialect/SMT/IR/SMTIntOps.td b/mlir/include/mlir/Dialect/SMT/IR/SMTIntOps.td
index ea94dfd8fbd2a..4aa07a1283461 100644
--- a/mlir/include/mlir/Dialect/SMT/IR/SMTIntOps.td
+++ b/mlir/include/mlir/Dialect/SMT/IR/SMTIntOps.td
@@ -52,12 +52,6 @@ class VariadicIntOp<string mnemonic> : SMTIntOp<mnemonic, [Pure, Commutative]> {
let arguments = (ins Variadic<IntType>:$inputs);
let results = (outs IntType:$result);
let assemblyFormat = "$inputs attr-dict";
-
- let builders = [
- OpBuilder<(ins "mlir::ValueRange":$inputs), [{
- build($_builder, $_state, $_builder.getType<smt::IntType>(), inputs);
- }]>,
- ];
}
class BinaryIntOp<string mnemonic> : SMTIntOp<mnemonic, [Pure]> {
diff --git a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
index ec2c87ca1cf44..cbe490f6e4dd1 100644
--- a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
+++ b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
@@ -3011,12 +3011,7 @@ def Vector_ScanOp :
vector<4x8x16x32xf32>, vector<4x16x32xf32>
```
}];
- let builders = [
- OpBuilder<(ins "Value":$source, "Value":$initial_value,
- "CombiningKind":$kind,
- CArg<"int64_t", "0">:$reduction_dim,
- CArg<"bool", "true">:$inclusive)>
- ];
+
let extraClassDeclaration = [{
VectorType getSourceType() {
return ::llvm::cast<VectorType>(getSource().getType());
diff --git a/mlir/test/lib/Dialect/Test/TestOps.td b/mlir/test/lib/Dialect/Test/TestOps.td
index 535f5e9b4a15d..ab3f847ca2acf 100644
--- a/mlir/test/lib/Dialect/Test/TestOps.td
+++ b/mlir/test/lib/Dialect/Test/TestOps.td
@@ -1192,7 +1192,6 @@ def OpFuncRef : TEST_Op<"op_funcref"> {
let description = [{
The "test.op_funcref" is a test op with a reference to a function symbol.
}];
- let builders = [OpBuilder<(ins "::mlir::func::FuncOp":$function)>];
}
// Pattern add the argument plus a increasing static number hidden in
|
joker-eph
left a comment
There was a problem hiding this comment.
Thanks for the cleanup!
bump to llvm/llvm-project@3ed3a33 This PR removes "dangling" builders for fixing compatibility issue caused by [2eb733b](llvm/llvm-project@2eb733b) as similar to PR llvm/llvm-project#147619. Similarly, this PR also add changes to stablehole: iree-org/stablehlo@7c08581, and add changes to torch-mlir: iree-org/torch-mlir@1983b6d. Revert llvm/llvm-project@1fdbe69 as it causes failures in IREE's end-to-end matmul tests on the CUDA backend. --------- Signed-off-by: Bangtian Liu <liubangtian@gmail.com>
bump to llvm/llvm-project@3ed3a33 This PR removes "dangling" builders for fixing compatibility issue caused by [2eb733b](llvm/llvm-project@2eb733b) as similar to PR llvm/llvm-project#147619. Similarly, this PR also add changes to stablehole: iree-org/stablehlo@7c08581, and add changes to torch-mlir: iree-org/torch-mlir@1983b6d. Revert llvm/llvm-project@1fdbe69 as it causes failures in IREE's end-to-end matmul tests on the CUDA backend. --------- Signed-off-by: Bangtian Liu <liubangtian@gmail.com>
These are "dangling" builders (decls are emitted but there are no defns anywhere).