Skip to content

[ThinLTO] Use a set rather than a map to track exported ValueInfos. #97360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 3, 2024
Merged

[ThinLTO] Use a set rather than a map to track exported ValueInfos. #97360

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14deb75
[ThinLTO] Track definitions only in export-set
mingmingl-llvm Jul 1, 2024
db822c9
resolve feedback
mingmingl-llvm Jul 3, 2024
805923a
simplify numGlobalVarSummaries
mingmingl-llvm Jul 3, 2024
07d061b
resolve comments
mingmingl-llvm Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions llvm/lib/Transforms/IPO/FunctionImport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,26 +995,19 @@ static bool isGlobalVarSummary(const ModuleSummaryIndex &Index,
return false;
}

// Return the number of global summaries and record the number of function
// summaries as output parameter.
static unsigned numGlobalVarSummaries(const ModuleSummaryIndex &Index,
FunctionImporter::ExportSetTy &ExportSet,
unsigned &DefinedFS) {
// Return the number of global summaries in ExportSet.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"global variable summaries" (to distinguish from global value summaries).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

static unsigned
numGlobalVarSummaries(const ModuleSummaryIndex &Index,
FunctionImporter::ExportSetTy &ExportSet) {
unsigned NumGVS = 0;
DefinedFS = 0;
for (auto &VI : ExportSet) {
for (auto &VI : ExportSet)
if (isGlobalVarSummary(Index, VI.getGUID()))
++NumGVS;
else
++DefinedFS;
}
return NumGVS;
}

// Return the number of global summaries and record the number of function
// summaries as output parameter. This is the same as `numGlobalVarSummaries`
// except that it takes `FunctionImporter::FunctionsToImportTy` as input
// parameter.
// Given ImportMap, return the number of global summaries and record the number
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

// of defined function summaries as output parameter.
static unsigned
numGlobalVarSummaries(const ModuleSummaryIndex &Index,
FunctionImporter::FunctionsToImportTy &ImportMap,
Expand Down Expand Up @@ -1147,12 +1140,9 @@ void llvm::ComputeCrossModuleImport(
for (auto &ModuleImports : ImportLists) {
auto ModName = ModuleImports.first;
auto &Exports = ExportLists[ModName];
unsigned DefinedFS = 0;
unsigned NumGVS = numGlobalVarSummaries(Index, Exports, DefinedFS);
LLVM_DEBUG(dbgs() << "* Module " << ModName << " exports " << DefinedFS
<< " function as definitions, "
<< Exports.size() - NumGVS - DefinedFS
<< " functions as declarations and " << NumGVS
unsigned NumGVS = numGlobalVarSummaries(Index, Exports);
LLVM_DEBUG(dbgs() << "* Module " << ModName << " exports "
<< Exports.size() - NumGVS << " functions and " << NumGVS
<< " vars. Imports from " << ModuleImports.second.size()
<< " modules.\n");
for (auto &Src : ModuleImports.second) {
Expand Down
Loading