Skip to content

[mlir] Move vector.{to_elements,from_elements} unrolling to VectorUnroll.cpp #159118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Sep 18, 2025
Merged

[mlir] Move vector.{to_elements,from_elements} unrolling to VectorUnroll.cpp #159118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
08655a9
[mlir] Add vector.{to_elements,from_elements} unrolling to VectorToSPIRV
amd-eochoalo Sep 16, 2025
c891a27
populate patterns inside populateVectorUnrollPatterns
amd-eochoalo Sep 16, 2025
e1f9605
Copy over UnrollToElements
amd-eochoalo Sep 16, 2025
5c3e7d5
Removes reference to previous UnrollToElements pattern
amd-eochoalo Sep 16, 2025
04431c5
Copy over UnrollFromElements
amd-eochoalo Sep 16, 2025
70a667e
Removes reference to previous UnrollFromElements pattern
amd-eochoalo Sep 16, 2025
c054f16
Adds UnrollVectorOptions to ToElements and ForElements patterns
amd-eochoalo Sep 16, 2025
28ca33b
Merge branch 'main' into eochoa/2025-09-16/unroll-to-from-elements
amd-eochoalo Sep 17, 2025
5a266fb
Address review comments
amd-eochoalo Sep 17, 2025
f0283ca
Update documentation
amd-eochoalo Sep 18, 2025
5d7afb1
Reword documentation 'exhaustive' -> 'fixed-point'
amd-eochoalo Sep 18, 2025
44145b5
Add documentation to UnrollToElements
amd-eochoalo Sep 18, 2025
d3af4ce
Merge branch 'main' into eochoa/2025-09-16/unroll-to-from-elements
amd-eochoalo Sep 18, 2025
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/SPIRV/Transforms/SPIRVConversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,6 +1495,8 @@ LogicalResult mlir::spirv::unrollVectorsInFuncBodies(Operation *op) {
RewritePatternSet patterns(context);
auto options = vector::UnrollVectorOptions().setNativeShapeFn(
[](auto op) { return mlir::spirv::getNativeVectorShape(op); });
vector::populateVectorFromElementsLoweringPatterns(patterns);
vector::populateVectorToElementsLoweringPatterns(patterns);
populateVectorUnrollPatterns(patterns, options);
if (failed(applyPatternsGreedily(op, std::move(patterns))))
return failure();
Expand Down
44 changes: 44 additions & 0 deletions mlir/test/Conversion/ConvertToSPIRV/vector-unroll.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,47 @@ func.func @transpose(%arg0 : vector<2x3xi32>) -> (vector<3x2xi32>) {
%0 = vector.transpose %arg0, [1, 0] : vector<2x3xi32> to vector<3x2xi32>
return %0 : vector<3x2xi32>
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It looks like these are the only tests that check for unrolling, although it does not check the conversion from vector to spirv, it just checks that the unrolling was applied. We could also start a new file that runs test-convert-to-spirv with run-vector-unrolling=true as an integration test.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure if we need specific vector unrolling test for SPIR-V but we should add independent test to test/Dialect/Vector/.... I think we have vector-unroll-options.mlir for unrolling.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm tasked with making sure that vector.to_elements and vector.from_elements are unrolled during the test-convert-to-spirv lowering, so I think that adding tests here makes sense.

// -----

// In order to verify that the pattern is applied,
// we need to make sure that the the 2d vector does not
// come from the parameters. Otherwise, the pattern
// in unrollVectorsInSignatures which splits the 2d vector
// parameter will take precedent. Similarly, let's avoid
// returning a vector as another pattern would take precendence.

// CHECK-LABEL: @unroll_to_elements_2d
func.func @unroll_to_elements_2d() -> (f32, f32, f32, f32) {
%1 = "test.op"() : () -> (vector<2x2xf32>)
// CHECK: %[[VEC2D:.+]] = "test.op"
// CHECK: %[[VEC0:.+]] = vector.extract %[[VEC2D]][0] : vector<2xf32> from vector<2x2xf32>
// CHECK: %[[VEC1:.+]] = vector.extract %[[VEC2D]][1] : vector<2xf32> from vector<2x2xf32>
// CHECK: %[[RES0:.+]]:2 = vector.to_elements %[[VEC0]]
// CHECK: %[[RES1:.+]]:2 = vector.to_elements %[[VEC1]]
%2:4 = vector.to_elements %1 : vector<2x2xf32>
return %2#0, %2#1, %2#2, %2#3 : f32, f32, f32, f32
}

// -----

// In order to verify that the pattern is applied,
// we need to make sure that the the 2d vector is used
// by an operation and that extracts are not folded away.
// In other words we can't use "test.op" nor return the
// value `%0 = vector.from_elements`

// CHECK-LABEL: @unroll_from_elements_2d
// CHECK-SAME: (%[[ARG0:.+]]: f32, %[[ARG1:.+]]: f32, %[[ARG2:.+]]: f32, %[[ARG3:.+]]: f32)
func.func @unroll_from_elements_2d(%arg0: f32, %arg1: f32, %arg2: f32, %arg3: f32) -> (vector<2x2xf32>) {
// CHECK: %[[VEC0:.+]] = vector.from_elements %[[ARG0]], %[[ARG1]] : vector<2xf32>
// CHECK: %[[VEC1:.+]] = vector.from_elements %[[ARG2]], %[[ARG3]] : vector<2xf32>
%0 = vector.from_elements %arg0, %arg1, %arg2, %arg3 : vector<2x2xf32>

// CHECK: %[[RES0:.+]] = arith.addf %[[VEC0]], %[[VEC0]]
// CHECK: %[[RES1:.+]] = arith.addf %[[VEC1]], %[[VEC1]]
%1 = arith.addf %0, %0 : vector<2x2xf32>

// return %[[RES0]], %%[[RES1]] : vector<2xf32>, vector<2xf32>
return %1 : vector<2x2xf32>
}
Loading