Skip to content

Commit ad635b4

Browse files
[memprof] Use more gtest matchers in unit tests (NFC) (#119338)
1 parent 53e9eee commit ad635b4

File tree

1 file changed

+23
-25
lines changed

1 file changed

+23
-25
lines changed

llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,15 @@ declare !dbg !19 void @_Z2f3v()
102102

103103
const auto &[CallerGUID, CallSites] = *It;
104104
EXPECT_EQ(CallerGUID, IndexedMemProfRecord::getGUID("_Z3foov"));
105-
ASSERT_THAT(CallSites, SizeIs(3));
106105

107106
// Verify that call sites show up in the ascending order of their source
108107
// locations.
109-
EXPECT_THAT(CallSites[0], Pair(LineLocation(1, 3),
110-
IndexedMemProfRecord::getGUID("_Z2f1v")));
111-
EXPECT_THAT(CallSites[1], Pair(LineLocation(2, 3),
112-
IndexedMemProfRecord::getGUID("_Z2f2v")));
113-
EXPECT_THAT(CallSites[2], Pair(LineLocation(2, 9),
114-
IndexedMemProfRecord::getGUID("_Z2f3v")));
108+
EXPECT_THAT(
109+
CallSites,
110+
ElementsAre(
111+
Pair(LineLocation(1, 3), IndexedMemProfRecord::getGUID("_Z2f1v")),
112+
Pair(LineLocation(2, 3), IndexedMemProfRecord::getGUID("_Z2f2v")),
113+
Pair(LineLocation(2, 9), IndexedMemProfRecord::getGUID("_Z2f3v"))));
115114
}
116115

117116
TEST(MemProf, ExtractDirectCallsFromIRInline) {
@@ -205,37 +204,37 @@ declare !dbg !25 void @_Z2g2v() local_unnamed_addr
205204
ASSERT_NE(FooIt, Calls.end());
206205
const auto &[FooCallerGUID, FooCallSites] = *FooIt;
207206
EXPECT_EQ(FooCallerGUID, IndexedMemProfRecord::getGUID("_Z3foov"));
208-
ASSERT_THAT(FooCallSites, SizeIs(2));
209-
EXPECT_THAT(FooCallSites[0], Pair(LineLocation(1, 3),
210-
IndexedMemProfRecord::getGUID("_ZL2f3v")));
211-
EXPECT_THAT(FooCallSites[1], Pair(LineLocation(2, 9),
212-
IndexedMemProfRecord::getGUID("_ZL2g3v")));
207+
EXPECT_THAT(
208+
FooCallSites,
209+
ElementsAre(
210+
Pair(LineLocation(1, 3), IndexedMemProfRecord::getGUID("_ZL2f3v")),
211+
Pair(LineLocation(2, 9), IndexedMemProfRecord::getGUID("_ZL2g3v"))));
213212

214213
auto F2It = Calls.find(IndexedMemProfRecord::getGUID("_ZL2f2v"));
215214
ASSERT_NE(F2It, Calls.end());
216215
const auto &[F2CallerGUID, F2CallSites] = *F2It;
217216
EXPECT_EQ(F2CallerGUID, IndexedMemProfRecord::getGUID("_ZL2f2v"));
218-
ASSERT_THAT(F2CallSites, SizeIs(1));
219-
EXPECT_THAT(F2CallSites[0], Pair(LineLocation(2, 3),
220-
IndexedMemProfRecord::getGUID("_Z2f1v")));
217+
EXPECT_THAT(F2CallSites,
218+
ElementsAre(Pair(LineLocation(2, 3),
219+
IndexedMemProfRecord::getGUID("_Z2f1v"))));
221220

222221
auto F3It = Calls.find(IndexedMemProfRecord::getGUID("_ZL2f3v"));
223222
ASSERT_NE(F3It, Calls.end());
224223
const auto &[F3CallerGUID, F3CallSites] = *F3It;
225224
EXPECT_EQ(F3CallerGUID, IndexedMemProfRecord::getGUID("_ZL2f3v"));
226-
ASSERT_THAT(F3CallSites, SizeIs(1));
227-
EXPECT_THAT(F3CallSites[0], Pair(LineLocation(1, 10),
228-
IndexedMemProfRecord::getGUID("_ZL2f2v")));
225+
EXPECT_THAT(F3CallSites,
226+
ElementsAre(Pair(LineLocation(1, 10),
227+
IndexedMemProfRecord::getGUID("_ZL2f2v"))));
229228

230229
auto G3It = Calls.find(IndexedMemProfRecord::getGUID("_ZL2g3v"));
231230
ASSERT_NE(G3It, Calls.end());
232231
const auto &[G3CallerGUID, G3CallSites] = *G3It;
233232
EXPECT_EQ(G3CallerGUID, IndexedMemProfRecord::getGUID("_ZL2g3v"));
234-
ASSERT_THAT(G3CallSites, SizeIs(2));
235-
EXPECT_THAT(G3CallSites[0], Pair(LineLocation(1, 8),
236-
IndexedMemProfRecord::getGUID("_Z2g1v")));
237-
EXPECT_THAT(G3CallSites[1], Pair(LineLocation(2, 3),
238-
IndexedMemProfRecord::getGUID("_Z2g2v")));
233+
EXPECT_THAT(
234+
G3CallSites,
235+
ElementsAre(
236+
Pair(LineLocation(1, 8), IndexedMemProfRecord::getGUID("_Z2g1v")),
237+
Pair(LineLocation(2, 3), IndexedMemProfRecord::getGUID("_Z2g2v"))));
239238
}
240239

241240
TEST(MemProf, ExtractDirectCallsFromIRCallingNew) {
@@ -300,8 +299,7 @@ attributes #2 = { builtin allocsize(0) }
300299
ASSERT_NE(FooIt, Calls.end());
301300
const auto &[FooCallerGUID, FooCallSites] = *FooIt;
302301
EXPECT_EQ(FooCallerGUID, IndexedMemProfRecord::getGUID("_Z3foov"));
303-
ASSERT_THAT(FooCallSites, SizeIs(1));
304-
EXPECT_THAT(FooCallSites[0], Pair(LineLocation(1, 10), 0));
302+
EXPECT_THAT(FooCallSites, ElementsAre(Pair(LineLocation(1, 10), 0)));
305303
}
306304

307305
// Populate those fields returned by getHotColdSchema.

0 commit comments

Comments
 (0)