[mlir] [tblgen-to-irdl] Add region support #110512
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-mlir-core Author: Alex Rice (alexarice) ChangesAdds support to exporting regions to irdl @math-fehr Full diff: https://github.com/llvm/llvm-project/pull/110512.diff 3 Files Affected:
diff --git a/mlir/include/mlir/IR/OpBase.td b/mlir/include/mlir/IR/OpBase.td
index 4481e56615b8bf..5c82c041c62eeb 100644
--- a/mlir/include/mlir/IR/OpBase.td
+++ b/mlir/include/mlir/IR/OpBase.td
@@ -206,7 +206,9 @@ def AnyRegion : Region<CPred<"true">, "any region">;
// A region with the given number of blocks.
class SizedRegion<int numBlocks> : Region<
CPred<"::llvm::hasNItems($_self, " # numBlocks # ")">,
- "region with " # numBlocks # " blocks">;
+ "region with " # numBlocks # " blocks"> {
+ int blocks = numBlocks;
+}
// A region with at least the given number of blocks.
class MinSizedRegion<int numBlocks> : Region<
diff --git a/mlir/test/tblgen-to-irdl/TestDialect.td b/mlir/test/tblgen-to-irdl/TestDialect.td
index 1ba84a5d3683d4..7f4815d865b60b 100644
--- a/mlir/test/tblgen-to-irdl/TestDialect.td
+++ b/mlir/test/tblgen-to-irdl/TestDialect.td
@@ -106,6 +106,17 @@ def Test_OrOp : Test_Op<"or"> {
// CHECK-NEXT: irdl.operands(%[[v3]])
// CHECK-NEXT: }
+// Check regions are converted correctly.
+def Test_RegionsOp : Test_Op<"regions"> {
+ let regions = (region AnyRegion:$any_region,
+ SizedRegion<1>:$single_block_region);
+}
+// CHECK-LABEL: irdl.operation @regions {
+// CHECK-NEXT: %[[v0:[^ ]*]] = irdl.region
+// CHECK-NEXT: %[[v1:[^ ]*]] = irdl.region with size 1
+// CHECK-NEXT: irdl.regions(%[[v0]], %[[v1]])
+// CHECK-NEXT: }
+
// Check that various types are converted correctly.
def Test_TypesOp : Test_Op<"types"> {
let arguments = (ins I32:$a,
diff --git a/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp b/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp
index d0a3552fb123da..79ff919f634b02 100644
--- a/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp
+++ b/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp
@@ -338,6 +338,29 @@ Value createAttrConstraint(OpBuilder &builder, tblgen::Constraint constraint) {
return createPredicate(builder, constraint.getPredicate());
}
+Value createRegionConstraint(OpBuilder &builder, tblgen::Region constraint) {
+ MLIRContext *ctx = builder.getContext();
+ const Record &predRec = constraint.getDef();
+
+ if (predRec.getName() == "AnyRegion") {
+ ValueRange entryBlockArgs = {};
+ auto op =
+ builder.create<irdl::RegionOp>(UnknownLoc::get(ctx), entryBlockArgs);
+ return op.getResult();
+ }
+
+ if (predRec.isSubClassOf("SizedRegion")) {
+ ValueRange entryBlockArgs = {};
+ auto ty = IntegerType::get(ctx, 32);
+ auto op = builder.create<irdl::RegionOp>(
+ UnknownLoc::get(ctx), entryBlockArgs,
+ IntegerAttr::get(ty, predRec.getValueAsInt("blocks")));
+ return op.getResult();
+ }
+
+ return createPredicate(builder, constraint.getPredicate());
+}
+
/// Returns the name of the operation without the dialect prefix.
static StringRef getOperatorName(tblgen::Operator &tblgenOp) {
StringRef opName = tblgenOp.getDef().getValueAsString("opName");
@@ -404,6 +427,12 @@ irdl::OperationOp createIRDLOperation(OpBuilder &builder,
attrNames.push_back(StringAttr::get(ctx, namedAttr.name));
}
+ SmallVector<Value> regions;
+ for (auto namedRegion : tblgenOp.getRegions()) {
+ regions.push_back(
+ createRegionConstraint(consBuilder, namedRegion.constraint));
+ }
+
// Create the operands and results operations.
if (!operands.empty())
consBuilder.create<irdl::OperandsOp>(UnknownLoc::get(ctx), operands,
@@ -414,6 +443,8 @@ irdl::OperationOp createIRDLOperation(OpBuilder &builder,
if (!attributes.empty())
consBuilder.create<irdl::AttributesOp>(UnknownLoc::get(ctx), attributes,
ArrayAttr::get(ctx, attrNames));
+ if (!regions.empty())
+ consBuilder.create<irdl::RegionsOp>(UnknownLoc::get(ctx), regions);
return op;
}
|
|
@llvm/pr-subscribers-mlir-ods Author: Alex Rice (alexarice) ChangesAdds support to exporting regions to irdl @math-fehr Full diff: https://github.com/llvm/llvm-project/pull/110512.diff 3 Files Affected:
diff --git a/mlir/include/mlir/IR/OpBase.td b/mlir/include/mlir/IR/OpBase.td
index 4481e56615b8bf..5c82c041c62eeb 100644
--- a/mlir/include/mlir/IR/OpBase.td
+++ b/mlir/include/mlir/IR/OpBase.td
@@ -206,7 +206,9 @@ def AnyRegion : Region<CPred<"true">, "any region">;
// A region with the given number of blocks.
class SizedRegion<int numBlocks> : Region<
CPred<"::llvm::hasNItems($_self, " # numBlocks # ")">,
- "region with " # numBlocks # " blocks">;
+ "region with " # numBlocks # " blocks"> {
+ int blocks = numBlocks;
+}
// A region with at least the given number of blocks.
class MinSizedRegion<int numBlocks> : Region<
diff --git a/mlir/test/tblgen-to-irdl/TestDialect.td b/mlir/test/tblgen-to-irdl/TestDialect.td
index 1ba84a5d3683d4..7f4815d865b60b 100644
--- a/mlir/test/tblgen-to-irdl/TestDialect.td
+++ b/mlir/test/tblgen-to-irdl/TestDialect.td
@@ -106,6 +106,17 @@ def Test_OrOp : Test_Op<"or"> {
// CHECK-NEXT: irdl.operands(%[[v3]])
// CHECK-NEXT: }
+// Check regions are converted correctly.
+def Test_RegionsOp : Test_Op<"regions"> {
+ let regions = (region AnyRegion:$any_region,
+ SizedRegion<1>:$single_block_region);
+}
+// CHECK-LABEL: irdl.operation @regions {
+// CHECK-NEXT: %[[v0:[^ ]*]] = irdl.region
+// CHECK-NEXT: %[[v1:[^ ]*]] = irdl.region with size 1
+// CHECK-NEXT: irdl.regions(%[[v0]], %[[v1]])
+// CHECK-NEXT: }
+
// Check that various types are converted correctly.
def Test_TypesOp : Test_Op<"types"> {
let arguments = (ins I32:$a,
diff --git a/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp b/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp
index d0a3552fb123da..79ff919f634b02 100644
--- a/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp
+++ b/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp
@@ -338,6 +338,29 @@ Value createAttrConstraint(OpBuilder &builder, tblgen::Constraint constraint) {
return createPredicate(builder, constraint.getPredicate());
}
+Value createRegionConstraint(OpBuilder &builder, tblgen::Region constraint) {
+ MLIRContext *ctx = builder.getContext();
+ const Record &predRec = constraint.getDef();
+
+ if (predRec.getName() == "AnyRegion") {
+ ValueRange entryBlockArgs = {};
+ auto op =
+ builder.create<irdl::RegionOp>(UnknownLoc::get(ctx), entryBlockArgs);
+ return op.getResult();
+ }
+
+ if (predRec.isSubClassOf("SizedRegion")) {
+ ValueRange entryBlockArgs = {};
+ auto ty = IntegerType::get(ctx, 32);
+ auto op = builder.create<irdl::RegionOp>(
+ UnknownLoc::get(ctx), entryBlockArgs,
+ IntegerAttr::get(ty, predRec.getValueAsInt("blocks")));
+ return op.getResult();
+ }
+
+ return createPredicate(builder, constraint.getPredicate());
+}
+
/// Returns the name of the operation without the dialect prefix.
static StringRef getOperatorName(tblgen::Operator &tblgenOp) {
StringRef opName = tblgenOp.getDef().getValueAsString("opName");
@@ -404,6 +427,12 @@ irdl::OperationOp createIRDLOperation(OpBuilder &builder,
attrNames.push_back(StringAttr::get(ctx, namedAttr.name));
}
+ SmallVector<Value> regions;
+ for (auto namedRegion : tblgenOp.getRegions()) {
+ regions.push_back(
+ createRegionConstraint(consBuilder, namedRegion.constraint));
+ }
+
// Create the operands and results operations.
if (!operands.empty())
consBuilder.create<irdl::OperandsOp>(UnknownLoc::get(ctx), operands,
@@ -414,6 +443,8 @@ irdl::OperationOp createIRDLOperation(OpBuilder &builder,
if (!attributes.empty())
consBuilder.create<irdl::AttributesOp>(UnknownLoc::get(ctx), attributes,
ArrayAttr::get(ctx, attrNames));
+ if (!regions.empty())
+ consBuilder.create<irdl::RegionsOp>(UnknownLoc::get(ctx), regions);
return op;
}
|
|
@llvm/pr-subscribers-mlir Author: Alex Rice (alexarice) ChangesAdds support to exporting regions to irdl @math-fehr Full diff: https://github.com/llvm/llvm-project/pull/110512.diff 3 Files Affected:
diff --git a/mlir/include/mlir/IR/OpBase.td b/mlir/include/mlir/IR/OpBase.td
index 4481e56615b8bf..5c82c041c62eeb 100644
--- a/mlir/include/mlir/IR/OpBase.td
+++ b/mlir/include/mlir/IR/OpBase.td
@@ -206,7 +206,9 @@ def AnyRegion : Region<CPred<"true">, "any region">;
// A region with the given number of blocks.
class SizedRegion<int numBlocks> : Region<
CPred<"::llvm::hasNItems($_self, " # numBlocks # ")">,
- "region with " # numBlocks # " blocks">;
+ "region with " # numBlocks # " blocks"> {
+ int blocks = numBlocks;
+}
// A region with at least the given number of blocks.
class MinSizedRegion<int numBlocks> : Region<
diff --git a/mlir/test/tblgen-to-irdl/TestDialect.td b/mlir/test/tblgen-to-irdl/TestDialect.td
index 1ba84a5d3683d4..7f4815d865b60b 100644
--- a/mlir/test/tblgen-to-irdl/TestDialect.td
+++ b/mlir/test/tblgen-to-irdl/TestDialect.td
@@ -106,6 +106,17 @@ def Test_OrOp : Test_Op<"or"> {
// CHECK-NEXT: irdl.operands(%[[v3]])
// CHECK-NEXT: }
+// Check regions are converted correctly.
+def Test_RegionsOp : Test_Op<"regions"> {
+ let regions = (region AnyRegion:$any_region,
+ SizedRegion<1>:$single_block_region);
+}
+// CHECK-LABEL: irdl.operation @regions {
+// CHECK-NEXT: %[[v0:[^ ]*]] = irdl.region
+// CHECK-NEXT: %[[v1:[^ ]*]] = irdl.region with size 1
+// CHECK-NEXT: irdl.regions(%[[v0]], %[[v1]])
+// CHECK-NEXT: }
+
// Check that various types are converted correctly.
def Test_TypesOp : Test_Op<"types"> {
let arguments = (ins I32:$a,
diff --git a/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp b/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp
index d0a3552fb123da..79ff919f634b02 100644
--- a/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp
+++ b/mlir/tools/tblgen-to-irdl/OpDefinitionsGen.cpp
@@ -338,6 +338,29 @@ Value createAttrConstraint(OpBuilder &builder, tblgen::Constraint constraint) {
return createPredicate(builder, constraint.getPredicate());
}
+Value createRegionConstraint(OpBuilder &builder, tblgen::Region constraint) {
+ MLIRContext *ctx = builder.getContext();
+ const Record &predRec = constraint.getDef();
+
+ if (predRec.getName() == "AnyRegion") {
+ ValueRange entryBlockArgs = {};
+ auto op =
+ builder.create<irdl::RegionOp>(UnknownLoc::get(ctx), entryBlockArgs);
+ return op.getResult();
+ }
+
+ if (predRec.isSubClassOf("SizedRegion")) {
+ ValueRange entryBlockArgs = {};
+ auto ty = IntegerType::get(ctx, 32);
+ auto op = builder.create<irdl::RegionOp>(
+ UnknownLoc::get(ctx), entryBlockArgs,
+ IntegerAttr::get(ty, predRec.getValueAsInt("blocks")));
+ return op.getResult();
+ }
+
+ return createPredicate(builder, constraint.getPredicate());
+}
+
/// Returns the name of the operation without the dialect prefix.
static StringRef getOperatorName(tblgen::Operator &tblgenOp) {
StringRef opName = tblgenOp.getDef().getValueAsString("opName");
@@ -404,6 +427,12 @@ irdl::OperationOp createIRDLOperation(OpBuilder &builder,
attrNames.push_back(StringAttr::get(ctx, namedAttr.name));
}
+ SmallVector<Value> regions;
+ for (auto namedRegion : tblgenOp.getRegions()) {
+ regions.push_back(
+ createRegionConstraint(consBuilder, namedRegion.constraint));
+ }
+
// Create the operands and results operations.
if (!operands.empty())
consBuilder.create<irdl::OperandsOp>(UnknownLoc::get(ctx), operands,
@@ -414,6 +443,8 @@ irdl::OperationOp createIRDLOperation(OpBuilder &builder,
if (!attributes.empty())
consBuilder.create<irdl::AttributesOp>(UnknownLoc::get(ctx), attributes,
ArrayAttr::get(ctx, attrNames));
+ if (!regions.empty())
+ consBuilder.create<irdl::RegionsOp>(UnknownLoc::get(ctx), regions);
return op;
}
|
math-fehr
approved these changes
Oct 3, 2024
xgupta
pushed a commit
to xgupta/llvm-project
that referenced
this pull request
Oct 4, 2024
Adds support to exporting regions.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds support to exporting regions to irdl
@math-fehr