Skip to content

[ANALYSIS] Fix AxisInfoAnalysis for arith.select #2711

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
ptillet merged 3 commits into from
Nov 28, 2023
Merged

[ANALYSIS] Fix AxisInfoAnalysis for arith.select #2711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07af2eb
Update
Jokeren Nov 28, 2023
870059a
Update
Jokeren Nov 28, 2023
ea1fe1a
Merge branch 'main' into keren/fix-select
Jokeren Nov 28, 2023
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
42 changes: 34 additions & 8 deletions lib/Analysis/AxisInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,15 +684,41 @@ class SelectOpAxisInfoVisitor final : public AxisInfoVisitorImpl<OpTy> {
constantValue = lhsInfo.getConstantValue();
}
} else {
// The condition can be either a tensor or i1.
// If i1 is used as the condition, the entire tensor of either
// lhs or rhs is selected.
bool i1Cond = op.getOperand(0).getType().template isa<IntegerType>();
for (auto d = 0; d < rank; ++d) {
constancy.push_back(
std::min(gcd(lhsInfo.getConstancy(d), condConstancy[d]),
gcd(rhsInfo.getConstancy(d), condConstancy[d])));
divisibility.push_back(
std::min(lhsInfo.getDivisibility(d), rhsInfo.getDivisibility(d)));
contiguity.push_back(
std::min(gcd(lhsInfo.getContiguity(d), condConstancy[d]),
gcd(rhsInfo.getContiguity(d), condConstancy[d])));
if (i1Cond) {
constancy.push_back(
std::min(lhsInfo.getConstancy(d), rhsInfo.getConstancy(d)));
divisibility.push_back(
std::min(lhsInfo.getDivisibility(d), rhsInfo.getDivisibility(d)));
contiguity.push_back(
std::min(lhsInfo.getContiguity(d), rhsInfo.getContiguity(d)));
} else {
constancy.push_back(
std::min(gcd(lhsInfo.getConstancy(d), condConstancy[d]),
gcd(rhsInfo.getConstancy(d), condConstancy[d])));
contiguity.push_back(
std::min(gcd(lhsInfo.getContiguity(d), condConstancy[d]),
gcd(rhsInfo.getContiguity(d), condConstancy[d])));
if (contiguity.back() == lhsInfo.getContiguity(d) &&
contiguity.back() == rhsInfo.getContiguity(d)) {
// Contiguity not changed
divisibility.push_back(
gcd(lhsInfo.getDivisibility(d), rhsInfo.getDivisibility(d)));
} else {
// Contiguity changed, we cannot use only divisibility.
// For example, the following example should have contiguity 2 and
// divisibility 2
// [[0, 1], [4, 5]]
// [[16, 17, 18, 19]]
divisibility.push_back(
std::min(gcd(lhsInfo.getDivisibility(d), contiguity.back()),
gcd(rhsInfo.getDivisibility(d), contiguity.back())));
}
}
}
if (lhsInfo.getConstantValue().has_value() &&
rhsInfo.getConstantValue().has_value() &&
Expand Down
18 changes: 17 additions & 1 deletion test/Analysis/test-alignment.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ tt.func @logic() {
// -----

// CHECK-LABEL: @select
tt.func @select() {
tt.func @select(%arg0 : i1, %arg1 : tensor<4xi1>) {
// CHECK: contiguity = [128], divisibility = [1073741824], constancy = [1], constant_value = <none>
%0 = tt.make_range {end = 128 : i32, start = 0 : i32} : tensor<128xi32>
// CHECK-NEXT: contiguity = [1], divisibility = [4611686018427387904], constancy = [128], constant_value = 0
Expand All @@ -293,6 +293,22 @@ tt.func @select() {
%5 = arith.select %4, %3, %7 : tensor<128xi1>
// CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [128], constant_value = <none>
%8 = arith.select %7, %3, %2 : tensor<128xi1>, tensor<128xi1>
// CHECK-NEXT: contiguity = [1, 1], divisibility = [1, 1], constancy = [128, 1], constant_value = <none>
%9 = tt.expand_dims %2 {axis = 1 : i32} : (tensor<128xi1>) -> tensor<128x1xi1>
// CHECK-NEXT: contiguity = [1, 1], divisibility = [1, 1], constancy = [128, 1], constant_value = <none>
%10 = tt.expand_dims %3 {axis = 1 : i32} : (tensor<128xi1>) -> tensor<128x1xi1>
// CHECK-NEXT: contiguity = [1, 1], divisibility = [1, 1], constancy = [128, 1], constant_value = <none>
%11 = arith.select %arg0, %9, %10 : tensor<128x1xi1>
// CHECK-NEXT: contiguity = [1], divisibility = [4], constancy = [4], constant_value = 4
%cst = arith.constant dense<4> : tensor<4xi32>
// CHECK-NEXT: contiguity = [4], divisibility = [1073741824], constancy = [1], constant_value = <none>
%12 = tt.make_range {end = 4 : i32, start = 0 : i32} : tensor<4xi32>
// CHECK-NEXT: contiguity = [1], divisibility = [4], constancy = [1], constant_value = <none>
%13 = arith.muli %12, %cst : tensor<4xi32>
// CHECK-NEXT: contiguity = [4], divisibility = [16], constancy = [1], constant_value = <none>
%14 = tt.make_range {end = 20 : i32, start = 16 : i32} : tensor<4xi32>
// CHECK-NEXT: contiguity = [1], divisibility = [1], constancy = [1], constant_value = <none>
%15 = arith.select %arg1, %12, %13 : tensor<4xi1>, tensor<4xi32>
tt.return
}

Expand Down