[llvm] [ThinLTO] Remove unused relative block frequency support (PR #177215)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Jan 21 11:01:52 PST 2026
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-llvm-ir
Author: Teresa Johnson (teresajohnson)
<details>
<summary>Changes</summary>
This removes most of the handling of the relative block frequency
support added in 2018 in c73cec84c99e5a63dca961fef67998a677c53a3c, which
was disabled by default and never utilized in the thin link as expected.
Support for reading old Bitcode containing the record is maintained as
required for backwards compatibility requirements, as is the support for
parsing old LLVM assembly containing that information. Tests ensure that
this backwards compatibility is maintained.
This came up in the context of redundant BFI/DT computations which
existed largely for the purpose of computing this information
and are being addressed in PR176646.
---
Patch is 20.77 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/177215.diff
12 Files Affected:
- (modified) llvm/include/llvm/Bitcode/LLVMBitCodes.h (+1)
- (modified) llvm/include/llvm/IR/ModuleSummaryIndex.h (+3-30)
- (modified) llvm/lib/Analysis/ModuleSummaryAnalysis.cpp (-7)
- (modified) llvm/lib/AsmParser/LLLexer.cpp (+1)
- (modified) llvm/lib/AsmParser/LLParser.cpp (+2-3)
- (modified) llvm/lib/Bitcode/Reader/BitcodeReader.cpp (+12-7)
- (modified) llvm/lib/Bitcode/Writer/BitcodeWriter.cpp (+10-50)
- (modified) llvm/lib/IR/AsmWriter.cpp (-2)
- (modified) llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp (+1-2)
- (modified) llvm/test/Assembler/thinlto-summary.ll (+2-1)
- (added) llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph-relbf.bc ()
- (modified) llvm/test/Bitcode/thinlto-function-summary-callgraph-relbf.ll (+9-9)
``````````diff
diff --git a/llvm/include/llvm/Bitcode/LLVMBitCodes.h b/llvm/include/llvm/Bitcode/LLVMBitCodes.h
index 2451d588bdbf7..20d19f21a64ce 100644
--- a/llvm/include/llvm/Bitcode/LLVMBitCodes.h
+++ b/llvm/include/llvm/Bitcode/LLVMBitCodes.h
@@ -265,6 +265,7 @@ enum GlobalValueSummarySymtabCodes {
// strings in strtab.
// [n * name]
FS_CFI_FUNCTION_DECLS = 18,
+ // Deprecated, but still needed to read old bitcode files.
// Per-module summary that also adds relative block frequency to callee info.
// PERMODULE_RELBF: [valueid, flags, instcount, numrefs,
// numrefs x valueid,
diff --git a/llvm/include/llvm/IR/ModuleSummaryIndex.h b/llvm/include/llvm/IR/ModuleSummaryIndex.h
index d85730c77d5c5..31c2f13a63e5f 100644
--- a/llvm/include/llvm/IR/ModuleSummaryIndex.h
+++ b/llvm/include/llvm/IR/ModuleSummaryIndex.h
@@ -30,7 +30,6 @@
#include "llvm/Support/Allocator.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/InterleavedRange.h"
-#include "llvm/Support/MathExtras.h"
#include "llvm/Support/ScaledNumber.h"
#include "llvm/Support/StringSaver.h"
#include "llvm/Support/raw_ostream.h"
@@ -76,19 +75,11 @@ struct CalleeInfo {
LLVM_PREFERRED_TYPE(bool)
uint32_t HasTailCall : 1;
- /// The value stored in RelBlockFreq has to be interpreted as the digits of
- /// a scaled number with a scale of \p -ScaleShift.
- static constexpr unsigned RelBlockFreqBits = 28;
- uint32_t RelBlockFreq : RelBlockFreqBits;
- static constexpr int32_t ScaleShift = 8;
- static constexpr uint64_t MaxRelBlockFreq = (1 << RelBlockFreqBits) - 1;
-
CalleeInfo()
: Hotness(static_cast<uint32_t>(HotnessType::Unknown)),
- HasTailCall(false), RelBlockFreq(0) {}
- explicit CalleeInfo(HotnessType Hotness, bool HasTC, uint64_t RelBF)
- : Hotness(static_cast<uint32_t>(Hotness)), HasTailCall(HasTC),
- RelBlockFreq(RelBF) {}
+ HasTailCall(false) {}
+ explicit CalleeInfo(HotnessType Hotness, bool HasTC)
+ : Hotness(static_cast<uint32_t>(Hotness)), HasTailCall(HasTC) {}
void updateHotness(const HotnessType OtherHotness) {
Hotness = std::max(Hotness, static_cast<uint32_t>(OtherHotness));
@@ -99,24 +90,6 @@ struct CalleeInfo {
void setHasTailCall(const bool HasTC) { HasTailCall = HasTC; }
HotnessType getHotness() const { return HotnessType(Hotness); }
-
- /// Update \p RelBlockFreq from \p BlockFreq and \p EntryFreq
- ///
- /// BlockFreq is divided by EntryFreq and added to RelBlockFreq. To represent
- /// fractional values, the result is represented as a fixed point number with
- /// scale of -ScaleShift.
- void updateRelBlockFreq(uint64_t BlockFreq, uint64_t EntryFreq) {
- if (EntryFreq == 0)
- return;
- using Scaled64 = ScaledNumber<uint64_t>;
- Scaled64 Temp(BlockFreq, ScaleShift);
- Temp /= Scaled64::get(EntryFreq);
-
- uint64_t Sum =
- SaturatingAdd<uint64_t>(Temp.toInt<uint64_t>(), RelBlockFreq);
- Sum = std::min(Sum, uint64_t(MaxRelBlockFreq));
- RelBlockFreq = static_cast<uint32_t>(Sum);
- }
};
inline const char *getHotnessName(CalleeInfo::HotnessType HT) {
diff --git a/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp b/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
index 55f87a4e3a099..069f4ae1790b1 100644
--- a/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
+++ b/llvm/lib/Analysis/ModuleSummaryAnalysis.cpp
@@ -468,13 +468,6 @@ static void computeFunctionSummary(
ValueInfo.updateHotness(Hotness);
if (CB->isTailCall())
ValueInfo.setHasTailCall(true);
- // Add the relative block frequency to CalleeInfo if there is no profile
- // information.
- if (BFI != nullptr && Hotness == CalleeInfo::HotnessType::Unknown) {
- uint64_t BBFreq = BFI->getBlockFreq(&BB).getFrequency();
- uint64_t EntryFreq = BFI->getEntryFreq().getFrequency();
- ValueInfo.updateRelBlockFreq(BBFreq, EntryFreq);
- }
} else {
HasUnknownCall = true;
// If F is imported, a local linkage ifunc (e.g. target_clones on a
diff --git a/llvm/lib/AsmParser/LLLexer.cpp b/llvm/lib/AsmParser/LLLexer.cpp
index 9ac671062966c..4e7e31da09a52 100644
--- a/llvm/lib/AsmParser/LLLexer.cpp
+++ b/llvm/lib/AsmParser/LLLexer.cpp
@@ -822,6 +822,7 @@ lltok::Kind LLLexer::LexIdentifier() {
KEYWORD(hotness);
KEYWORD(unknown);
KEYWORD(critical);
+ // Deprecated, keep in order to support old files.
KEYWORD(relbf);
KEYWORD(variable);
KEYWORD(vTableFuncs);
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index 66f128ed3a1f1..068b52fcf0995 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -10187,6 +10187,7 @@ bool LLParser::parseOptionalCalls(
if (parseToken(lltok::colon, "expected ':'") || parseHotness(Hotness))
return true;
break;
+ // Deprecated, keep in order to support old files.
case lltok::kw_relbf:
Lex.Lex();
if (parseToken(lltok::colon, "expected ':'") || parseUInt32(RelBF))
@@ -10201,15 +10202,13 @@ bool LLParser::parseOptionalCalls(
return error(Lex.getLoc(), "expected hotness, relbf, or tail");
}
}
- if (Hotness != CalleeInfo::HotnessType::Unknown && RelBF > 0)
- return tokError("Expected only one of hotness or relbf");
// Keep track of the Call array index needing a forward reference.
// We will save the location of the ValueInfo needing an update, but
// can only do so once the std::vector is finalized.
if (VI.getRef() == FwdVIRef)
IdToIndexMap[GVId].push_back(std::make_pair(Calls.size(), Loc));
Calls.push_back(
- FunctionSummary::EdgeTy{VI, CalleeInfo(Hotness, HasTailCall, RelBF)});
+ FunctionSummary::EdgeTy{VI, CalleeInfo(Hotness, HasTailCall)});
if (parseToken(lltok::rparen, "expected ')' in call"))
return true;
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 816ef37cfd92f..036f3c2964997 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -1199,12 +1199,13 @@ getDecodedHotnessCallEdgeInfo(uint64_t RawFlags) {
return {Hotness, HasTailCall};
}
+// Deprecated, but still needed to read old bitcode files.
static void getDecodedRelBFCallEdgeInfo(uint64_t RawFlags, uint64_t &RelBF,
bool &HasTailCall) {
- static constexpr uint64_t RelBlockFreqMask =
- (1 << CalleeInfo::RelBlockFreqBits) - 1;
+ static constexpr unsigned RelBlockFreqBits = 28;
+ static constexpr uint64_t RelBlockFreqMask = (1 << RelBlockFreqBits) - 1;
RelBF = RawFlags & RelBlockFreqMask; // RelBlockFreqBits bits
- HasTailCall = (RawFlags & (1 << CalleeInfo::RelBlockFreqBits)); // 1 bit
+ HasTailCall = (RawFlags & (1 << RelBlockFreqBits)); // 1 bit
}
static GlobalValue::VisibilityTypes getDecodedVisibility(unsigned Val) {
@@ -7505,10 +7506,11 @@ ModuleSummaryIndexBitcodeReader::makeCallList(ArrayRef<uint64_t> Record,
} else if (HasProfile)
std::tie(Hotness, HasTailCall) =
getDecodedHotnessCallEdgeInfo(Record[++I]);
+ // Deprecated, but still needed to read old bitcode files.
else if (HasRelBF)
getDecodedRelBFCallEdgeInfo(Record[++I], RelBF, HasTailCall);
- Ret.push_back(FunctionSummary::EdgeTy{
- Callee, CalleeInfo(Hotness, HasTailCall, RelBF)});
+ Ret.push_back(
+ FunctionSummary::EdgeTy{Callee, CalleeInfo(Hotness, HasTailCall)});
}
return Ret;
}
@@ -7771,12 +7773,14 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
// FS_PERMODULE_PROFILE: [valueid, flags, instcount, fflags, numrefs,
// numrefs x valueid,
// n x (valueid, hotness+tailcall flags)]
+ // Deprecated, but still needed to read old bitcode files.
// FS_PERMODULE_RELBF: [valueid, flags, instcount, fflags, numrefs,
// numrefs x valueid,
// n x (valueid, relblockfreq+tailcall)]
case bitc::FS_PERMODULE:
- case bitc::FS_PERMODULE_RELBF:
- case bitc::FS_PERMODULE_PROFILE: {
+ case bitc::FS_PERMODULE_PROFILE:
+ // Deprecated, but still needed to read old bitcode files.
+ case bitc::FS_PERMODULE_RELBF: {
unsigned ValueID = Record[0];
uint64_t RawFlags = Record[1];
unsigned InstCount = Record[2];
@@ -7810,6 +7814,7 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
SmallVector<ValueInfo, 0> Refs = makeRefList(
ArrayRef<uint64_t>(Record).slice(RefListStartIndex, NumRefs));
bool HasProfile = (BitCode == bitc::FS_PERMODULE_PROFILE);
+ // Deprecated, but still needed to read old bitcode files.
bool HasRelBF = (BitCode == bitc::FS_PERMODULE_RELBF);
SmallVector<FunctionSummary::EdgeTy, 0> Calls = makeCallList(
ArrayRef<uint64_t>(Record).slice(CallGraphEdgeStartIndex),
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
index 845ecb4672cf2..8bc98c92bc698 100644
--- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -98,10 +98,6 @@ static cl::opt<uint32_t> FlushThreshold(
"bitcode-flush-threshold", cl::Hidden, cl::init(512),
cl::desc("The threshold (unit M) for flushing LLVM bitcode."));
-static cl::opt<bool> WriteRelBFToSummary(
- "write-relbf-to-summary", cl::Hidden, cl::init(false),
- cl::desc("Write relative block frequency to function summary "));
-
// Since we only use the context information in the memprof summary records in
// the LTO backends to do assertion checking, save time and space by only
// serializing the context for non-NDEBUG builds.
@@ -261,9 +257,9 @@ class ModuleBitcodeWriterBase : public BitcodeWriterBase {
private:
void writePerModuleFunctionSummaryRecord(
SmallVector<uint64_t, 64> &NameVals, GlobalValueSummary *Summary,
- unsigned ValueID, unsigned FSCallsAbbrev, unsigned FSCallsProfileAbbrev,
- unsigned CallsiteAbbrev, unsigned AllocAbbrev, unsigned ContextIdAbbvId,
- const Function &F, DenseMap<CallStackId, LinearCallStackId> &CallStackPos,
+ unsigned ValueID, unsigned FSCallsProfileAbbrev, unsigned CallsiteAbbrev,
+ unsigned AllocAbbrev, unsigned ContextIdAbbvId, const Function &F,
+ DenseMap<CallStackId, LinearCallStackId> &CallStackPos,
CallStackId &CallStackCount);
void writeModuleLevelReferences(const GlobalVariable &V,
SmallVector<uint64_t, 64> &NameVals,
@@ -1355,15 +1351,6 @@ static uint64_t getEncodedHotnessCallEdgeInfo(const CalleeInfo &CI) {
return RawFlags;
}
-static uint64_t getEncodedRelBFCallEdgeInfo(const CalleeInfo &CI) {
- uint64_t RawFlags = 0;
-
- RawFlags |= CI.RelBlockFreq; // CalleeInfo::RelBlockFreqBits bits
- RawFlags |= (CI.HasTailCall << CalleeInfo::RelBlockFreqBits); // 1 bit
-
- return RawFlags;
-}
-
static unsigned getEncodedVisibility(const GlobalValue &GV) {
switch (GV.getVisibility()) {
case GlobalValue::DefaultVisibility: return 0;
@@ -4550,8 +4537,7 @@ static void writeFunctionHeapProfileRecords(
// Helper to emit a single function summary record.
void ModuleBitcodeWriterBase::writePerModuleFunctionSummaryRecord(
SmallVector<uint64_t, 64> &NameVals, GlobalValueSummary *Summary,
- unsigned ValueID, unsigned FSCallsRelBFAbbrev,
- unsigned FSCallsProfileAbbrev, unsigned CallsiteAbbrev,
+ unsigned ValueID, unsigned FSCallsProfileAbbrev, unsigned CallsiteAbbrev,
unsigned AllocAbbrev, unsigned ContextIdAbbvId, const Function &F,
DenseMap<CallStackId, LinearCallStackId> &CallStackPos,
CallStackId &CallStackCount) {
@@ -4582,24 +4568,13 @@ void ModuleBitcodeWriterBase::writePerModuleFunctionSummaryRecord(
for (auto &RI : FS->refs())
NameVals.push_back(getValueId(RI));
- const bool UseRelBFRecord =
- WriteRelBFToSummary && !F.hasProfileData() &&
- ForceSummaryEdgesCold == FunctionSummary::FSHT_None;
for (auto &ECI : FS->calls()) {
NameVals.push_back(getValueId(ECI.first));
- if (UseRelBFRecord)
- NameVals.push_back(getEncodedRelBFCallEdgeInfo(ECI.second));
- else
- NameVals.push_back(getEncodedHotnessCallEdgeInfo(ECI.second));
+ NameVals.push_back(getEncodedHotnessCallEdgeInfo(ECI.second));
}
- unsigned FSAbbrev =
- (UseRelBFRecord ? FSCallsRelBFAbbrev : FSCallsProfileAbbrev);
- unsigned Code =
- (UseRelBFRecord ? bitc::FS_PERMODULE_RELBF : bitc::FS_PERMODULE_PROFILE);
-
// Emit the finished record.
- Stream.EmitRecord(Code, NameVals, FSAbbrev);
+ Stream.EmitRecord(bitc::FS_PERMODULE_PROFILE, NameVals, FSCallsProfileAbbrev);
NameVals.clear();
}
@@ -4747,21 +4722,6 @@ void ModuleBitcodeWriterBase::writePerModuleGlobalValueSummary() {
Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 8));
unsigned FSCallsProfileAbbrev = Stream.EmitAbbrev(std::move(Abbv));
- // Abbrev for FS_PERMODULE_RELBF.
- Abbv = std::make_shared<BitCodeAbbrev>();
- Abbv->Add(BitCodeAbbrevOp(bitc::FS_PERMODULE_RELBF));
- Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 8)); // valueid
- Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 6)); // flags
- Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 8)); // instcount
- Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 4)); // fflags
- Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 4)); // numrefs
- Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 4)); // rorefcnt
- Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 4)); // worefcnt
- // numrefs x valueid, n x (valueid, rel_block_freq+tailcall])
- Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Array));
- Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 8));
- unsigned FSCallsRelBFAbbrev = Stream.EmitAbbrev(std::move(Abbv));
-
// Abbrev for FS_PERMODULE_GLOBALVAR_INIT_REFS.
Abbv = std::make_shared<BitCodeAbbrev>();
Abbv->Add(BitCodeAbbrevOp(bitc::FS_PERMODULE_GLOBALVAR_INIT_REFS));
@@ -4876,10 +4836,10 @@ void ModuleBitcodeWriterBase::writePerModuleGlobalValueSummary() {
continue;
}
auto *Summary = VI.getSummaryList()[0].get();
- writePerModuleFunctionSummaryRecord(
- NameVals, Summary, VE.getValueID(&F), FSCallsRelBFAbbrev,
- FSCallsProfileAbbrev, CallsiteAbbrev, AllocAbbrev, ContextIdAbbvId, F,
- CallStackPos, CallStackCount);
+ writePerModuleFunctionSummaryRecord(NameVals, Summary, VE.getValueID(&F),
+ FSCallsProfileAbbrev, CallsiteAbbrev,
+ AllocAbbrev, ContextIdAbbvId, F,
+ CallStackPos, CallStackCount);
}
// Capture references from GlobalVariable initializers, which are outside
diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp
index cbdd444f15d85..82e4de6d07441 100644
--- a/llvm/lib/IR/AsmWriter.cpp
+++ b/llvm/lib/IR/AsmWriter.cpp
@@ -3505,8 +3505,6 @@ void AssemblyWriter::printFunctionSummary(const FunctionSummary *FS) {
Out << "(callee: ^" << Machine.getGUIDSlot(Call.first.getGUID());
if (Call.second.getHotness() != CalleeInfo::HotnessType::Unknown)
Out << ", hotness: " << getHotnessName(Call.second.getHotness());
- else if (Call.second.RelBlockFreq)
- Out << ", relbf: " << Call.second.RelBlockFreq;
// Follow the convention of emitting flags as a boolean value, but only
// emit if true to avoid unnecessary verbosity and test churn.
if (Call.second.HasTailCall)
diff --git a/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp b/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp
index ed7678c750414..950b429edacb7 100644
--- a/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp
+++ b/llvm/lib/Transforms/IPO/WholeProgramDevirt.cpp
@@ -1318,8 +1318,7 @@ static bool addCalls(VTableSlotInfo &SlotInfo, const ValueInfo &Callee) {
// to better ensure we have the opportunity to inline them.
bool IsExported = false;
auto &S = Callee.getSummaryList()[0];
- CalleeInfo CI(CalleeInfo::HotnessType::Hot, /* HasTailCall = */ false,
- /* RelBF = */ 0);
+ CalleeInfo CI(CalleeInfo::HotnessType::Hot, /* HasTailCall = */ false);
auto AddCalls = [&](CallSiteInfo &CSInfo) {
for (auto *FS : CSInfo.SummaryTypeCheckedLoadUsers) {
FS->addCall({Callee, CI});
diff --git a/llvm/test/Assembler/thinlto-summary.ll b/llvm/test/Assembler/thinlto-summary.ll
index 4c6e47af183e0..21da14850b962 100644
--- a/llvm/test/Assembler/thinlto-summary.ll
+++ b/llvm/test/Assembler/thinlto-summary.ll
@@ -11,6 +11,7 @@
; and refs).
^2 = gv: (guid: 1, summaries: (function: (module: ^0, flags: (linkage: external, visibility: default, notEligibleToImport: 0, live: 0, dsoLocal: 0), insts: 10, calls: ((callee: ^15, hotness: hot), (callee: ^17, hotness: cold), (callee: ^16, hotness: none, tail: 1)), refs: (writeonly ^14, readonly ^13, ^11))))
+;; relbf is deprecated, but we support reading old files.
; Function with a call that has relative block frequency instead of profile
; hotness.
^3 = gv: (guid: 2, summaries: (function: (module: ^1, flags: (linkage: external, visibility: default, notEligibleToImport: 0, live: 0, dsoLocal: 0), insts: 10, calls: ((callee: ^15, relbf: 256, tail: 1)))))
@@ -81,7 +82,7 @@
; CHECK: ^1 = module: (path: "thinlto-summary2.o", hash: (2998369023, 4283347029, 1195487472, 2757298015, 1852134156))
; CHECK: ^2 = gv: (guid: 1, summaries: (function: (module: ^0, flags: (linkage: external, visibility: default, notEligibleToImport: 0, live: 0, dsoLocal: 0, canAutoHide: 0, importType: definition), insts: 10, calls: ((callee: ^15, hotness: hot), (callee: ^17, hotness: cold), (callee: ^16, hotness: none, tail: 1)), refs: (^11, readonly ^13, writeonly ^14))))
;; relbf is not emitted since this is a combined summary, and that is only
-;; emitted for per-module summaries.
+;; emitted for per-module summaries. Additionally, it is now deprecated.
; CHECK: ^3 = gv: (guid: 2, summaries: (function: (module: ^1, flags: (linkage: external, visibility: default, notEligibleToImport: 0, live: 0, dsoLocal: 0, canAutoHide: 0, importType: definition), insts: 10, calls: ((callee: ^15, tail: 1)))))
; CHECK: ^4 = gv: (guid: 3, summaries: (function: (module: ^0, flags: (linkage: internal, visibility: default, notEligibleToImport: 0, live: 0, dsoLocal: 1, canAutoHide: 0, importType: definition), insts: 1)))
; CHECK: ^5 = gv: (guid: 4, summaries: (alias: (module: ^0, flags: (linkage: private, visibility: default, notEligibleToImport: 0, live: 0, dsoLocal: 1, canAutoHide: 0, importType: definition), aliasee: ^14)))
diff --git a/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph-relbf.bc b/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph-relbf.bc
new file mode 100644
index 0000000000000..d1694bdfb7a75
Binary files /dev/null and b/llvm/test/Bitcode/Inputs/thinlto-function-summary-callgraph-relbf.bc differ
diff --git a/llvm/test/Bitcode/thinlto-function-summary-callgraph-relbf.ll b/llvm/test/Bitcode/thinlto-function-summary-callgraph-relbf.ll
index 3c827247a6c9f..22e27c45324af 100644
--- a/llvm/test/Bitcode/thinlto-function-summary-callgraph-relbf.ll
+++ b/llvm/test/Bitcode/thinlto-function-summary-callgraph-relbf.ll
@@ -1,9 +1,9 @@
-; Test to check the callgraph in summary
-; RUN: opt -write-relbf-to-summary -module-summary %s -o %t.o
-; RUN: llvm-bcanalyzer -dump %t.o | FileCheck %s
-; RUN: llvm-dis -o - %t.o | FileCheck %s --check-prefix=DIS
-; Round trip it through llvm-as
-; RUN: llvm-dis -o - %t.o | llvm-as -write-relbf-to-summary -o - | llvm-dis -o - | FileCheck %s --check-prefix=DIS
+;; Test to ensure that we can still read old bitcode containing the now
+;; deprected PERMODULE_RELBF record. It should be read and the relbf itself
+;; ignored.
+
+; RUN: llvm-bcanalyzer -dump %S/Inputs/thinlto-function-summary-callgraph-relbf.bc | FileCheck %s
+; RUN: llvm-dis -o - %S/Inputs/thinlto-function-summary-callgraph-relbf.bc | FileCheck %s --check-prefix=DIS
; CHECK: <SOURCE_FILENAME
; CHECK-NEXT: <GLOBALVAR
@@ -35,9 +35,9 @@ entry:
declare void @func(...) #1
@undefinedglob = external global i32
-; OLD: Index {{.*}} contains 1 nodes (1 functions, 0 alias, 0 globals) and 1 edges (0 refs and 1 calls)
-
; DIS: ^0 = module: (path: "{{.*}}", hash: (0, 0, 0, 0, 0))
; DIS: ^1 = gv: (name: "func") ...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/177215
More information about the llvm-commits
mailing list