averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Caching] Fix frontend cache replay for batch mode

Browse Source 
Teach swift-frontend to correctly replay cache when using
batch-mode/primary-file. Currently, the cache replay logic will try to
look up cache key for all the inputs and only replay if all lookups are
successful. In batch-mode, not all inputs are producing outputs, which
causes lookup for those keys to be a miss and causing a false miss for
the compilation.
This commit is contained in:
Steven Wu
2023-12-01 09:59:38 -08:00
parent 556c503685
commit 1325dd6a50
3 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Frontend/CachingUtils.cpp
View File

@@ -215,6 +215,12 @@ bool replayCachedCompilerOutputs(
Outputs.try_emplace(ID, File);
});
// If this input doesn't produce any outputs, don't try to look up cache.
// This can be a standalone emitModule action that only one input produces
// output.
if (Outputs.empty())
return;
// Add cached diagnostic entry for lookup. Output path doesn't matter here.
Outputs.try_emplace(file_types::ID::TY_CachedDiagnostics,
"<cached-diagnostics>");
@@ -222,7 +228,23 @@ bool replayCachedCompilerOutputs(
return replayOutputsForInputFile(InputPath, Outputs);
};
llvm::for_each(InputsAndOutputs.getAllInputs(), replayOutputFromInput);
// If there are primary inputs, look up only the primary input files.
// Otherwise, prepare to do cache lookup for all inputs.
if (InputsAndOutputs.hasPrimaryInputs())
InputsAndOutputs.forEachPrimaryInput([&](const InputFile &File) {
replayOutputFromInput(File);
return false;
});
else
llvm::for_each(InputsAndOutputs.getAllInputs(), replayOutputFromInput);
// If there is not diagnostic output, this is a job that produces no output
// and only diagnostics, like `typecheck-module-from-interface`, look up
// diagnostics from first file.
if (!DiagnosticsOutput)
replayOutputsForInputFile(
InputsAndOutputs.getFirstOutputProducingInput().getFileName(),
{{file_types::ID::TY_CachedDiagnostics, "<cached-diagnostics>"}});
if (!CanReplayAllOutput)
return false;