Skip to content

[mlir][tensor] Bufferize tensor.reshape with non-identity layouts #65654

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
Lewuathe merged 1 commit into from
Sep 19, 2023
Merged

[mlir][tensor] Bufferize tensor.reshape with non-identity layouts #65654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions mlir/lib/Dialect/Tensor/Transforms/BufferizableOpInterfaceImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,6 +995,20 @@ struct ReshapeOpInterface
bufferization::getBufferType(reshapeOp.getResult(), options);
if (failed(maybeResultMemRefType))
return failure();

// memref.reshape requires the source buffer to have an identity layout.
// If the source memref does not have an identity layout, clone the source
// into a new buffer with an identity layout.
auto srcType = llvm::dyn_cast<MemRefType>(srcBuffer->getType());
if (srcType && !srcType.getLayout().isIdentity()) {
auto identityType =
MemRefType::get(srcType.getShape(), srcType.getElementType());
srcBuffer = rewriter
.create<bufferization::CloneOp>(op->getLoc(),
identityType, *srcBuffer)
.getResult();
}

replaceOpWithNewBufferizedOp<memref::ReshapeOp>(
rewriter, op, maybeResultMemRefType.value(), *srcBuffer, *shapeBuffer);
return success();
Expand Down
21 changes: 21 additions & 0 deletions mlir/test/Dialect/Tensor/one-shot-bufferize.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,3 +418,24 @@ func.func @tensor.reshape() -> tensor<2x2x5xf32> {
// CHECK: return %[[RESHAPED]]
return %reshaped : tensor<2x2x5xf32>
}

// -----

// CHECK-LABEL: @reshape_with_non_identity_layout(
// CHECK-SAME: %[[INPUT:[a-zA-Z0-9]*]]: memref<2x2xf32, strided<[?, ?], offset: ?>>,
// CHECK-SAME: %[[LAYOUT:[a-zA-Z0-9]*]]: memref<2xi32, strided<[?], offset: ?>>)
func.func @reshape_with_non_identity_layout(%arg0: tensor<2x2xf32>, %arg1: tensor<2xi32>) -> tensor<1x2xf32> {

// CHECK: %[[SUBVIEW:.+]] = memref.subview %[[INPUT]][1, 0] [1, 2] [1, 1] : memref<2x2xf32, strided<[?, ?], offset: ?>> to memref<2xf32, strided<[?], offset: ?>>
%extracted_slice = tensor.extract_slice %arg0[1, 0] [1, 2] [1, 1] : tensor<2x2xf32> to tensor<2xf32>

// To satisify the constraints of memref.reshape, the subview must be cloned into
// a buffer with an identity layout.
// CHECK: %[[CLONED:.+]] = bufferization.clone %[[SUBVIEW]] : memref<2xf32, strided<[?], offset: ?>> to memref<2xf32>
// CHECK: %[[RESHAPED:.+]] = memref.reshape %[[CLONED]](%[[LAYOUT]]) : (memref<2xf32>, memref<2xi32, strided<[?], offset: ?>>) -> memref<1x2xf32>

%reshape = tensor.reshape %extracted_slice(%arg1) : (tensor<2xf32>, tensor<2xi32>) -> tensor<1x2xf32>

// CHECK: return %[[RESHAPED]] : memref<1x2xf32>
return %reshape : tensor<1x2xf32>
}