Skip to content

Commit 88ad44e

Browse files
leewei05leewei05
authored
[llvm] Remove br i1 undef from some regression tests [NFC] (#115817)
This PR removes tests with `br i1 undef` under `llvm/tests/G*`. There were a few tests that I couldn't fix to pass lit. I'll come back and fix those later.
1 parent 3183b3a commit 88ad44e

23 files changed

+176
-176
lines changed

‎llvm/test/Transforms/GVN/2011-04-27-phioperands.ll

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

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

7-
define fastcc void @p_ere() nounwind {
7+
define fastcc void @p_ere(i1 %arg) nounwind {
88
entry:
99
br label %"<bb 5>"
1010

1111
"<L18>.i":
12-
br i1 undef, label %"<bb 3>.i30.i", label %doemit.exit51.i
12+
br i1 %arg, label %"<bb 3>.i30.i", label %doemit.exit51.i
1313

1414
"<bb 3>.i30.i":
1515
unreachable
@@ -18,7 +18,7 @@ doemit.exit51.i:
1818
br label %"<bb 53>.i"
1919

2020
"<L19>.i":
21-
br i1 undef, label %"<bb 3>.i55.i", label %doemit.exit76.i
21+
br i1 %arg, label %"<bb 3>.i55.i", label %doemit.exit76.i
2222

2323
"<bb 3>.i55.i":
2424
unreachable
@@ -34,7 +34,7 @@ doemit.exit76.i:
3434
br label %"<bb 53>.i"
3535

3636
"<L24>.i":
37-
br i1 undef, label %"<bb 53>.i", label %"<bb 35>.i"
37+
br i1 %arg, label %"<bb 53>.i", label %"<bb 35>.i"
3838

3939
"<bb 35>.i":
4040
br label %"<bb 53>.i"
@@ -51,13 +51,13 @@ doemit.exit76.i:
5151
"<bb 53>.i":
5252
%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" ]
5353
%D.5496_84.i = load ptr, ptr undef, align 8
54-
br i1 undef, label %"<bb 54>.i", label %"<bb 5>"
54+
br i1 %arg, label %"<bb 54>.i", label %"<bb 5>"
5555

5656
"<bb 54>.i":
57-
br i1 undef, label %"<bb 5>", label %"<bb 58>.i"
57+
br i1 %arg, label %"<bb 5>", label %"<bb 58>.i"
5858

5959
"<bb 58>.i":
60-
br i1 undef, label %"<bb 64>.i", label %"<bb 59>.i"
60+
br i1 %arg, label %"<bb 64>.i", label %"<bb 59>.i"
6161

6262
"<bb 59>.i":
6363
br label %"<bb 64>.i"
@@ -71,7 +71,7 @@ doemit.exit76.i:
7171
]
7272

7373
"<L54>.i":
74-
br i1 undef, label %"<bb 3>.i105.i", label %doemit.exit127.i
74+
br i1 %arg, label %"<bb 3>.i105.i", label %doemit.exit127.i
7575

7676
"<bb 3>.i105.i":
7777
unreachable
@@ -80,7 +80,7 @@ doemit.exit127.i:
8080
unreachable
8181

8282
"<L55>.i":
83-
br i1 undef, label %"<bb 3>.i157.i", label %"<bb 5>"
83+
br i1 %arg, label %"<bb 3>.i157.i", label %"<bb 5>"
8484

8585
"<bb 3>.i157.i":
8686
unreachable

‎llvm/test/Transforms/GVN/2012-05-22-PreCrash.ll

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

4-
define void @fn5(i16 signext %p1, i8 signext %p2) nounwind uwtable {
4+
define void @fn5(i16 signext %p1, i8 signext %p2, i1 %arg) nounwind uwtable {
55
entry:
6-
br i1 undef, label %if.else, label %if.then
6+
br i1 %arg, label %if.else, label %if.then
77

88
if.then: ; preds = %entry
99
br label %if.end
@@ -14,7 +14,7 @@ if.else: ; preds = %entry
1414

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

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

‎llvm/test/Transforms/GVN/PRE/phi-translate-2.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ if.end3: ; preds = %if.then2, %if.else,
251251
; Here the load from arrayidx1 is partially redundant, but its value is
252252
; available in if.then. Check that we correctly phi-translate to the phi that
253253
; the load has been replaced with.
254-
define void @test6(ptr %ptr) {
254+
define void @test6(ptr %ptr, i1 %arg) {
255255
; CHECK-LABEL: @test6(
256256
; CHECK-NEXT: entry:
257257
; CHECK-NEXT: [[ARRAYIDX1_PHI_TRANS_INSERT:%.*]] = getelementptr inbounds i32, ptr [[PTR:%.*]], i64 1
@@ -272,7 +272,7 @@ define void @test6(ptr %ptr) {
272272
; CHECK-NEXT: br label [[IF_END]]
273273
; CHECK: if.end:
274274
; CHECK-NEXT: [[TMP2]] = phi i32 [ [[TMP0]], [[IF_THEN]] ], [ [[TMP1]], [[WHILE]] ]
275-
; CHECK-NEXT: br i1 undef, label [[WHILE_END:%.*]], label [[WHILE]]
275+
; CHECK-NEXT: br i1 %arg, label [[WHILE_END:%.*]], label [[WHILE]]
276276
; CHECK: while.end:
277277
; CHECK-NEXT: ret void
278278
;
@@ -295,7 +295,7 @@ if.then:
295295
br label %if.end
296296

297297
if.end:
298-
br i1 undef, label %while.end, label %while
298+
br i1 %arg, label %while.end, label %while
299299

300300
while.end:
301301
ret void

‎llvm/test/Transforms/GVN/PRE/pre-loop-load-new-pm.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ cold_exit:
432432
}
433433

434434
; TODO: PRE via splittinga backedge in the cold loop. Make sure we don't insert a load into an inner loop.
435-
define i32 @test_inner_loop(ptr %p) {
435+
define i32 @test_inner_loop(ptr %p, i1 %arg) {
436436
; CHECK-LABEL: @test_inner_loop(
437437
; CHECK-NEXT: entry:
438438
; CHECK-NEXT: br label [[LOOP:%.*]]
@@ -447,7 +447,7 @@ define i32 @test_inner_loop(ptr %p) {
447447
; CHECK-NEXT: br label [[INNER_LOOP:%.*]]
448448
; CHECK: inner_loop:
449449
; CHECK-NEXT: call void @side_effect()
450-
; CHECK-NEXT: br i1 undef, label [[INNER_LOOP]], label [[BACKEDGE]]
450+
; CHECK-NEXT: br i1 %arg, label [[INNER_LOOP]], label [[BACKEDGE]]
451451
; CHECK: backedge:
452452
; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], [[X]]
453453
; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp ult i32 [[IV_NEXT]], 1000
@@ -472,7 +472,7 @@ cold_path:
472472

473473
inner_loop:
474474
call void @side_effect()
475-
br i1 undef, label %inner_loop, label %backedge
475+
br i1 %arg, label %inner_loop, label %backedge
476476

477477
backedge:
478478
%iv.next = add i32 %iv, %x

‎llvm/test/Transforms/GVN/PRE/pre-loop-load.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ cold_exit:
636636
}
637637

638638
; TODO: PRE via splittinga backedge in the cold loop. Make sure we don't insert a load into an inner loop.
639-
define i32 @test_inner_loop(ptr %p) {
639+
define i32 @test_inner_loop(ptr %p, i1 %arg) {
640640
; CHECK-LABEL: @test_inner_loop(
641641
; CHECK-NEXT: entry:
642642
; CHECK-NEXT: br label [[LOOP:%.*]]
@@ -651,7 +651,7 @@ define i32 @test_inner_loop(ptr %p) {
651651
; CHECK-NEXT: br label [[INNER_LOOP:%.*]]
652652
; CHECK: inner_loop:
653653
; CHECK-NEXT: call void @side_effect() #[[ATTR0]]
654-
; CHECK-NEXT: br i1 undef, label [[INNER_LOOP]], label [[BACKEDGE]]
654+
; CHECK-NEXT: br i1 %arg, label [[INNER_LOOP]], label [[BACKEDGE]]
655655
; CHECK: backedge:
656656
; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], [[X]]
657657
; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp ult i32 [[IV_NEXT]], 1000
@@ -676,7 +676,7 @@ cold_path:
676676

677677
inner_loop:
678678
call void @side_effect() nofree
679-
br i1 undef, label %inner_loop, label %backedge
679+
br i1 %arg, label %inner_loop, label %backedge
680680

681681
backedge:
682682
%iv.next = add i32 %iv, %x

‎llvm/test/Transforms/GVN/PRE/preserve-tbaa.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ target datalayout = "e-p:64:64:64"
77
; CHECK-LABEL: @test(
88
; CHECK: %tmp33.pre = load i16, ptr %P, align 2, !tbaa !0
99
; CHECK: br label %for.body
10-
define void @test(ptr %P, ptr %Q) nounwind {
10+
define void @test(ptr %P, ptr %Q, i1 %arg) nounwind {
1111
entry:
12-
br i1 undef, label %bb.nph, label %for.end
12+
br i1 %arg, label %bb.nph, label %for.end
1313

1414
bb.nph: ; preds = %entry
1515
br label %for.body

‎llvm/test/Transforms/GVN/crash.ll

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
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-apple-darwin10.0"
77

8-
define ptr @test1(ptr %name, i32 %namelen, ptr %o, i32 %expected_type) nounwind ssp {
8+
define ptr @test1(ptr %name, i32 %namelen, ptr %o, i32 %expected_type, i1 %arg) nounwind ssp {
99
entry:
10-
br i1 undef, label %if.end13, label %while.body.preheader
10+
br i1 %arg, label %if.end13, label %while.body.preheader
1111

1212

1313
if.end13: ; preds = %if.then6
@@ -22,25 +22,25 @@ while.body: ; preds = %while.body.backedge
2222

2323
lor.lhs.false: ; preds = %while.body
2424
%tmp22 = load i32, ptr %o.addr.0 ; <i32> [#uses=0]
25-
br i1 undef, label %land.lhs.true24, label %if.end31
25+
br i1 %arg, label %land.lhs.true24, label %if.end31
2626

2727
land.lhs.true24: ; preds = %lor.lhs.false
2828
%call28 = call ptr @parse_object(ptr undef) nounwind ; <ptr> [#uses=0]
29-
br i1 undef, label %return.loopexit, label %if.end31
29+
br i1 %arg, label %return.loopexit, label %if.end31
3030

3131
if.end31: ; preds = %land.lhs.true24, %lor.lhs.false
32-
br i1 undef, label %return.loopexit, label %if.end41
32+
br i1 %arg, label %return.loopexit, label %if.end41
3333

3434
if.end41: ; preds = %if.end31
3535
%tmp45 = load i32, ptr %o.addr.0 ; <i32> [#uses=0]
36-
br i1 undef, label %if.then50, label %if.else
36+
br i1 %arg, label %if.then50, label %if.else
3737

3838
if.then50: ; preds = %if.end41
3939
%tmp53 = load ptr, ptr undef ; <ptr> [#uses=1]
4040
br label %while.body.backedge
4141

4242
if.else: ; preds = %if.end41
43-
br i1 undef, label %if.then62, label %if.else67
43+
br i1 %arg, label %if.then62, label %if.else67
4444

4545
if.then62: ; preds = %if.else
4646
br label %while.body.backedge
@@ -97,10 +97,10 @@ bb66.i: ; Unreachable
9797

9898
@g = external global i64, align 8
9999

100-
define ptr @test3() {
100+
define ptr @test3(i1 %arg) {
101101
do.end17.i:
102102
%tmp18.i = load ptr, ptr undef
103-
br i1 undef, label %do.body36.i, label %if.then21.i
103+
br i1 %arg, label %do.body36.i, label %if.then21.i
104104

105105
if.then21.i:
106106
ret ptr undef
@@ -110,7 +110,7 @@ do.body36.i:
110110
%add.ptr39.sum.i = add i64 %ivar38.i, 8
111111
%tmp40.i = getelementptr inbounds i8, ptr %tmp18.i, i64 %add.ptr39.sum.i
112112
%tmp41.i = load i64, ptr %tmp40.i
113-
br i1 undef, label %if.then48.i, label %do.body57.i
113+
br i1 %arg, label %if.then48.i, label %do.body57.i
114114

115115
if.then48.i:
116116
%call54.i = call i32 @foo2()
@@ -163,15 +163,15 @@ entry:
163163

164164
%struct.type = type { i64, i32, i32 }
165165

166-
define fastcc void @func() nounwind uwtable ssp align 2 {
166+
define fastcc void @func(i1 %arg) nounwind uwtable ssp align 2 {
167167
entry:
168168
br label %reachable.bb
169169

170170
;; Unreachable code.
171171

172172
unreachable.bb:
173173
%gep.val = getelementptr inbounds %struct.type, ptr %gep.val, i64 1
174-
br i1 undef, label %u2.bb, label %u1.bb
174+
br i1 %arg, label %u2.bb, label %u1.bb
175175

176176
u1.bb:
177177
store i64 -1, ptr %gep.val, align 8

‎llvm/test/Transforms/GVN/equality-assume.ll

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ define i32 @test2(ptr %p, i32 %v) {
109109
ret i32 %load2
110110
}
111111

112-
define i32 @test3(ptr %p, i32 %v) {
112+
define i32 @test3(ptr %p, i32 %v, i1 %arg) {
113113
; CHECK-LABEL: @test3(
114114
; CHECK-NEXT: [[LOAD:%.*]] = load i32, ptr [[P:%.*]]
115115
; CHECK-NEXT: [[C:%.*]] = icmp eq i32 [[LOAD]], [[V:%.*]]
116116
; CHECK-NEXT: call void @llvm.assume(i1 [[C]])
117-
; CHECK-NEXT: br i1 undef, label [[TAKEN:%.*]], label [[MERGE:%.*]]
117+
; CHECK-NEXT: br i1 %arg, label [[TAKEN:%.*]], label [[MERGE:%.*]]
118118
; CHECK: taken:
119119
; CHECK-NEXT: br label [[MERGE]]
120120
; CHECK: merge:
@@ -123,42 +123,42 @@ define i32 @test3(ptr %p, i32 %v) {
123123
%load = load i32, ptr %p
124124
%c = icmp eq i32 %load, %v
125125
call void @llvm.assume(i1 %c)
126-
br i1 undef, label %taken, label %merge
126+
br i1 %arg, label %taken, label %merge
127127
taken:
128128
br label %merge
129129
merge:
130130
ret i32 %load
131131
}
132132

133-
define i32 @trivial_constants(ptr %p) {
133+
define i32 @trivial_constants(ptr %p, i1 %arg) {
134134
; CHECK-LABEL: @trivial_constants(
135-
; CHECK-NEXT: br i1 undef, label [[TAKEN:%.*]], label [[MERGE:%.*]]
135+
; CHECK-NEXT: br i1 %arg, label [[TAKEN:%.*]], label [[MERGE:%.*]]
136136
; CHECK: taken:
137137
; CHECK-NEXT: br label [[MERGE]]
138138
; CHECK: merge:
139139
; CHECK-NEXT: ret i32 0
140140
;
141141
%c = icmp eq i32 0, 0
142142
call void @llvm.assume(i1 %c)
143-
br i1 undef, label %taken, label %merge
143+
br i1 %arg, label %taken, label %merge
144144
taken:
145145
br label %merge
146146
merge:
147147
ret i32 0
148148
}
149149

150-
define i32 @conflicting_constants(ptr %p) {
150+
define i32 @conflicting_constants(ptr %p, i1 %arg) {
151151
; CHECK-LABEL: @conflicting_constants(
152152
; CHECK-NEXT: store i8 poison, ptr null
153-
; CHECK-NEXT: br i1 undef, label [[TAKEN:%.*]], label [[MERGE:%.*]]
153+
; CHECK-NEXT: br i1 %arg, label [[TAKEN:%.*]], label [[MERGE:%.*]]
154154
; CHECK: taken:
155155
; CHECK-NEXT: br label [[MERGE]]
156156
; CHECK: merge:
157157
; CHECK-NEXT: ret i32 1
158158
;
159159
%c = icmp eq i32 0, 5
160160
call void @llvm.assume(i1 %c)
161-
br i1 undef, label %taken, label %merge
161+
br i1 %arg, label %taken, label %merge
162162
taken:
163163
br label %merge
164164
merge:

‎llvm/test/Transforms/GVN/pre-new-inst.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
; RUN: opt -passes=gvn -S %s | FileCheck %s
22

33
%MyStruct = type { i32, i32 }
4-
define i8 @foo(i64 %in, ptr %arr) {
4+
define i8 @foo(i64 %in, ptr %arr, i1 %arg) {
55
%addr = alloca %MyStruct
66
%dead = trunc i64 %in to i32
7-
br i1 undef, label %next, label %tmp
7+
br i1 %arg, label %next, label %tmp
88

99
tmp:
1010
call void @bar()

‎llvm/test/Transforms/GVN/stale-loop-info.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
1313
; Function Attrs: argmemonly
1414
declare void @snork.1(ptr) local_unnamed_addr #0
1515

16-
define hidden zeroext i1 @eggs(ptr %arg, i1 %arg2) unnamed_addr align 2 {
16+
define hidden zeroext i1 @eggs(ptr %arg, i1 %arg2, i1 %arg3) unnamed_addr align 2 {
1717
bb:
1818
br i1 %arg2, label %bb14, label %bb3
1919

@@ -25,7 +25,7 @@ bb6: ; preds = %bb12, %bb3
2525
br label %bb7
2626

2727
bb7: ; preds = %bb6
28-
br i1 undef, label %bb11, label %bb8
28+
br i1 %arg3, label %bb11, label %bb8
2929

3030
bb8: ; preds = %bb7
3131
%tmp9 = load ptr, ptr %tmp, align 8

‎llvm/test/Transforms/GVN/unreachable_block_infinite_loop.ll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,32 @@ unreachable_block:
1212
ret i32 %a
1313
}
1414

15-
define i32 @pr23096_test0() {
15+
define i32 @pr23096_test0(i1 %arg, ptr %arg2) {
1616
entry:
1717
br label %bb0
1818

1919
bb1:
2020
%ptr1 = ptrtoint ptr %ptr2 to i64
2121
%ptr2 = inttoptr i64 %ptr1 to ptr
22-
br i1 undef, label %bb0, label %bb1
22+
br i1 %arg, label %bb0, label %bb1
2323

2424
bb0:
25-
%phi = phi ptr [ undef, %entry ], [ %ptr2, %bb1 ]
25+
%phi = phi ptr [ %arg2, %entry ], [ %ptr2, %bb1 ]
2626
%load = load i32, ptr %phi
2727
ret i32 %load
2828
}
2929

30-
define i32 @pr23096_test1() {
30+
define i32 @pr23096_test1(i1 %arg, ptr %arg2) {
3131
entry:
3232
br label %bb0
3333

3434
bb1:
3535
%ptr1 = getelementptr i32, ptr %ptr2, i32 0
3636
%ptr2 = getelementptr i32, ptr %ptr1, i32 0
37-
br i1 undef, label %bb0, label %bb1
37+
br i1 %arg, label %bb0, label %bb1
3838

3939
bb0:
40-
%phi = phi ptr [ undef, %entry ], [ %ptr2, %bb1 ]
40+
%phi = phi ptr [ %arg2, %entry ], [ %ptr2, %bb1 ]
4141
%load = load i32, ptr %phi
4242
ret i32 %load
4343
}

0 commit comments

Comments
 (0)