Skip to content

Commit 4f15039

Browse files
kazutakahiratakazutakahirata
authored
[LTO] Introduce new type alias ImportListsTy (NFC) (#106420)
The background is as follows. I'm planning to reduce the memory footprint of ThinLTO indexing by changing ImportMapTy, the data structure used for an import list. Once this patch lands, I'm planning to change the type slightly. The new type alias allows us to update the type without touching many places.
1 parent 1bde8e0 commit 4f15039

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

‎llvm/include/llvm/Transforms/IPO/FunctionImport.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ class FunctionImporter {
149149
ImportMapTyImpl ImportMap;
150150
};
151151

152+
// A map from destination modules to lists of imports.
153+
using ImportListsTy = DenseMap<StringRef, ImportMapTy>;
154+
152155
/// The set contains an entry for every global value that the module exports.
153156
/// Depending on the user context, this container is allowed to contain
154157
/// definitions, declarations or a mix of both.
@@ -211,7 +214,7 @@ void ComputeCrossModuleImport(
211214
const DenseMap<StringRef, GVSummaryMapTy> &ModuleToDefinedGVSummaries,
212215
function_ref<bool(GlobalValue::GUID, const GlobalValueSummary *)>
213216
isPrevailing,
214-
DenseMap<StringRef, FunctionImporter::ImportMapTy> &ImportLists,
217+
FunctionImporter::ImportListsTy &ImportLists,
215218
DenseMap<StringRef, FunctionImporter::ExportSetTy> &ExportLists);
216219

217220
/// PrevailingType enum used as a return type of callback passed

‎llvm/lib/LTO/LTO.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1716,8 +1716,7 @@ Error LTO::runThinLTO(AddStreamFn AddStream, FileCache Cache,
17161716
// Synthesize entry counts for functions in the CombinedIndex.
17171717
computeSyntheticCounts(ThinLTO.CombinedIndex);
17181718

1719-
DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists(
1720-
ThinLTO.ModuleMap.size());
1719+
FunctionImporter::ImportListsTy ImportLists(ThinLTO.ModuleMap.size());
17211720
DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists(
17221721
ThinLTO.ModuleMap.size());
17231722
StringMap<std::map<GlobalValue::GUID, GlobalValue::LinkageTypes>> ResolvedODR;

‎llvm/lib/LTO/ThinLTOCodeGenerator.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ void ThinLTOCodeGenerator::promote(Module &TheModule, ModuleSummaryIndex &Index,
693693
computePrevailingCopies(Index, PrevailingCopy);
694694

695695
// Generate import/export list
696-
DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists(ModuleCount);
696+
FunctionImporter::ImportListsTy ImportLists(ModuleCount);
697697
DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists(ModuleCount);
698698
ComputeCrossModuleImport(Index, ModuleToDefinedGVSummaries,
699699
IsPrevailing(PrevailingCopy), ImportLists,
@@ -745,7 +745,7 @@ void ThinLTOCodeGenerator::crossModuleImport(Module &TheModule,
745745
computePrevailingCopies(Index, PrevailingCopy);
746746

747747
// Generate import/export list
748-
DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists(ModuleCount);
748+
FunctionImporter::ImportListsTy ImportLists(ModuleCount);
749749
DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists(ModuleCount);
750750
ComputeCrossModuleImport(Index, ModuleToDefinedGVSummaries,
751751
IsPrevailing(PrevailingCopy), ImportLists,
@@ -785,7 +785,7 @@ void ThinLTOCodeGenerator::gatherImportedSummariesForModule(
785785
computePrevailingCopies(Index, PrevailingCopy);
786786

787787
// Generate import/export list
788-
DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists(ModuleCount);
788+
FunctionImporter::ImportListsTy ImportLists(ModuleCount);
789789
DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists(ModuleCount);
790790
ComputeCrossModuleImport(Index, ModuleToDefinedGVSummaries,
791791
IsPrevailing(PrevailingCopy), ImportLists,
@@ -823,7 +823,7 @@ void ThinLTOCodeGenerator::emitImports(Module &TheModule, StringRef OutputName,
823823
computePrevailingCopies(Index, PrevailingCopy);
824824

825825
// Generate import/export list
826-
DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists(ModuleCount);
826+
FunctionImporter::ImportListsTy ImportLists(ModuleCount);
827827
DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists(ModuleCount);
828828
ComputeCrossModuleImport(Index, ModuleToDefinedGVSummaries,
829829
IsPrevailing(PrevailingCopy), ImportLists,
@@ -874,7 +874,7 @@ void ThinLTOCodeGenerator::internalize(Module &TheModule,
874874
computePrevailingCopies(Index, PrevailingCopy);
875875

876876
// Generate import/export list
877-
DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists(ModuleCount);
877+
FunctionImporter::ImportListsTy ImportLists(ModuleCount);
878878
DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists(ModuleCount);
879879
ComputeCrossModuleImport(Index, ModuleToDefinedGVSummaries,
880880
IsPrevailing(PrevailingCopy), ImportLists,
@@ -1074,7 +1074,7 @@ void ThinLTOCodeGenerator::run() {
10741074

10751075
// Collect the import/export lists for all modules from the call-graph in the
10761076
// combined index.
1077-
DenseMap<StringRef, FunctionImporter::ImportMapTy> ImportLists(ModuleCount);
1077+
FunctionImporter::ImportListsTy ImportLists(ModuleCount);
10781078
DenseMap<StringRef, FunctionImporter::ExportSetTy> ExportLists(ModuleCount);
10791079
ComputeCrossModuleImport(*Index, ModuleToDefinedGVSummaries,
10801080
IsPrevailing(PrevailingCopy), ImportLists,

‎llvm/lib/Transforms/IPO/FunctionImport.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ collectImportStatistics(const ModuleSummaryIndex &Index,
11111111
#ifndef NDEBUG
11121112
static bool checkVariableImport(
11131113
const ModuleSummaryIndex &Index,
1114-
DenseMap<StringRef, FunctionImporter::ImportMapTy> &ImportLists,
1114+
FunctionImporter::ImportListsTy &ImportLists,
11151115
DenseMap<StringRef, FunctionImporter::ExportSetTy> &ExportLists) {
11161116
DenseSet<GlobalValue::GUID> FlattenedImports;
11171117

@@ -1152,7 +1152,7 @@ void llvm::ComputeCrossModuleImport(
11521152
const DenseMap<StringRef, GVSummaryMapTy> &ModuleToDefinedGVSummaries,
11531153
function_ref<bool(GlobalValue::GUID, const GlobalValueSummary *)>
11541154
isPrevailing,
1155-
DenseMap<StringRef, FunctionImporter::ImportMapTy> &ImportLists,
1155+
FunctionImporter::ImportListsTy &ImportLists,
11561156
DenseMap<StringRef, FunctionImporter::ExportSetTy> &ExportLists) {
11571157
auto MIS = ModuleImportsManager::create(isPrevailing, Index, &ExportLists);
11581158
// For each module that has function defined, compute the import/export lists.

0 commit comments

Comments
 (0)