Skip to content

Commit 615efc3

Browse files
nikicnikic
committed
[AlignmentFromAssumptions] Migrate tests to opaque pointers (NFC)
Tests were updated with (without manual fixup): https://gist.github.com/nikic/98357b71fd67756b0f064c9517b62a34
1 parent 67fe3bd commit 615efc3

File tree

4 files changed

+162
-177
lines changed

4 files changed

+162
-177
lines changed

‎llvm/test/Transforms/AlignmentFromAssumptions/amdgpu-crash.ll

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5-ni:7"
55

6-
%"core::str::CharIndices.29.66.90.114.138.149.165.173.181.197.205.213.229.387.398" = type { [0 x i64], i64, [0 x i64], { i8*, i8* }, [0 x i64] }
7-
%"unwind::libunwind::_Unwind_Exception.9.51.75.99.123.147.163.171.179.195.203.211.227.385.396" = type { [0 x i64], i64, [0 x i64], void (i32, %"unwind::libunwind::_Unwind_Exception.9.51.75.99.123.147.163.171.179.195.203.211.227.385.396"*)*, [0 x i64], [6 x i64], [0 x i64] }
6+
%"core::str::CharIndices.29.66.90.114.138.149.165.173.181.197.205.213.229.387.398" = type { [0 x i64], i64, [0 x i64], { ptr, ptr }, [0 x i64] }
7+
%"unwind::libunwind::_Unwind_Exception.9.51.75.99.123.147.163.171.179.195.203.211.227.385.396" = type { [0 x i64], i64, [0 x i64], ptr, [0 x i64], [6 x i64], [0 x i64] }
88
%"unwind::libunwind::_Unwind_Context.10.52.76.100.124.148.164.172.180.196.204.212.228.386.397" = type { [0 x i8] }
99

1010
define void @"_ZN44_$LT$$RF$T$u20$as$u20$core..fmt..Display$GT$3fmt17h7b1d039c7ff5e1feE"() {
@@ -13,16 +13,15 @@ start:
1313
br label %bb12.i.i
1414

1515
bb12.i.i: ; preds = %start
16-
%0 = addrspacecast %"core::str::CharIndices.29.66.90.114.138.149.165.173.181.197.205.213.229.387.398" addrspace(5)* %_15.i.i to %"core::str::CharIndices.29.66.90.114.138.149.165.173.181.197.205.213.229.387.398"*
17-
%ptrint53.i.i = ptrtoint %"core::str::CharIndices.29.66.90.114.138.149.165.173.181.197.205.213.229.387.398"* %0 to i64
16+
%0 = addrspacecast ptr addrspace(5) %_15.i.i to ptr
17+
%ptrint53.i.i = ptrtoint ptr %0 to i64
1818
%maskedptr54.i.i = and i64 %ptrint53.i.i, 7
1919
%maskcond55.i.i = icmp eq i64 %maskedptr54.i.i, 0
2020
call void @llvm.assume(i1 %maskcond55.i.i)
2121
br i1 undef, label %bb20.i.i, label %bb3.i.i.i.i.i.preheader.i.i
2222

2323
bb3.i.i.i.i.i.preheader.i.i: ; preds = %bb12.i.i
24-
%1 = getelementptr inbounds %"core::str::CharIndices.29.66.90.114.138.149.165.173.181.197.205.213.229.387.398", %"core::str::CharIndices.29.66.90.114.138.149.165.173.181.197.205.213.229.387.398"* %0, i64 0, i32 0, i64 0
25-
store i64 0, i64* %1, align 8
24+
store i64 0, ptr %0, align 8
2625
unreachable
2726

2827
bb20.i.i: ; preds = %bb12.i.i

‎llvm/test/Transforms/AlignmentFromAssumptions/simple.ll

Lines changed: 67 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
target datalayout = "e-i64:64-f80:128-n8:16:32:64-S128"
22
; RUN: opt < %s -passes=alignment-from-assumptions -S | FileCheck %s
33

4-
define i32 @foo(i32* nocapture %a) nounwind uwtable readonly {
4+
define i32 @foo(ptr nocapture %a) nounwind uwtable readonly {
55
entry:
6-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i32 32)]
7-
%0 = load i32, i32* %a, align 4
6+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i32 32)]
7+
%0 = load i32, ptr %a, align 4
88
ret i32 %0
99

1010
; CHECK-LABEL: @foo
11-
; CHECK: load i32, i32* {{[^,]+}}, align 32
11+
; CHECK: load i32, ptr {{[^,]+}}, align 32
1212
; CHECK: ret i32
1313
}
1414

15-
define i32 @foo2(i32* nocapture %a) nounwind uwtable readonly {
15+
define i32 @foo2(ptr nocapture %a) nounwind uwtable readonly {
1616
entry:
17-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i32 32, i32 24)]
18-
%arrayidx = getelementptr inbounds i32, i32* %a, i64 -2
19-
%0 = load i32, i32* %arrayidx, align 4
17+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i32 32, i32 24)]
18+
%arrayidx = getelementptr inbounds i32, ptr %a, i64 -2
19+
%0 = load i32, ptr %arrayidx, align 4
2020
ret i32 %0
2121

2222
; CHECK-LABEL: @foo2
23-
; CHECK: load i32, i32* {{[^,]+}}, align 16
23+
; CHECK: load i32, ptr {{[^,]+}}, align 16
2424
; CHECK: ret i32
2525
}
2626

27-
define i32 @foo2a(i32* nocapture %a) nounwind uwtable readonly {
27+
define i32 @foo2a(ptr nocapture %a) nounwind uwtable readonly {
2828
entry:
29-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i32 32, i32 28)]
30-
%arrayidx = getelementptr inbounds i32, i32* %a, i64 1
31-
%0 = load i32, i32* %arrayidx, align 4
29+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i32 32, i32 28)]
30+
%arrayidx = getelementptr inbounds i32, ptr %a, i64 1
31+
%0 = load i32, ptr %arrayidx, align 4
3232
ret i32 %0
3333

3434
; CHECK-LABEL: @foo2a
35-
; CHECK: load i32, i32* {{[^,]+}}, align 32
35+
; CHECK: load i32, ptr {{[^,]+}}, align 32
3636
; CHECK: ret i32
3737
}
3838

3939
; TODO: this can be 8-bytes aligned
40-
define i32 @foo2b(i32* nocapture %a) nounwind uwtable readonly {
40+
define i32 @foo2b(ptr nocapture %a) nounwind uwtable readonly {
4141
entry:
42-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i32 32, i32 28)]
43-
%arrayidx = getelementptr inbounds i32, i32* %a, i64 -1
44-
%0 = load i32, i32* %arrayidx, align 4
42+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i32 32, i32 28)]
43+
%arrayidx = getelementptr inbounds i32, ptr %a, i64 -1
44+
%0 = load i32, ptr %arrayidx, align 4
4545
ret i32 %0
4646

4747
; CHECK-LABEL: @foo2b
48-
; CHECK: load i32, i32* {{[^,]+}}, align 4
48+
; CHECK: load i32, ptr {{[^,]+}}, align 4
4949
; CHECK: ret i32
5050
}
5151

52-
define i32 @goo(i32* nocapture %a) nounwind uwtable readonly {
52+
define i32 @goo(ptr nocapture %a) nounwind uwtable readonly {
5353
entry:
54-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i32 32, i32 0)]
55-
%0 = load i32, i32* %a, align 4
54+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i32 32, i32 0)]
55+
%0 = load i32, ptr %a, align 4
5656
ret i32 %0
5757

5858
; CHECK-LABEL: @goo
59-
; CHECK: load i32, i32* {{[^,]+}}, align 32
59+
; CHECK: load i32, ptr {{[^,]+}}, align 32
6060
; CHECK: ret i32
6161
}
6262

63-
define i32 @hoo(i32* nocapture %a) nounwind uwtable readonly {
63+
define i32 @hoo(ptr nocapture %a) nounwind uwtable readonly {
6464
entry:
65-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i64 32, i32 0)]
65+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i64 32, i32 0)]
6666
br label %for.body
6767

6868
for.body: ; preds = %entry, %for.body
6969
%indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]
7070
%r.06 = phi i32 [ 0, %entry ], [ %add, %for.body ]
71-
%arrayidx = getelementptr inbounds i32, i32* %a, i64 %indvars.iv
72-
%0 = load i32, i32* %arrayidx, align 4
71+
%arrayidx = getelementptr inbounds i32, ptr %a, i64 %indvars.iv
72+
%0 = load i32, ptr %arrayidx, align 4
7373
%add = add nsw i32 %0, %r.06
7474
%indvars.iv.next = add i64 %indvars.iv, 8
7575
%1 = trunc i64 %indvars.iv.next to i32
@@ -81,7 +81,7 @@ for.end: ; preds = %for.body
8181
ret i32 %add.lcssa
8282

8383
; CHECK-LABEL: @hoo
84-
; CHECK: load i32, i32* %arrayidx, align 32
84+
; CHECK: load i32, ptr %arrayidx, align 32
8585
; CHECK: ret i32 %add.lcssa
8686
}
8787

@@ -91,9 +91,9 @@ for.end: ; preds = %for.body
9191
; for i1 in range(0, 4096, 32):
9292
; for i2 in range(0, 4096, 32):
9393
; load(a, i0+i1+i2+32)
94-
define void @hoo2(i32* nocapture %a, i64 %id, i64 %num) nounwind uwtable readonly {
94+
define void @hoo2(ptr nocapture %a, i64 %id, i64 %num) nounwind uwtable readonly {
9595
entry:
96-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i8 32, i64 0)]
96+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i8 32, i64 0)]
9797
%id.mul = shl nsw i64 %id, 6
9898
%num.mul = shl nsw i64 %num, 6
9999
br label %for0.body
@@ -112,8 +112,8 @@ for2.body:
112112
%t1 = add nuw nsw i64 %i0, %i1
113113
%t2 = add nuw nsw i64 %t1, %i2
114114
%t3 = add nuw nsw i64 %t2, 32
115-
%arrayidx = getelementptr inbounds i32, i32* %a, i64 %t3
116-
%x = load i32, i32* %arrayidx, align 4
115+
%arrayidx = getelementptr inbounds i32, ptr %a, i64 %t3
116+
%x = load i32, ptr %arrayidx, align 4
117117

118118
%i2.next = add nuw nsw i64 %i2, 32
119119
%cmp2 = icmp ult i64 %i2.next, 4096
@@ -133,20 +133,20 @@ return:
133133
ret void
134134

135135
; CHECK-LABEL: @hoo2
136-
; CHECK: load i32, i32* %arrayidx, align 32
136+
; CHECK: load i32, ptr %arrayidx, align 32
137137
; CHECK: ret void
138138
}
139139

140-
define i32 @joo(i32* nocapture %a) nounwind uwtable readonly {
140+
define i32 @joo(ptr nocapture %a) nounwind uwtable readonly {
141141
entry:
142-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i8 32, i8 0)]
142+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i8 32, i8 0)]
143143
br label %for.body
144144

145145
for.body: ; preds = %entry, %for.body
146146
%indvars.iv = phi i64 [ 4, %entry ], [ %indvars.iv.next, %for.body ]
147147
%r.06 = phi i32 [ 0, %entry ], [ %add, %for.body ]
148-
%arrayidx = getelementptr inbounds i32, i32* %a, i64 %indvars.iv
149-
%0 = load i32, i32* %arrayidx, align 4
148+
%arrayidx = getelementptr inbounds i32, ptr %a, i64 %indvars.iv
149+
%0 = load i32, ptr %arrayidx, align 4
150150
%add = add nsw i32 %0, %r.06
151151
%indvars.iv.next = add i64 %indvars.iv, 8
152152
%1 = trunc i64 %indvars.iv.next to i32
@@ -158,20 +158,20 @@ for.end: ; preds = %for.body
158158
ret i32 %add.lcssa
159159

160160
; CHECK-LABEL: @joo
161-
; CHECK: load i32, i32* %arrayidx, align 16
161+
; CHECK: load i32, ptr %arrayidx, align 16
162162
; CHECK: ret i32 %add.lcssa
163163
}
164164

165-
define i32 @koo(i32* nocapture %a) nounwind uwtable readonly {
165+
define i32 @koo(ptr nocapture %a) nounwind uwtable readonly {
166166
entry:
167167
br label %for.body
168168

169169
for.body: ; preds = %entry, %for.body
170170
%indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]
171171
%r.06 = phi i32 [ 0, %entry ], [ %add, %for.body ]
172-
%arrayidx = getelementptr inbounds i32, i32* %a, i64 %indvars.iv
173-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i8 32, i8 0)]
174-
%0 = load i32, i32* %arrayidx, align 4
172+
%arrayidx = getelementptr inbounds i32, ptr %a, i64 %indvars.iv
173+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i8 32, i8 0)]
174+
%0 = load i32, ptr %arrayidx, align 4
175175
%add = add nsw i32 %0, %r.06
176176
%indvars.iv.next = add i64 %indvars.iv, 4
177177
%1 = trunc i64 %indvars.iv.next to i32
@@ -183,20 +183,20 @@ for.end: ; preds = %for.body
183183
ret i32 %add.lcssa
184184

185185
; CHECK-LABEL: @koo
186-
; CHECK: load i32, i32* %arrayidx, align 16
186+
; CHECK: load i32, ptr %arrayidx, align 16
187187
; CHECK: ret i32 %add.lcssa
188188
}
189189

190-
define i32 @koo2(i32* nocapture %a) nounwind uwtable readonly {
190+
define i32 @koo2(ptr nocapture %a) nounwind uwtable readonly {
191191
entry:
192-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i128 32, i128 0)]
192+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i128 32, i128 0)]
193193
br label %for.body
194194

195195
for.body: ; preds = %entry, %for.body
196196
%indvars.iv = phi i64 [ -4, %entry ], [ %indvars.iv.next, %for.body ]
197197
%r.06 = phi i32 [ 0, %entry ], [ %add, %for.body ]
198-
%arrayidx = getelementptr inbounds i32, i32* %a, i64 %indvars.iv
199-
%0 = load i32, i32* %arrayidx, align 4
198+
%arrayidx = getelementptr inbounds i32, ptr %a, i64 %indvars.iv
199+
%0 = load i32, ptr %arrayidx, align 4
200200
%add = add nsw i32 %0, %r.06
201201
%indvars.iv.next = add i64 %indvars.iv, 4
202202
%1 = trunc i64 %indvars.iv.next to i32
@@ -208,64 +208,59 @@ for.end: ; preds = %for.body
208208
ret i32 %add.lcssa
209209

210210
; CHECK-LABEL: @koo2
211-
; CHECK: load i32, i32* %arrayidx, align 16
211+
; CHECK: load i32, ptr %arrayidx, align 16
212212
; CHECK: ret i32 %add.lcssa
213213
}
214214

215-
define i32 @moo(i32* nocapture %a) nounwind uwtable {
215+
define i32 @moo(ptr nocapture %a) nounwind uwtable {
216216
entry:
217-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i16 32)]
218-
%0 = bitcast i32* %a to i8*
219-
tail call void @llvm.memset.p0i8.i64(i8* align 4 %0, i8 0, i64 64, i1 false)
217+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i16 32)]
218+
tail call void @llvm.memset.p0.i64(ptr align 4 %a, i8 0, i64 64, i1 false)
220219
ret i32 undef
221220

222221
; CHECK-LABEL: @moo
223-
; CHECK: @llvm.memset.p0i8.i64(i8* align 32 %0, i8 0, i64 64, i1 false)
222+
; CHECK: @llvm.memset.p0.i64(ptr align 32 %a, i8 0, i64 64, i1 false)
224223
; CHECK: ret i32 undef
225224
}
226225

227-
define i32 @moo2(i32* nocapture %a, i32* nocapture %b) nounwind uwtable {
226+
define i32 @moo2(ptr nocapture %a, ptr nocapture %b) nounwind uwtable {
228227
entry:
229-
tail call void @llvm.assume(i1 true) ["align"(i32* %b, i32 128)]
230-
%0 = bitcast i32* %a to i8*
231-
tail call void @llvm.assume(i1 true) ["align"(i8* %0, i16 32)]
232-
%1 = bitcast i32* %b to i8*
233-
tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 %0, i8* align 4 %1, i64 64, i1 false)
228+
tail call void @llvm.assume(i1 true) ["align"(ptr %b, i32 128)]
229+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i16 32)]
230+
tail call void @llvm.memcpy.p0.p0.i64(ptr align 4 %a, ptr align 4 %b, i64 64, i1 false)
234231
ret i32 undef
235232

236233
; CHECK-LABEL: @moo2
237-
; CHECK: @llvm.memcpy.p0i8.p0i8.i64(i8* align 32 %0, i8* align 128 %1, i64 64, i1 false)
234+
; CHECK: @llvm.memcpy.p0.p0.i64(ptr align 32 %a, ptr align 128 %b, i64 64, i1 false)
238235
; CHECK: ret i32 undef
239236
}
240237

241-
define i32 @moo3(i32* nocapture %a, i32* nocapture %b) nounwind uwtable {
238+
define i32 @moo3(ptr nocapture %a, ptr nocapture %b) nounwind uwtable {
242239
entry:
243-
%0 = bitcast i32* %a to i8*
244-
tail call void @llvm.assume(i1 true) ["align"(i8* %0, i16 32), "align"(i32* %b, i32 128)]
245-
%1 = bitcast i32* %b to i8*
246-
tail call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 4 %0, i8* align 4 %1, i64 64, i1 false)
240+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i16 32), "align"(ptr %b, i32 128)]
241+
tail call void @llvm.memcpy.p0.p0.i64(ptr align 4 %a, ptr align 4 %b, i64 64, i1 false)
247242
ret i32 undef
248243

249244
; CHECK-LABEL: @moo3
250-
; CHECK: @llvm.memcpy.p0i8.p0i8.i64(i8* align 32 %0, i8* align 128 %1, i64 64, i1 false)
245+
; CHECK: @llvm.memcpy.p0.p0.i64(ptr align 32 %a, ptr align 128 %b, i64 64, i1 false)
251246
; CHECK: ret i32 undef
252247
}
253248

254249

255250
; Variable alignments appear to be legal, don't crash
256-
define i32 @pr51680(i32* nocapture %a, i32 %align) nounwind uwtable readonly {
251+
define i32 @pr51680(ptr nocapture %a, i32 %align) nounwind uwtable readonly {
257252
entry:
258-
tail call void @llvm.assume(i1 true) ["align"(i32* %a, i32 %align)]
259-
%0 = load i32, i32* %a, align 4
253+
tail call void @llvm.assume(i1 true) ["align"(ptr %a, i32 %align)]
254+
%0 = load i32, ptr %a, align 4
260255
ret i32 %0
261256

262257
; CHECK-LABEL: @pr51680
263-
; CHECK: load i32, i32* {{[^,]+}}, align 4
258+
; CHECK: load i32, ptr {{[^,]+}}, align 4
264259
; CHECK: ret i32
265260
}
266261

267262
declare void @llvm.assume(i1) nounwind
268263

269-
declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i1) nounwind
270-
declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture, i64, i1) nounwind
264+
declare void @llvm.memset.p0.i64(ptr nocapture, i8, i64, i1) nounwind
265+
declare void @llvm.memcpy.p0.p0.i64(ptr nocapture, ptr nocapture, i64, i1) nounwind
271266

0 commit comments

Comments
 (0)