[mli][vector] canonicalize vector.from_elements from ascending extracts #139819
+389
−69
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| // RUN: mlir-opt %s -canonicalize="test-convergence" -split-input-file -allow-unregistered-dialect | FileCheck %s | ||
|
|
||
| // This file contains some tests of folding/canonicalizing vector.from_elements | ||
|
|
||
| ///===----------------------------------------------===// | ||
| /// Tests of `rewriteFromElementsAsSplat` | ||
| ///===----------------------------------------------===// | ||
|
Comment on lines
+5
to
+7
There was a problem hiding this comment. This section was copied, right? Could you add a note in the summary so that it's easy to track the history? There was a problem hiding this comment. Yes, copied. I added a comment to the PR summary, I assume that's where you meant? |
||
|
|
||
| // CHECK-LABEL: func @extract_scalar_from_from_elements( | ||
| // CHECK-SAME: %[[a:.*]]: f32, %[[b:.*]]: f32) | ||
| func.func @extract_scalar_from_from_elements(%a: f32, %b: f32) -> (f32, f32, f32, f32, f32, f32, f32) { | ||
| // Extract from 0D. | ||
| %0 = vector.from_elements %a : vector<f32> | ||
| %1 = vector.extract %0[] : f32 from vector<f32> | ||
|
|
||
| // Extract from 1D. | ||
| %2 = vector.from_elements %a : vector<1xf32> | ||
| %3 = vector.extract %2[0] : f32 from vector<1xf32> | ||
| %4 = vector.from_elements %a, %b, %a, %a, %b : vector<5xf32> | ||
| %5 = vector.extract %4[4] : f32 from vector<5xf32> | ||
|
|
||
| // Extract from 2D. | ||
| %6 = vector.from_elements %a, %a, %a, %b, %b, %b : vector<2x3xf32> | ||
| %7 = vector.extract %6[0, 0] : f32 from vector<2x3xf32> | ||
| %8 = vector.extract %6[0, 1] : f32 from vector<2x3xf32> | ||
| %9 = vector.extract %6[1, 1] : f32 from vector<2x3xf32> | ||
| %10 = vector.extract %6[1, 2] : f32 from vector<2x3xf32> | ||
|
|
||
| // CHECK: return %[[a]], %[[a]], %[[b]], %[[a]], %[[a]], %[[b]], %[[b]] | ||
| return %1, %3, %5, %7, %8, %9, %10 : f32, f32, f32, f32, f32, f32, f32 | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // CHECK-LABEL: func @extract_1d_from_from_elements( | ||
| // CHECK-SAME: %[[a:.*]]: f32, %[[b:.*]]: f32) | ||
| func.func @extract_1d_from_from_elements(%a: f32, %b: f32) -> (vector<3xf32>, vector<3xf32>) { | ||
| %0 = vector.from_elements %a, %a, %a, %b, %b, %b : vector<2x3xf32> | ||
| // CHECK: %[[splat1:.*]] = vector.splat %[[a]] : vector<3xf32> | ||
| %1 = vector.extract %0[0] : vector<3xf32> from vector<2x3xf32> | ||
| // CHECK: %[[splat2:.*]] = vector.splat %[[b]] : vector<3xf32> | ||
| %2 = vector.extract %0[1] : vector<3xf32> from vector<2x3xf32> | ||
| // CHECK: return %[[splat1]], %[[splat2]] | ||
| return %1, %2 : vector<3xf32>, vector<3xf32> | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // CHECK-LABEL: func @extract_2d_from_from_elements( | ||
| // CHECK-SAME: %[[a:.*]]: f32, %[[b:.*]]: f32) | ||
| func.func @extract_2d_from_from_elements(%a: f32, %b: f32) -> (vector<2x2xf32>, vector<2x2xf32>) { | ||
| %0 = vector.from_elements %a, %a, %a, %b, %b, %b, %b, %a, %b, %a, %a, %b : vector<3x2x2xf32> | ||
| // CHECK: %[[splat1:.*]] = vector.from_elements %[[a]], %[[a]], %[[a]], %[[b]] : vector<2x2xf32> | ||
| %1 = vector.extract %0[0] : vector<2x2xf32> from vector<3x2x2xf32> | ||
| // CHECK: %[[splat2:.*]] = vector.from_elements %[[b]], %[[b]], %[[b]], %[[a]] : vector<2x2xf32> | ||
| %2 = vector.extract %0[1] : vector<2x2xf32> from vector<3x2x2xf32> | ||
| // CHECK: return %[[splat1]], %[[splat2]] | ||
| return %1, %2 : vector<2x2xf32>, vector<2x2xf32> | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // CHECK-LABEL: func @from_elements_to_splat( | ||
| // CHECK-SAME: %[[a:.*]]: f32, %[[b:.*]]: f32) | ||
| func.func @from_elements_to_splat(%a: f32, %b: f32) -> (vector<2x3xf32>, vector<2x3xf32>, vector<f32>) { | ||
| // CHECK: %[[splat:.*]] = vector.splat %[[a]] : vector<2x3xf32> | ||
| %0 = vector.from_elements %a, %a, %a, %a, %a, %a : vector<2x3xf32> | ||
| // CHECK: %[[from_el:.*]] = vector.from_elements {{.*}} : vector<2x3xf32> | ||
| %1 = vector.from_elements %a, %a, %a, %a, %b, %a : vector<2x3xf32> | ||
| // CHECK: %[[splat2:.*]] = vector.splat %[[a]] : vector<f32> | ||
| %2 = vector.from_elements %a : vector<f32> | ||
| // CHECK: return %[[splat]], %[[from_el]], %[[splat2]] | ||
| return %0, %1, %2 : vector<2x3xf32>, vector<2x3xf32>, vector<f32> | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| ///===----------------------------------------------===// | ||
| /// Tests of `FromElementsToShapeCast` | ||
| ///===----------------------------------------------===// | ||
|
|
||
| // CHECK-LABEL: func @to_shape_cast_rank2_to_rank1( | ||
| // CHECK-SAME: %[[a:.*]]: vector<1x2xi8>) | ||
| // CHECK: %[[shape_cast:.*]] = vector.shape_cast %[[a]] : vector<1x2xi8> to vector<2xi8> | ||
| // CHECK: return %[[shape_cast]] : vector<2xi8> | ||
|
There was a problem hiding this comment. [nit] Could you use caps for LIT variables? That's much more common. And, IMHO, easier to parse 😅 I suspect that you wanted to maintain consistency with the tests for There was a problem hiding this comment. Easier, but still hard IMO 😆 |
||
| func.func @to_shape_cast_rank2_to_rank1(%arg0: vector<1x2xi8>) -> vector<2xi8> { | ||
| %0 = vector.extract %arg0[0, 0] : i8 from vector<1x2xi8> | ||
| %1 = vector.extract %arg0[0, 1] : i8 from vector<1x2xi8> | ||
| %4 = vector.from_elements %0, %1 : vector<2xi8> | ||
| return %4 : vector<2xi8> | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // CHECK-LABEL: func @to_shape_cast_rank1_to_rank3( | ||
| // CHECK-SAME: %[[a:.*]]: vector<8xi8>) | ||
| // CHECK: %[[shape_cast:.*]] = vector.shape_cast %[[a]] : vector<8xi8> to vector<2x2x2xi8> | ||
| // CHECK: return %[[shape_cast]] : vector<2x2x2xi8> | ||
| func.func @to_shape_cast_rank1_to_rank3(%arg0: vector<8xi8>) -> vector<2x2x2xi8> { | ||
| %0 = vector.extract %arg0[0] : i8 from vector<8xi8> | ||
| %1 = vector.extract %arg0[1] : i8 from vector<8xi8> | ||
| %2 = vector.extract %arg0[2] : i8 from vector<8xi8> | ||
| %3 = vector.extract %arg0[3] : i8 from vector<8xi8> | ||
| %4 = vector.extract %arg0[4] : i8 from vector<8xi8> | ||
| %5 = vector.extract %arg0[5] : i8 from vector<8xi8> | ||
| %6 = vector.extract %arg0[6] : i8 from vector<8xi8> | ||
| %7 = vector.extract %arg0[7] : i8 from vector<8xi8> | ||
| %8 = vector.from_elements %0, %1, %2, %3, %4, %5, %6, %7 : vector<2x2x2xi8> | ||
| return %8 : vector<2x2x2xi8> | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // The extracted elements are recombined into a single vector, but in a new order. | ||
| // CHECK-LABEL: func @negative_nonascending_order( | ||
| // CHECK-NOT: shape_cast | ||
| func.func @negative_nonascending_order(%arg0: vector<1x2xi8>) -> vector<2xi8> { | ||
| %0 = vector.extract %arg0[0, 1] : i8 from vector<1x2xi8> | ||
| %1 = vector.extract %arg0[0, 0] : i8 from vector<1x2xi8> | ||
| %2 = vector.from_elements %0, %1 : vector<2xi8> | ||
| return %2 : vector<2xi8> | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // CHECK-LABEL: func @negative_nonstatic_extract( | ||
| // CHECK-NOT: shape_cast | ||
| func.func @negative_nonstatic_extract(%arg0: vector<1x2xi8>, %i0 : index, %i1 : index) -> vector<2xi8> { | ||
| %0 = vector.extract %arg0[0, %i0] : i8 from vector<1x2xi8> | ||
| %1 = vector.extract %arg0[0, %i1] : i8 from vector<1x2xi8> | ||
| %2 = vector.from_elements %0, %1 : vector<2xi8> | ||
| return %2 : vector<2xi8> | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // CHECK-LABEL: func @negative_different_sources( | ||
| // CHECK-NOT: shape_cast | ||
| func.func @negative_different_sources(%arg0: vector<1x2xi8>, %arg1: vector<1x2xi8>) -> vector<2xi8> { | ||
| %0 = vector.extract %arg0[0, 0] : i8 from vector<1x2xi8> | ||
| %1 = vector.extract %arg1[0, 1] : i8 from vector<1x2xi8> | ||
| %2 = vector.from_elements %0, %1 : vector<2xi8> | ||
| return %2 : vector<2xi8> | ||
| } | ||
|
|
||
| // ----- | ||
|
|
||
| // CHECK-LABEL: func @negative_source_too_large( | ||
| // CHECK-NOT: shape_cast | ||
| func.func @negative_source_too_large(%arg0: vector<1x3xi8>) -> vector<2xi8> { | ||
| %0 = vector.extract %arg0[0, 0] : i8 from vector<1x3xi8> | ||
| %1 = vector.extract %arg0[0, 1] : i8 from vector<1x3xi8> | ||
| %2 = vector.from_elements %0, %1 : vector<2xi8> | ||
| return %2 : vector<2xi8> | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[ultra nit] "if possible" is implicit and "less is more" :)