Skip to content

Commit cefc1b0

Browse files
authored
[llvm] Remove br i1 undef from some regression tests [NFC] (#117292)
This PR removes tests with `br i1 undef` under `llvm/tests/Transforms/MemCpyOpt, MergedLoadStoreMotion, NewGVN`.
1 parent 46a0857 commit cefc1b0

38 files changed

+270
-270
lines changed

llvm/test/Transforms/MemCpyOpt/aa-recursion-assertion-failure.ll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source_filename = "test.cpp"
66
target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
77
target triple = "aarch64-unknown-linux-android21"
88

9-
define dso_local void @_Z1ml(i64 %e) {
9+
define dso_local void @_Z1ml(i64 %e, i1 %arg) {
1010
; CHECK-LABEL: @_Z1ml(
1111
; CHECK-NEXT: entry:
1212
; CHECK-NEXT: [[L:%.*]] = alloca i8, align 1
@@ -20,7 +20,7 @@ define dso_local void @_Z1ml(i64 %e) {
2020
; CHECK: while.cond:
2121
; CHECK-NEXT: [[TMP1]] = phi ptr [ [[L]], [[ENTRY:%.*]] ], [ [[TMP0]], [[WHILE_COND_LOOPEXIT]] ]
2222
; CHECK-NEXT: [[I_0]] = phi ptr [ [[L]], [[ENTRY]] ], [ [[I_1_LCSSA]], [[WHILE_COND_LOOPEXIT]] ]
23-
; CHECK-NEXT: br i1 undef, label [[FOR_BODY_LR_PH:%.*]], label [[WHILE_COND_LOOPEXIT]]
23+
; CHECK-NEXT: br i1 [[ARG:%.*]], label [[FOR_BODY_LR_PH:%.*]], label [[WHILE_COND_LOOPEXIT]]
2424
; CHECK: for.body.lr.ph:
2525
; CHECK-NEXT: br label [[FOR_BODY:%.*]]
2626
; CHECK: for.body:
@@ -32,7 +32,7 @@ define dso_local void @_Z1ml(i64 %e) {
3232
; CHECK-NEXT: store i8 [[TMP4]], ptr [[TMP2]], align 1
3333
; CHECK-NEXT: br label [[_Z1DPCS_L_EXIT:%.*]]
3434
; CHECK: _Z1dPcS_l.exit:
35-
; CHECK-NEXT: br i1 undef, label [[IF_THEN3:%.*]], label [[IF_END5]]
35+
; CHECK-NEXT: br i1 [[ARG]], label [[IF_THEN3:%.*]], label [[IF_END5]]
3636
; CHECK: if.then3:
3737
; CHECK-NEXT: [[ADD_PTR4:%.*]] = getelementptr inbounds i8, ptr [[I_15]], i64 [[E]]
3838
; CHECK-NEXT: br label [[IF_END5]]
@@ -55,7 +55,7 @@ while.cond.loopexit: ; preds = %while.cond, %for.co
5555
while.cond: ; preds = %while.cond.loopexit, %entry
5656
%1 = phi ptr [ %l, %entry ], [ %0, %while.cond.loopexit ]
5757
%i.0 = phi ptr [ %l, %entry ], [ %i.1.lcssa, %while.cond.loopexit ]
58-
br i1 undef, label %for.body.lr.ph, label %while.cond.loopexit
58+
br i1 %arg, label %for.body.lr.ph, label %while.cond.loopexit
5959

6060
for.body.lr.ph: ; preds = %while.cond
6161
br label %for.body
@@ -70,7 +70,7 @@ for.body: ; preds = %if.end5, %for.body.
7070
br label %_Z1dPcS_l.exit
7171

7272
_Z1dPcS_l.exit: ; preds = %for.body
73-
br i1 undef, label %if.then3, label %if.end5
73+
br i1 %arg, label %if.then3, label %if.end5
7474

7575
if.then3: ; preds = %_Z1dPcS_l.exit
7676
%add.ptr4 = getelementptr inbounds i8, ptr %i.15, i64 %e

llvm/test/Transforms/MergedLoadStoreMotion/st_sink_debuginvariant.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
@g_173 = dso_local local_unnamed_addr global i16 0, !dbg !0
1919

2020
; Function Attrs: noinline norecurse nounwind
21-
define dso_local void @func_34(ptr noalias sret(%struct.S0) %agg.result) local_unnamed_addr #0 !dbg !11 {
21+
define dso_local void @func_34(ptr noalias sret(%struct.S0) %agg.result, i1 %arg) local_unnamed_addr #0 !dbg !11 {
2222
entry:
23-
br i1 undef, label %if.end, label %if.then, !dbg !18
23+
br i1 %arg, label %if.end, label %if.then, !dbg !18
2424

2525
if.then: ; preds = %entry
2626
call void @llvm.dbg.value(metadata i16 5, metadata !19, metadata !DIExpression()), !dbg !22

llvm/test/Transforms/NewGVN/2010-03-31-RedundantPHIs.ll

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,43 @@
44
; CHECK-NOT: load
55
; CHECK-NOT: phi
66

7-
define ptr @cat(ptr %s1, ...) nounwind {
7+
define ptr @cat(ptr %s1, i1 %arg, i1 %arg2, i1 %arg3, ...) nounwind {
88
; CHECK-LABEL: define ptr @cat(
9-
; CHECK-SAME: ptr [[S1:%.*]], ...) #[[ATTR0:[0-9]+]] {
9+
; CHECK-SAME: ptr [[S1:%.*]], i1 [[ARG:%.*]], i1 [[ARG2:%.*]], i1 [[ARG3:%.*]], ...) #[[ATTR0:[0-9]+]] {
1010
; CHECK-NEXT: entry:
11-
; CHECK-NEXT: br i1 undef, label [[BB:%.*]], label [[BB3:%.*]]
11+
; CHECK-NEXT: br i1 [[ARG2]], label [[BB:%.*]], label [[BB3:%.*]]
1212
; CHECK: bb:
1313
; CHECK-NEXT: unreachable
1414
; CHECK: bb3:
1515
; CHECK-NEXT: store ptr undef, ptr undef, align 4
16-
; CHECK-NEXT: br i1 undef, label [[BB5:%.*]], label [[BB6:%.*]]
16+
; CHECK-NEXT: br i1 [[ARG3]], label [[BB5:%.*]], label [[BB6:%.*]]
1717
; CHECK: bb5:
1818
; CHECK-NEXT: unreachable
1919
; CHECK: bb6:
2020
; CHECK-NEXT: br label [[BB12:%.*]]
2121
; CHECK: bb8:
22-
; CHECK-NEXT: br i1 undef, label [[BB9:%.*]], label [[BB10:%.*]]
22+
; CHECK-NEXT: br i1 true, label [[BB9:%.*]], label [[BB10:%.*]]
2323
; CHECK: bb9:
2424
; CHECK-NEXT: br label [[BB11:%.*]]
2525
; CHECK: bb10:
26+
; CHECK-NEXT: store i8 poison, ptr null, align 1
2627
; CHECK-NEXT: br label [[BB11]]
2728
; CHECK: bb11:
2829
; CHECK-NEXT: br label [[BB12]]
2930
; CHECK: bb12:
30-
; CHECK-NEXT: br i1 undef, label [[BB8:%.*]], label [[BB13:%.*]]
31+
; CHECK-NEXT: br i1 [[ARG]], label [[BB8:%.*]], label [[BB13:%.*]]
3132
; CHECK: bb13:
3233
; CHECK-NEXT: ret ptr undef
3334
;
3435
entry:
35-
br i1 undef, label %bb, label %bb3
36+
br i1 %arg2, label %bb, label %bb3
3637

3738
bb: ; preds = %entry
3839
unreachable
3940

4041
bb3: ; preds = %entry
4142
store ptr undef, ptr undef, align 4
42-
br i1 undef, label %bb5, label %bb6
43+
br i1 %arg3, label %bb5, label %bb6
4344

4445
bb5: ; preds = %bb3
4546
unreachable
@@ -48,7 +49,7 @@ bb6: ; preds = %bb3
4849
br label %bb12
4950

5051
bb8: ; preds = %bb12
51-
br i1 undef, label %bb9, label %bb10
52+
br i1 %arg, label %bb9, label %bb10
5253

5354
bb9: ; preds = %bb8
5455
%0 = load ptr, ptr undef, align 4 ; <ptr> [#uses=0]
@@ -62,7 +63,7 @@ bb11: ; preds = %bb10, %bb9
6263
br label %bb12
6364

6465
bb12: ; preds = %bb11, %bb6
65-
br i1 undef, label %bb8, label %bb13
66+
br i1 %arg, label %bb8, label %bb13
6667

6768
bb13: ; preds = %bb12
6869
ret ptr undef

llvm/test/Transforms/NewGVN/2010-05-08-OneBit.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
66
target triple = "x86_64-unknown-linux-gnu"
77

8-
define i32 @main(i32 %argc, ptr nocapture %argv) personality ptr @__gxx_personality_v0 {
8+
define i32 @main(i32 %argc, ptr nocapture %argv, i1 %arg, i32 %arg2) personality ptr @__gxx_personality_v0 {
99
entry:
1010
%0 = getelementptr inbounds i8, ptr undef, i64 5 ; <ptr> [#uses=1]
1111
store i32 undef, ptr %0, align 1
12-
br i1 undef, label %k121.i.i, label %l117.i.i
12+
br i1 %arg, label %k121.i.i, label %l117.i.i
1313

1414
l117.i.i: ; preds = %entry
1515
invoke fastcc void @foo()
@@ -19,7 +19,7 @@ l117.i.i: ; preds = %entry
1919
unreachable
2020

2121
k121.i.i: ; preds = %entry
22-
br i1 undef, label %l129.i.i, label %k133.i.i
22+
br i1 %arg, label %l129.i.i, label %k133.i.i
2323

2424
l129.i.i: ; preds = %k121.i.i
2525
invoke fastcc void @foo()
@@ -46,7 +46,7 @@ k151.i.i: ; preds = %k133.i.i
4646
landing_pad: ; preds = %l147.i.i, %l129.i.i, %l117.i.i
4747
%exn = landingpad {ptr, i32}
4848
cleanup
49-
switch i32 undef, label %fin [
49+
switch i32 %arg2, label %fin [
5050
i32 1, label %catch1
5151
i32 2, label %catch
5252
]

llvm/test/Transforms/NewGVN/2011-04-27-phioperands.ll

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3
55

66
@nuls = external global [10 x i8]
77

8-
define fastcc void @p_ere() nounwind {
8+
define fastcc void @p_ere(i1 %arg, i32 %arg2) nounwind {
99
entry:
1010
br label %"<bb 5>"
1111

1212
"<L18>.i":
13-
br i1 undef, label %"<bb 3>.i30.i", label %doemit.exit51.i
13+
br i1 %arg, label %"<bb 3>.i30.i", label %doemit.exit51.i
1414

1515
"<bb 3>.i30.i":
1616
unreachable
@@ -19,7 +19,7 @@ doemit.exit51.i:
1919
br label %"<bb 53>.i"
2020

2121
"<L19>.i":
22-
br i1 undef, label %"<bb 3>.i55.i", label %doemit.exit76.i
22+
br i1 %arg, label %"<bb 3>.i55.i", label %doemit.exit76.i
2323

2424
"<bb 3>.i55.i":
2525
unreachable
@@ -35,7 +35,7 @@ doemit.exit76.i:
3535
br label %"<bb 53>.i"
3636

3737
"<L24>.i":
38-
br i1 undef, label %"<bb 53>.i", label %"<bb 35>.i"
38+
br i1 %arg, label %"<bb 53>.i", label %"<bb 35>.i"
3939

4040
"<bb 35>.i":
4141
br label %"<bb 53>.i"
@@ -52,27 +52,27 @@ doemit.exit76.i:
5252
"<bb 53>.i":
5353
%wascaret_2.i = phi i32 [ 0, %"<L39>.i" ], [ 0, %"<L29>.i" ], [ 0, %"<L28>.i" ], [ 0, %"<bb 35>.i" ], [ 0, %"<L99>.i" ], [ 0, %"<L98>.i" ], [ 0, %doemit.exit76.i ], [ 1, %doemit.exit51.i ], [ 0, %"<L24>.i" ]
5454
%D.5496_84.i = load ptr, ptr undef, align 8
55-
br i1 undef, label %"<bb 54>.i", label %"<bb 5>"
55+
br i1 %arg, label %"<bb 54>.i", label %"<bb 5>"
5656

5757
"<bb 54>.i":
58-
br i1 undef, label %"<bb 5>", label %"<bb 58>.i"
58+
br i1 %arg, label %"<bb 5>", label %"<bb 58>.i"
5959

6060
"<bb 58>.i":
61-
br i1 undef, label %"<bb 64>.i", label %"<bb 59>.i"
61+
br i1 %arg, label %"<bb 64>.i", label %"<bb 59>.i"
6262

6363
"<bb 59>.i":
6464
br label %"<bb 64>.i"
6565

6666
"<bb 64>.i":
67-
switch i32 undef, label %"<bb 5>" [
67+
switch i32 %arg2, label %"<bb 5>" [
6868
i32 42, label %"<L54>.i"
6969
i32 43, label %"<L55>.i"
7070
i32 63, label %"<L56>.i"
7171
i32 123, label %"<bb 5>.i258.i"
7272
]
7373

7474
"<L54>.i":
75-
br i1 undef, label %"<bb 3>.i105.i", label %doemit.exit127.i
75+
br i1 %arg, label %"<bb 3>.i105.i", label %doemit.exit127.i
7676

7777
"<bb 3>.i105.i":
7878
unreachable
@@ -81,7 +81,7 @@ doemit.exit127.i:
8181
unreachable
8282

8383
"<L55>.i":
84-
br i1 undef, label %"<bb 3>.i157.i", label %"<bb 5>"
84+
br i1 %arg, label %"<bb 3>.i157.i", label %"<bb 5>"
8585

8686
"<bb 3>.i157.i":
8787
unreachable
@@ -93,7 +93,7 @@ doemit.exit127.i:
9393
unreachable
9494

9595
"<bb 5>":
96-
switch i32 undef, label %"<L39>.i" [
96+
switch i32 %arg2, label %"<L39>.i" [
9797
i32 36, label %"<L19>.i"
9898
i32 94, label %"<L18>.i"
9999
i32 124, label %"<L98>.i"

llvm/test/Transforms/NewGVN/2012-05-22-PreCrash.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
; RUN: opt < %s -passes=newgvn
33
; PR12858
44

5-
define void @fn5(i16 signext %p1, i8 signext %p2) nounwind uwtable {
5+
define void @fn5(i16 signext %p1, i8 signext %p2, i1 %arg) nounwind uwtable {
66
entry:
7-
br i1 undef, label %if.else, label %if.then
7+
br i1 %arg, label %if.else, label %if.then
88

99
if.then: ; preds = %entry
1010
br label %if.end
@@ -15,7 +15,7 @@ if.else: ; preds = %entry
1515

1616
if.end: ; preds = %if.else, %if.then
1717
%conv1 = sext i16 %p1 to i32
18-
br i1 undef, label %if.then3, label %if.else4
18+
br i1 %arg, label %if.then3, label %if.else4
1919

2020
if.then3: ; preds = %if.end
2121
br label %if.end12

llvm/test/Transforms/NewGVN/basic-cyclic-opt.ll

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -242,29 +242,29 @@ bb23: ; preds = %bb4
242242
;; Both loads should equal 0, but it requires being
243243
;; completely optimistic about MemoryPhis, otherwise
244244
;; we will not be able to see through the cycle.
245-
define i8 @irreducible_memoryphi(ptr noalias %arg, ptr noalias %arg2) {
245+
define i8 @irreducible_memoryphi(ptr noalias %arg, ptr noalias %arg2, i1 %arg3) {
246246
; CHECK-LABEL: @irreducible_memoryphi(
247247
; CHECK-NEXT: bb:
248248
; CHECK-NEXT: store i8 0, ptr [[ARG:%.*]], align 1
249-
; CHECK-NEXT: br i1 undef, label [[BB2:%.*]], label [[BB1:%.*]]
249+
; CHECK-NEXT: br i1 [[ARG3:%.*]], label [[BB2:%.*]], label [[BB1:%.*]]
250250
; CHECK: bb1:
251251
; CHECK-NEXT: br label [[BB2]]
252252
; CHECK: bb2:
253-
; CHECK-NEXT: br i1 undef, label [[BB1]], label [[BB3:%.*]]
253+
; CHECK-NEXT: br i1 [[ARG3]], label [[BB1]], label [[BB3:%.*]]
254254
; CHECK: bb3:
255255
; CHECK-NEXT: ret i8 0
256256
;
257257
bb:
258258
store i8 0, ptr %arg
259-
br i1 undef, label %bb2, label %bb1
259+
br i1 %arg3, label %bb2, label %bb1
260260

261261
bb1: ; preds = %bb2, %bb
262262
br label %bb2
263263

264264
bb2: ; preds = %bb1, %bb
265265
%tmp2 = load i8, ptr %arg
266266
store i8 0, ptr %arg
267-
br i1 undef, label %bb1, label %bb3
267+
br i1 %arg3, label %bb1, label %bb3
268268

269269
bb3: ; preds = %bb2
270270
%tmp = load i8, ptr %arg
@@ -277,28 +277,28 @@ bb3: ; preds = %bb2
277277
;; It should return 0, but it requires being
278278
;; completely optimistic about phis, otherwise
279279
;; we will not be able to see through the cycle.
280-
define i32 @irreducible_phi(i32 %arg) {
280+
define i32 @irreducible_phi(i32 %arg, i1 %arg2) {
281281
; CHECK-LABEL: @irreducible_phi(
282282
; CHECK-NEXT: bb:
283-
; CHECK-NEXT: br i1 undef, label [[BB2:%.*]], label [[BB1:%.*]]
283+
; CHECK-NEXT: br i1 [[ARG2:%.*]], label [[BB2:%.*]], label [[BB1:%.*]]
284284
; CHECK: bb1:
285285
; CHECK-NEXT: br label [[BB2]]
286286
; CHECK: bb2:
287-
; CHECK-NEXT: br i1 undef, label [[BB1]], label [[BB3:%.*]]
287+
; CHECK-NEXT: br i1 [[ARG2]], label [[BB1]], label [[BB3:%.*]]
288288
; CHECK: bb3:
289289
; CHECK-NEXT: ret i32 0
290290
;
291291
bb:
292292
%tmp = add i32 0, %arg
293-
br i1 undef, label %bb2, label %bb1
293+
br i1 %arg2, label %bb2, label %bb1
294294

295295
bb1: ; preds = %bb2, %bb
296296
%phi1 = phi i32 [%tmp, %bb], [%phi2, %bb2]
297297
br label %bb2
298298

299299
bb2: ; preds = %bb1, %bb
300300
%phi2 = phi i32 [%tmp, %bb], [%phi1, %bb1]
301-
br i1 undef, label %bb1, label %bb3
301+
br i1 %arg2, label %bb1, label %bb3
302302

303303
bb3: ; preds = %bb2
304304
; This should be zero

0 commit comments

Comments
 (0)