Skip to content

Commit eda6ff3

Browse files
bjopebjope
committed
[test][Transform/Utils] Update tests to opaque pointer syntax. NFC
This patch converts test cases that simly could be rewritten using the script at https://gist.github.com/nikic/98357b71fd67756b0f064c9517b62a34
1 parent 83f2b19 commit eda6ff3

29 files changed

+405
-428
lines changed

‎llvm/test/Transforms/Util/PredicateInfo/condprop.ll

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
22
; RUN: opt -passes=print-predicateinfo -disable-output < %s 2>&1 | FileCheck %s
33

4-
@a = external global i32 ; <i32*> [#uses=7]
4+
@a = external global i32 ; <ptr> [#uses=7]
55

66
define i32 @test1() nounwind {
77
; CHECK-LABEL: @test1(
88
; CHECK-NEXT: entry:
9-
; CHECK-NEXT: [[TMP0:%.*]] = load i32, i32* @a, align 4
9+
; CHECK-NEXT: [[TMP0:%.*]] = load i32, ptr @a, align 4
1010
; CHECK-NEXT: [[TMP1:%.*]] = icmp eq i32 [[TMP0]], 4
1111
; CHECK-NEXT: br i1 [[TMP1]], label [[BB:%.*]], label [[BB1:%.*]]
1212
; CHECK: bb:
1313
; CHECK-NEXT: br label [[BB8:%.*]]
1414
; CHECK: bb1:
15-
; CHECK-NEXT: [[TMP2:%.*]] = load i32, i32* @a, align 4
15+
; CHECK-NEXT: [[TMP2:%.*]] = load i32, ptr @a, align 4
1616
; CHECK-NEXT: [[TMP3:%.*]] = icmp eq i32 [[TMP2]], 5
1717
; CHECK-NEXT: br i1 [[TMP3]], label [[BB2:%.*]], label [[BB3:%.*]]
1818
; CHECK: bb2:
1919
; CHECK-NEXT: br label [[BB8]]
2020
; CHECK: bb3:
21-
; CHECK-NEXT: [[TMP4:%.*]] = load i32, i32* @a, align 4
21+
; CHECK-NEXT: [[TMP4:%.*]] = load i32, ptr @a, align 4
2222
; CHECK-NEXT: [[TMP5:%.*]] = icmp eq i32 [[TMP4]], 4
2323
; CHECK-NEXT: br i1 [[TMP5]], label [[BB4:%.*]], label [[BB5:%.*]]
2424
; CHECK: bb4:
25-
; CHECK-NEXT: [[TMP6:%.*]] = load i32, i32* @a, align 4
25+
; CHECK-NEXT: [[TMP6:%.*]] = load i32, ptr @a, align 4
2626
; CHECK-NEXT: [[TMP7:%.*]] = add i32 [[TMP6]], 5
2727
; CHECK-NEXT: br label [[BB8]]
2828
; CHECK: bb5:
29-
; CHECK-NEXT: [[TMP8:%.*]] = load i32, i32* @a, align 4
29+
; CHECK-NEXT: [[TMP8:%.*]] = load i32, ptr @a, align 4
3030
; CHECK-NEXT: [[TMP9:%.*]] = icmp eq i32 [[TMP8]], 5
3131
; CHECK-NEXT: br i1 [[TMP9]], label [[BB6:%.*]], label [[BB7:%.*]]
3232
; CHECK: bb6:
33-
; CHECK-NEXT: [[TMP10:%.*]] = load i32, i32* @a, align 4
33+
; CHECK-NEXT: [[TMP10:%.*]] = load i32, ptr @a, align 4
3434
; CHECK-NEXT: [[TMP11:%.*]] = add i32 [[TMP10]], 4
3535
; CHECK-NEXT: br label [[BB8]]
3636
; CHECK: bb7:
37-
; CHECK-NEXT: [[TMP12:%.*]] = load i32, i32* @a, align 4
37+
; CHECK-NEXT: [[TMP12:%.*]] = load i32, ptr @a, align 4
3838
; CHECK-NEXT: br label [[BB8]]
3939
; CHECK: bb8:
4040
; CHECK-NEXT: [[DOT0:%.*]] = phi i32 [ [[TMP12]], [[BB7]] ], [ [[TMP11]], [[BB6]] ], [ [[TMP7]], [[BB4]] ], [ 4, [[BB2]] ], [ 5, [[BB]] ]
@@ -43,43 +43,43 @@ define i32 @test1() nounwind {
4343
; CHECK-NEXT: ret i32 [[DOT0]]
4444
;
4545
entry:
46-
%0 = load i32, i32* @a, align 4
46+
%0 = load i32, ptr @a, align 4
4747
%1 = icmp eq i32 %0, 4
4848
br i1 %1, label %bb, label %bb1
4949

5050
bb: ; preds = %entry
5151
br label %bb8
5252

5353
bb1: ; preds = %entry
54-
%2 = load i32, i32* @a, align 4
54+
%2 = load i32, ptr @a, align 4
5555
%3 = icmp eq i32 %2, 5
5656
br i1 %3, label %bb2, label %bb3
5757

5858
bb2: ; preds = %bb1
5959
br label %bb8
6060

6161
bb3: ; preds = %bb1
62-
%4 = load i32, i32* @a, align 4
62+
%4 = load i32, ptr @a, align 4
6363
%5 = icmp eq i32 %4, 4
6464
br i1 %5, label %bb4, label %bb5
6565

6666
bb4: ; preds = %bb3
67-
%6 = load i32, i32* @a, align 4
67+
%6 = load i32, ptr @a, align 4
6868
%7 = add i32 %6, 5
6969
br label %bb8
7070

7171
bb5: ; preds = %bb3
72-
%8 = load i32, i32* @a, align 4
72+
%8 = load i32, ptr @a, align 4
7373
%9 = icmp eq i32 %8, 5
7474
br i1 %9, label %bb6, label %bb7
7575

7676
bb6: ; preds = %bb5
77-
%10 = load i32, i32* @a, align 4
77+
%10 = load i32, ptr @a, align 4
7878
%11 = add i32 %10, 4
7979
br label %bb8
8080

8181
bb7: ; preds = %bb5
82-
%12 = load i32, i32* @a, align 4
82+
%12 = load i32, ptr @a, align 4
8383
br label %bb8
8484

8585
bb8: ; preds = %bb7, %bb6, %bb4, %bb2, %bb

‎llvm/test/Transforms/Util/PredicateInfo/pr33456.ll

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,33 @@
99

1010
define i32 @main() {
1111
; CHECK-LABEL: @main(
12-
; CHECK-NEXT: [[TMP1:%.*]] = load i32, i32* @d, align 4
12+
; CHECK-NEXT: [[TMP1:%.*]] = load i32, ptr @d, align 4
1313
; CHECK-NEXT: [[TMP2:%.*]] = icmp eq i32 [[TMP1]], 0
1414
; CHECK-NEXT: br i1 [[TMP2]], label [[TMP3:%.*]], label [[TMP13:%.*]]
15-
; CHECK: [[TMP4:%.*]] = load i32, i32* @a, align 4
16-
; CHECK-NEXT: [[TMP5:%.*]] = load i32, i32* @c, align 4
15+
; CHECK: [[TMP4:%.*]] = load i32, ptr @a, align 4
16+
; CHECK-NEXT: [[TMP5:%.*]] = load i32, ptr @c, align 4
1717
; CHECK-NEXT: [[TMP6:%.*]] = icmp slt i32 [[TMP5]], 1
1818
; CHECK-NEXT: br i1 [[TMP6]], label [[TMP7:%.*]], label [[TMP9:%.*]]
1919
; CHECK: [[TMP8:%.*]] = icmp eq i32 [[TMP4]], 0
2020
; CHECK-NEXT: br i1 [[TMP8]], label [[TMP9]], label [[TMP9]]
2121
; CHECK: [[DOT0:%.*]] = phi i32 [ [[TMP4]], [[TMP7]] ], [ [[TMP4]], [[TMP7]] ], [ [[DOT1:%.*]], [[TMP13]] ], [ [[TMP4]], [[TMP3]] ]
22-
; CHECK-NEXT: [[TMP10:%.*]] = load i32, i32* @b, align 4
22+
; CHECK-NEXT: [[TMP10:%.*]] = load i32, ptr @b, align 4
2323
; CHECK-NEXT: [[TMP11:%.*]] = sdiv i32 [[TMP10]], [[DOT0]]
2424
; CHECK-NEXT: [[TMP12:%.*]] = icmp eq i32 [[TMP11]], 0
2525
; CHECK-NEXT: br i1 [[TMP12]], label [[TMP13]], label [[TMP13]]
2626
; CHECK: [[DOT1]] = phi i32 [ [[DOT0]], [[TMP9]] ], [ [[DOT0]], [[TMP9]] ], [ undef, [[TMP0:%.*]] ]
27-
; CHECK-NEXT: [[TMP14:%.*]] = load i32, i32* @e, align 4
27+
; CHECK-NEXT: [[TMP14:%.*]] = load i32, ptr @e, align 4
2828
; CHECK-NEXT: [[TMP15:%.*]] = icmp eq i32 [[TMP14]], 0
2929
; CHECK-NEXT: br i1 [[TMP15]], label [[TMP16:%.*]], label [[TMP9]]
3030
; CHECK: ret i32 0
3131
;
32-
%1 = load i32, i32* @d, align 4
32+
%1 = load i32, ptr @d, align 4
3333
%2 = icmp eq i32 %1, 0
3434
br i1 %2, label %3, label %13
3535

3636
; <label>:3: ; preds = %0
37-
%4 = load i32, i32* @a, align 4
38-
%5 = load i32, i32* @c, align 4
37+
%4 = load i32, ptr @a, align 4
38+
%5 = load i32, ptr @c, align 4
3939
%6 = icmp slt i32 %5, 1
4040
br i1 %6, label %7, label %9
4141

@@ -45,14 +45,14 @@ define i32 @main() {
4545

4646
; <label>:9: ; preds = %13, %7, %7, %3
4747
%.0 = phi i32 [ %4, %7 ], [ %4, %7 ], [ %.1, %13 ], [ %4, %3 ]
48-
%10 = load i32, i32* @b, align 4
48+
%10 = load i32, ptr @b, align 4
4949
%11 = sdiv i32 %10, %.0
5050
%12 = icmp eq i32 %11, 0
5151
br i1 %12, label %13, label %13
5252

5353
; <label>:13: ; preds = %9, %9, %0
5454
%.1 = phi i32 [ %.0, %9 ], [ %.0, %9 ], [ undef, %0 ]
55-
%14 = load i32, i32* @e, align 4
55+
%14 = load i32, ptr @e, align 4
5656
%15 = icmp eq i32 %14, 0
5757
br i1 %15, label %16, label %9
5858

@@ -61,8 +61,8 @@ define i32 @main() {
6161
}
6262

6363
; Function Attrs: argmemonly nounwind
64-
declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture)
64+
declare void @llvm.lifetime.start.p0(i64, ptr nocapture)
6565

6666
; Function Attrs: argmemonly nounwind
67-
declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture)
67+
declare void @llvm.lifetime.end.p0(i64, ptr nocapture)
6868

‎llvm/test/Transforms/Util/PredicateInfo/pr33457.ll

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
; Function Attrs: nounwind ssp uwtable
1212
define i32 @main() {
1313
; CHECK-LABEL: @main(
14-
; CHECK-NEXT: store i32 6, i32* @e, align 4
14+
; CHECK-NEXT: store i32 6, ptr @e, align 4
1515
; CHECK-NEXT: br label [[TMP1:%.*]]
16-
; CHECK: [[TMP2:%.*]] = load i32, i32* @d, align 4
16+
; CHECK: [[TMP2:%.*]] = load i32, ptr @d, align 4
1717
; CHECK-NEXT: [[TMP3:%.*]] = sext i32 [[TMP2]] to i64
18-
; CHECK-NEXT: [[TMP4:%.*]] = getelementptr inbounds [6 x i32], [6 x i32]* @b, i64 0, i64 [[TMP3]]
19-
; CHECK-NEXT: [[TMP5:%.*]] = load i32, i32* [[TMP4]], align 4
20-
; CHECK-NEXT: [[TMP6:%.*]] = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32 [[TMP5]])
21-
; CHECK-NEXT: [[TMP7:%.*]] = load i32, i32* @a, align 4
18+
; CHECK-NEXT: [[TMP4:%.*]] = getelementptr inbounds [6 x i32], ptr @b, i64 0, i64 [[TMP3]]
19+
; CHECK-NEXT: [[TMP5:%.*]] = load i32, ptr [[TMP4]], align 4
20+
; CHECK-NEXT: [[TMP6:%.*]] = call i32 (ptr, ...) @printf(ptr @.str, i32 [[TMP5]])
21+
; CHECK-NEXT: [[TMP7:%.*]] = load i32, ptr @a, align 4
2222
; CHECK-NEXT: [[TMP8:%.*]] = icmp eq i32 [[TMP7]], 0
2323
; CHECK-NEXT: br i1 [[TMP8]], label %thread-pre-split, label [[TMP9:%.*]]
24-
; CHECK: [[TMP10:%.*]] = load i32, i32* @e, align 4
24+
; CHECK: [[TMP10:%.*]] = load i32, ptr @e, align 4
2525
; CHECK-NEXT: [[TMP11:%.*]] = icmp eq i32 [[TMP10]], 0
2626
; CHECK-NEXT: br i1 [[TMP11]], label [[TMP12:%.*]], label [[TMP12]]
2727
; CHECK: thread-pre-split:
28-
; CHECK-NEXT: [[DOTPR:%.*]] = load i32, i32* @e, align 4
28+
; CHECK-NEXT: [[DOTPR:%.*]] = load i32, ptr @e, align 4
2929
; CHECK-NEXT: br label [[TMP12]]
3030
; CHECK: [[TMP13:%.*]] = phi i32 [ [[DOTPR]], %thread-pre-split ], [ [[TMP10]], [[TMP9]] ], [ [[TMP10]], [[TMP9]] ]
3131
; CHECK-NEXT: [[TMP14:%.*]] = icmp ne i32 [[TMP13]], 0
@@ -34,34 +34,34 @@ define i32 @main() {
3434
; CHECK: br label [[TMP17]]
3535
; CHECK: [[DOT0:%.*]] = phi i32 [ 1, [[TMP16]] ], [ -1, [[TMP15]] ]
3636
; CHECK-NEXT: [[TMP18:%.*]] = and i32 [[DOT0]], 8693
37-
; CHECK-NEXT: [[TMP19:%.*]] = load i32, i32* @c, align 4
37+
; CHECK-NEXT: [[TMP19:%.*]] = load i32, ptr @c, align 4
3838
; CHECK-NEXT: [[TMP20:%.*]] = xor i32 [[TMP18]], [[TMP19]]
3939
; CHECK-NEXT: [[TMP21:%.*]] = xor i32 [[TMP20]], -1
40-
; CHECK-NEXT: store i32 [[TMP21]], i32* @d, align 4
40+
; CHECK-NEXT: store i32 [[TMP21]], ptr @d, align 4
4141
; CHECK-NEXT: [[TMP22:%.*]] = icmp slt i32 [[TMP20]], -2
4242
; CHECK-NEXT: br i1 [[TMP22]], label [[TMP1]], label [[TMP23:%.*]]
4343
; CHECK: ret i32 0
4444
;
45-
store i32 6, i32* @e, align 4
45+
store i32 6, ptr @e, align 4
4646
br label %1
4747

4848
; <label>:1: ; preds = %17, %0
49-
%2 = load i32, i32* @d, align 4
49+
%2 = load i32, ptr @d, align 4
5050
%3 = sext i32 %2 to i64
51-
%4 = getelementptr inbounds [6 x i32], [6 x i32]* @b, i64 0, i64 %3
52-
%5 = load i32, i32* %4, align 4
53-
%6 = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([4 x i8], [4 x i8]* @.str, i64 0, i64 0), i32 %5) #2
54-
%7 = load i32, i32* @a, align 4
51+
%4 = getelementptr inbounds [6 x i32], ptr @b, i64 0, i64 %3
52+
%5 = load i32, ptr %4, align 4
53+
%6 = call i32 (ptr, ...) @printf(ptr @.str, i32 %5) #2
54+
%7 = load i32, ptr @a, align 4
5555
%8 = icmp eq i32 %7, 0
5656
br i1 %8, label %thread-pre-split, label %9
5757

5858
; <label>:9: ; preds = %1
59-
%10 = load i32, i32* @e, align 4
59+
%10 = load i32, ptr @e, align 4
6060
%11 = icmp eq i32 %10, 0
6161
br i1 %11, label %12, label %12
6262

6363
thread-pre-split: ; preds = %1
64-
%.pr = load i32, i32* @e, align 4
64+
%.pr = load i32, ptr @e, align 4
6565
br label %12
6666

6767
; <label>:12: ; preds = %thread-pre-split, %9, %9
@@ -78,16 +78,16 @@ thread-pre-split: ; preds = %1
7878
; <label>:17: ; preds = %16, %15
7979
%.0 = phi i32 [ 1, %16 ], [ -1, %15 ]
8080
%18 = and i32 %.0, 8693
81-
%19 = load i32, i32* @c, align 4
81+
%19 = load i32, ptr @c, align 4
8282
%20 = xor i32 %18, %19
8383
%21 = xor i32 %20, -1
84-
store i32 %21, i32* @d, align 4
84+
store i32 %21, ptr @d, align 4
8585
%22 = icmp slt i32 %20, -2
8686
br i1 %22, label %1, label %23
8787

8888
; <label>:23: ; preds = %17
8989
ret i32 0
9090
}
9191

92-
declare i32 @printf(i8*, ...)
92+
declare i32 @printf(ptr, ...)
9393

‎llvm/test/Transforms/Util/PredicateInfo/unreachable.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
declare void @foo()
44
declare void @llvm.assume(i1)
55

6-
define void @bar(i32* %p) {
6+
define void @bar(ptr %p) {
77
entry:
88
; CHECK-LABEL: @bar
99
br label %end
1010

1111
unreachable1:
12-
%v1 = load i32, i32* %p, align 4
12+
%v1 = load i32, ptr %p, align 4
1313
%c1 = icmp eq i32 %v1, 0
1414
call void @llvm.assume(i1 %c1)
1515
br label %unreachable2
1616

1717
unreachable2:
18-
%v2 = load i32, i32* %p, align 4
18+
%v2 = load i32, ptr %p, align 4
1919
%c2 = icmp eq i32 %v2, 0
2020
call void @llvm.assume(i1 %c2)
2121
br label %end

‎llvm/test/Transforms/Util/annotation-remarks-dbg-info.ll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@
4040
; CHECK-NEXT: - type: _remarks1
4141
; CHECK-NEXT: ...
4242

43-
define void @test1(float* %a) !dbg !7 {
43+
define void @test1(ptr %a) !dbg !7 {
4444
entry:
45-
%a.addr = alloca float*, align 8, !dbg !16, !annotation !5
46-
store float* null, float** %a.addr, align 8, !annotation !6
47-
store float* %a, float** %a.addr, align 8, !annotation !5
45+
%a.addr = alloca ptr, align 8, !dbg !16, !annotation !5
46+
store ptr null, ptr %a.addr, align 8, !annotation !6
47+
store ptr %a, ptr %a.addr, align 8, !annotation !5
4848
ret void, !annotation !5
4949
}
5050

51-
define void @test2(float* %a) !dbg !17 {
51+
define void @test2(ptr %a) !dbg !17 {
5252
entry:
53-
%a.addr = alloca float*, align 8, !annotation !6
53+
%a.addr = alloca ptr, align 8, !annotation !6
5454
ret void, !dbg !18, !annotation !6
5555
}
5656

‎llvm/test/Transforms/Util/annotation-remarks.ll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@
3434
; CHECK-NEXT: - type: _remarks1
3535
; CHECK-NEXT: ...
3636

37-
define void @test1(float* %a) {
37+
define void @test1(ptr %a) {
3838
entry:
39-
%a.addr = alloca float*, align 8, !annotation !0
40-
store float* null, float** %a.addr, align 8, !annotation !1
41-
store float* %a, float** %a.addr, align 8, !annotation !0
39+
%a.addr = alloca ptr, align 8, !annotation !0
40+
store ptr null, ptr %a.addr, align 8, !annotation !1
41+
store ptr %a, ptr %a.addr, align 8, !annotation !0
4242
ret void, !annotation !0
4343
}
4444

45-
define void @test2(float* %a) {
45+
define void @test2(ptr %a) {
4646
entry:
47-
%a.addr = alloca float*, align 8, !annotation !1
47+
%a.addr = alloca ptr, align 8, !annotation !1
4848
ret void, !annotation !1
4949
}
5050

0 commit comments

Comments
 (0)