[CIR] Fix unary op folding #132269
Merged
[CIR] Fix unary op folding #132269
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
Unary ops had previously been omitted from the list of ops handled in the CIRCanonicalizePass. Although the incubator code doesn't use them directly, the mlir folding code does. This change enables folding of unary ops by adding them to the list.
llvmbot
added
clang
|
@mmha This fixes the problem you noticed earlier. |
|
@llvm/pr-subscribers-clangir @llvm/pr-subscribers-clang Author: Andy Kaylor (andykaylor) ChangesUnary ops had previously been omitted from the list of ops handled in the CIRCanonicalizePass. Although the incubator code doesn't use them directly, the mlir folding code does. This change enables folding of unary ops by adding them to the list. Full diff: https://github.com/llvm/llvm-project/pull/132269.diff 3 Files Affected:
diff --git a/clang/include/clang/CIR/MissingFeatures.h b/clang/include/clang/CIR/MissingFeatures.h
index d276af5686995..46780775dd4bd 100644
--- a/clang/include/clang/CIR/MissingFeatures.h
+++ b/clang/include/clang/CIR/MissingFeatures.h
@@ -110,7 +110,6 @@ struct MissingFeatures {
static bool brCondOp() { return false; }
static bool switchOp() { return false; }
static bool tryOp() { return false; }
- static bool unaryOp() { return false; }
static bool selectOp() { return false; }
static bool complexCreateOp() { return false; }
static bool complexRealOp() { return false; }
diff --git a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp
index d32691dba1473..6cbaf26a0bf33 100644
--- a/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp
+++ b/clang/lib/CIR/Dialect/Transforms/CIRCanonicalize.cpp
@@ -121,15 +121,14 @@ void CIRCanonicalizePass::runOnOperation() {
assert(!cir::MissingFeatures::brCondOp());
assert(!cir::MissingFeatures::switchOp());
assert(!cir::MissingFeatures::tryOp());
- assert(!cir::MissingFeatures::unaryOp());
assert(!cir::MissingFeatures::selectOp());
assert(!cir::MissingFeatures::complexCreateOp());
assert(!cir::MissingFeatures::complexRealOp());
assert(!cir::MissingFeatures::complexImagOp());
assert(!cir::MissingFeatures::callOp());
- // CastOp here is to perform a manual `fold` in
- // applyOpPatternsGreedily
- if (isa<BrOp, ScopeOp, CastOp>(op))
+ // CastOp and UnaryOp are here to perform a manual `fold` in
+ // applyOpPatternsGreedily.
+ if (isa<BrOp, ScopeOp, CastOp, UnaryOp>(op))
ops.push_back(op);
});
diff --git a/clang/test/CIR/Transforms/canonicalize.cir b/clang/test/CIR/Transforms/canonicalize.cir
index d61991aef6f01..c0c32627a1096 100644
--- a/clang/test/CIR/Transforms/canonicalize.cir
+++ b/clang/test/CIR/Transforms/canonicalize.cir
@@ -31,6 +31,14 @@ module {
// CHECK-NEXT: cir.return
// CHECK-NEXT: }
+ cir.func @unary_not(%arg0: !cir.bool) -> !cir.bool {
+ %0 = cir.unary(not, %arg0) : !cir.bool, !cir.bool
+ %1 = cir.unary(not, %0) : !cir.bool, !cir.bool
+ cir.return %1 : !cir.bool
+ }
+ // CHECK: cir.func @unary_not(%arg0: !cir.bool) -> !cir.bool
+ // CHECK: cir.return %arg0 : !cir.bool
+
cir.func @cast1(%arg0: !cir.bool) -> !cir.bool {
%0 = cir.cast(bool_to_int, %arg0 : !cir.bool), !s32i
%1 = cir.cast(int_to_bool, %0 : !s32i), !cir.bool
|
erichkeane
approved these changes
Mar 20, 2025
bcardosolopes
approved these changes
Mar 20, 2025
bcardosolopes
added a commit
to llvm/clangir
that referenced
this pull request
Mar 20, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/30/builds/18078 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/14659 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/88/builds/9410 Here is the relevant piece of the build log for the reference |
el-ev
pushed a commit
to el-ev/clangir
that referenced
this pull request
Mar 21, 2025
el-ev
pushed a commit
to el-ev/clangir
that referenced
this pull request
Mar 21, 2025
el-ev
pushed a commit
to el-ev/clangir
that referenced
this pull request
Mar 24, 2025
el-ev
pushed a commit
to el-ev/clangir
that referenced
this pull request
Mar 24, 2025
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.
Unary ops had previously been omitted from the list of ops handled in the CIRCanonicalizePass. Although the incubator code doesn't use them directly, the mlir folding code does.
This change enables folding of unary ops by adding them to the list.