Skip to content

Commit bdf37f4

Browse files
arsenmarsenm
authored
unittests: Convert some tests to opaque pointers (#167443)
1 parent ae1e2ec commit bdf37f4

25 files changed

+463
-463
lines changed

‎llvm/unittests/Analysis/AliasAnalysisTest.cpp‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -232,18 +232,18 @@ TEST_F(AliasAnalysisTest, BatchAAPhiCycles) {
232232
LLVMContext C;
233233
SMDiagnostic Err;
234234
std::unique_ptr<Module> M = parseAssemblyString(R"(
235-
define void @f(i8* noalias %a, i1 %c) {
235+
define void @f(ptr noalias %a, i1 %c) {
236236
entry:
237237
br label %loop
238238
239239
loop:
240-
%phi = phi i8* [ null, %entry ], [ %a2, %loop ]
240+
%phi = phi ptr [ null, %entry ], [ %a2, %loop ]
241241
%offset1 = phi i64 [ 0, %entry ], [ %offset2, %loop]
242242
%offset2 = add i64 %offset1, 1
243-
%a1 = getelementptr i8, i8* %a, i64 %offset1
244-
%a2 = getelementptr i8, i8* %a, i64 %offset2
245-
%s1 = select i1 %c, i8* %a1, i8* %phi
246-
%s2 = select i1 %c, i8* %a2, i8* %a1
243+
%a1 = getelementptr i8, ptr %a, i64 %offset1
244+
%a2 = getelementptr i8, ptr %a, i64 %offset2
245+
%s1 = select i1 %c, ptr %a1, ptr %phi
246+
%s2 = select i1 %c, ptr %a2, ptr %a1
247247
br label %loop
248248
}
249249
)", Err, C);
@@ -280,15 +280,15 @@ TEST_F(AliasAnalysisTest, BatchAAPhiAssumption) {
280280
LLVMContext C;
281281
SMDiagnostic Err;
282282
std::unique_ptr<Module> M = parseAssemblyString(R"(
283-
define void @f(i8* %a.base, i8* %b.base, i1 %c) {
283+
define void @f(ptr %a.base, ptr %b.base, i1 %c) {
284284
entry:
285285
br label %loop
286286
287287
loop:
288-
%a = phi i8* [ %a.next, %loop ], [ %a.base, %entry ]
289-
%b = phi i8* [ %b.next, %loop ], [ %b.base, %entry ]
290-
%a.next = getelementptr i8, i8* %a, i64 1
291-
%b.next = getelementptr i8, i8* %b, i64 1
288+
%a = phi ptr [ %a.next, %loop ], [ %a.base, %entry ]
289+
%b = phi ptr [ %b.next, %loop ], [ %b.base, %entry ]
290+
%a.next = getelementptr i8, ptr %a, i64 1
291+
%b.next = getelementptr i8, ptr %b, i64 1
292292
br label %loop
293293
}
294294
)", Err, C);
@@ -318,16 +318,16 @@ TEST_F(AliasAnalysisTest, PartialAliasOffset) {
318318
LLVMContext C;
319319
SMDiagnostic Err;
320320
std::unique_ptr<Module> M = parseAssemblyString(R"(
321-
define void @foo(float* %arg, i32 %i) {
321+
define void @foo(ptr %arg, i32 %i) {
322322
bb:
323323
%i2 = zext i32 %i to i64
324-
%i3 = getelementptr inbounds float, float* %arg, i64 %i2
325-
%i4 = bitcast float* %i3 to <2 x float>*
326-
%L1 = load <2 x float>, <2 x float>* %i4, align 16
324+
%i3 = getelementptr inbounds float, ptr %arg, i64 %i2
325+
%i4 = bitcast ptr %i3 to ptr
326+
%L1 = load <2 x float>, ptr %i4, align 16
327327
%i7 = add nuw nsw i32 %i, 1
328328
%i8 = zext i32 %i7 to i64
329-
%i9 = getelementptr inbounds float, float* %arg, i64 %i8
330-
%L2 = load float, float* %i9, align 4
329+
%i9 = getelementptr inbounds float, ptr %arg, i64 %i8
330+
%L2 = load float, ptr %i9, align 4
331331
ret void
332332
}
333333
)",
@@ -353,11 +353,11 @@ TEST_F(AliasAnalysisTest, PartialAliasOffsetSign) {
353353
LLVMContext C;
354354
SMDiagnostic Err;
355355
std::unique_ptr<Module> M = parseAssemblyString(R"(
356-
define void @f(i64* %p) {
357-
%L1 = load i64, i64* %p
358-
%p.i8 = bitcast i64* %p to i8*
359-
%q = getelementptr i8, i8* %p.i8, i32 1
360-
%L2 = load i8, i8* %q
356+
define void @f(ptr %p) {
357+
%L1 = load i64, ptr %p
358+
%p.i8 = bitcast ptr %p to ptr
359+
%q = getelementptr i8, ptr %p.i8, i32 1
360+
%L2 = load i8, ptr %q
361361
ret void
362362
}
363363
)",
@@ -388,10 +388,10 @@ class AAPassInfraTest : public testing::Test {
388388

389389
public:
390390
AAPassInfraTest()
391-
: M(parseAssemblyString("define i32 @f(i32* %x, i32* %y) {\n"
391+
: M(parseAssemblyString("define i32 @f(ptr %x, ptr %y) {\n"
392392
"entry:\n"
393-
" %lx = load i32, i32* %x\n"
394-
" %ly = load i32, i32* %y\n"
393+
" %lx = load i32, ptr %x\n"
394+
" %ly = load i32, ptr %y\n"
395395
" %sum = add i32 %lx, %ly\n"
396396
" ret i32 %sum\n"
397397
"}\n",

‎llvm/unittests/Analysis/AliasSetTrackerTest.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ TEST(AliasSetTracker, AliasUnknownInst) {
2626
2727
; Function Attrs: nounwind ssp uwtable
2828
define i32 @read_a() #0 {
29-
%1 = load i32, i32* @a, align 4, !tbaa !3
29+
%1 = load i32, ptr @a, align 4, !tbaa !3
3030
ret i32 %1
3131
}
3232
3333
; Function Attrs: nounwind ssp uwtable
3434
define void @write_b() #0 {
35-
store float 1.000000e+01, float* @b, align 4, !tbaa !7
35+
store float 1.000000e+01, ptr @b, align 4, !tbaa !7
3636
ret void
3737
}
3838
@@ -72,7 +72,7 @@ TEST(AliasSetTracker, AliasUnknownInst) {
7272
AliasSetTracker AST(BAA);
7373
for (auto &BB : *Test)
7474
AST.add(BB);
75-
// There should be 2 disjoint alias sets. 1 from each call.
75+
// There should be 2 disjoint alias sets. 1 from each call.
7676
ASSERT_EQ((int)AST.getAliasSets().size(), 2);
7777

7878
// Directly test aliasesUnknownInst.

‎llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,18 @@ TEST(AssumeQueryAPI, hasAttributeInAssume) {
7474
EnableKnowledgeRetention.setValue(true);
7575
StringRef Head =
7676
"declare void @llvm.assume(i1)\n"
77-
"declare void @func(i32*, i32*, i32*)\n"
78-
"declare void @func1(i32*, i32*, i32*, i32*)\n"
79-
"declare void @func_many(i32*) \"no-jump-tables\" nounwind "
77+
"declare void @func(ptr, ptr, ptr)\n"
78+
"declare void @func1(ptr, ptr, ptr, ptr)\n"
79+
"declare void @func_many(ptr) \"no-jump-tables\" nounwind "
8080
"\"less-precise-fpmad\" willreturn norecurse\n"
81-
"define void @test(i32* %P, i32* %P1, i32* %P2, i32* %P3) {\n";
81+
"define void @test(ptr %P, ptr %P1, ptr %P2, ptr %P3) {\n";
8282
StringRef Tail = "ret void\n"
8383
"}";
8484
std::vector<std::pair<StringRef, llvm::function_ref<void(Instruction *)>>>
8585
Tests;
8686
Tests.push_back(std::make_pair(
87-
"call void @func(i32* nonnull align 4 dereferenceable(16) %P, i32* align "
88-
"8 noalias %P1, i32* align 8 noundef %P2)\n",
87+
"call void @func(ptr nonnull align 4 dereferenceable(16) %P, ptr align "
88+
"8 noalias %P1, ptr align 8 noundef %P2)\n",
8989
[](Instruction *I) {
9090
auto *Assume = buildAssumeFromInst(I);
9191
Assume->insertBefore(I->getIterator());
@@ -103,11 +103,11 @@ TEST(AssumeQueryAPI, hasAttributeInAssume) {
103103
Attribute::AttrKind::Alignment, 4));
104104
}));
105105
Tests.push_back(std::make_pair(
106-
"call void @func1(i32* nonnull align 32 dereferenceable(48) %P, i32* "
106+
"call void @func1(ptr nonnull align 32 dereferenceable(48) %P, ptr "
107107
"nonnull "
108-
"align 8 dereferenceable(28) %P, i32* nonnull align 64 "
108+
"align 8 dereferenceable(28) %P, ptr nonnull align 64 "
109109
"dereferenceable(4) "
110-
"%P, i32* nonnull align 16 dereferenceable(12) %P)\n",
110+
"%P, ptr nonnull align 16 dereferenceable(12) %P)\n",
111111
[](Instruction *I) {
112112
auto *Assume = buildAssumeFromInst(I);
113113
Assume->insertBefore(I->getIterator());
@@ -127,7 +127,7 @@ TEST(AssumeQueryAPI, hasAttributeInAssume) {
127127
Attribute::AttrKind::Alignment, 64));
128128
}));
129129
Tests.push_back(std::make_pair(
130-
"call void @func_many(i32* align 8 noundef %P1) cold\n", [](Instruction *I) {
130+
"call void @func_many(ptr align 8 noundef %P1) cold\n", [](Instruction *I) {
131131
ShouldPreserveAllAttributes.setValue(true);
132132
auto *Assume = buildAssumeFromInst(I);
133133
Assume->insertBefore(I->getIterator());
@@ -142,11 +142,11 @@ TEST(AssumeQueryAPI, hasAttributeInAssume) {
142142
ASSERT_TRUE(hasMatchesExactlyAttributes(Assume, nullptr, ""));
143143
}));
144144
Tests.push_back(std::make_pair(
145-
"call void @func1(i32* readnone align 32 "
146-
"dereferenceable(48) noalias %P, i32* "
147-
"align 8 dereferenceable(28) %P1, i32* align 64 "
145+
"call void @func1(ptr readnone align 32 "
146+
"dereferenceable(48) noalias %P, ptr "
147+
"align 8 dereferenceable(28) %P1, ptr align 64 "
148148
"dereferenceable(4) "
149-
"%P2, i32* nonnull align 16 dereferenceable(12) %P3)\n",
149+
"%P2, ptr nonnull align 16 dereferenceable(12) %P3)\n",
150150
[](Instruction *I) {
151151
auto *Assume = buildAssumeFromInst(I);
152152
Assume->insertBefore(I->getIterator());
@@ -178,11 +178,11 @@ TEST(AssumeQueryAPI, hasAttributeInAssume) {
178178
}));
179179

180180
Tests.push_back(std::make_pair(
181-
"call void @func1(i32* readnone align 32 "
182-
"dereferenceable(48) noalias %P, i32* "
183-
"align 8 dereferenceable(28) %P1, i32* align 64 "
181+
"call void @func1(ptr readnone align 32 "
182+
"dereferenceable(48) noalias %P, ptr "
183+
"align 8 dereferenceable(28) %P1, ptr align 64 "
184184
"dereferenceable(4) "
185-
"%P2, i32* nonnull align 16 dereferenceable(12) %P3)\n",
185+
"%P2, ptr nonnull align 16 dereferenceable(12) %P3)\n",
186186
[](Instruction *I) {
187187
auto *Assume = buildAssumeFromInst(I);
188188
Assume->insertBefore(I->getIterator());
@@ -204,8 +204,8 @@ TEST(AssumeQueryAPI, hasAttributeInAssume) {
204204
Attribute::AttrKind::Dereferenceable, 48));
205205
}));
206206
Tests.push_back(std::make_pair(
207-
"call void @func(i32* nonnull align 4 dereferenceable(16) %P, i32* align "
208-
"8 noalias %P1, i32* %P1)\n",
207+
"call void @func(ptr nonnull align 4 dereferenceable(16) %P, ptr align "
208+
"8 noalias %P1, ptr %P1)\n",
209209
[](Instruction *I) {
210210
auto *Assume = buildAssumeFromInst(I);
211211
Assume->insertBefore(I->getIterator());
@@ -251,18 +251,18 @@ TEST(AssumeQueryAPI, fillMapFromAssume) {
251251
EnableKnowledgeRetention.setValue(true);
252252
StringRef Head =
253253
"declare void @llvm.assume(i1)\n"
254-
"declare void @func(i32*, i32*, i32*)\n"
255-
"declare void @func1(i32*, i32*, i32*, i32*)\n"
256-
"declare void @func_many(i32*) \"no-jump-tables\" nounwind "
254+
"declare void @func(ptr, ptr, ptr)\n"
255+
"declare void @func1(ptr, ptr, ptr, ptr)\n"
256+
"declare void @func_many(ptr) \"no-jump-tables\" nounwind "
257257
"\"less-precise-fpmad\" willreturn norecurse\n"
258-
"define void @test(i32* %P, i32* %P1, i32* %P2, i32* %P3) {\n";
258+
"define void @test(ptr %P, ptr %P1, ptr %P2, ptr %P3) {\n";
259259
StringRef Tail = "ret void\n"
260260
"}";
261261
std::vector<std::pair<StringRef, llvm::function_ref<void(Instruction *)>>>
262262
Tests;
263263
Tests.push_back(std::make_pair(
264-
"call void @func(i32* nonnull align 4 dereferenceable(16) %P, i32* align "
265-
"8 noalias %P1, i32* align 8 dereferenceable(8) %P2)\n",
264+
"call void @func(ptr nonnull align 4 dereferenceable(16) %P, ptr align "
265+
"8 noalias %P1, ptr align 8 dereferenceable(8) %P2)\n",
266266
[](Instruction *I) {
267267
auto *Assume = buildAssumeFromInst(I);
268268
Assume->insertBefore(I->getIterator());
@@ -283,11 +283,11 @@ TEST(AssumeQueryAPI, fillMapFromAssume) {
283283
{4, 4}));
284284
}));
285285
Tests.push_back(std::make_pair(
286-
"call void @func1(i32* nonnull align 32 dereferenceable(48) %P, i32* "
286+
"call void @func1(ptr nonnull align 32 dereferenceable(48) %P, ptr "
287287
"nonnull "
288-
"align 8 dereferenceable(28) %P, i32* nonnull align 64 "
288+
"align 8 dereferenceable(28) %P, ptr nonnull align 64 "
289289
"dereferenceable(4) "
290-
"%P, i32* nonnull align 16 dereferenceable(12) %P)\n",
290+
"%P, ptr nonnull align 16 dereferenceable(12) %P)\n",
291291
[](Instruction *I) {
292292
auto *Assume = buildAssumeFromInst(I);
293293
Assume->insertBefore(I->getIterator());
@@ -310,7 +310,7 @@ TEST(AssumeQueryAPI, fillMapFromAssume) {
310310
Map, Assume, {I->getOperand(0), Attribute::Alignment}, {64, 64}));
311311
}));
312312
Tests.push_back(std::make_pair(
313-
"call void @func_many(i32* align 8 %P1) cold\n", [](Instruction *I) {
313+
"call void @func_many(ptr align 8 %P1) cold\n", [](Instruction *I) {
314314
ShouldPreserveAllAttributes.setValue(true);
315315
auto *Assume = buildAssumeFromInst(I);
316316
Assume->insertBefore(I->getIterator());
@@ -331,11 +331,11 @@ TEST(AssumeQueryAPI, fillMapFromAssume) {
331331
ASSERT_TRUE(Map.empty());
332332
}));
333333
Tests.push_back(std::make_pair(
334-
"call void @func1(i32* readnone align 32 "
335-
"dereferenceable(48) noalias %P, i32* "
336-
"align 8 dereferenceable(28) %P1, i32* align 64 "
334+
"call void @func1(ptr readnone align 32 "
335+
"dereferenceable(48) noalias %P, ptr "
336+
"align 8 dereferenceable(28) %P1, ptr align 64 "
337337
"dereferenceable(4) "
338-
"%P2, i32* nonnull align 16 dereferenceable(12) %P3)\n",
338+
"%P2, ptr nonnull align 16 dereferenceable(12) %P3)\n",
339339
[](Instruction *I) {
340340
auto *Assume = buildAssumeFromInst(I);
341341
Assume->insertBefore(I->getIterator());
@@ -371,8 +371,8 @@ TEST(AssumeQueryAPI, fillMapFromAssume) {
371371

372372
/// Keep this test last as it modifies the function.
373373
Tests.push_back(std::make_pair(
374-
"call void @func(i32* nonnull align 4 dereferenceable(16) %P, i32* align "
375-
"8 noalias %P1, i32* %P2)\n",
374+
"call void @func(ptr nonnull align 4 dereferenceable(16) %P, ptr align "
375+
"8 noalias %P1, ptr %P2)\n",
376376
[](Instruction *I) {
377377
auto *Assume = buildAssumeFromInst(I);
378378
Assume->insertBefore(I->getIterator());
@@ -507,11 +507,11 @@ TEST(AssumeQueryAPI, AssumptionCache) {
507507
SMDiagnostic Err;
508508
std::unique_ptr<Module> Mod = parseAssemblyString(
509509
"declare void @llvm.assume(i1)\n"
510-
"define void @test(i32* %P, i32* %P1, i32* %P2, i32* %P3, i1 %B) {\n"
511-
"call void @llvm.assume(i1 true) [\"nonnull\"(i32* %P), \"align\"(i32* "
512-
"%P2, i32 4), \"align\"(i32* %P, i32 8)]\n"
513-
"call void @llvm.assume(i1 %B) [\"test\"(i32* %P1), "
514-
"\"dereferenceable\"(i32* %P, i32 4)]\n"
510+
"define void @test(ptr %P, ptr %P1, ptr %P2, ptr %P3, i1 %B) {\n"
511+
"call void @llvm.assume(i1 true) [\"nonnull\"(ptr %P), \"align\"(ptr "
512+
"%P2, i32 4), \"align\"(ptr %P, i32 8)]\n"
513+
"call void @llvm.assume(i1 %B) [\"test\"(ptr %P1), "
514+
"\"dereferenceable\"(ptr %P, i32 4)]\n"
515515
"ret void\n}\n",
516516
Err, C);
517517
if (!Mod)
@@ -569,11 +569,11 @@ TEST(AssumeQueryAPI, Alignment) {
569569
SMDiagnostic Err;
570570
std::unique_ptr<Module> Mod = parseAssemblyString(
571571
"declare void @llvm.assume(i1)\n"
572-
"define void @test(i32* %P, i32* %P1, i32* %P2, i32 %I3, i1 %B) {\n"
573-
"call void @llvm.assume(i1 true) [\"align\"(i32* %P, i32 8, i32 %I3)]\n"
574-
"call void @llvm.assume(i1 true) [\"align\"(i32* %P1, i32 %I3, i32 "
572+
"define void @test(ptr %P, ptr %P1, ptr %P2, i32 %I3, i1 %B) {\n"
573+
"call void @llvm.assume(i1 true) [\"align\"(ptr %P, i32 8, i32 %I3)]\n"
574+
"call void @llvm.assume(i1 true) [\"align\"(ptr %P1, i32 %I3, i32 "
575575
"%I3)]\n"
576-
"call void @llvm.assume(i1 true) [\"align\"(i32* %P2, i32 16, i32 8)]\n"
576+
"call void @llvm.assume(i1 true) [\"align\"(ptr %P2, i32 16, i32 8)]\n"
577577
"ret void\n}\n",
578578
Err, C);
579579
if (!Mod)

‎llvm/unittests/Analysis/CGSCCPassManagerTest.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,26 +1936,26 @@ TEST_F(CGSCCPassManagerTest, TestDeletionOfFunctionInNonTrivialRefSCC) {
19361936
TEST_F(CGSCCPassManagerTest, TestInsertionOfNewNonTrivialCallEdge) {
19371937
std::unique_ptr<Module> M = parseIR("define void @f1() {\n"
19381938
"entry:\n"
1939-
" %a = bitcast void ()* @f4 to i8*\n"
1940-
" %b = bitcast void ()* @f2 to i8*\n"
1939+
" %a = bitcast ptr @f4 to ptr\n"
1940+
" %b = bitcast ptr @f2 to ptr\n"
19411941
" ret void\n"
19421942
"}\n"
19431943
"define void @f2() {\n"
19441944
"entry:\n"
1945-
" %a = bitcast void ()* @f1 to i8*\n"
1946-
" %b = bitcast void ()* @f3 to i8*\n"
1945+
" %a = bitcast ptr @f1 to ptr\n"
1946+
" %b = bitcast ptr @f3 to ptr\n"
19471947
" ret void\n"
19481948
"}\n"
19491949
"define void @f3() {\n"
19501950
"entry:\n"
1951-
" %a = bitcast void ()* @f2 to i8*\n"
1952-
" %b = bitcast void ()* @f4 to i8*\n"
1951+
" %a = bitcast ptr @f2 to ptr\n"
1952+
" %b = bitcast ptr @f4 to ptr\n"
19531953
" ret void\n"
19541954
"}\n"
19551955
"define void @f4() {\n"
19561956
"entry:\n"
1957-
" %a = bitcast void ()* @f3 to i8*\n"
1958-
" %b = bitcast void ()* @f1 to i8*\n"
1957+
" %a = bitcast ptr @f3 to ptr\n"
1958+
" %b = bitcast ptr @f1 to ptr\n"
19591959
" ret void\n"
19601960
"}\n");
19611961

0 commit comments

Comments
 (0)