Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,47 @@ struct SoftmaxOpInterface
return success();
}
};

struct PackOpInterface
: public DstBufferizableOpInterfaceExternalModel<PackOpInterface,
linalg::PackOp> {
bool bufferizesToMemoryRead(Operation *op, OpOperand &opOperand,
const AnalysisState &state) const {
auto packOp = cast<linalg::PackOp>(op);
return !packOp.isDpsInit(&opOperand);
Comment thread
adam-smnk marked this conversation as resolved.
}

LogicalResult bufferize(Operation *op, RewriterBase &rewriter,
const BufferizationOptions &options,
BufferizationState &state) const {
auto packOp = cast<linalg::PackOp>(op);
if (packOp.hasPureBufferSemantics())
Comment thread
adam-smnk marked this conversation as resolved.
Outdated
return success();
if (!packOp.hasPureTensorSemantics())
return packOp.emitError() << "op does not have pure tensor semantics";
Comment thread
adam-smnk marked this conversation as resolved.
Outdated

FailureOr<Value> sourceBuffer =
getBuffer(rewriter, packOp.getSource(), options, state);
if (failed(sourceBuffer))
return failure();
FailureOr<Value> destBuffer =
getBuffer(rewriter, packOp.getDest(), options, state);
if (failed(destBuffer))
return failure();

SmallVector<Value> operands;
operands.push_back(*sourceBuffer);
operands.push_back(*destBuffer);
if (auto val = packOp.getPaddingValue())
operands.push_back(val);
llvm::append_range(operands, packOp.getInnerTiles());

linalg::PackOp::create(rewriter, packOp.getLoc(), TypeRange{}, operands,
op->getAttrs());
replaceOpWithBufferizedValues(rewriter, op, *destBuffer);
return success();
}
};
} // namespace

void mlir::linalg::registerBufferizableOpInterfaceExternalModels(
Expand All @@ -206,5 +247,6 @@ void mlir::linalg::registerBufferizableOpInterfaceExternalModels(
>::registerOpInterface(ctx);

SoftmaxOp::attachInterface<SoftmaxOpInterface>(*ctx);
PackOp::attachInterface<PackOpInterface>(*ctx);
});
}
20 changes: 20 additions & 0 deletions mlir/test/Dialect/Linalg/bufferize.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -206,3 +206,23 @@ func.func @bufferize_softmax(%arg0: tensor<2x16x32xf32>, %arg1: tensor<2x16x32xf
outs(%arg1: tensor<2x16x32xf32>) -> tensor<2x16x32xf32>
return %1 : tensor<2x16x32xf32>
}

// -----

// CHECK-LABEL: func @bufferize_pack(
// CHECK-SAME: %[[SRC:.*]]: tensor<200x127x256xf32>, %[[DST:.*]]: tensor<256x64x200x2xf32>) -> tensor<256x64x200x2xf32> {
// CHECK-DAG: %[[CST:.*]] = arith.constant 0.000000e+00 : f32
// CHECK-DAG: %[[SRC_BUF:.*]] = bufferization.to_buffer %[[SRC]] : tensor<200x127x256xf32> to memref<200x127x256xf32>
// CHECK-DAG: %[[DST_BUF:.*]] = memref.alloc() {{.*}} : memref<256x64x200x2xf32>
// CHECK-NOT: memref.copy
// CHECK: linalg.pack %[[SRC_BUF]] padding_value(%[[CST]] : f32) outer_dims_perm = [2, 1, 0] inner_dims_pos = [1] inner_tiles = [2] into %[[DST_BUF]] : memref<200x127x256xf32> -> memref<256x64x200x2xf32>
// CHECK: %[[RESULT:.*]] = bufferization.to_tensor %[[DST_BUF]] : memref<256x64x200x2xf32> to tensor<256x64x200x2xf32>
// CHECK: return %[[RESULT]] : tensor<256x64x200x2xf32>
func.func @bufferize_pack(%arg0: tensor<200x127x256xf32>, %arg1: tensor<256x64x200x2xf32>) -> tensor<256x64x200x2xf32> {
%pad = arith.constant 0.0 : f32
%0 = linalg.pack %arg0 padding_value(%pad : f32) outer_dims_perm = [2, 1, 0]
inner_dims_pos = [1] inner_tiles = [2] into %arg1
: tensor<200x127x256xf32> -> tensor<256x64x200x2xf32>
return %0 : tensor<256x64x200x2xf32>
}