Skip to content
Merged
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
49 changes: 47 additions & 2 deletions mlir/lib/Dialect/Vector/Transforms/VectorLinearize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,51 @@ struct LinearizeVectorFromElements final
}
};

/// This pattern linearizes the operand in `vector.to_elements` operations
/// by converting the source type to a 1-D vector while preserving all element
/// values. The transformation creates a linearized `vector.shape_cast`
/// followed by a `vector.to_elements`.
///
/// Example:
///
/// %0:4 = vector.to_elements %v : vector<2x2xf32>
///
/// is converted to:
///
/// %vector_cast = vector.shape_cast %v : vector<2x2xf32> to vector<4xf32>
/// %0:4 = vector.to_elements %vector_cast : vector<4xf32>
///
struct LinearizeVectorToElements final
: public OpConversionPattern<vector::ToElementsOp> {
using OpConversionPattern::OpConversionPattern;

LinearizeVectorToElements(const TypeConverter &typeConverter,
MLIRContext *context, PatternBenefit benefit = 1)
: OpConversionPattern(typeConverter, context, benefit) {}

LogicalResult
matchAndRewrite(vector::ToElementsOp toElementsOp, OpAdaptor adaptor,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Happy to use the adaptor, but I noticed that in the pattern above adaptor is not used. To continue the style of the pattern above I also did not use it here.

ConversionPatternRewriter &rewriter) const override {

VectorType vecType = toElementsOp.getSource().getType();
if (vecType.getRank() <= 1)
return rewriter.notifyMatchFailure(
toElementsOp, "the rank is already less than or equal to 1");

assert(vecType.getNumScalableDims() == 0 &&
"to_elements does not support scalable vectors");
auto vec1DType =
VectorType::get({vecType.getNumElements()}, vecType.getElementType());
Value shapeCast = vector::ShapeCastOp::create(
rewriter, toElementsOp.getLoc(), vec1DType, toElementsOp.getSource());
auto newToElementsOp =
vector::ToElementsOp::create(rewriter, toElementsOp.getLoc(),
toElementsOp.getResultTypes(), shapeCast);
rewriter.replaceOp(toElementsOp, newToElementsOp);
return success();
}
};

} // namespace

/// This method defines the set of operations that are linearizable, and hence
Expand Down Expand Up @@ -890,8 +935,8 @@ void mlir::vector::populateVectorLinearizeBasePatterns(
patterns
.add<LinearizeConstantLike, LinearizeVectorizable, LinearizeVectorBitCast,
LinearizeVectorSplat, LinearizeVectorCreateMask, LinearizeVectorLoad,
LinearizeVectorStore, LinearizeVectorFromElements>(
typeConverter, patterns.getContext());
LinearizeVectorStore, LinearizeVectorFromElements,
LinearizeVectorToElements>(typeConverter, patterns.getContext());
}

void mlir::vector::populateVectorLinearizeShuffleLikeOpsPatterns(
Expand Down
23 changes: 23 additions & 0 deletions mlir/test/Dialect/Vector/linearize.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -538,3 +538,26 @@ func.func @test_vector_from_elements(%arg0: f32, %arg1: f32, %arg2: f32, %arg3:
%1 = vector.from_elements %arg0, %arg1, %arg2, %arg3 : vector<2x2xf32>
return %1 : vector<2x2xf32>
}

// -----

// CHECK-LABEL: func.func @to_elements_1d(
// CHECK-SAME: %[[ARG0:.+]]: vector<2xf32>
// CHECK: %[[RES:.+]]:2 = vector.to_elements %[[ARG0]] : vector<2xf32>
// CHECK: return %[[RES]]#0, %[[RES]]#1
func.func @to_elements_1d(%arg0: vector<2xf32>) -> (f32, f32) {
%0:2 = vector.to_elements %arg0 : vector<2xf32>
return %0#0, %0#1 : f32, f32
}

// -----

// CHECK-LABEL: func.func @to_elements_2d(
// CHECK-SAME: %[[ARG0:.+]]: vector<2x2xf32>
// CHECK: %[[CAST:.+]] = vector.shape_cast %[[ARG0]]
// CHECK: %[[RES:.+]]:4 = vector.to_elements %[[CAST]] : vector<4xf32>
// CHECK: return %[[RES]]#0, %[[RES]]#1, %[[RES]]#2, %[[RES]]#3
func.func @to_elements_2d(%arg0: vector<2x2xf32>) -> (f32, f32, f32, f32) {
%0:4 = vector.to_elements %arg0 : vector<2x2xf32>
return %0#0, %0#1, %0#2, %0#3 : f32, f32, f32, f32
}