Skip to content

Optimize Module Dependency Handling for Efficient Memory Usage #132287

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

Closed
ayushpareek2003 wants to merge 2 commits into from
Closed

Optimize Module Dependency Handling for Efficient Memory Usage #132287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c09daa
Optimize Module Dependency Handling for Efficient Memory Usage
ayushpareek2003 Mar 20, 2025
0f23b05
Merge branch 'llvm:main' into main
ayushpareek2003 Mar 20, 2025
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
64 changes: 43 additions & 21 deletions clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,40 +394,62 @@ void ModuleDepCollector::addModuleMapFiles(
if (Service.shouldEagerLoadModules())
return; // Only pcm is needed for eager load.

// Preallocate memory to avoid multiple allocations
CI.getFrontendOpts().ModuleMapFiles.reserve(
CI.getFrontendOpts().ModuleMapFiles.size() + ClangModuleDeps.size());

for (const ModuleID &MID : ClangModuleDeps) {
ModuleDeps *MD = ModuleDepsByID.lookup(MID);
assert(MD && "Inconsistent dependency info");
CI.getFrontendOpts().ModuleMapFiles.push_back(MD->ClangModuleMapFile);

if (ModuleDeps *MD = ModuleDepsByID.lookup(MID)) { // Single lookup
assert(MD && "Inconsistent dependency info");
CI.getFrontendOpts().ModuleMapFiles.emplace_back(MD->ClangModuleMapFile);
}
}
}

void ModuleDepCollector::addModuleFiles(
CompilerInvocation &CI, ArrayRef<ModuleID> ClangModuleDeps) const {

// Preallocate memory if eager load is enabled
if (Service.shouldEagerLoadModules()) {
CI.getFrontendOpts().ModuleFiles.reserve(
CI.getFrontendOpts().ModuleFiles.size() + ClangModuleDeps.size());
}
for (const ModuleID &MID : ClangModuleDeps) {
ModuleDeps *MD = ModuleDepsByID.lookup(MID);
std::string PCMPath =
Controller.lookupModuleOutput(*MD, ModuleOutputKind::ModuleFile);

if (Service.shouldEagerLoadModules())
CI.getFrontendOpts().ModuleFiles.push_back(std::move(PCMPath));
else
CI.getHeaderSearchOpts().PrebuiltModuleFiles.insert(
{MID.ModuleName, std::move(PCMPath)});
if (ModuleDeps *MD = ModuleDepsByID.lookup(MID)) {
std::string PCMPath =
Controller.lookupModuleOutput(*MD, ModuleOutputKind::ModuleFile);

if (Service.shouldEagerLoadModules()) {
CI.getFrontendOpts().ModuleFiles.emplace_back(std::move(PCMPath));
} else {
CI.getHeaderSearchOpts().PrebuiltModuleFiles.try_emplace(
MID.ModuleName, std::move(PCMPath));
}
}
}
}

void ModuleDepCollector::addModuleFiles(
CowCompilerInvocation &CI, ArrayRef<ModuleID> ClangModuleDeps) const {
for (const ModuleID &MID : ClangModuleDeps) {
ModuleDeps *MD = ModuleDepsByID.lookup(MID);
std::string PCMPath =
Controller.lookupModuleOutput(*MD, ModuleOutputKind::ModuleFile);

if (Service.shouldEagerLoadModules())
CI.getMutFrontendOpts().ModuleFiles.push_back(std::move(PCMPath));
else
CI.getMutHeaderSearchOpts().PrebuiltModuleFiles.insert(
{MID.ModuleName, std::move(PCMPath)});
// Preallocation
if (Service.shouldEagerLoadModules()) {
CI.getMutFrontendOpts().ModuleFiles.reserve(
CI.getMutFrontendOpts().ModuleFiles.size() + ClangModuleDeps.size());
}
for (const ModuleID &MID : ClangModuleDeps) {
if (ModuleDeps *MD = ModuleDepsByID.lookup(MID)) {
std::string PCMPath =
Controller.lookupModuleOutput(*MD, ModuleOutputKind::ModuleFile);

if (EagerLoad) {
CI.getMutFrontendOpts().ModuleFiles.emplace_back(std::move(PCMPath));
} else {
CI.getMutHeaderSearchOpts().PrebuiltModuleFiles.try_emplace(
MID.ModuleName, std::move(PCMPath));
}
}
}
}

Expand Down