This is an archive of the discontinued LLVM Phabricator instance.

Differential D125984

[mlir][vector] Fix crash in DropInnerMostUnitDims pattern
ClosedPublic

Authored by ThomasRaoux on May 19 2022, 8:50 AM.

Details

Reviewers
mravishankar
aartbik
nicolasvasilache
Commits
rG4c1b65e7bc92: [mlir][vector] Fix crash in DropInnerMostUnitDims pattern
Summary

Fix number of dimensions when incrementally replacing dimensions in
affine map.

Diff Detail

Event Timeline

ThomasRaoux created this revision.May 19 2022, 8:50 AM
Herald added a reviewer: aartbik. · View Herald TranscriptMay 19 2022, 8:50 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: sdasgup3, Groverkss, wenzhicui and 20 others. · View Herald Transcript
ThomasRaoux requested review of this revision.May 19 2022, 8:50 AM
Herald added a reviewer: nicolasvasilache. · View Herald TranscriptMay 19 2022, 8:50 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
Harbormaster completed remote builds in B165344: Diff 430705.May 19 2022, 9:31 AM
mravishankar accepted this revision.May 19 2022, 9:45 AM

Nice! Thanks!

This revision is now accepted and ready to land.May 19 2022, 9:45 AM
Closed by commit rG4c1b65e7bc92: [mlir][vector] Fix crash in DropInnerMostUnitDims pattern (authored by ThomasRaoux). · Explain WhyMay 19 2022, 10:40 AM
This revision was automatically updated to reflect the committed changes.
ThomasRaoux added a commit: rG4c1b65e7bc92: [mlir][vector] Fix crash in DropInnerMostUnitDims pattern.

Revision Contents

PathSize
mlir/
lib/
Dialect/
Vector/
Transforms/
5 lines
test/
Dialect/
Vector/
16 lines

Diff 430739

mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp

Show First 20 Lines • Show All 2,392 Lines • ▼ Show 20 Lines LogicalResult matchAndRewrite(vector::TransferReadOp readOp,
MemRefType resultMemrefType; MemRefType resultMemrefType;
if (srcType.getLayout().getAffineMap().isIdentity()) { if (srcType.getLayout().getAffineMap().isIdentity()) {
resultMemrefType = MemRefType::get( resultMemrefType = MemRefType::get(
srcType.getShape().drop_back(dimsToDrop), srcType.getElementType(), srcType.getShape().drop_back(dimsToDrop), srcType.getElementType(),
{}, srcType.getMemorySpaceAsInt()); {}, srcType.getMemorySpaceAsInt());
} else { } else {
AffineMap map = srcType.getLayout().getAffineMap(); AffineMap map = srcType.getLayout().getAffineMap();
int numResultDims = map.getNumDims() - dimsToDrop;
int numSymbols = map.getNumSymbols(); int numSymbols = map.getNumSymbols();
for (size_t i = 0; i < dimsToDrop; ++i) { for (size_t i = 0; i < dimsToDrop; ++i) {
int dim = srcType.getRank() - i - 1; int dim = srcType.getRank() - i - 1;
map = map.replace(rewriter.getAffineDimExpr(dim), map = map.replace(rewriter.getAffineDimExpr(dim),
rewriter.getAffineConstantExpr(0), numResultDims, rewriter.getAffineConstantExpr(0),
numSymbols); map.getNumDims() - 1, numSymbols);
} }
resultMemrefType = MemRefType::get( resultMemrefType = MemRefType::get(
srcType.getShape().drop_back(dimsToDrop), srcType.getElementType(), srcType.getShape().drop_back(dimsToDrop), srcType.getElementType(),
map, srcType.getMemorySpaceAsInt()); map, srcType.getMemorySpaceAsInt());
} }
auto loc = readOp.getLoc(); auto loc = readOp.getLoc();
SmallVector<int64_t> offsets(srcType.getRank(), 0); SmallVector<int64_t> offsets(srcType.getRank(), 0);
▲ Show 20 Lines • Show All 301 Lines • Show Last 20 Lines

mlir/test/Dialect/Vector/vector-transfer-collapse-inner-most-dims.mlir

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Linesfunc.func @contiguous_inner_most_dim_bounds(%A: memref<1000x1xf32>, %i:index, %ii:index) -> (vector<4x1xf32>) {
return %1 : vector<4x1xf32> return %1 : vector<4x1xf32>
} }
// CHECK: func @contiguous_inner_most_dim_bounds(%[[SRC:.+]]: memref<1000x1xf32>, %[[II:.+]]: index, %[[J:.+]]: index) -> vector<4x1xf32> // CHECK: func @contiguous_inner_most_dim_bounds(%[[SRC:.+]]: memref<1000x1xf32>, %[[II:.+]]: index, %[[J:.+]]: index) -> vector<4x1xf32>
// CHECK: %[[SRC_0:.+]] = memref.subview %[[SRC]] // CHECK: %[[SRC_0:.+]] = memref.subview %[[SRC]]
// CHECK: %[[SRC_1:.+]] = memref.subview %[[SRC_0]] // CHECK: %[[SRC_1:.+]] = memref.subview %[[SRC_0]]
// CHECK: %[[V:.+]] = vector.transfer_read %[[SRC_1]] // CHECK: %[[V:.+]] = vector.transfer_read %[[SRC_1]]
// CHECK-SAME: {in_bounds = [true]} // CHECK-SAME: {in_bounds = [true]}
// CHECK-SAME: vector<4xf32> // CHECK-SAME: vector<4xf32>
// -----
func.func @contiguous_inner_most_dim_bounds_2d(%A: memref<1000x1x1xf32>, %i:index, %ii:index) -> (vector<4x1x1xf32>) {
%c0 = arith.constant 0 : index
%cst = arith.constant 0.0 : f32
%0 = memref.subview %A[%i, 0, 0] [40, 1, 1] [1, 1, 1] : memref<1000x1x1xf32> to memref<40x1x1xf32, affine_map<(d0, d1, d2)[s0] -> (d0 + s0 + d1 + d2)>>
%1 = vector.transfer_read %0[%ii, %c0, %c0], %cst {in_bounds = [true, true, true]} : memref<40x1x1xf32, affine_map<(d0, d1, d2)[s0] -> (d0 + s0 + d1 + d2)>>, vector<4x1x1xf32>
return %1 : vector<4x1x1xf32>
}
// CHECK: func @contiguous_inner_most_dim_bounds_2d(%[[SRC:.+]]: memref<1000x1x1xf32>, %[[II:.+]]: index, %[[J:.+]]: index) -> vector<4x1x1xf32>
// CHECK: %[[SRC_0:.+]] = memref.subview %[[SRC]]
// CHECK: %[[SRC_1:.+]] = memref.subview %[[SRC_0]]
// CHECK: %[[V:.+]] = vector.transfer_read %[[SRC_1]]
// CHECK-SAME: {in_bounds = [true]}
// CHECK-SAME: vector<4xf32>