Skip to content

[MLIR][Arith] SelectOp fix invalid folding #117555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 26, 2024
Merged

[MLIR][Arith] SelectOp fix invalid folding #117555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f459a27
[MLIR][Arith] SelectOp fix invalid folding
7FM Nov 25, 2024
9aca6a1
Add LIT test
7FM Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mlir/lib/Dialect/Arith/IR/ArithOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2314,7 +2314,8 @@ OpFoldResult arith::SelectOp::fold(FoldAdaptor adaptor) {
return trueVal;

// select %x, true, false => %x
if (getType().isInteger(1) && matchPattern(adaptor.getTrueValue(), m_One()) &&
if (getType().isSignlessInteger(1) &&
matchPattern(adaptor.getTrueValue(), m_One()) &&
matchPattern(adaptor.getFalseValue(), m_Zero()))
return condition;
Copy link
Member

@kuhar kuhar Nov 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we could also have a canon pattern that can broadcast the condition in the vector case, but that's probably better for a separate PR.

Copy link
Contributor Author

@7FM 7FM Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since I am not familiar with the Arith + vector use case, I would prefer a separate PR for this.


Expand Down
12 changes: 12 additions & 0 deletions mlir/test/Dialect/Arith/canonicalize.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@ func.func @select_extui_i1(%arg0: i1) -> i1 {
return %res : i1
}

// CHECK-LABEL: @select_no_fold_ui1
// CHECK: %[[CONST_0:.+]] = "test.constant"() <{value = 0 : i32}> : () -> ui1
// CHECK: %[[CONST_1:.+]] = "test.constant"() <{value = 1 : i32}> : () -> ui1
// CHECK-NEXT: %[[RES:.+]] = arith.select %arg0, %[[CONST_1]], %[[CONST_0]] : ui1
// CHECK-NEXT: return %[[RES]]
func.func @select_no_fold_ui1(%arg0: i1) -> ui1 {
%c0_i1 = "test.constant"() {value = 0 : i32} : () -> ui1
%c1_i1 = "test.constant"() {value = 1 : i32} : () -> ui1
%res = arith.select %arg0, %c1_i1, %c0_i1 : ui1
return %res : ui1
}

// CHECK-LABEL: @select_cst_false_scalar
// CHECK-SAME: (%[[ARG0:.+]]: i32, %[[ARG1:.+]]: i32)
// CHECK-NEXT: return %[[ARG1]]
Expand Down
Loading