Skip to content

Commit 7034b77

Browse files
MacDueMacDue
committed
Manually upgrade three tests (with non-standard syntax/checks)
1 parent 4512401 commit 7034b77

File tree

3 files changed

+50
-59
lines changed

3 files changed

+50
-59
lines changed

‎mlir/test/Dialect/Vector/invalid.mlir

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -631,13 +631,6 @@ func.func @insert_strided_slice(%a: vector<4x4xf32>, %b: vector<4x8x16xf32>) {
631631

632632
// -----
633633

634-
func.func @insert_strided_slice(%a: vector<4x4xf32>, %b: vector<4x8x16xf32>) {
635-
// expected-error@+1 {{expected source rank to be no greater than destination rank}}
636-
%1 = vector.insert_strided_slice %b, %a[2:1][2:1][2:1] : vector<4x8x16xf32> into vector<4x4xf32>
637-
}
638-
639-
// -----
640-
641634
func.func @insert_strided_slice(%a: vector<4x4xf32>, %b: vector<4x8x16xf32>) {
642635
// expected-error@+1 {{op expected offsets dimension 0 to be confined to [0, 4)}}
643636
%1 = vector.insert_strided_slice %a, %b[100][100:1][100:1] : vector<4x4xf32> into vector<4x8x16xf32>
@@ -677,13 +670,13 @@ func.func @insert_strided_slice_scalable(%a : vector<1x1x4xi32>, %b: vector<1x4x
677670

678671
func.func @extract_strided_slice(%arg0: vector<4x8x16xf32>) {
679672
// expected-error@+1 {{expected offsets, sizes and strides attributes of same size}}
680-
%1 = vector.extract_strided_slice %arg0[100:2:1][100:2:1] : vector<4x8x16xf32> to vector<2x2x16xf32>
673+
%1 = vector.extract_strided_slice %arg0[100][4:2:1][0:2:1] : vector<4x8x16xf32> to vector<2x2x16xf32>
681674
}
682675

683676
// -----
684677

685678
func.func @extract_strided_slice(%arg0: vector<4x8x16xf32>) {
686-
// expected-error@+1 {{expected offsets attribute of rank no greater than vector rank}}
679+
// expected-error@+1 {{op expected offsets to have rank no greater than vector rank}}
687680
%1 = vector.extract_strided_slice %arg0[2:2:1][2:2:1][2:2:1][2:2:1] : vector<4x8x16xf32> to vector<2x2x16xf32>
688681
}
689682

‎mlir/test/Dialect/Vector/linearize.mlir

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,18 +172,17 @@ func.func @test_extract_strided_slice_1(%arg0 : vector<4x8xf32>) -> vector<2x2xf
172172

173173
// BW-0: %[[RES:.*]] = vector.extract_strided_slice %[[ARG:.*]][0:2:1][4:2:1] : vector<4x8xf32> to vector<2x2xf32>
174174
// BW-0: return %[[RES]] : vector<2x2xf32>
175-
%0 = vector.extract_strided_slice %arg0 { sizes = [2, 2], strides = [1, 1], offsets = [0, 4]}
176-
: vector<4x8xf32> to vector<2x2xf32>
175+
%0 = vector.extract_strided_slice %arg0[0:2:1][4:2:1] : vector<4x8xf32> to vector<2x2xf32>
177176
return %0 : vector<2x2xf32>
178177
}
179178

180179
// ALL-LABEL: func.func @test_extract_strided_slice_1_scalable(
181180
// ALL-SAME: %[[VAL_0:.*]]: vector<4x[8]xf32>) -> vector<2x[8]xf32> {
182-
func.func @test_extract_strided_slice_1_scalable(%arg0: vector<4x[8]xf32>) -> vector<2x[8]xf32> {
181+
func.func @test_extract_strided_slice_1_scalable(%arg0: vector<4x[8]xf32>) -> vector<2x[8]xf32> {
183182
// ALL-NOT: vector.shuffle
184183
// ALL-NOT: vector.shape_cast
185184
// ALL: %[[RES:.*]] = vector.extract_strided_slice %[[VAL_0]][1:2:1][0:8:1] : vector<4x[8]xf32> to vector<2x[8]xf32>
186-
%0 = vector.extract_strided_slice %arg0 { sizes = [2, 8], strides = [1, 1], offsets = [1, 0] } : vector<4x[8]xf32> to vector<2x[8]xf32>
185+
%0 = vector.extract_strided_slice %arg0[1:2:1][0:8:1] : vector<4x[8]xf32> to vector<2x[8]xf32>
187186
// ALL: return %[[RES]] : vector<2x[8]xf32>
188187
return %0 : vector<2x[8]xf32>
189188
}
@@ -206,8 +205,7 @@ func.func @test_extract_strided_slice_2(%arg0 : vector<2x8x2xf32>) -> vector<1x4
206205

207206
// BW-0: %[[RES:.*]] = vector.extract_strided_slice %[[ORIG_ARG]][1:1:1][2:4:1] : vector<2x8x2xf32> to vector<1x4x2xf32>
208207
// BW-0: return %[[RES]] : vector<1x4x2xf32>
209-
%0 = vector.extract_strided_slice %arg0 { offsets = [1, 2], strides = [1, 1], sizes = [1, 4] }
210-
: vector<2x8x2xf32> to vector<1x4x2xf32>
208+
%0 = vector.extract_strided_slice %arg0[1:1:1][2:4:1] : vector<2x8x2xf32> to vector<1x4x2xf32>
211209
return %0 : vector<1x4x2xf32>
212210
}
213211

‎mlir/test/Dialect/Vector/vector-unroll-options.mlir

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16,66 +16,66 @@ func.func @vector_contract_f32(%lhs : vector<8x4xf32>, %rhs : vector<8x4xf32>,
1616
// CHECK-SAME: [[arg0:%.+]]: vector<8x4xf32>, [[arg1:%.+]]: vector<8x4xf32>, [[arg2:%.+]]: vector<8x8xf32>
1717

1818
// CHECK: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
19-
// CHECK-SAME: offsets = [0, 0]
19+
// CHECK-SAME: [0:{{.*}}][0:{{.*}}]
2020
// CHECK: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
21-
// CHECK-SAME: offsets = [0, 0]
21+
// CHECK-SAME: [0:{{.*}}][0:{{.*}}]
2222
// CHECK: [[c:%.+]] = vector.extract_strided_slice [[arg2]]
23-
// CHECK-SAME: offsets = [0, 0]
23+
// CHECK-SAME: [0:{{.*}}][0:{{.*}}]
2424
// CHECK: [[accum1:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[c]]
2525
// CHECK-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
2626

2727
// CHECK: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
28-
// CHECK-SAME: offsets = [0, 2]
28+
// CHECK-SAME: [0:{{.*}}][2:{{.*}}]
2929
// CHECK: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
30-
// CHECK-SAME: offsets = [0, 2]
30+
// CHECK-SAME: [0:{{.*}}][2:{{.*}}]
3131
// CHECK: [[accum2:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[accum1]]
3232
// CHECK-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
3333

3434
// CHECK: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
35-
// CHECK-SAME: offsets = [0, 0]
35+
// CHECK-SAME: [0:{{.*}}][0:{{.*}}]
3636
// CHECK: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
37-
// CHECK-SAME: offsets = [4, 0]
37+
// CHECK-SAME: [4:{{.*}}][0:{{.*}}]
3838
// CHECK: [[c:%.+]] = vector.extract_strided_slice [[arg2]]
39-
// CHECK-SAME: offsets = [0, 4]
39+
// CHECK-SAME: [0:{{.*}}][4:{{.*}}]
4040
// CHECK: [[accum3:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[c]]
4141
// CHECK-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
4242

4343
// CHECK: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
44-
// CHECK-SAME: offsets = [0, 2]
44+
// CHECK-SAME: [0:{{.*}}][2:{{.*}}]
4545
// CHECK: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
46-
// CHECK-SAME: offsets = [4, 2]
46+
// CHECK-SAME: [4:{{.*}}][2:{{.*}}]
4747
// CHECK: [[accum4:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[accum3]]
4848
// CHECK-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
4949

5050
// CHECK: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
51-
// CHECK-SAME: offsets = [4, 0]
51+
// CHECK-SAME: [4:{{.*}}][0:{{.*}}]
5252
// CHECK: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
53-
// CHECK-SAME: offsets = [0, 0]
53+
// CHECK-SAME: [0:{{.*}}][0:{{.*}}]
5454
// CHECK: [[c:%.+]] = vector.extract_strided_slice [[arg2]]
55-
// CHECK-SAME: offsets = [4, 0]
55+
// CHECK-SAME: [4:{{.*}}][0:{{.*}}]
5656
// CHECK: [[accum5:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[c]]
5757
// CHECK-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
5858

5959
// CHECK: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
60-
// CHECK-SAME: offsets = [4, 2]
60+
// CHECK-SAME: [4:{{.*}}][2:{{.*}}]
6161
// CHECK: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
62-
// CHECK-SAME: offsets = [0, 2]
62+
// CHECK-SAME: [0:{{.*}}][2:{{.*}}]
6363
// CHECK: [[accum6:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[accum5]]
6464
// CHECK-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
6565

6666
// CHECK: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
67-
// CHECK-SAME: offsets = [4, 0]
67+
// CHECK-SAME: [4:{{.*}}][0:{{.*}}]
6868
// CHECK: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
69-
// CHECK-SAME: offsets = [4, 0]
69+
// CHECK-SAME: [4:{{.*}}][0:{{.*}}]
7070
// CHECK: [[c:%.+]] = vector.extract_strided_slice [[arg2]]
71-
// CHECK-SAME: offsets = [4, 4]
71+
// CHECK-SAME: [4:{{.*}}][4:{{.*}}]
7272
// CHECK: [[accum7:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[c]]
7373
// CHECK-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
7474

7575
// CHECK: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
76-
// CHECK-SAME: offsets = [4, 2]
76+
// CHECK-SAME: [4:{{.*}}][2:{{.*}}]
7777
// CHECK: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
78-
// CHECK-SAME: offsets = [4, 2]
78+
// CHECK-SAME: [4:{{.*}}][2:{{.*}}]
7979
// CHECK: [[accum8:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[accum7]]
8080
// CHECK-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
8181

@@ -85,66 +85,66 @@ func.func @vector_contract_f32(%lhs : vector<8x4xf32>, %rhs : vector<8x4xf32>,
8585
// ORDER-SAME: [[arg0:%.+]]: vector<8x4xf32>, [[arg1:%.+]]: vector<8x4xf32>, [[arg2:%.+]]: vector<8x8xf32>
8686

8787
// ORDER: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
88-
// ORDER-SAME: offsets = [0, 0]
88+
// ORDER-SAME: [0:{{.*}}][0:{{.*}}]
8989
// ORDER: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
90-
// ORDER-SAME: offsets = [0, 0]
90+
// ORDER-SAME: [0:{{.*}}][0:{{.*}}]
9191
// ORDER: [[c:%.+]] = vector.extract_strided_slice [[arg2]]
92-
// ORDER-SAME: offsets = [0, 0]
92+
// ORDER-SAME: [0:{{.*}}][0:{{.*}}]
9393
// ORDER: [[accum1:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[c]]
9494
// ORDER-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
9595

9696
// ORDER: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
97-
// ORDER-SAME: offsets = [0, 0]
97+
// ORDER-SAME: [0:{{.*}}][0:{{.*}}]
9898
// ORDER: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
99-
// ORDER-SAME: offsets = [4, 0]
99+
// ORDER-SAME: [4:{{.*}}][0:{{.*}}]
100100
// ORDER: [[c:%.+]] = vector.extract_strided_slice [[arg2]]
101-
// ORDER-SAME: offsets = [0, 4]
101+
// ORDER-SAME: [0:{{.*}}][4:{{.*}}]
102102
// ORDER: [[accum2:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[c]]
103103
// ORDER-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
104104

105105
// ORDER: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
106-
// ORDER-SAME: offsets = [4, 0]
106+
// ORDER-SAME: [4:{{.*}}][0:{{.*}}]
107107
// ORDER: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
108-
// ORDER-SAME: offsets = [0, 0]
108+
// ORDER-SAME: [0:{{.*}}][0:{{.*}}]
109109
// ORDER: [[c:%.+]] = vector.extract_strided_slice [[arg2]]
110-
// ORDER-SAME: offsets = [4, 0]
110+
// ORDER-SAME: [4:{{.*}}][0:{{.*}}]
111111
// ORDER: [[accum3:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[c]]
112112
// ORDER-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
113113

114114
// ORDER: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
115-
// ORDER-SAME: offsets = [4, 0]
115+
// ORDER-SAME: [4:{{.*}}][0:{{.*}}]
116116
// ORDER: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
117-
// ORDER-SAME: offsets = [4, 0]
117+
// ORDER-SAME: [4:{{.*}}][0:{{.*}}]
118118
// ORDER: [[c:%.+]] = vector.extract_strided_slice [[arg2]]
119-
// ORDER-SAME: offsets = [4, 4]
119+
// ORDER-SAME: [4:{{.*}}][4:{{.*}}]
120120
// ORDER: [[accum4:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[c]]
121121
// ORDER-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
122122

123123
// ORDER: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
124-
// ORDER-SAME: offsets = [0, 2]
124+
// ORDER-SAME: [0:{{.*}}][2:{{.*}}]
125125
// ORDER: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
126-
// ORDER-SAME: offsets = [0, 2]
126+
// ORDER-SAME: [0:{{.*}}][2:{{.*}}]
127127
// ORDER: [[accum5:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[accum1]]
128128
// ORDER-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
129129

130130
// ORDER: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
131-
// ORDER-SAME: offsets = [0, 2]
131+
// ORDER-SAME: [0:{{.*}}][2:{{.*}}]
132132
// ORDER: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
133-
// ORDER-SAME: offsets = [4, 2]
133+
// ORDER-SAME: [4:{{.*}}][2:{{.*}}]
134134
// ORDER: [[accum6:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[accum2]]
135135
// ORDER-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
136136

137137
// ORDER: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
138-
// ORDER-SAME: offsets = [4, 2]
138+
// ORDER-SAME: [4:{{.*}}][2:{{.*}}]
139139
// ORDER: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
140-
// ORDER-SAME: offsets = [0, 2]
140+
// ORDER-SAME: [0:{{.*}}][2:{{.*}}]
141141
// ORDER: [[accum7:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[accum3]]
142142
// ORDER-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
143143

144144
// ORDER: [[a:%.+]] = vector.extract_strided_slice [[arg0]]
145-
// ORDER-SAME: offsets = [4, 2]
145+
// ORDER-SAME: [4:{{.*}}][2:{{.*}}]
146146
// ORDER: [[b:%.+]] = vector.extract_strided_slice [[arg1]]
147-
// ORDER-SAME: offsets = [4, 2]
147+
// ORDER-SAME: [4:{{.*}}][2:{{.*}}]
148148
// ORDER: [[accum8:%.+]] = vector.contract {{{.*}}} [[a]], [[b]], [[accum4]]
149149
// ORDER-SAME: vector<4x2xf32>, vector<4x2xf32> into vector<4x4xf32>
150150

@@ -219,15 +219,15 @@ func.func @vector_reduction(%v : vector<8xf32>) -> f32 {
219219
}
220220
// CHECK-LABEL: func @vector_reduction(
221221
// CHECK-SAME: %[[v:.*]]: vector<8xf32>
222-
// CHECK: %[[s0:.*]] = vector.extract_strided_slice %[[v]] {offsets = [0], sizes = [2]
222+
// CHECK: %[[s0:.*]] = vector.extract_strided_slice %[[v]][0:2:
223223
// CHECK: %[[r0:.*]] = vector.reduction <add>, %[[s0]]
224-
// CHECK: %[[s1:.*]] = vector.extract_strided_slice %[[v]] {offsets = [2], sizes = [2]
224+
// CHECK: %[[s1:.*]] = vector.extract_strided_slice %[[v]][2:2:
225225
// CHECK: %[[r1:.*]] = vector.reduction <add>, %[[s1]]
226226
// CHECK: %[[add1:.*]] = arith.addf %[[r0]], %[[r1]]
227-
// CHECK: %[[s2:.*]] = vector.extract_strided_slice %[[v]] {offsets = [4], sizes = [2]
227+
// CHECK: %[[s2:.*]] = vector.extract_strided_slice %[[v]][4:2
228228
// CHECK: %[[r2:.*]] = vector.reduction <add>, %[[s2]]
229229
// CHECK: %[[add2:.*]] = arith.addf %[[add1]], %[[r2]]
230-
// CHECK: %[[s3:.*]] = vector.extract_strided_slice %[[v]] {offsets = [6], sizes = [2]
230+
// CHECK: %[[s3:.*]] = vector.extract_strided_slice %[[v]][6:2
231231
// CHECK: %[[r3:.*]] = vector.reduction <add>, %[[s3]]
232232
// CHECK: %[[add3:.*]] = arith.addf %[[add2]], %[[r3]]
233233
// CHECK: return %[[add3]]

0 commit comments

Comments
 (0)