This is an archive of the discontinued LLVM Phabricator instance.

Differential D128903

[mlir][Vector] Fold InsertStridedSliceOp of ExtractStridedSliceOp.
ClosedPublic

Authored by jacquesguan on Jun 30 2022, 4:27 AM.

Details

Reviewers
nicolasvasilache
ftynse
aartbik
bondhugula
rriddle
mehdi_amini
Mogball
ThomasRaoux
Commits
rG8f45c5862f82: [mlir][Vector] Fold InsertStridedSliceOp of ExtractStridedSliceOp.
Summary

This patch supports to fold InsertStridedSliceOp(ExtractStridedSliceOp(dst), dst) to dst.

Diff Detail

Event Timeline

jacquesguan created this revision.Jun 30 2022, 4:27 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 30 2022, 4:27 AM
Herald added subscribers: bzcheeseman, sdasgup3, wenzhicui and 16 others. · View Herald Transcript
jacquesguan requested review of this revision.Jun 30 2022, 4:27 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 30 2022, 4:27 AM
Herald added a subscriber: stephenneuendorffer. · View Herald Transcript
Harbormaster completed remote builds in B173002: Diff 441348.Jun 30 2022, 4:28 AM
Mogball requested changes to this revision.Jun 30 2022, 1:38 PM
Mogball added inline comments.
mlir/lib/Dialect/Vector/IR/VectorOps.cpp
2232–2249

Because these are required to be I64ArrayAttrs, you can directly do pointer comparisons.

This revision now requires changes to proceed.Jun 30 2022, 1:38 PM
jacquesguan updated this revision to Diff 441580.Jun 30 2022, 8:19 PM

Address comment.

Herald added a subscriber: anlunx. · View Herald TranscriptJun 30 2022, 8:19 PM
jacquesguan marked an inline comment as done.Jun 30 2022, 8:20 PM
jacquesguan added inline comments.
mlir/lib/Dialect/Vector/IR/VectorOps.cpp
2232–2249

Done.

Mogball accepted this revision.Jun 30 2022, 8:21 PM
This revision is now accepted and ready to land.Jun 30 2022, 8:21 PM
Harbormaster completed remote builds in B173167: Diff 441580.Jun 30 2022, 8:43 PM
Closed by commit rG8f45c5862f82: [mlir][Vector] Fold InsertStridedSliceOp of ExtractStridedSliceOp. (authored by jacquesguan). · Explain WhyJun 30 2022, 8:45 PM
This revision was automatically updated to reflect the committed changes.
jacquesguan marked an inline comment as done.
jacquesguan added a commit: rG8f45c5862f82: [mlir][Vector] Fold InsertStridedSliceOp of ExtractStridedSliceOp..

Revision Contents

PathSize
mlir/
lib/
Dialect/
Vector/
IR/
34 lines
test/
Dialect/
Vector/
14 lines

Diff 441582

mlir/lib/Dialect/Vector/IR/VectorOps.cpp

Show First 20 Lines • Show All 2,199 Lines • ▼ Show 20 Lines LogicalResult matchAndRewrite(InsertStridedSliceOp insertStridedSliceOp,
if (srcSplatOp.getInput() != destSplatOp.getInput()) if (srcSplatOp.getInput() != destSplatOp.getInput())
return failure(); return failure();
rewriter.replaceOp(insertStridedSliceOp, insertStridedSliceOp.getDest()); rewriter.replaceOp(insertStridedSliceOp, insertStridedSliceOp.getDest());
return success(); return success();
} }
}; };
/// Pattern to rewrite an InsertStridedSliceOp(ExtractStridedSliceOp(dst), dst)
/// to dst.
class FoldInsertStridedSliceOfExtract final
: public OpRewritePattern<InsertStridedSliceOp> {
public:
using OpRewritePattern<InsertStridedSliceOp>::OpRewritePattern;
LogicalResult matchAndRewrite(InsertStridedSliceOp insertStridedSliceOp,
PatternRewriter &rewriter) const override {
auto extractStridedSliceOp =
insertStridedSliceOp.getSource()
.getDefiningOp<vector::ExtractStridedSliceOp>();
if (!extractStridedSliceOp)
return failure();
if (extractStridedSliceOp.getOperand() != insertStridedSliceOp.getDest())
return failure();
// Check if have the same strides and offsets.
if (extractStridedSliceOp.getStrides() !=
insertStridedSliceOp.getStrides() ||
extractStridedSliceOp.getOffsets() != insertStridedSliceOp.getOffsets())
return failure();
rewriter.replaceOp(insertStridedSliceOp, insertStridedSliceOp.getDest());
return success();
}
};
} // namespace } // namespace
void vector::InsertStridedSliceOp::getCanonicalizationPatterns( void vector::InsertStridedSliceOp::getCanonicalizationPatterns(
RewritePatternSet &results, MLIRContext *context) { RewritePatternSet &results, MLIRContext *context) {
results.add<FoldInsertStridedSliceSplat>(context); results.add<FoldInsertStridedSliceSplat, FoldInsertStridedSliceOfExtract>(
context);
} }
OpFoldResult InsertStridedSliceOp::fold(ArrayRef<Attribute> operands) { OpFoldResult InsertStridedSliceOp::fold(ArrayRef<Attribute> operands) {
if (getSourceVectorType() == getDestVectorType()) if (getSourceVectorType() == getDestVectorType())
return getSource(); return getSource();
MogballUnsubmitted
Done
ReplyInline Actions
return array[idx].cast<IntegerAttr>().getInt();
};
- auto extractStrides = extractStridedSliceOp.getStrides();
- auto extractOffsets = extractStridedSliceOp.getOffsets();
- auto insertStrides = insertStridedSliceOp.getStrides();
- auto insertOffsets = insertStridedSliceOp.getOffsets();
- // Check if have the same strides.
- if (extractStrides.size() != insertStrides.size())
+ if (extractStridedSliceOp.getStrides() !=
+ insertStridedSliceOp.getStrides() ||
+ extractStridedSliceOp.getOffsets() !=
+ insertStridedSliceOp.getOffsets())
return failure();
- for (size_t i = 0; i < extractStrides.size(); ++i)
- if (getElement(extractStrides, i) != getElement(insertStrides, i))
- return failure();
-
- // Check if have the same offsets.
- if (extractOffsets.size() != insertOffsets.size())
- return failure();
- for (size_t i = 0; i < extractOffsets.size(); ++i)
- if (getElement(extractOffsets, i) != getElement(insertOffsets, i))
- return failure();
-
rewriter.replaceOp(insertStridedSliceOp, insertStridedSliceOp.getDest());

Because these are required to be I64ArrayAttrs, you can directly do pointer comparisons.

Mogball: Because these are required to be `I64ArrayAttr`s, you can directly do pointer comparisons.
jacquesguanAuthorUnsubmitted
Done
ReplyInline Actions

Done.

jacquesguan: Done.
return {}; return {};
} }
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// OuterProductOp // OuterProductOp
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
/// Build an op without mask, use the type of `acc` as the return type. /// Build an op without mask, use the type of `acc` as the return type.
▲ Show 20 Lines • Show All 2,702 Lines • Show Last 20 Lines

mlir/test/Dialect/Vector/canonicalize.mlir

Show First 20 Lines • Show All 1,635 Lines • ▼ Show 20 Lines
// CHECK-NEXT: return %[[SPLAT]] : vector<8x16xf32> // CHECK-NEXT: return %[[SPLAT]] : vector<8x16xf32>
func.func @insert_strided_slice_splat(%x: f32) -> (vector<8x16xf32>) { func.func @insert_strided_slice_splat(%x: f32) -> (vector<8x16xf32>) {
%splat0 = vector.splat %x : vector<4x4xf32> %splat0 = vector.splat %x : vector<4x4xf32>
%splat1 = vector.splat %x : vector<8x16xf32> %splat1 = vector.splat %x : vector<8x16xf32>
%0 = vector.insert_strided_slice %splat0, %splat1 {offsets = [2, 2], strides = [1, 1]} %0 = vector.insert_strided_slice %splat0, %splat1 {offsets = [2, 2], strides = [1, 1]}
: vector<4x4xf32> into vector<8x16xf32> : vector<4x4xf32> into vector<8x16xf32>
return %0 : vector<8x16xf32> return %0 : vector<8x16xf32>
} }
// -----
// CHECK-LABEL: @insert_extract_strided_slice
// CHECK-SAME: (%[[ARG:.*]]: vector<8x16xf32>)
// CHECK-NEXT: return %[[ARG]] : vector<8x16xf32>
func.func @insert_extract_strided_slice(%x: vector<8x16xf32>) -> (vector<8x16xf32>) {
%0 = vector.extract_strided_slice %x {offsets = [0, 8], sizes = [2, 4], strides = [1, 1]}
: vector<8x16xf32> to vector<2x4xf32>
%1 = vector.insert_strided_slice %0, %x {offsets = [0, 8], strides = [1, 1]}
: vector<2x4xf32> into vector<8x16xf32>
return %1 : vector<8x16xf32>
}