Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 2 additions & 0 deletions mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,8 @@ struct ReorderCastOpsOnBroadcast
PatternRewriter &rewriter) const override {
if (op->getNumOperands() != 1)
return failure();
if (!isa<VectorType>(op->getResult(0).getType()))
return failure();
auto bcastOp = op->getOperand(0).getDefiningOp<vector::BroadcastOp>();
if (!bcastOp)
return failure();
Expand Down
17 changes: 17 additions & 0 deletions mlir/test/Dialect/Vector/vector-sink.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -850,3 +850,20 @@ func.func @negative_store_no_single_use(%arg0: memref<?xf32>, %arg1: index, %arg
vector.store %0, %arg0[%arg1] : memref<?xf32>, vector<1xf32>
return %0 : vector<1xf32>
}

// -----

// CHECK-LABEL: func.func @broadcast_cast_non_vector_result
// CHECK-SAME: (%[[ARG:.*]]: i64)
// CHECK: %[[BCAST:.*]] = vector.broadcast %[[ARG]] : i64 to vector<26x7xi64>
// CHECK: %[[CAST:.*]] = builtin.unrealized_conversion_cast %[[BCAST]] : vector<26x7xi64> to !llvm.array<26 x vector<7xi64>>
// CHECK: return %[[CAST]] : !llvm.array<26 x vector<7xi64>>
/// This test ensures that the `ReorderCastOpsOnBroadcast` pattern does not
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests for this pattern are located below this block comment:

// [Pattern: ReorderCastOpsOnBroadcast]

Please move it accordingly. Thanks!

/// attempt to reorder a cast operation that produces a non-vector result type.
/// Previously, this would crash because the pattern assumed the result was a
/// vector type when creating the new inner broadcast.
Comment on lines +863 to +864
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nit] "Previously" is a very relative term ("previously to what?"). I would just drop this sentence, it doesn't add any new info.

func.func @broadcast_cast_non_vector_result(%arg0: i64) -> !llvm.array<26 x vector<7xi64>> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please follow our naming convention (as per https://mlir.llvm.org/getting_started/TestingGuide/#test-naming-convention)

Suggested change
func.func @broadcast_cast_non_vector_result(%arg0: i64) -> !llvm.array<26 x vector<7xi64>> {
func.func @negative_broadcast_cast_non_vector_result(%arg0: i64) -> !llvm.array<26 x vector<7xi64>> {

%0 = vector.broadcast %arg0 : i64 to vector<26x7xi64>
%1 = builtin.unrealized_conversion_cast %0 : vector<26x7xi64> to !llvm.array<26 x vector<7xi64>>
return %1 : !llvm.array<26 x vector<7xi64>>
}
Loading