Skip to content

Commit 8ce612f

Browse files
arsenmarsenm
authored
AMDGPU: Replace undef phi inputs with poison in tests (#130267)
I think the chance of this changing the tests in meaningful ways is very low. This was perl with a few minor adjustments to a few tests that produce new undefs. Only one test had a minor codegen change with the switch, which I dropped from the change.
1 parent ecec7d1 commit 8ce612f

35 files changed

+93
-93
lines changed

‎llvm/test/CodeGen/AMDGPU/GlobalISel/divergent-control-flow.ll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if.true:
2626
br label %endif
2727

2828
endif:
29-
%v = phi i32 [ %val, %if.true ], [ undef, %entry ]
29+
%v = phi i32 [ %val, %if.true ], [ poison, %entry ]
3030
ret i32 %v
3131
}
3232

@@ -49,7 +49,7 @@ entry:
4949
br i1 %c, label %if.true, label %endif
5050

5151
endif:
52-
%v = phi i32 [ %val, %if.true ], [ undef, %entry ]
52+
%v = phi i32 [ %val, %if.true ], [ poison, %entry ]
5353
ret i32 %v
5454

5555
if.true:
@@ -82,7 +82,7 @@ if.true:
8282
br label %endif
8383

8484
endif:
85-
%v = phi i32 [ %val, %if.true ], [ undef, %entry ]
85+
%v = phi i32 [ %val, %if.true ], [ poison, %entry ]
8686
ret i32 %v
8787
}
8888

@@ -114,7 +114,7 @@ if.true:
114114
br label %endif
115115

116116
endif:
117-
%v = phi i32 [ %val, %if.true ], [ undef, %entry ]
117+
%v = phi i32 [ %val, %if.true ], [ poison, %entry ]
118118
ret i32 %v
119119
}
120120

‎llvm/test/CodeGen/AMDGPU/amdgpu-codegenprepare-break-large-phis.ll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -643,11 +643,11 @@ define amdgpu_kernel void @phi_v15i8_random_constant_init(<15 x i8> %in, ptr %ou
643643
; OPT-NEXT: br label [[FINALLY]]
644644
; OPT: finally:
645645
; OPT-NEXT: [[TMP0:%.*]] = phi <4 x i8> [ <i8 poison, i8 1, i8 2, i8 3>, [[THEN]] ], [ [[LARGEPHI_EXTRACTSLICE1]], [[ELSE]] ]
646-
; OPT-NEXT: [[TMP1:%.*]] = phi <4 x i8> [ <i8 4, i8 undef, i8 6, i8 7>, [[THEN]] ], [ [[LARGEPHI_EXTRACTSLICE3]], [[ELSE]] ]
646+
; OPT-NEXT: [[TMP1:%.*]] = phi <4 x i8> [ <i8 4, i8 poison, i8 6, i8 7>, [[THEN]] ], [ [[LARGEPHI_EXTRACTSLICE3]], [[ELSE]] ]
647647
; OPT-NEXT: [[TMP2:%.*]] = phi <4 x i8> [ <i8 9, i8 10, i8 11, i8 12>, [[THEN]] ], [ [[LARGEPHI_EXTRACTSLICE5]], [[ELSE]] ]
648648
; OPT-NEXT: [[TMP3:%.*]] = phi i8 [ 13, [[THEN]] ], [ [[LARGEPHI_EXTRACTSLICE7]], [[ELSE]] ]
649649
; OPT-NEXT: [[TMP4:%.*]] = phi i8 [ 14, [[THEN]] ], [ [[LARGEPHI_EXTRACTSLICE9]], [[ELSE]] ]
650-
; OPT-NEXT: [[TMP5:%.*]] = phi i8 [ undef, [[THEN]] ], [ [[LARGEPHI_EXTRACTSLICE11]], [[ELSE]] ]
650+
; OPT-NEXT: [[TMP5:%.*]] = phi i8 [ poison, [[THEN]] ], [ [[LARGEPHI_EXTRACTSLICE11]], [[ELSE]] ]
651651
; OPT-NEXT: [[LARGEPHI_INSERTSLICE0:%.*]] = call <15 x i8> @llvm.vector.insert.v15i8.v4i8(<15 x i8> poison, <4 x i8> [[TMP0]], i64 0)
652652
; OPT-NEXT: [[LARGEPHI_INSERTSLICE1:%.*]] = call <15 x i8> @llvm.vector.insert.v15i8.v4i8(<15 x i8> [[LARGEPHI_INSERTSLICE0]], <4 x i8> [[TMP1]], i64 4)
653653
; OPT-NEXT: [[LARGEPHI_INSERTSLICE2:%.*]] = call <15 x i8> @llvm.vector.insert.v15i8.v4i8(<15 x i8> [[LARGEPHI_INSERTSLICE1]], <4 x i8> [[TMP2]], i64 8)
@@ -666,7 +666,7 @@ define amdgpu_kernel void @phi_v15i8_random_constant_init(<15 x i8> %in, ptr %ou
666666
; NOOPT-NEXT: [[Y:%.*]] = insertelement <15 x i8> [[IN:%.*]], i8 64, i32 6
667667
; NOOPT-NEXT: br label [[FINALLY]]
668668
; NOOPT: finally:
669-
; NOOPT-NEXT: [[VAL:%.*]] = phi <15 x i8> [ <i8 poison, i8 1, i8 2, i8 3, i8 4, i8 undef, i8 6, i8 7, i8 9, i8 10, i8 11, i8 12, i8 13, i8 14, i8 undef>, [[THEN]] ], [ [[Y]], [[ELSE]] ]
669+
; NOOPT-NEXT: [[VAL:%.*]] = phi <15 x i8> [ <i8 poison, i8 1, i8 2, i8 3, i8 4, i8 poison, i8 6, i8 7, i8 9, i8 10, i8 11, i8 12, i8 13, i8 14, i8 poison>, [[THEN]] ], [ [[Y]], [[ELSE]] ]
670670
; NOOPT-NEXT: store <15 x i8> [[VAL]], ptr [[OUT:%.*]], align 1
671671
; NOOPT-NEXT: ret void
672672
;
@@ -678,7 +678,7 @@ else:
678678
%y = insertelement <15 x i8> %in, i8 64, i32 6
679679
br label %finally
680680
finally:
681-
%val = phi <15 x i8> [<i8 poison, i8 1, i8 2, i8 3, i8 4, i8 undef, i8 6, i8 7, i8 9, i8 10, i8 11, i8 12, i8 13, i8 14, i8 undef>, %then], [%y, %else]
681+
%val = phi <15 x i8> [<i8 poison, i8 1, i8 2, i8 3, i8 4, i8 poison, i8 6, i8 7, i8 9, i8 10, i8 11, i8 12, i8 13, i8 14, i8 poison>, %then], [%y, %else]
682682
store <15 x i8> %val, ptr %out, align 1
683683
ret void
684684
}

‎llvm/test/CodeGen/AMDGPU/amdpal_scratch_mergedshader.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ define amdgpu_hs void @_amdgpu_hs_main(i32 inreg %arg, i32 inreg %arg1, i32 inre
2828
br label %bb
2929

3030
bb: ; preds = %bb, %.endls
31-
%lsr.iv182 = phi ptr addrspace(5) [ undef, %bb ], [ %__llpc_global_proxy_7.i, %.endls ]
31+
%lsr.iv182 = phi ptr addrspace(5) [ poison, %bb ], [ %__llpc_global_proxy_7.i, %.endls ]
3232
%scevgep183 = getelementptr [3 x <4 x float>], ptr addrspace(5) %lsr.iv182, i32 0, i32 1
3333
br label %bb
3434
}

‎llvm/test/CodeGen/AMDGPU/branch-relaxation.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ bb14: ; preds = %bb13, %bb9
15291529
br label %bb19
15301530

15311531
bb19: ; preds = %bb14, %bb13, %bb9
1532-
%tmp20 = phi i32 [ undef, %bb9 ], [ undef, %bb13 ], [ %tmp18, %bb14 ]
1532+
%tmp20 = phi i32 [ poison, %bb9 ], [ poison, %bb13 ], [ %tmp18, %bb14 ]
15331533
%tmp21 = getelementptr inbounds i32, ptr addrspace(1) %arg, i64 %arg5
15341534
store i32 %tmp20, ptr addrspace(1) %tmp21, align 4
15351535
ret void

‎llvm/test/CodeGen/AMDGPU/bug-deadlanes.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ define dllexport amdgpu_ps void @_amdgpu_ps_main(i32 %descTable2) #0 {
1818

1919
bb1750: ; preds = %bb1897, %.entry
2020
%__llpc_global_proxy_r3.12.vec.extract2358295 = phi i32 [ 0, %.entry ], [ %__llpc_global_proxy_r3.12.vec.extract2358, %bb1897 ]
21-
%__llpc_global_proxy_r13.20293 = phi <4 x i32> [ undef, %.entry ], [ %__llpc_global_proxy_r13.22, %bb1897 ]
21+
%__llpc_global_proxy_r13.20293 = phi <4 x i32> [ poison, %.entry ], [ %__llpc_global_proxy_r13.22, %bb1897 ]
2222
%__llpc_global_proxy_r10.19291 = phi <4 x i32> [ poison, %.entry ], [ %i1914, %bb1897 ]
2323
%i1751 = call float @llvm.amdgcn.struct.buffer.load.format.f32(<4 x i32> %i1746, i32 poison, i32 0, i32 0, i32 0)
2424
%i1754 = shufflevector <4 x i32> %__llpc_global_proxy_r10.19291, <4 x i32> poison, <4 x i32> <i32 0, i32 1, i32 2, i32 7>

‎llvm/test/CodeGen/AMDGPU/coalescer_distribute.ll‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bb6:
1515
br label %bb8
1616

1717
bb8:
18-
%tmp9 = phi i64 [ %tmp7, %bb6 ], [ undef, %bb2 ]
18+
%tmp9 = phi i64 [ %tmp7, %bb6 ], [ poison, %bb2 ]
1919
%tmp10 = icmp eq i32 %tmp, 0
2020
br i1 %tmp10, label %bb11, label %bb23
2121

@@ -26,16 +26,16 @@ bb17:
2626
br label %bb20
2727

2828
bb20:
29-
%tmp21 = phi i64 [ undef, %bb17 ], [ %tmp9, %bb11 ]
29+
%tmp21 = phi i64 [ poison, %bb17 ], [ %tmp9, %bb11 ]
3030
%tmp22 = trunc i64 %tmp21 to i32
3131
br label %bb23
3232

3333
bb23:
34-
%tmp24 = phi i32 [ %tmp22, %bb20 ], [ undef, %bb8 ], [ undef, %bb ]
34+
%tmp24 = phi i32 [ %tmp22, %bb20 ], [ poison, %bb8 ], [ poison, %bb ]
3535
br label %bb25
3636

3737
bb25:
38-
%tmp26 = phi i32 [ %tmp24, %bb23 ], [ undef, %bb25 ]
38+
%tmp26 = phi i32 [ %tmp24, %bb23 ], [ poison, %bb25 ]
3939
br i1 %c3, label %bb25, label %bb30
4040

4141
bb30:

‎llvm/test/CodeGen/AMDGPU/combine-add-zext-xor.ll‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ bb: ; preds = %.a
7171
br label %bb9
7272

7373
bb9: ; preds = %bb, %.a
74-
%.2.0.in.in = phi i1 [ %i5, %bb ], [ undef, %.a ]
74+
%.2.0.in.in = phi i1 [ %i5, %bb ], [ poison, %.a ]
7575
%.2.0.in = xor i1 %.2.0.in.in, true
7676
%.2.0 = zext i1 %.2.0.in to i32
7777
%i11 = add i32 %.2, %.2.0
@@ -151,7 +151,7 @@ bb: ; preds = %.a
151151
br label %bb9
152152

153153
bb9: ; preds = %bb, %.a
154-
%.2.0.in.in = phi i1 [ %i5, %bb ], [ undef, %.a ]
154+
%.2.0.in.in = phi i1 [ %i5, %bb ], [ poison, %.a ]
155155
%.2.0.in = xor i1 %.2.0.in.in, true
156156
%.2.0 = zext i1 %.2.0.in to i32
157157
%i11 = sub i32 %.2, %.2.0
@@ -234,7 +234,7 @@ bb: ; preds = %.a
234234
br label %bb9
235235

236236
bb9: ; preds = %bb, %.a
237-
%.2.0.in.in = phi i1 [ %i5, %bb ], [ undef, %.a ]
237+
%.2.0.in.in = phi i1 [ %i5, %bb ], [ poison, %.a ]
238238
%t = icmp sgt i32 %.2, -1050
239239
%.2.0.in = or i1 %.2.0.in.in, %t
240240
%.2.0 = zext i1 %.2.0.in to i32
@@ -318,7 +318,7 @@ bb: ; preds = %.a
318318
br label %bb9
319319

320320
bb9: ; preds = %bb, %.a
321-
%.2.0.in.in = phi i1 [ %i5, %bb ], [ undef, %.a ]
321+
%.2.0.in.in = phi i1 [ %i5, %bb ], [ poison, %.a ]
322322
%t = icmp sgt i32 %.2, -1050
323323
%.2.0.in = or i1 %.2.0.in.in, %t
324324
%.2.0 = zext i1 %.2.0.in to i32
@@ -397,7 +397,7 @@ bb: ; preds = %.a
397397
br label %bb9
398398

399399
bb9: ; preds = %bb, %.a
400-
%.2.0.in.in = phi i1 [ %i5, %bb ], [ undef, %.a ]
400+
%.2.0.in.in = phi i1 [ %i5, %bb ], [ poison, %.a ]
401401
%t = icmp sgt i32 %.2, -1050
402402
%.2.0.in = and i1 %.2.0.in.in, %t
403403
%.2.0 = zext i1 %.2.0.in to i32
@@ -476,7 +476,7 @@ bb: ; preds = %.a
476476
br label %bb9
477477

478478
bb9: ; preds = %bb, %.a
479-
%.2.0.in.in = phi i1 [ %i5, %bb ], [ undef, %.a ]
479+
%.2.0.in.in = phi i1 [ %i5, %bb ], [ poison, %.a ]
480480
%t = icmp sgt i32 %.2, -1050
481481
%.2.0.in = and i1 %.2.0.in.in, %t
482482
%.2.0 = zext i1 %.2.0.in to i32

‎llvm/test/CodeGen/AMDGPU/cse-phi-incoming-val.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ bb9: ; preds = %bb5
3030
br label %bb10
3131

3232
bb10: ; preds = %bb9, %bb5, %bb3, %bb
33-
%tmp11 = phi float [ 1.000000e+00, %bb3 ], [ 0.000000e+00, %bb9 ], [ 1.000000e+00, %bb ], [ undef, %bb5 ]
33+
%tmp11 = phi float [ 1.000000e+00, %bb3 ], [ 0.000000e+00, %bb9 ], [ 1.000000e+00, %bb ], [ poison, %bb5 ]
3434
call void @llvm.amdgcn.exp.f32(i32 40, i32 15, float %tmp11, float undef, float undef, float undef, i1 false, i1 false) #0
3535
ret void
3636
}

‎llvm/test/CodeGen/AMDGPU/dagcomb-shuffle-vecextend-non2.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ bb:
2525
br label %bb12
2626

2727
bb12:
28-
%__llpc_global_proxy_r2.0 = phi <4 x i32> [ %__llpc_global_proxy_r2.0.vec.insert196, %bb ], [ undef, %.entry ]
28+
%__llpc_global_proxy_r2.0 = phi <4 x i32> [ %__llpc_global_proxy_r2.0.vec.insert196, %bb ], [ poison, %.entry ]
2929
%tmp6 = shufflevector <4 x i32> %__llpc_global_proxy_r2.0, <4 x i32> undef, <3 x i32> <i32 1, i32 2, i32 3>
3030
%tmp7 = bitcast <3 x i32> %tmp6 to <3 x float>
3131
%a0.i = extractelement <3 x float> %tmp7, i32 0

‎llvm/test/CodeGen/AMDGPU/dagcombine-fma-crash.ll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ bb2:
6464
br label %bb11
6565

6666
bb11:
67-
%i12 = phi float [ %i6, %bb2 ], [ undef, %bb ]
68-
%i13 = phi float [ %i10, %bb2 ], [ undef, %bb ]
67+
%i12 = phi float [ %i6, %bb2 ], [ poison, %bb ]
68+
%i13 = phi float [ %i10, %bb2 ], [ poison, %bb ]
6969
%i14 = phi i1 [ false, %bb2 ], [ true, %bb ]
7070
br i1 %i14, label %bb15, label %bb17
7171

0 commit comments

Comments
 (0)