[mlir][emitc] Do not convert illegal types to emitc #156222
Open
+26
−2
Conversation
This file contains hidden or 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
This PR adds fallbacks for other types instead of converting unsupported types to emtic.
|
@llvm/pr-subscribers-mlir Author: Longsheng Mou (CoTinker) ChangesThis PR adds fallbacks for other types instead of converting unsupported types to emtic. Full diff: https://github.com/llvm/llvm-project/pull/156222.diff 4 Files Affected:
diff --git a/mlir/lib/Conversion/ArithToEmitC/ArithToEmitCPass.cpp b/mlir/lib/Conversion/ArithToEmitC/ArithToEmitCPass.cpp
index 45a088ed144f1..5ab1627ec40f3 100644
--- a/mlir/lib/Conversion/ArithToEmitC/ArithToEmitCPass.cpp
+++ b/mlir/lib/Conversion/ArithToEmitC/ArithToEmitCPass.cpp
@@ -42,7 +42,12 @@ void ConvertArithToEmitC::runOnOperation() {
RewritePatternSet patterns(&getContext());
TypeConverter typeConverter;
- typeConverter.addConversion([](Type type) { return type; });
+ // Fallback for other types.
+ typeConverter.addConversion([](Type type) -> std::optional<Type> {
+ if (!emitc::isSupportedEmitCType(type))
+ return {};
+ return type;
+ });
populateArithToEmitCPatterns(typeConverter, patterns);
diff --git a/mlir/lib/Conversion/FuncToEmitC/FuncToEmitCPass.cpp b/mlir/lib/Conversion/FuncToEmitC/FuncToEmitCPass.cpp
index 5b59e7675d7c6..b82a7266dc95f 100644
--- a/mlir/lib/Conversion/FuncToEmitC/FuncToEmitCPass.cpp
+++ b/mlir/lib/Conversion/FuncToEmitC/FuncToEmitCPass.cpp
@@ -41,7 +41,12 @@ void ConvertFuncToEmitC::runOnOperation() {
RewritePatternSet patterns(&getContext());
TypeConverter typeConverter;
- typeConverter.addConversion([](Type type) { return type; });
+ // Fallback for other types.
+ typeConverter.addConversion([](Type type) -> std::optional<Type> {
+ if (!emitc::isSupportedEmitCType(type))
+ return {};
+ return type;
+ });
populateFuncToEmitCPatterns(typeConverter, patterns);
diff --git a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-failed.mlir b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-failed.mlir
index 30abd81f3d447..fba4483d316f4 100644
--- a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-failed.mlir
+++ b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-failed.mlir
@@ -13,3 +13,11 @@ func.func @vector(%arg0: vector<4xi32>, %arg1: vector<4xi32>) {
%0 = arith.addi %arg0, %arg1 : vector<4xi32>
return
}
+
+// -----
+
+func.func @unsuppoted_emitc_type(%arg0: i4, %arg1: i4) {
+ // expected-error@+1 {{failed to legalize operation 'arith.addi'}}
+ %0 = arith.addi %arg0, %arg1 : i4
+ return
+}
diff --git a/mlir/test/Conversion/FuncToEmitC/func-to-emitc-failed.mlir b/mlir/test/Conversion/FuncToEmitC/func-to-emitc-failed.mlir
new file mode 100644
index 0000000000000..73b3adeedaecd
--- /dev/null
+++ b/mlir/test/Conversion/FuncToEmitC/func-to-emitc-failed.mlir
@@ -0,0 +1,6 @@
+// RUN: mlir-opt -convert-func-to-emitc %s -split-input-file -verify-diagnostics
+
+// expected-error@+1 {{failed to legalize operation 'func.func'}}
+func.func @unsuppoted_emitc_type(%arg0: i4) -> i4 {
+ return %arg0 : i4
+}
|
|
@llvm/pr-subscribers-mlir-emitc Author: Longsheng Mou (CoTinker) ChangesThis PR adds fallbacks for other types instead of converting unsupported types to emtic. Full diff: https://github.com/llvm/llvm-project/pull/156222.diff 4 Files Affected:
diff --git a/mlir/lib/Conversion/ArithToEmitC/ArithToEmitCPass.cpp b/mlir/lib/Conversion/ArithToEmitC/ArithToEmitCPass.cpp
index 45a088ed144f1..5ab1627ec40f3 100644
--- a/mlir/lib/Conversion/ArithToEmitC/ArithToEmitCPass.cpp
+++ b/mlir/lib/Conversion/ArithToEmitC/ArithToEmitCPass.cpp
@@ -42,7 +42,12 @@ void ConvertArithToEmitC::runOnOperation() {
RewritePatternSet patterns(&getContext());
TypeConverter typeConverter;
- typeConverter.addConversion([](Type type) { return type; });
+ // Fallback for other types.
+ typeConverter.addConversion([](Type type) -> std::optional<Type> {
+ if (!emitc::isSupportedEmitCType(type))
+ return {};
+ return type;
+ });
populateArithToEmitCPatterns(typeConverter, patterns);
diff --git a/mlir/lib/Conversion/FuncToEmitC/FuncToEmitCPass.cpp b/mlir/lib/Conversion/FuncToEmitC/FuncToEmitCPass.cpp
index 5b59e7675d7c6..b82a7266dc95f 100644
--- a/mlir/lib/Conversion/FuncToEmitC/FuncToEmitCPass.cpp
+++ b/mlir/lib/Conversion/FuncToEmitC/FuncToEmitCPass.cpp
@@ -41,7 +41,12 @@ void ConvertFuncToEmitC::runOnOperation() {
RewritePatternSet patterns(&getContext());
TypeConverter typeConverter;
- typeConverter.addConversion([](Type type) { return type; });
+ // Fallback for other types.
+ typeConverter.addConversion([](Type type) -> std::optional<Type> {
+ if (!emitc::isSupportedEmitCType(type))
+ return {};
+ return type;
+ });
populateFuncToEmitCPatterns(typeConverter, patterns);
diff --git a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-failed.mlir b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-failed.mlir
index 30abd81f3d447..fba4483d316f4 100644
--- a/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-failed.mlir
+++ b/mlir/test/Conversion/ArithToEmitC/arith-to-emitc-failed.mlir
@@ -13,3 +13,11 @@ func.func @vector(%arg0: vector<4xi32>, %arg1: vector<4xi32>) {
%0 = arith.addi %arg0, %arg1 : vector<4xi32>
return
}
+
+// -----
+
+func.func @unsuppoted_emitc_type(%arg0: i4, %arg1: i4) {
+ // expected-error@+1 {{failed to legalize operation 'arith.addi'}}
+ %0 = arith.addi %arg0, %arg1 : i4
+ return
+}
diff --git a/mlir/test/Conversion/FuncToEmitC/func-to-emitc-failed.mlir b/mlir/test/Conversion/FuncToEmitC/func-to-emitc-failed.mlir
new file mode 100644
index 0000000000000..73b3adeedaecd
--- /dev/null
+++ b/mlir/test/Conversion/FuncToEmitC/func-to-emitc-failed.mlir
@@ -0,0 +1,6 @@
+// RUN: mlir-opt -convert-func-to-emitc %s -split-input-file -verify-diagnostics
+
+// expected-error@+1 {{failed to legalize operation 'func.func'}}
+func.func @unsuppoted_emitc_type(%arg0: i4) -> i4 {
+ return %arg0 : i4
+}
|
|
Ping~ |
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.
This PR adds fallbacks for other types instead of converting unsupported types to emtic.