[llvm] [memprof] Teach extractCallsFromIR to look into inline stacks (PR #115441)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Fri Nov 8 14:13:09 PST 2024
https://github.com/kazutakahirata updated https://github.com/llvm/llvm-project/pull/115441
>From 887d8ca5015eee6d306a83244bf8e882fde00f03 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Thu, 7 Nov 2024 14:36:49 -0800
Subject: [PATCH 1/4] [memprof] Teach extractCallsFromIR to look into inline
stacks
To undrift the profile, we need to extract as many caller-callee pairs
from the IR as we can to maximize the number of call sites in the
profile we can undrift.
Now, since MemProfUsePass runs after early inlining, some functions
have been inlined, and we may no longer have bodies for those
functions in the IR. To cope with this, this patch teaches
extractCallsFromIR to extract caller-calee pairs from inline stacks.
The output format of extractCallsFromIR remains the same. We still
return a map from caller GUIDs to lists of corresponding call sites.
---
.../Instrumentation/MemProfiler.cpp | 21 +++-
.../Instrumentation/MemProfUseTest.cpp | 112 ++++++++++++++++++
2 files changed, 128 insertions(+), 5 deletions(-)
diff --git a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
index 0b4d3ff201e622..afcde4a479d134 100644
--- a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
+++ b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
@@ -824,11 +824,22 @@ memprof::extractCallsFromIR(Module &M) {
continue;
StringRef CalleeName = CalledFunction->getName();
- uint64_t CallerGUID =
- IndexedMemProfRecord::getGUID(DIL->getSubprogramLinkageName());
- uint64_t CalleeGUID = IndexedMemProfRecord::getGUID(CalleeName);
- LineLocation Loc = {GetOffset(DIL), DIL->getColumn()};
- Calls[CallerGUID].emplace_back(Loc, CalleeGUID);
+ if (DIL->getInlinedAt()) {
+ for (; DIL; DIL = DIL->getInlinedAt()) {
+ uint64_t CallerGUID =
+ IndexedMemProfRecord::getGUID(DIL->getSubprogramLinkageName());
+ uint64_t CalleeGUID = IndexedMemProfRecord::getGUID(CalleeName);
+ LineLocation Loc = {GetOffset(DIL), DIL->getColumn()};
+ Calls[CallerGUID].emplace_back(Loc, CalleeGUID);
+ CalleeName = DIL->getSubprogramLinkageName();
+ }
+ } else {
+ uint64_t CallerGUID =
+ IndexedMemProfRecord::getGUID(DIL->getSubprogramLinkageName());
+ uint64_t CalleeGUID = IndexedMemProfRecord::getGUID(CalleeName);
+ LineLocation Loc = {GetOffset(DIL), DIL->getColumn()};
+ Calls[CallerGUID].emplace_back(Loc, CalleeGUID);
+ }
}
}
}
diff --git a/llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp b/llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp
index a510a57099aba4..50ef151923e992 100644
--- a/llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp
+++ b/llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp
@@ -101,4 +101,116 @@ declare !dbg !19 void @_Z2f3v()
EXPECT_THAT(CallSites[2],
Pair(FieldsAre(2U, 9U), IndexedMemProfRecord::getGUID("_Z2f3v")));
}
+
+TEST(MemProf, ExtractDirectCallsFromIRInline) {
+ // The following IR is generated from:
+ //
+ // void f1();
+ // static inline void f2() { f1(); }
+ // static inline void f3() { f2(); }
+ //
+ // void g1();
+ // void g2();
+ // static inline void g3() { g1(); g2(); }
+ //
+ // void foo() {
+ // f3();
+ // g3();
+ // }
+ StringRef IR = R"IR(
+define dso_local void @_Z3foov() local_unnamed_addr !dbg !10 {
+entry:
+ tail call void @_Z2f1v(), !dbg !13
+ tail call void @_Z2g1v(), !dbg !18
+ tail call void @_Z2g2v(), !dbg !21
+ ret void, !dbg !23
+}
+
+declare !dbg !24 void @_Z2f1v() local_unnamed_addr
+
+declare !dbg !25 void @_Z2g1v() local_unnamed_addr
+
+declare !dbg !26 void @_Z2g2v() local_unnamed_addr
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang", isOptimized: true, runtimeVersion: 0, emissionKind: LineTablesOnly, splitDebugInlining: false, debugInfoForProfiling: true, nameTableKind: None)
+!1 = !DIFile(filename: "foobar.cc", directory: "/")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 1, !"MemProfProfileFilename", !"memprof.profraw"}
+!6 = !{i32 8, !"PIC Level", i32 2}
+!7 = !{i32 7, !"PIE Level", i32 2}
+!8 = !{i32 7, !"uwtable", i32 2}
+!9 = !{!"clang"}
+!10 = distinct !DISubprogram(name: "foo", linkageName: "_Z3foov", scope: !1, file: !1, line: 9, type: !11, scopeLine: 9, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0)
+!11 = !DISubroutineType(types: !12)
+!12 = !{}
+!13 = !DILocation(line: 2, column: 27, scope: !14, inlinedAt: !15)
+!14 = distinct !DISubprogram(name: "f2", linkageName: "_ZL2f2v", scope: !1, file: !1, line: 2, type: !11, scopeLine: 2, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: !0)
+!15 = distinct !DILocation(line: 3, column: 27, scope: !16, inlinedAt: !17)
+!16 = distinct !DISubprogram(name: "f3", linkageName: "_ZL2f3v", scope: !1, file: !1, line: 3, type: !11, scopeLine: 3, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: !0)
+!17 = distinct !DILocation(line: 10, column: 3, scope: !10)
+!18 = !DILocation(line: 7, column: 27, scope: !19, inlinedAt: !20)
+!19 = distinct !DISubprogram(name: "g3", linkageName: "_ZL2g3v", scope: !1, file: !1, line: 7, type: !11, scopeLine: 7, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: !0)
+!20 = distinct !DILocation(line: 11, column: 3, scope: !10)
+!21 = !DILocation(line: 7, column: 33, scope: !22, inlinedAt: !20)
+!22 = !DILexicalBlockFile(scope: !19, file: !1, discriminator: 2)
+!23 = !DILocation(line: 12, column: 1, scope: !10)
+!24 = !DISubprogram(name: "f1", linkageName: "_Z2f1v", scope: !1, file: !1, line: 1, type: !11, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized)
+!25 = !DISubprogram(name: "g1", linkageName: "_Z2g1v", scope: !1, file: !1, line: 5, type: !11, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized)
+!26 = !DISubprogram(name: "g2", linkageName: "_Z2g2v", scope: !1, file: !1, line: 6, type: !11, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized)
+)IR";
+
+ LLVMContext Ctx;
+ SMDiagnostic Err;
+ std::unique_ptr<Module> M = parseAssemblyString(IR, Err, Ctx);
+ ASSERT_TRUE(M);
+
+ auto Calls = extractCallsFromIR(*M);
+
+ // Expect exactly 4 callers.
+ ASSERT_THAT(Calls, SizeIs(4));
+
+ // Verify each key-value pair.
+
+ auto FooIt = Calls.find(IndexedMemProfRecord::getGUID("_Z3foov"));
+ ASSERT_NE(FooIt, Calls.end());
+ const auto &[FooCallerGUID, FooCallSites] = *FooIt;
+ EXPECT_EQ(FooCallerGUID, IndexedMemProfRecord::getGUID("_Z3foov"));
+ ASSERT_THAT(FooCallSites, SizeIs(2));
+ EXPECT_THAT(FooCallSites[0], Pair(FieldsAre(1U, 3U),
+ IndexedMemProfRecord::getGUID("_ZL2f3v")));
+ EXPECT_THAT(FooCallSites[1], Pair(FieldsAre(2U, 3U),
+ IndexedMemProfRecord::getGUID("_ZL2g3v")));
+
+ auto F2It = Calls.find(IndexedMemProfRecord::getGUID("_ZL2f2v"));
+ ASSERT_NE(F2It, Calls.end());
+ const auto &[F2CallerGUID, F2CallSites] = *F2It;
+ EXPECT_EQ(F2CallerGUID, IndexedMemProfRecord::getGUID("_ZL2f2v"));
+ ASSERT_THAT(F2CallSites, SizeIs(1));
+ EXPECT_THAT(F2CallSites[0], Pair(FieldsAre(0U, 27U),
+ IndexedMemProfRecord::getGUID("_Z2f1v")));
+
+ auto F3It = Calls.find(IndexedMemProfRecord::getGUID("_ZL2f3v"));
+ ASSERT_NE(F3It, Calls.end());
+ const auto &[F3CallerGUID, F3CallSites] = *F3It;
+ EXPECT_EQ(F3CallerGUID, IndexedMemProfRecord::getGUID("_ZL2f3v"));
+ ASSERT_THAT(F3CallSites, SizeIs(1));
+ EXPECT_THAT(F3CallSites[0], Pair(FieldsAre(0U, 27U),
+ IndexedMemProfRecord::getGUID("_ZL2f2v")));
+
+ auto G3It = Calls.find(IndexedMemProfRecord::getGUID("_ZL2g3v"));
+ ASSERT_NE(G3It, Calls.end());
+ const auto &[G3CallerGUID, G3CallSites] = *G3It;
+ EXPECT_EQ(G3CallerGUID, IndexedMemProfRecord::getGUID("_ZL2g3v"));
+ ASSERT_THAT(G3CallSites, SizeIs(2));
+ EXPECT_THAT(G3CallSites[0], Pair(FieldsAre(0U, 27U),
+ IndexedMemProfRecord::getGUID("_Z2g1v")));
+ EXPECT_THAT(G3CallSites[1], Pair(FieldsAre(0U, 33U),
+ IndexedMemProfRecord::getGUID("_Z2g2v")));
+}
} // namespace
>From cf2948f3f375438018c05c279725eb9d6e233139 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Fri, 8 Nov 2024 08:37:00 -0800
Subject: [PATCH 2/4] Address comments.
---
.../lib/Transforms/Instrumentation/MemProfiler.cpp | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
index afcde4a479d134..f77f6b8dc9b5fa 100644
--- a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
+++ b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
@@ -824,22 +824,14 @@ memprof::extractCallsFromIR(Module &M) {
continue;
StringRef CalleeName = CalledFunction->getName();
- if (DIL->getInlinedAt()) {
- for (; DIL; DIL = DIL->getInlinedAt()) {
- uint64_t CallerGUID =
- IndexedMemProfRecord::getGUID(DIL->getSubprogramLinkageName());
- uint64_t CalleeGUID = IndexedMemProfRecord::getGUID(CalleeName);
- LineLocation Loc = {GetOffset(DIL), DIL->getColumn()};
- Calls[CallerGUID].emplace_back(Loc, CalleeGUID);
- CalleeName = DIL->getSubprogramLinkageName();
- }
- } else {
+ do {
uint64_t CallerGUID =
IndexedMemProfRecord::getGUID(DIL->getSubprogramLinkageName());
uint64_t CalleeGUID = IndexedMemProfRecord::getGUID(CalleeName);
LineLocation Loc = {GetOffset(DIL), DIL->getColumn()};
Calls[CallerGUID].emplace_back(Loc, CalleeGUID);
- }
+ CalleeName = DIL->getSubprogramLinkageName();
+ } while ((DIL = DIL->getInlinedAt()));
}
}
}
>From fb8fd7a06ac9a462ae0a0fdeb411c43d2f039db9 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Fri, 8 Nov 2024 09:58:35 -0800
Subject: [PATCH 3/4] Simplify the inline stack traversal.
Make the line/column numbers in the test more interesting.
---
.../Instrumentation/MemProfiler.cpp | 15 ++---
.../Instrumentation/MemProfUseTest.cpp | 67 ++++++++++---------
2 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
index f77f6b8dc9b5fa..abe5eb795e6ba9 100644
--- a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
+++ b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
@@ -810,10 +810,6 @@ memprof::extractCallsFromIR(Module &M) {
for (auto &BB : F) {
for (auto &I : BB) {
- const DILocation *DIL = I.getDebugLoc();
- if (!DIL)
- continue;
-
if (!isa<CallBase>(&I) || isa<IntrinsicInst>(&I))
continue;
@@ -824,14 +820,15 @@ memprof::extractCallsFromIR(Module &M) {
continue;
StringRef CalleeName = CalledFunction->getName();
- do {
- uint64_t CallerGUID =
- IndexedMemProfRecord::getGUID(DIL->getSubprogramLinkageName());
+ for (const DILocation *DIL = I.getDebugLoc(); DIL;
+ DIL = DIL->getInlinedAt()) {
+ StringRef CallerName = DIL->getSubprogramLinkageName();
+ uint64_t CallerGUID = IndexedMemProfRecord::getGUID(CallerName);
uint64_t CalleeGUID = IndexedMemProfRecord::getGUID(CalleeName);
LineLocation Loc = {GetOffset(DIL), DIL->getColumn()};
Calls[CallerGUID].emplace_back(Loc, CalleeGUID);
- CalleeName = DIL->getSubprogramLinkageName();
- } while ((DIL = DIL->getInlinedAt()));
+ CalleeName = CallerName;
+ }
}
}
}
diff --git a/llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp b/llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp
index 50ef151923e992..c864b06e991dc3 100644
--- a/llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp
+++ b/llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp
@@ -106,16 +106,24 @@ TEST(MemProf, ExtractDirectCallsFromIRInline) {
// The following IR is generated from:
//
// void f1();
- // static inline void f2() { f1(); }
- // static inline void f3() { f2(); }
+ // static inline void f2() {
+ // // For an interesting line number.
+ // f1();
+ // }
+ // static inline void f3() {
+ // /****/ f2(); // For an interesting column number.
+ // }
//
// void g1();
// void g2();
- // static inline void g3() { g1(); g2(); }
+ // static inline void g3() {
+ // /**/ g1(); // For an interesting column number.
+ // g2();
+ // }
//
// void foo() {
// f3();
- // g3();
+ // /***/ g3(); // For an interesting column number.
// }
StringRef IR = R"IR(
define dso_local void @_Z3foov() local_unnamed_addr !dbg !10 {
@@ -123,14 +131,14 @@ define dso_local void @_Z3foov() local_unnamed_addr !dbg !10 {
tail call void @_Z2f1v(), !dbg !13
tail call void @_Z2g1v(), !dbg !18
tail call void @_Z2g2v(), !dbg !21
- ret void, !dbg !23
+ ret void, !dbg !22
}
-declare !dbg !24 void @_Z2f1v() local_unnamed_addr
+declare !dbg !23 void @_Z2f1v() local_unnamed_addr
-declare !dbg !25 void @_Z2g1v() local_unnamed_addr
+declare !dbg !24 void @_Z2g1v() local_unnamed_addr
-declare !dbg !26 void @_Z2g2v() local_unnamed_addr
+declare !dbg !25 void @_Z2g2v() local_unnamed_addr
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
@@ -146,23 +154,22 @@ declare !dbg !26 void @_Z2g2v() local_unnamed_addr
!7 = !{i32 7, !"PIE Level", i32 2}
!8 = !{i32 7, !"uwtable", i32 2}
!9 = !{!"clang"}
-!10 = distinct !DISubprogram(name: "foo", linkageName: "_Z3foov", scope: !1, file: !1, line: 9, type: !11, scopeLine: 9, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0)
+!10 = distinct !DISubprogram(name: "foo", linkageName: "_Z3foov", scope: !1, file: !1, line: 17, type: !11, scopeLine: 17, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0)
!11 = !DISubroutineType(types: !12)
!12 = !{}
-!13 = !DILocation(line: 2, column: 27, scope: !14, inlinedAt: !15)
+!13 = !DILocation(line: 4, column: 3, scope: !14, inlinedAt: !15)
!14 = distinct !DISubprogram(name: "f2", linkageName: "_ZL2f2v", scope: !1, file: !1, line: 2, type: !11, scopeLine: 2, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: !0)
-!15 = distinct !DILocation(line: 3, column: 27, scope: !16, inlinedAt: !17)
-!16 = distinct !DISubprogram(name: "f3", linkageName: "_ZL2f3v", scope: !1, file: !1, line: 3, type: !11, scopeLine: 3, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: !0)
-!17 = distinct !DILocation(line: 10, column: 3, scope: !10)
-!18 = !DILocation(line: 7, column: 27, scope: !19, inlinedAt: !20)
-!19 = distinct !DISubprogram(name: "g3", linkageName: "_ZL2g3v", scope: !1, file: !1, line: 7, type: !11, scopeLine: 7, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: !0)
-!20 = distinct !DILocation(line: 11, column: 3, scope: !10)
-!21 = !DILocation(line: 7, column: 33, scope: !22, inlinedAt: !20)
-!22 = !DILexicalBlockFile(scope: !19, file: !1, discriminator: 2)
-!23 = !DILocation(line: 12, column: 1, scope: !10)
-!24 = !DISubprogram(name: "f1", linkageName: "_Z2f1v", scope: !1, file: !1, line: 1, type: !11, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized)
-!25 = !DISubprogram(name: "g1", linkageName: "_Z2g1v", scope: !1, file: !1, line: 5, type: !11, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized)
-!26 = !DISubprogram(name: "g2", linkageName: "_Z2g2v", scope: !1, file: !1, line: 6, type: !11, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized)
+!15 = distinct !DILocation(line: 7, column: 10, scope: !16, inlinedAt: !17)
+!16 = distinct !DISubprogram(name: "f3", linkageName: "_ZL2f3v", scope: !1, file: !1, line: 6, type: !11, scopeLine: 6, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: !0)
+!17 = distinct !DILocation(line: 18, column: 3, scope: !10)
+!18 = !DILocation(line: 13, column: 8, scope: !19, inlinedAt: !20)
+!19 = distinct !DISubprogram(name: "g3", linkageName: "_ZL2g3v", scope: !1, file: !1, line: 12, type: !11, scopeLine: 12, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: !0)
+!20 = distinct !DILocation(line: 19, column: 9, scope: !10)
+!21 = !DILocation(line: 14, column: 3, scope: !19, inlinedAt: !20)
+!22 = !DILocation(line: 20, column: 1, scope: !10)
+!23 = !DISubprogram(name: "f1", linkageName: "_Z2f1v", scope: !1, file: !1, line: 1, type: !11, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized)
+!24 = !DISubprogram(name: "g1", linkageName: "_Z2g1v", scope: !1, file: !1, line: 10, type: !11, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized)
+!25 = !DISubprogram(name: "g2", linkageName: "_Z2g2v", scope: !1, file: !1, line: 11, type: !11, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized)
)IR";
LLVMContext Ctx;
@@ -184,7 +191,7 @@ declare !dbg !26 void @_Z2g2v() local_unnamed_addr
ASSERT_THAT(FooCallSites, SizeIs(2));
EXPECT_THAT(FooCallSites[0], Pair(FieldsAre(1U, 3U),
IndexedMemProfRecord::getGUID("_ZL2f3v")));
- EXPECT_THAT(FooCallSites[1], Pair(FieldsAre(2U, 3U),
+ EXPECT_THAT(FooCallSites[1], Pair(FieldsAre(2U, 9U),
IndexedMemProfRecord::getGUID("_ZL2g3v")));
auto F2It = Calls.find(IndexedMemProfRecord::getGUID("_ZL2f2v"));
@@ -192,15 +199,15 @@ declare !dbg !26 void @_Z2g2v() local_unnamed_addr
const auto &[F2CallerGUID, F2CallSites] = *F2It;
EXPECT_EQ(F2CallerGUID, IndexedMemProfRecord::getGUID("_ZL2f2v"));
ASSERT_THAT(F2CallSites, SizeIs(1));
- EXPECT_THAT(F2CallSites[0], Pair(FieldsAre(0U, 27U),
- IndexedMemProfRecord::getGUID("_Z2f1v")));
+ EXPECT_THAT(F2CallSites[0],
+ Pair(FieldsAre(2U, 3U), IndexedMemProfRecord::getGUID("_Z2f1v")));
auto F3It = Calls.find(IndexedMemProfRecord::getGUID("_ZL2f3v"));
ASSERT_NE(F3It, Calls.end());
const auto &[F3CallerGUID, F3CallSites] = *F3It;
EXPECT_EQ(F3CallerGUID, IndexedMemProfRecord::getGUID("_ZL2f3v"));
ASSERT_THAT(F3CallSites, SizeIs(1));
- EXPECT_THAT(F3CallSites[0], Pair(FieldsAre(0U, 27U),
+ EXPECT_THAT(F3CallSites[0], Pair(FieldsAre(1U, 10U),
IndexedMemProfRecord::getGUID("_ZL2f2v")));
auto G3It = Calls.find(IndexedMemProfRecord::getGUID("_ZL2g3v"));
@@ -208,9 +215,9 @@ declare !dbg !26 void @_Z2g2v() local_unnamed_addr
const auto &[G3CallerGUID, G3CallSites] = *G3It;
EXPECT_EQ(G3CallerGUID, IndexedMemProfRecord::getGUID("_ZL2g3v"));
ASSERT_THAT(G3CallSites, SizeIs(2));
- EXPECT_THAT(G3CallSites[0], Pair(FieldsAre(0U, 27U),
- IndexedMemProfRecord::getGUID("_Z2g1v")));
- EXPECT_THAT(G3CallSites[1], Pair(FieldsAre(0U, 33U),
- IndexedMemProfRecord::getGUID("_Z2g2v")));
+ EXPECT_THAT(G3CallSites[0],
+ Pair(FieldsAre(1U, 8U), IndexedMemProfRecord::getGUID("_Z2g1v")));
+ EXPECT_THAT(G3CallSites[1],
+ Pair(FieldsAre(2U, 3U), IndexedMemProfRecord::getGUID("_Z2g2v")));
}
} // namespace
>From c9ce7806e4d5ca59150c82e7c8b93a99a07a6041 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu at google.com>
Date: Fri, 8 Nov 2024 14:08:50 -0800
Subject: [PATCH 4/4] Add an assert.
---
llvm/lib/Transforms/Instrumentation/MemProfiler.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
index abe5eb795e6ba9..64e850c7d9316d 100644
--- a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
+++ b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
@@ -823,6 +823,8 @@ memprof::extractCallsFromIR(Module &M) {
for (const DILocation *DIL = I.getDebugLoc(); DIL;
DIL = DIL->getInlinedAt()) {
StringRef CallerName = DIL->getSubprogramLinkageName();
+ assert(!CallerName.empty() &&
+ "Be sure to enable -fdebug-info-for-profiling");
uint64_t CallerGUID = IndexedMemProfRecord::getGUID(CallerName);
uint64_t CalleeGUID = IndexedMemProfRecord::getGUID(CalleeName);
LineLocation Loc = {GetOffset(DIL), DIL->getColumn()};
More information about the llvm-commits
mailing list