Skip to content

Commit b85869a

Browse files
banach-spacebanach-space
committed
[mlir][Vector] Add support for masks in castAwayContractionLeadingOneDim
Partial fix for #78787
1 parent 55a7ff8 commit b85869a

File tree

2 files changed

+108
-41
lines changed

2 files changed

+108
-41
lines changed

‎mlir/lib/Dialect/Vector/Transforms/VectorDropLeadUnitDim.cpp

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,12 @@ struct CastAwayTransferWriteLeadingOneDim
332332
LogicalResult
333333
mlir::vector::castAwayContractionLeadingOneDim(vector::ContractionOp contractOp,
334334
RewriterBase &rewriter) {
335-
// TODO(#78787): Not supported masked op yet.
336-
if (cast<MaskableOpInterface>(contractOp.getOperation()).isMasked())
337-
return failure();
335+
// Specifically for masked Ops for which we need to update the insertion
336+
// point
337+
PatternRewriter::InsertionGuard guard(rewriter);
338+
339+
auto isMasked =
340+
cast<MaskableOpInterface>(contractOp.getOperation()).isMasked();
338341
VectorType oldAccType = dyn_cast<VectorType>(contractOp.getAccType());
339342
if (oldAccType == nullptr)
340343
return failure();
@@ -346,6 +349,12 @@ mlir::vector::castAwayContractionLeadingOneDim(vector::ContractionOp contractOp,
346349
// greedily to drop more.
347350
int64_t dropDim = 1;
348351

352+
if (isMasked) {
353+
// Update the insertion point to avoid adding more ops to the vector.mask
354+
// region corresponding to `mask`
355+
rewriter.setInsertionPointAfter(contractOp->getParentOp());
356+
}
357+
349358
auto oldIndexingMaps = contractOp.getIndexingMapsArray();
350359
SmallVector<AffineMap> newIndexingMaps;
351360

@@ -368,6 +377,7 @@ mlir::vector::castAwayContractionLeadingOneDim(vector::ContractionOp contractOp,
368377
SmallVector<Value> operands = {contractOp.getLhs(), contractOp.getRhs(),
369378
contractOp.getAcc()};
370379
SmallVector<Value> newOperands;
380+
auto loc = contractOp.getLoc();
371381

372382
for (const auto &it : llvm::enumerate(oldIndexingMaps)) {
373383
// Check if the dim to be dropped exists as a leading dim in the operand
@@ -405,7 +415,7 @@ mlir::vector::castAwayContractionLeadingOneDim(vector::ContractionOp contractOp,
405415
map = AffineMap::get(map.getNumDims(), 0, transposeResults,
406416
contractOp.getContext());
407417
operands[it.index()] = rewriter.create<vector::TransposeOp>(
408-
contractOp.getLoc(), operands[it.index()], perm);
418+
loc, operands[it.index()], perm);
409419
}
410420
}
411421
// We have taken care to have the dim to be dropped be
@@ -429,17 +439,30 @@ mlir::vector::castAwayContractionLeadingOneDim(vector::ContractionOp contractOp,
429439
// Extract if its a valid extraction, otherwise use the operand
430440
// without extraction.
431441
newOperands.push_back(
432-
validExtract ? rewriter.create<vector::ExtractOp>(contractOp.getLoc(),
433-
operands[it.index()],
434-
splatZero(dropDim))
442+
validExtract ? rewriter.create<vector::ExtractOp>(
443+
loc, operands[it.index()], splatZero(dropDim))
435444
: operands[it.index()]);
436445
}
437-
auto newContractOp = rewriter.create<vector::ContractionOp>(
438-
contractOp.getLoc(), newOperands[0], newOperands[1], newOperands[2],
446+
Operation *newContractOp = rewriter.create<vector::ContractionOp>(
447+
loc, newOperands[0], newOperands[1], newOperands[2],
439448
rewriter.getAffineMapArrayAttr(newIndexingMaps),
440449
rewriter.getArrayAttr(newIteratorTypes), contractOp.getKind());
441-
rewriter.replaceOpWithNewOp<vector::BroadcastOp>(
442-
contractOp, contractOp->getResultTypes()[0], newContractOp);
450+
451+
if (isMasked) {
452+
auto mask = contractOp.getMaskingOp();
453+
auto newMask = rewriter.create<vector::ExtractOp>(loc, mask.getMask(),
454+
splatZero(dropDim));
455+
456+
newContractOp =
457+
mlir::vector::maskOperation(rewriter, newContractOp, newMask);
458+
rewriter.replaceOpWithNewOp<vector::BroadcastOp>(
459+
mask, contractOp->getResultTypes()[0], newContractOp->getResults()[0]);
460+
} else {
461+
rewriter.replaceOpWithNewOp<vector::BroadcastOp>(
462+
contractOp, contractOp->getResultTypes()[0],
463+
newContractOp->getResults()[0]);
464+
}
465+
443466
return success();
444467
}
445468

‎mlir/test/Dialect/Vector/vector-dropleadunitdim-transforms.mlir

Lines changed: 74 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,80 @@ func.func @cast_away_contraction_leading_one_dims(%arg0: vector<1x16x8xf32>, %ar
3030
}
3131

3232
// -----
33+
// CHECK: #[[$MAP_0:.+]] = affine_map<(d0, d1, d2) -> (d0, d2)>
34+
// CHECK: #[[$MAP_1:.+]] = affine_map<(d0, d1, d2) -> (d2, d1)>
35+
// CHECK: #[[$MAP_2:.+]] = affine_map<(d0, d1, d2) -> (d0, d1)>
36+
37+
// CHECK-LABEL: func.func @cast_away_contraction_leading_one_dim_under_const_mask
38+
// CHECK: %[[MASK:.*]] = vector.constant_mask [15, 15, 8] : vector<16x16x8xi1>
39+
// CHECK: %[[R0:.*]] = vector.extract %{{.*}}[0] : vector<16x8xf32> from vector<1x16x8xf32>
40+
// CHECK: %[[R1:.*]] = vector.extract %{{.*}}[0] : vector<8x16xf32> from vector<1x8x16xf32>
41+
// CHECK: %[[R2:.*]] = vector.extract %{{.*}}[0] : vector<16x16xf32> from vector<1x16x16xf32>
42+
// CHECK: %[[CONTRACT:.*]] = vector.mask %[[MASK]] {
43+
// CHECK-SAME: vector.contract {indexing_maps = [#[[$MAP_0]], #[[$MAP_1]], #[[$MAP_2]]], iterator_types = ["parallel", "parallel", "reduction"], kind = #vector.kind<add>}
44+
// CHECK-SAME: %[[R0]], %[[R1]], %[[R2]] : vector<16x8xf32>, vector<8x16xf32> into vector<16x16xf32>
45+
// CHECK-SAME: } : vector<16x16x8xi1> -> vector<16x16xf32>
46+
// CHECK: %[[RES:.*]] = vector.broadcast %[[CONTRACT]] : vector<16x16xf32> to vector<1x16x16xf32>
47+
// CHECK: return %[[RES]] : vector<1x16x16xf32>
48+
49+
#contraction_accesses0 = [
50+
affine_map<(l, i, j, k) -> (l, i, k)>,
51+
affine_map<(l, i, j, k) -> (l, k, j)>,
52+
affine_map<(l, i, j, k) -> (l, i, j)>
53+
]
54+
#contraction_trait0 = {
55+
indexing_maps = #contraction_accesses0,
56+
iterator_types = ["parallel", "parallel", "parallel", "reduction"]
57+
}
58+
59+
func.func @cast_away_contraction_leading_one_dim_under_const_mask(%arg0: vector<1x16x8xf32>, %arg1: vector<1x8x16xf32>, %arg2: vector<1x16x16xf32>) -> vector<1x16x16xf32> {
60+
%mask = vector.constant_mask [1, 15, 15, 8] : vector<1x16x16x8xi1>
61+
%0 = vector.mask %mask {
62+
vector.contract #contraction_trait0 %arg0, %arg1, %arg2 : vector<1x16x8xf32>, vector<1x8x16xf32> into vector<1x16x16xf32>
63+
} : vector<1x16x16x8xi1> -> vector<1x16x16xf32>
64+
return %0 : vector<1x16x16xf32>
65+
}
66+
67+
// -----
68+
// CHECK-DAG: #[[$MAP0:.+]] = affine_map<(d0, d1, d2) -> (d0, d2)>
69+
// CHECK-DAG: #[[$MAP1:.+]] = affine_map<(d0, d1, d2) -> (d2, d1)>
70+
// CHECK-DAG: #[[$MAP2:.+]] = affine_map<(d0, d1, d2) -> (d0, d1)>
71+
72+
// CHECK-LABEL: func.func @cast_away_contraction_leading_one_dim_under_mask
73+
// CHECK: %[[R0:.*]] = vector.extract %{{.*}} : vector<16x8xf32> from vector<1x16x8xf32>
74+
// CHECK: %[[R1:.*]] = vector.extract %{{.*}} : vector<8x16xf32> from vector<1x8x16xf32>
75+
// CHECK: %[[R2:.*]] = vector.extract %{{.*}} : vector<16x16xf32> from vector<1x16x16xf32>
76+
// CHECK: %[[M:.*]] = vector.extract %{{.*}} : vector<16x16x8xi1> from vector<1x16x16x8xi1>
77+
// CHECK: %[[CONTRACT:.*]] = vector.mask %[[M]] {
78+
// CHECK-SAME: vector.contract {indexing_maps = [#[[$MAP0]], #[[$MAP1]], #[[$MAP2]]], iterator_types = ["parallel", "parallel", "reduction"], kind = #vector.kind<add>}
79+
// CHECK-SAME: %[[R0]], %[[R1]], %[[R2]] : vector<16x8xf32>, vector<8x16xf32> into vector<16x16xf32>
80+
// CHECK-SAME: } : vector<16x16x8xi1> -> vector<16x16xf32>
81+
// CHECK-NEXT: %[[RES:.*]] = vector.broadcast %[[CONTRACT]] : vector<16x16xf32> to vector<1x16x16xf32>
82+
// CHECK-NEXT: return %[[RES]] : vector<1x16x16xf32>
83+
84+
#contraction_accesses0 = [
85+
affine_map<(l, i, j, k) -> (l, i, k)>,
86+
affine_map<(l, i, j, k) -> (l, k, j)>,
87+
affine_map<(l, i, j, k) -> (l, i, j)>
88+
]
89+
#contraction_trait0 = {
90+
indexing_maps = #contraction_accesses0,
91+
iterator_types = ["parallel", "parallel", "parallel", "reduction"]
92+
}
93+
94+
func.func @cast_away_contraction_leading_one_dim_under_mask(
95+
%arg0: vector<1x16x8xf32>,
96+
%arg1: vector<1x8x16xf32>,
97+
%arg2: vector<1x16x16xf32>,
98+
%mask: vector<1x16x16x8xi1>) -> vector<1x16x16xf32> {
99+
%0 = vector.mask %mask {
100+
vector.contract #contraction_trait0 %arg0, %arg1, %arg2 : vector<1x16x8xf32>, vector<1x8x16xf32> into vector<1x16x16xf32>
101+
} : vector<1x16x16x8xi1> -> vector<1x16x16xf32>
102+
return %0: vector<1x16x16xf32>
103+
}
104+
105+
// -----
106+
33107
// CHECK-DAG: #[[$map0:.*]] = affine_map<(d0, d1) -> (d1)>
34108
// CHECK-DAG: #[[$map1:.*]] = affine_map<(d0, d1) -> (d1, d0)>
35109
// CHECK-DAG: #[[$map2:.*]] = affine_map<(d0, d1) -> (d0)>
@@ -164,36 +238,6 @@ func.func @cast_away_contraction_leading_one_dims_nonleadingunitdim_rank4_acctra
164238
return %0: vector<1x1x2x16xf32>
165239
}
166240

167-
// -----
168-
169-
// CHECK-DAG: #[[MAP0:.*]] = affine_map<(d0, d1, d2, d3) -> (d0, d1, d3)>
170-
// CHECK-DAG: #[[MAP1:.*]] = affine_map<(d0, d1, d2, d3) -> (d0, d3, d2)>
171-
// CHECK-DAG: #[[MAP2:.*]] = affine_map<(d0, d1, d2, d3) -> (d0, d1, d2)>
172-
173-
// CHECK-LABEL: not_insert_cast_for_contraction_under_mask
174-
// CHECK: %[[MASK:.+]] = vector.constant_mask
175-
// CHECK: %[[CASTED_MASK:.+]] = vector.broadcast %[[MASK]]
176-
// CHECK: %[[RET:.+]] = vector.mask %[[CASTED_MASK]] {
177-
// CHECK-SAME: vector.contract {{.*}} : vector<1x16x8xf32>, vector<1x8x16xf32> into vector<1x16x16xf32> }
178-
// CHECK: return %[[RET]] : vector<1x16x16xf32>
179-
180-
#contraction_accesses0 = [
181-
affine_map<(l, i, j, k) -> (l, i, k)>,
182-
affine_map<(l, i, j, k) -> (l, k, j)>,
183-
affine_map<(l, i, j, k) -> (l, i, j)>
184-
]
185-
#contraction_trait0 = {
186-
indexing_maps = #contraction_accesses0,
187-
iterator_types = ["parallel", "parallel", "parallel", "reduction"]
188-
}
189-
190-
func.func @not_insert_cast_for_contraction_under_mask(%arg0: vector<1x16x8xf32>, %arg1: vector<1x8x16xf32>, %arg2: vector<1x16x16xf32>) -> vector<1x16x16xf32> {
191-
%mask = vector.constant_mask [1, 15, 15, 8] : vector<1x16x16x8xi1>
192-
%0 = vector.mask %mask {
193-
vector.contract #contraction_trait0 %arg0, %arg1, %arg2 : vector<1x16x8xf32>, vector<1x8x16xf32> into vector<1x16x16xf32>
194-
} : vector<1x16x16x8xi1> -> vector<1x16x16xf32>
195-
return %0 : vector<1x16x16xf32>
196-
}
197241

198242
// -----
199243
// CHECK-LABEL: func @cast_away_extract_strided_slice_leading_one_dims

0 commit comments

Comments
 (0)