Skip to content

Commit 6564bf6

Browse files
preamespreames
committed
[RISCV] Rewrite tests to preserve test intent and simplify
Cleaning up tests in advance of pr #150049.
1 parent f26db3f commit 6564bf6

File tree

3 files changed

+27
-62
lines changed

3 files changed

+27
-62
lines changed

‎llvm/test/CodeGen/RISCV/rvv/fixed-vectors-deinterleave-load.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,16 +261,16 @@ define { <8 x i8>, <8 x i8>, <8 x i8> } @vector_deinterleave_load_factor3(ptr %p
261261
; CHECK-LABEL: vector_deinterleave_load_factor3:
262262
; CHECK: # %bb.0:
263263
; CHECK-NEXT: vsetivli zero, 8, e8, mf2, ta, ma
264-
; CHECK-NEXT: vlseg3e8.v v6, (a0)
264+
; CHECK-NEXT: vlseg3e8.v v8, (a0)
265265
; CHECK-NEXT: ret
266266
%vec = load <24 x i8>, ptr %p
267267
%d0 = call {<8 x i8>, <8 x i8>, <8 x i8>} @llvm.vector.deinterleave3(<24 x i8> %vec)
268268
%t0 = extractvalue {<8 x i8>, <8 x i8>, <8 x i8>} %d0, 0
269269
%t1 = extractvalue {<8 x i8>, <8 x i8>, <8 x i8>} %d0, 1
270270
%t2 = extractvalue {<8 x i8>, <8 x i8>, <8 x i8>} %d0, 2
271271
%res0 = insertvalue { <8 x i8>, <8 x i8>, <8 x i8> } poison, <8 x i8> %t0, 0
272-
%res1 = insertvalue { <8 x i8>, <8 x i8>, <8 x i8> } %res0, <8 x i8> %t1, 0
273-
%res2 = insertvalue { <8 x i8>, <8 x i8>, <8 x i8> } %res1, <8 x i8> %t2, 0
272+
%res1 = insertvalue { <8 x i8>, <8 x i8>, <8 x i8> } %res0, <8 x i8> %t1, 1
273+
%res2 = insertvalue { <8 x i8>, <8 x i8>, <8 x i8> } %res1, <8 x i8> %t2, 2
274274
ret { <8 x i8>, <8 x i8>, <8 x i8> } %res2
275275
}
276276

‎llvm/test/CodeGen/RISCV/rvv/fixed-vectors-segN-load.ll

Lines changed: 21 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,72 @@
11
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
22
; RUN: llc -mtriple riscv64 -mattr=+zve64x,+zvl128b < %s | FileCheck %s
33

4-
define <8 x i8> @load_factor2(ptr %ptr) {
4+
define {<8 x i8>, <8 x i8>} @load_factor2(ptr %ptr) {
55
; CHECK-LABEL: load_factor2:
66
; CHECK: # %bb.0:
77
; CHECK-NEXT: vsetivli zero, 8, e8, mf2, ta, ma
8-
; CHECK-NEXT: vlseg2e8.v v7, (a0)
8+
; CHECK-NEXT: vlseg2e8.v v8, (a0)
99
; CHECK-NEXT: ret
1010
%1 = call { <8 x i8>, <8 x i8> } @llvm.riscv.seg2.load.mask.v8i8.i64(ptr %ptr, <8 x i1> splat (i1 true), i64 8)
11-
%2 = extractvalue { <8 x i8>, <8 x i8> } %1, 0
12-
%3 = extractvalue { <8 x i8>, <8 x i8> } %1, 1
13-
ret <8 x i8> %3
11+
ret {<8 x i8>, <8 x i8>} %1
1412
}
1513

16-
define <8 x i8> @load_factor3(ptr %ptr) {
14+
define {<8 x i8>, <8 x i8>, <8 x i8>} @load_factor3(ptr %ptr) {
1715
; CHECK-LABEL: load_factor3:
1816
; CHECK: # %bb.0:
1917
; CHECK-NEXT: vsetivli zero, 8, e8, mf2, ta, ma
20-
; CHECK-NEXT: vlseg3e8.v v6, (a0)
18+
; CHECK-NEXT: vlseg3e8.v v8, (a0)
2119
; CHECK-NEXT: ret
2220
%1 = call { <8 x i8>, <8 x i8>, <8 x i8> } @llvm.riscv.seg3.load.mask.v8i8.i64(ptr %ptr, <8 x i1> splat (i1 true), i64 8)
23-
%2 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8> } %1, 0
24-
%3 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8> } %1, 1
25-
%4 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8> } %1, 2
26-
ret <8 x i8> %4
21+
ret { <8 x i8>, <8 x i8>, <8 x i8> } %1
2722
}
2823

29-
define <8 x i8> @load_factor4(ptr %ptr) {
24+
define {<8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>} @load_factor4(ptr %ptr) {
3025
; CHECK-LABEL: load_factor4:
3126
; CHECK: # %bb.0:
3227
; CHECK-NEXT: vsetivli zero, 8, e8, mf2, ta, ma
33-
; CHECK-NEXT: vlseg4e8.v v5, (a0)
28+
; CHECK-NEXT: vlseg4e8.v v8, (a0)
3429
; CHECK-NEXT: ret
3530
%1 = call { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } @llvm.riscv.seg4.load.mask.v8i8.i64(ptr %ptr, <8 x i1> splat (i1 true), i64 8)
36-
%2 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 0
37-
%3 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 1
38-
%4 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 2
39-
%5 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 3
40-
ret <8 x i8> %5
31+
ret { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1
4132
}
4233

43-
define <8 x i8> @load_factor5(ptr %ptr) {
34+
define {<8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>} @load_factor5(ptr %ptr) {
4435
; CHECK-LABEL: load_factor5:
4536
; CHECK: # %bb.0:
4637
; CHECK-NEXT: vsetivli zero, 8, e8, mf2, ta, ma
47-
; CHECK-NEXT: vlseg5e8.v v4, (a0)
38+
; CHECK-NEXT: vlseg5e8.v v8, (a0)
4839
; CHECK-NEXT: ret
4940
%1 = call { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } @llvm.riscv.seg5.load.mask.v8i8.i64(ptr %ptr, <8 x i1> splat (i1 true), i64 8)
50-
%2 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 0
51-
%3 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 1
52-
%4 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 2
53-
%5 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 3
54-
%6 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 4
55-
ret <8 x i8> %6
41+
ret { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1
5642
}
5743

58-
define <8 x i8> @load_factor6(ptr %ptr) {
44+
define {<8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>} @load_factor6(ptr %ptr) {
5945
; CHECK-LABEL: load_factor6:
6046
; CHECK: # %bb.0:
6147
; CHECK-NEXT: vsetivli zero, 8, e8, mf2, ta, ma
62-
; CHECK-NEXT: vlseg6e8.v v3, (a0)
48+
; CHECK-NEXT: vlseg6e8.v v8, (a0)
6349
; CHECK-NEXT: ret
6450
%1 = call { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } @llvm.riscv.seg6.load.mask.v8i8.i64(ptr %ptr, <8 x i1> splat (i1 true), i64 8)
65-
%2 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 0
66-
%3 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 1
67-
%4 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 2
68-
%5 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 3
69-
%6 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 4
70-
%7 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 5
71-
ret <8 x i8> %7
51+
ret { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1
7252
}
7353

74-
define <8 x i8> @load_factor7(ptr %ptr) {
54+
define {<8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>} @load_factor7(ptr %ptr) {
7555
; CHECK-LABEL: load_factor7:
7656
; CHECK: # %bb.0:
7757
; CHECK-NEXT: vsetivli zero, 8, e8, mf2, ta, ma
78-
; CHECK-NEXT: vlseg7e8.v v2, (a0)
58+
; CHECK-NEXT: vlseg7e8.v v8, (a0)
7959
; CHECK-NEXT: ret
8060
%1 = call { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } @llvm.riscv.seg7.load.mask.v8i8.i64(ptr %ptr, <8 x i1> splat (i1 true), i64 8)
81-
%2 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 0
82-
%3 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 1
83-
%4 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 2
84-
%5 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 3
85-
%6 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 4
86-
%7 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 5
87-
%8 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 6
88-
ret <8 x i8> %8
61+
ret { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1
8962
}
9063

91-
define <8 x i8> @load_factor8(ptr %ptr) {
64+
define {<8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>} @load_factor8(ptr %ptr) {
9265
; CHECK-LABEL: load_factor8:
9366
; CHECK: # %bb.0:
9467
; CHECK-NEXT: vsetivli zero, 8, e8, mf2, ta, ma
95-
; CHECK-NEXT: vlseg8e8.v v1, (a0)
68+
; CHECK-NEXT: vlseg8e8.v v8, (a0)
9669
; CHECK-NEXT: ret
9770
%1 = call { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } @llvm.riscv.seg8.load.mask.v8i8.i64(ptr %ptr, <8 x i1> splat (i1 true), i64 8)
98-
%2 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 0
99-
%3 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 1
100-
%4 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 2
101-
%5 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 3
102-
%6 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 4
103-
%7 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 5
104-
%8 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 6
105-
%9 = extractvalue { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1, 7
106-
ret <8 x i8> %9
71+
ret { <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8>, <8 x i8> } %1
10772
}

‎llvm/test/CodeGen/RISCV/rvv/vector-deinterleave-load.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,16 +372,16 @@ define { <vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8> } @vector_deint
372372
; CHECK-LABEL: vector_deinterleave_load_factor3:
373373
; CHECK: # %bb.0:
374374
; CHECK-NEXT: vsetvli a1, zero, e8, m1, ta, ma
375-
; CHECK-NEXT: vlseg3e8.v v6, (a0)
375+
; CHECK-NEXT: vlseg3e8.v v8, (a0)
376376
; CHECK-NEXT: ret
377377
%vec = load <vscale x 24 x i8>, ptr %p
378378
%d0 = call {<vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8>} @llvm.vector.deinterleave3(<vscale x 24 x i8> %vec)
379379
%t0 = extractvalue {<vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8>} %d0, 0
380380
%t1 = extractvalue {<vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8>} %d0, 1
381381
%t2 = extractvalue {<vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8>} %d0, 2
382382
%res0 = insertvalue { <vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8> } poison, <vscale x 8 x i8> %t0, 0
383-
%res1 = insertvalue { <vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8> } %res0, <vscale x 8 x i8> %t1, 0
384-
%res2 = insertvalue { <vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8> } %res1, <vscale x 8 x i8> %t2, 0
383+
%res1 = insertvalue { <vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8> } %res0, <vscale x 8 x i8> %t1, 1
384+
%res2 = insertvalue { <vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8> } %res1, <vscale x 8 x i8> %t2, 2
385385
ret { <vscale x 8 x i8>, <vscale x 8 x i8>, <vscale x 8 x i8> } %res2
386386
}
387387

0 commit comments

Comments
 (0)