This is an archive of the discontinued LLVM Phabricator instance.

Differential D92145

[MLIR] Fix vector::TransferWriteOp builder losing permutation map
ClosedPublic

Authored by max-kudr on Nov 25 2020, 5:53 PM.

Details

Reviewers
nicolasvasilache
aartbik
Commits
rG636db7f87c77: [MLIR] Fix vector::TransferWriteOp builder losing permutation map
Summary

Supervectorizer pass uses this builder and loses the permutation map.

Diff Detail

Event Timeline

max-kudr created this revision.Nov 25 2020, 5:53 PM
Herald added a reviewer: aartbik. · View Herald TranscriptNov 25 2020, 5:53 PM
Herald added subscribers: teijeong, rdzhabarov, tatianashp and 14 others. · View Herald Transcript
max-kudr requested review of this revision.Nov 25 2020, 5:53 PM
Herald added a subscriber: stephenneuendorffer. · View Herald TranscriptNov 25 2020, 5:53 PM
Harbormaster completed remote builds in B80168: Diff 307733.Nov 25 2020, 6:16 PM
max-kudr updated this revision to Diff 307743.Nov 25 2020, 6:48 PM

Updated unit test

nicolasvasilache accepted this revision.Nov 28 2020, 5:43 AM
This revision is now accepted and ready to land.Nov 28 2020, 5:43 AM
max-kudr added a project: Restricted Project.Nov 30 2020, 12:26 PM
max-kudr set the repository for this revision to rG LLVM Github Monorepo.
max-kudr removed a project: Restricted Project.Dec 1 2020, 3:25 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 1 2020, 3:25 PM
Closed by commit rG636db7f87c77: [MLIR] Fix vector::TransferWriteOp builder losing permutation map (authored by max-kudr, committed by stella.stamenova). · Explain WhyDec 3 2020, 9:56 AM
This revision was automatically updated to reflect the committed changes.
stella.stamenova added a commit: rG636db7f87c77: [MLIR] Fix vector::TransferWriteOp builder losing permutation map.

Revision Contents

PathSize
mlir/
lib/
Dialect/
Vector/
5 lines
test/
Dialect/
Affine/
SuperVectorize/
2 lines

Diff 309293

mlir/lib/Dialect/Vector/VectorOps.cpp

Show First 20 Lines • Show All 2,165 Lines • ▼ Show 20 Lines auto permMap = getTransferMinorIdentityMap(
memref.getType().cast<MemRefType>(), vectorType); memref.getType().cast<MemRefType>(), vectorType);
if (maybeMasked.empty()) if (maybeMasked.empty())
return build(builder, result, vector, memref, indices, permMap, return build(builder, result, vector, memref, indices, permMap,
ArrayAttr()); ArrayAttr());
ArrayAttr maskedArrayAttr = builder.getBoolArrayAttr(maybeMasked); ArrayAttr maskedArrayAttr = builder.getBoolArrayAttr(maybeMasked);
build(builder, result, vector, memref, indices, permMap, maskedArrayAttr); build(builder, result, vector, memref, indices, permMap, maskedArrayAttr);
} }
/// Builder that sets permutation map to 'getMinorIdentityMap'.
void TransferWriteOp::build(OpBuilder &builder, OperationState &result, void TransferWriteOp::build(OpBuilder &builder, OperationState &result,
Value vector, Value memref, ValueRange indices, Value vector, Value memref, ValueRange indices,
AffineMap permutationMap) { AffineMap permutationMap) {
build(builder, result, vector, memref, indices, build(builder, result, vector, memref, indices, permutationMap,
/*maybeMasked=*/ArrayRef<bool>{}); /*maybeMasked=*/ArrayAttr());
} }
static ParseResult parseTransferWriteOp(OpAsmParser &parser, static ParseResult parseTransferWriteOp(OpAsmParser &parser,
OperationState &result) { OperationState &result) {
llvm::SMLoc typesLoc; llvm::SMLoc typesLoc;
OpAsmParser::OperandType vectorInfo, memrefInfo; OpAsmParser::OperandType vectorInfo, memrefInfo;
SmallVector<OpAsmParser::OperandType, 8> indexInfo; SmallVector<OpAsmParser::OperandType, 8> indexInfo;
SmallVector<Type, 2> types; SmallVector<Type, 2> types;
▲ Show 20 Lines • Show All 849 Lines • Show Last 20 Lines

mlir/test/Dialect/Affine/SuperVectorize/vector_utils.mlir

Show First 20 Lines • Show All 50 Lines • ▼ Show 20 Linesfunc @double_loop_nest(%a: memref<20x30xf32>, %b: memref<20xf32>) {
return return
} }
// VECNEST: affine.for %{{.*}} = 0 to 20 step 4 { // VECNEST: affine.for %{{.*}} = 0 to 20 step 4 {
// VECNEST: vector.transfer_read // VECNEST: vector.transfer_read
// VECNEST-NEXT: affine.for %{{.*}} = 0 to 30 { // VECNEST-NEXT: affine.for %{{.*}} = 0 to 30 {
// VECNEST: vector.transfer_read // VECNEST: vector.transfer_read
// VECNEST-NEXT: vector.transfer_write // VECNEST-NEXT: vector.transfer_write %{{.*}}, %{{.*}}[%{{.*}}, %{{.*}}] {permutation_map = #{{.*}}}
// VECNEST-NEXT: } // VECNEST-NEXT: }
// VECNEST-NEXT: vector.transfer_write // VECNEST-NEXT: vector.transfer_write
// VECNEST: } // VECNEST: }