Skip to content

Commit a2367c4

Browse files
committed
GVN/test: regen with UTC (NFC)
Regenerate tests in GVN with UpdateTestChecks, where possible.
1 parent f58e85a commit a2367c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2296
-963
lines changed
Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
12
; RUN: opt < %s -passes=gvn -S | FileCheck %s
23

3-
%struct.INT2 = type { i32, i32 }
4+
%struct.INT2 = type { i32, i32 }
45
@blkshifts = external global ptr ; <ptr> [#uses=2]
56

67
define i32 @xcompact() {
8+
; CHECK-LABEL: define i32 @xcompact() {
9+
; CHECK-NEXT: [[ENTRY:.*:]]
10+
; CHECK-NEXT: store ptr null, ptr @blkshifts, align 4
11+
; CHECK-NEXT: br label %[[BB:.*]]
12+
; CHECK: [[BB]]:
13+
; CHECK-NEXT: br label %[[BB]]
14+
;
715
entry:
8-
store ptr null, ptr @blkshifts, align 4
9-
br label %bb
16+
store ptr null, ptr @blkshifts, align 4
17+
br label %bb
1018

1119
bb: ; preds = %bb, %entry
12-
%tmp10 = load ptr, ptr @blkshifts, align 4 ; <ptr> [#uses=0]
13-
; CHECK-NOT: %tmp10
14-
br label %bb
20+
%tmp10 = load ptr, ptr @blkshifts, align 4 ; <ptr> [#uses=0]
21+
br label %bb
1522
}
Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,60 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
12
; RUN: opt < %s -passes=gvn -S | FileCheck %s
23

34
@last = external global [65 x ptr]
45

56
define i32 @NextRootMove(i32 %wtm, i32 %x, i32 %y, i32 %z) {
7+
; CHECK-LABEL: define i32 @NextRootMove(
8+
; CHECK-SAME: i32 [[WTM:%.*]], i32 [[X:%.*]], i32 [[Y:%.*]], i32 [[Z:%.*]]) {
9+
; CHECK-NEXT: [[ENTRY:.*:]]
10+
; CHECK-NEXT: [[A:%.*]] = alloca ptr, align 8
11+
; CHECK-NEXT: [[TMP17618:%.*]] = load ptr, ptr getelementptr ([65 x ptr], ptr @last, i32 0, i32 1), align 4
12+
; CHECK-NEXT: store ptr [[TMP17618]], ptr [[A]], align 8
13+
; CHECK-NEXT: br label %[[COND_TRUE116:.*]]
14+
; CHECK: [[COND_TRUE116]]:
15+
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[X]], [[Y]]
16+
; CHECK-NEXT: br i1 [[CMP]], label %[[COND_TRUE128:.*]], label %[[COND_TRUE145:.*]]
17+
; CHECK: [[COND_TRUE128]]:
18+
; CHECK-NEXT: store ptr [[TMP17618]], ptr [[A]], align 8
19+
; CHECK-NEXT: [[CMP1:%.*]] = icmp eq i32 [[X]], [[Z]]
20+
; CHECK-NEXT: br i1 [[CMP1]], label %[[BB98_BACKEDGE:.*]], label %[[RETURN_LOOPEXIT:.*]]
21+
; CHECK: [[BB98_BACKEDGE]]:
22+
; CHECK-NEXT: br label %[[COND_TRUE116]]
23+
; CHECK: [[COND_TRUE145]]:
24+
; CHECK-NEXT: store ptr [[TMP17618]], ptr [[A]], align 8
25+
; CHECK-NEXT: br i1 false, label %[[COND_TRUE145_BB98_BACKEDGE_CRIT_EDGE:.*]], label %[[RETURN_LOOPEXIT]]
26+
; CHECK: [[COND_TRUE145_BB98_BACKEDGE_CRIT_EDGE]]:
27+
; CHECK-NEXT: br label %[[BB98_BACKEDGE]]
28+
; CHECK: [[RETURN_LOOPEXIT]]:
29+
; CHECK-NEXT: ret i32 0
30+
;
631
entry:
7-
%A = alloca ptr
8-
%tmp17618 = load ptr, ptr getelementptr ([65 x ptr], ptr @last, i32 0, i32 1), align 4
9-
store ptr %tmp17618, ptr %A
10-
; CHECK: entry:
11-
; CHECK-NEXT: alloca ptr
12-
; CHECK-NEXT: %tmp17618 = load
13-
; CHECK-NOT: load
14-
; CHECK-NOT: phi
15-
br label %cond_true116
32+
%A = alloca ptr
33+
%tmp17618 = load ptr, ptr getelementptr ([65 x ptr], ptr @last, i32 0, i32 1), align 4
34+
store ptr %tmp17618, ptr %A
35+
br label %cond_true116
1636

1737
cond_true116:
18-
%cmp = icmp eq i32 %x, %y
19-
br i1 %cmp, label %cond_true128, label %cond_true145
38+
%cmp = icmp eq i32 %x, %y
39+
br i1 %cmp, label %cond_true128, label %cond_true145
2040

2141
cond_true128:
22-
%tmp17625 = load ptr, ptr getelementptr ([65 x ptr], ptr @last, i32 0, i32 1), align 4
23-
store ptr %tmp17625, ptr %A
24-
%cmp1 = icmp eq i32 %x, %z
25-
br i1 %cmp1 , label %bb98.backedge, label %return.loopexit
42+
%tmp17625 = load ptr, ptr getelementptr ([65 x ptr], ptr @last, i32 0, i32 1), align 4
43+
store ptr %tmp17625, ptr %A
44+
%cmp1 = icmp eq i32 %x, %z
45+
br i1 %cmp1 , label %bb98.backedge, label %return.loopexit
2646

2747
bb98.backedge:
28-
br label %cond_true116
48+
br label %cond_true116
2949

3050
cond_true145:
31-
%tmp17631 = load ptr, ptr getelementptr ([65 x ptr], ptr @last, i32 0, i32 1), align 4
32-
store ptr %tmp17631, ptr %A
33-
br i1 false, label %bb98.backedge, label %return.loopexit
51+
%tmp17631 = load ptr, ptr getelementptr ([65 x ptr], ptr @last, i32 0, i32 1), align 4
52+
store ptr %tmp17631, ptr %A
53+
br i1 false, label %bb98.backedge, label %return.loopexit
3454

3555
return.loopexit:
36-
br label %return
56+
br label %return
3757

3858
return:
39-
ret i32 0
59+
ret i32 0
4060
}

llvm/test/Transforms/GVN/2007-07-26-PhiErasure.ll

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,45 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
12
; RUN: opt < %s -passes=gvn -S | FileCheck %s
23

3-
%struct..0anon = type { i32 }
4-
%struct.FILE = type { ptr, i32, i32, i16, i16, %struct.__sbuf, i32, ptr, ptr, ptr, ptr, ptr, %struct.__sbuf, ptr, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 }
5-
%struct.__sFILEX = type opaque
6-
%struct.__sbuf = type { ptr, i32 }
7-
%struct.rtx_def = type { i16, i8, i8, [1 x %struct..0anon] }
4+
%struct..0anon = type { i32 }
5+
%struct.FILE = type { ptr, i32, i32, i16, i16, %struct.__sbuf, i32, ptr, ptr, ptr, ptr, ptr, %struct.__sbuf, ptr, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 }
6+
%struct.__sFILEX = type opaque
7+
%struct.__sbuf = type { ptr, i32 }
8+
%struct.rtx_def = type { i16, i8, i8, [1 x %struct..0anon] }
89
@n_spills = external global i32 ; <ptr> [#uses=2]
910

1011
define i32 @reload(ptr %first, i32 %global, ptr %dumpfile) {
12+
; CHECK-LABEL: define i32 @reload(
13+
; CHECK-SAME: ptr [[FIRST:%.*]], i32 [[GLOBAL:%.*]], ptr [[DUMPFILE:%.*]]) {
14+
; CHECK-NEXT: [[COND_NEXT2835_1:.*:]]
15+
; CHECK-NEXT: br label %[[BB2928:.*]]
16+
; CHECK: [[BB2928]]:
17+
; CHECK-NEXT: br i1 false, label %[[BB2928_COND_NEXT2943_CRIT_EDGE:.*]], label %[[COND_TRUE2935:.*]]
18+
; CHECK: [[BB2928_COND_NEXT2943_CRIT_EDGE]]:
19+
; CHECK-NEXT: br label %[[COND_NEXT2943:.*]]
20+
; CHECK: [[COND_TRUE2935]]:
21+
; CHECK-NEXT: br label %[[COND_NEXT2943]]
22+
; CHECK: [[COND_NEXT2943]]:
23+
; CHECK-NEXT: br i1 false, label %[[BB2982_PREHEADER:.*]], label %[[BB2928]]
24+
; CHECK: [[BB2982_PREHEADER]]:
25+
; CHECK-NEXT: [[TMP298316:%.*]] = load i32, ptr @n_spills, align 4
26+
; CHECK-NEXT: ret i32 [[TMP298316]]
27+
;
1128
cond_next2835.1: ; preds = %cond_next2861
12-
%tmp2922 = load i32, ptr @n_spills, align 4 ; <i32> [#uses=0]
13-
br label %bb2928
29+
%tmp2922 = load i32, ptr @n_spills, align 4 ; <i32> [#uses=0]
30+
br label %bb2928
1431

1532
bb2928: ; preds = %cond_next2835.1, %cond_next2943
16-
br i1 false, label %cond_next2943, label %cond_true2935
33+
br i1 false, label %cond_next2943, label %cond_true2935
1734

1835
cond_true2935: ; preds = %bb2928
19-
br label %cond_next2943
36+
br label %cond_next2943
2037

2138
cond_next2943: ; preds = %cond_true2935, %bb2928
22-
br i1 false, label %bb2982.preheader, label %bb2928
39+
br i1 false, label %bb2982.preheader, label %bb2928
2340

2441
bb2982.preheader: ; preds = %cond_next2943
25-
%tmp298316 = load i32, ptr @n_spills, align 4 ; <i32> [#uses=0]
26-
ret i32 %tmp298316
27-
42+
%tmp298316 = load i32, ptr @n_spills, align 4 ; <i32> [#uses=0]
43+
ret i32 %tmp298316
2844
}
2945

30-
; CHECK: define i32 @reload(ptr %first, i32 %global, ptr %dumpfile) {
31-
; CHECK-NEXT: cond_next2835.1:
32-
; CHECK-NEXT: br label %bb2928
33-
; CHECK: bb2928:
34-
; CHECK-NEXT: br i1 false, label %bb2928.cond_next2943_crit_edge, label %cond_true2935
35-
; CHECK: bb2928.cond_next2943_crit_edge:
36-
; CHECK-NEXT: br label %cond_next2943
37-
; CHECK: cond_true2935:
38-
; CHECK-NEXT: br label %cond_next2943
39-
; CHECK: cond_next2943:
40-
; CHECK-NEXT: br i1 false, label %bb2982.preheader, label %bb2928
41-
; CHECK: bb2982.preheader:
42-
; CHECK-NEXT: %tmp298316 = load i32, ptr @n_spills, align 4
43-
; CHECK-NEXT: ret i32 %tmp298316
44-
; CHECK-NEXT: }

0 commit comments

Comments
 (0)