[mlir][arith] Fold arith.cmpi eq, %val, %one : i1 -> %val and arith.cmpi ne, %val, %zero : i1 -> %val
#124436
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
Hardcode84
requested review from
krzysz00,
matthias-springer,
joker-eph and
kuhar
|
@llvm/pr-subscribers-flang-fir-hlfir @llvm/pr-subscribers-mlir Author: Ivan Butygin (Hardcode84) ChangesFull diff: https://github.com/llvm/llvm-project/pull/124436.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Arith/IR/ArithOps.cpp b/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
index 7ca104691e6df6..75d59ba8c1a108 100644
--- a/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
+++ b/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
@@ -1865,6 +1865,18 @@ OpFoldResult arith::CmpIOp::fold(FoldAdaptor adaptor) {
getPredicate() == arith::CmpIPredicate::ne)
return extOp.getOperand();
}
+
+ // arith.cmpi ne, %val, %zero : i1 -> %val
+ if (getElementTypeOrSelf(getLhs().getType()).isInteger(1) &&
+ getPredicate() == arith::CmpIPredicate::ne)
+ return getLhs();
+ }
+
+ if (matchPattern(adaptor.getRhs(), m_One())) {
+ // arith.cmpi eq, %val, %one : i1 -> %val
+ if (getElementTypeOrSelf(getLhs().getType()).isInteger(1) &&
+ getPredicate() == arith::CmpIPredicate::eq)
+ return getLhs();
}
// Move constant to the right side.
diff --git a/mlir/test/Dialect/Arith/canonicalize.mlir b/mlir/test/Dialect/Arith/canonicalize.mlir
index 522711b08f289d..3a16ee3d4f8fde 100644
--- a/mlir/test/Dialect/Arith/canonicalize.mlir
+++ b/mlir/test/Dialect/Arith/canonicalize.mlir
@@ -160,6 +160,78 @@ func.func @selNotCond(%arg0: i1, %arg1 : i32, %arg2 : i32, %arg3 : i32, %arg4 :
return %res1, %res2 : i32, i32
}
+// CHECK-LABEL: @cmpiI1eq
+// CHECK-SAME: (%[[ARG:.*]]: i1)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1eq(%arg0: i1) -> i1 {
+ %one = arith.constant 1 : i1
+ %res = arith.cmpi eq, %arg0, %one : i1
+ return %res : i1
+}
+
+// CHECK-LABEL: @cmpiI1eqVec
+// CHECK-SAME: (%[[ARG:.*]]: vector<4xi1>)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1eqVec(%arg0: vector<4xi1>) -> vector<4xi1> {
+ %one = arith.constant dense<1> : vector<4xi1>
+ %res = arith.cmpi eq, %arg0, %one : vector<4xi1>
+ return %res : vector<4xi1>
+}
+
+// CHECK-LABEL: @cmpiI1ne
+// CHECK-SAME: (%[[ARG:.*]]: i1)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1ne(%arg0: i1) -> i1 {
+ %zero = arith.constant 0 : i1
+ %res = arith.cmpi ne, %arg0, %zero : i1
+ return %res : i1
+}
+
+// CHECK-LABEL: @cmpiI1neVec
+// CHECK-SAME: (%[[ARG:.*]]: vector<4xi1>)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1neVec(%arg0: vector<4xi1>) -> vector<4xi1> {
+ %zero = arith.constant dense<0> : vector<4xi1>
+ %res = arith.cmpi ne, %arg0, %zero : vector<4xi1>
+ return %res : vector<4xi1>
+}
+
+// CHECK-LABEL: @cmpiI1eqLhs
+// CHECK-SAME: (%[[ARG:.*]]: i1)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1eqLhs(%arg0: i1) -> i1 {
+ %one = arith.constant 1 : i1
+ %res = arith.cmpi eq, %one, %arg0 : i1
+ return %res : i1
+}
+
+// CHECK-LABEL: @cmpiI1eqVecLhs
+// CHECK-SAME: (%[[ARG:.*]]: vector<4xi1>)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1eqVecLhs(%arg0: vector<4xi1>) -> vector<4xi1> {
+ %one = arith.constant dense<1> : vector<4xi1>
+ %res = arith.cmpi eq, %one, %arg0 : vector<4xi1>
+ return %res : vector<4xi1>
+}
+
+// CHECK-LABEL: @cmpiI1neLhs
+// CHECK-SAME: (%[[ARG:.*]]: i1)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1neLhs(%arg0: i1) -> i1 {
+ %zero = arith.constant 0 : i1
+ %res = arith.cmpi ne, %zero, %arg0 : i1
+ return %res : i1
+}
+
+// CHECK-LABEL: @cmpiI1neVecLhs
+// CHECK-SAME: (%[[ARG:.*]]: vector<4xi1>)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1neVecLhs(%arg0: vector<4xi1>) -> vector<4xi1> {
+ %zero = arith.constant dense<0> : vector<4xi1>
+ %res = arith.cmpi ne, %zero, %arg0 : vector<4xi1>
+ return %res : vector<4xi1>
+}
+
// Test case: Folding of comparisons with equal operands.
// CHECK-LABEL: @cmpi_equal_operands
// CHECK-DAG: %[[T:.*]] = arith.constant true
|
|
@llvm/pr-subscribers-mlir-arith Author: Ivan Butygin (Hardcode84) ChangesFull diff: https://github.com/llvm/llvm-project/pull/124436.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Arith/IR/ArithOps.cpp b/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
index 7ca104691e6df6..75d59ba8c1a108 100644
--- a/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
+++ b/mlir/lib/Dialect/Arith/IR/ArithOps.cpp
@@ -1865,6 +1865,18 @@ OpFoldResult arith::CmpIOp::fold(FoldAdaptor adaptor) {
getPredicate() == arith::CmpIPredicate::ne)
return extOp.getOperand();
}
+
+ // arith.cmpi ne, %val, %zero : i1 -> %val
+ if (getElementTypeOrSelf(getLhs().getType()).isInteger(1) &&
+ getPredicate() == arith::CmpIPredicate::ne)
+ return getLhs();
+ }
+
+ if (matchPattern(adaptor.getRhs(), m_One())) {
+ // arith.cmpi eq, %val, %one : i1 -> %val
+ if (getElementTypeOrSelf(getLhs().getType()).isInteger(1) &&
+ getPredicate() == arith::CmpIPredicate::eq)
+ return getLhs();
}
// Move constant to the right side.
diff --git a/mlir/test/Dialect/Arith/canonicalize.mlir b/mlir/test/Dialect/Arith/canonicalize.mlir
index 522711b08f289d..3a16ee3d4f8fde 100644
--- a/mlir/test/Dialect/Arith/canonicalize.mlir
+++ b/mlir/test/Dialect/Arith/canonicalize.mlir
@@ -160,6 +160,78 @@ func.func @selNotCond(%arg0: i1, %arg1 : i32, %arg2 : i32, %arg3 : i32, %arg4 :
return %res1, %res2 : i32, i32
}
+// CHECK-LABEL: @cmpiI1eq
+// CHECK-SAME: (%[[ARG:.*]]: i1)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1eq(%arg0: i1) -> i1 {
+ %one = arith.constant 1 : i1
+ %res = arith.cmpi eq, %arg0, %one : i1
+ return %res : i1
+}
+
+// CHECK-LABEL: @cmpiI1eqVec
+// CHECK-SAME: (%[[ARG:.*]]: vector<4xi1>)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1eqVec(%arg0: vector<4xi1>) -> vector<4xi1> {
+ %one = arith.constant dense<1> : vector<4xi1>
+ %res = arith.cmpi eq, %arg0, %one : vector<4xi1>
+ return %res : vector<4xi1>
+}
+
+// CHECK-LABEL: @cmpiI1ne
+// CHECK-SAME: (%[[ARG:.*]]: i1)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1ne(%arg0: i1) -> i1 {
+ %zero = arith.constant 0 : i1
+ %res = arith.cmpi ne, %arg0, %zero : i1
+ return %res : i1
+}
+
+// CHECK-LABEL: @cmpiI1neVec
+// CHECK-SAME: (%[[ARG:.*]]: vector<4xi1>)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1neVec(%arg0: vector<4xi1>) -> vector<4xi1> {
+ %zero = arith.constant dense<0> : vector<4xi1>
+ %res = arith.cmpi ne, %arg0, %zero : vector<4xi1>
+ return %res : vector<4xi1>
+}
+
+// CHECK-LABEL: @cmpiI1eqLhs
+// CHECK-SAME: (%[[ARG:.*]]: i1)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1eqLhs(%arg0: i1) -> i1 {
+ %one = arith.constant 1 : i1
+ %res = arith.cmpi eq, %one, %arg0 : i1
+ return %res : i1
+}
+
+// CHECK-LABEL: @cmpiI1eqVecLhs
+// CHECK-SAME: (%[[ARG:.*]]: vector<4xi1>)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1eqVecLhs(%arg0: vector<4xi1>) -> vector<4xi1> {
+ %one = arith.constant dense<1> : vector<4xi1>
+ %res = arith.cmpi eq, %one, %arg0 : vector<4xi1>
+ return %res : vector<4xi1>
+}
+
+// CHECK-LABEL: @cmpiI1neLhs
+// CHECK-SAME: (%[[ARG:.*]]: i1)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1neLhs(%arg0: i1) -> i1 {
+ %zero = arith.constant 0 : i1
+ %res = arith.cmpi ne, %zero, %arg0 : i1
+ return %res : i1
+}
+
+// CHECK-LABEL: @cmpiI1neVecLhs
+// CHECK-SAME: (%[[ARG:.*]]: vector<4xi1>)
+// CHECK: return %[[ARG]]
+func.func @cmpiI1neVecLhs(%arg0: vector<4xi1>) -> vector<4xi1> {
+ %zero = arith.constant dense<0> : vector<4xi1>
+ %res = arith.cmpi ne, %zero, %arg0 : vector<4xi1>
+ return %res : vector<4xi1>
+}
+
// Test case: Folding of comparisons with equal operands.
// CHECK-LABEL: @cmpi_equal_operands
// CHECK-DAG: %[[T:.*]] = arith.constant true
|
llvmbot
added
flang
Hardcode84
force-pushed
the
fold-cmp-one
branch
from
1d95c2b to
7c29918
Compare
kuhar
approved these changes
Jan 26, 2025
done |
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.
https://alive2.llvm.org/ce/z/dNZMdC