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

[Caching] Re-associate diagnostics cache key with InputFile

Browse Source 
Change how cached diagnostics are stored inside the CAS. It used to be
stored as a standalone entry for a frontend invocation in the cache and
now it is switched to be associated with input files, stored together
with other outputs like object files, etc.

This enables cleaner Cache Replay APIs and future cached diagnostics
that can be splitted up by file contribution.
This commit is contained in:
Steven Wu
2023-10-26 10:44:07 -07:00
parent 22592d22fc
commit 30cfa3deb2
8 changed files with 83 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/DriverTool/swift_cache_tool_main.cpp
View File

@@ -50,9 +50,8 @@ enum class SwiftCacheToolAction {
struct OutputEntry {
std::string InputPath;
std::string OutputPath;
std::string OutputKind;
std::string CacheKey;
std::vector<std::pair<std::string, std::string>> Outputs;
};
enum ID {
@@ -285,35 +284,30 @@ int SwiftCacheToolInvocation::printOutputKeys() {
std::vector<OutputEntry> OutputKeys;
bool hasError = false;
auto addOutputKey = [&](StringRef InputPath, file_types::ID OutputKind,
StringRef OutputPath) {
auto addFromInputFile = [&](const InputFile &Input) {
auto InputPath = Input.getFileName();
auto OutputKey =
createCompileJobCacheKeyForOutput(CAS, *BaseKey, InputPath);
if (!OutputKey) {
llvm::errs() << "cannot create cache key for " << OutputPath << ": "
llvm::errs() << "cannot create cache key for " << InputPath << ": "
<< toString(OutputKey.takeError()) << "\n";
hasError = true;
}
OutputKeys.emplace_back(
OutputEntry{InputPath.str(), OutputPath.str(),
file_types::getTypeName(OutputKind).str(),
CAS.getID(*OutputKey).toString()});
};
auto addFromInputFile = [&](const InputFile &Input) {
auto InputPath = Input.getFileName();
OutputEntry{InputPath, CAS.getID(*OutputKey).toString(), {}});
auto &Outputs = OutputKeys.back().Outputs;
if (!Input.outputFilename().empty())
addOutputKey(InputPath,
Invocation.getFrontendOptions()
.InputsAndOutputs.getPrincipalOutputType(),
Input.outputFilename());
Outputs.emplace_back(file_types::getTypeName(
Invocation.getFrontendOptions()
.InputsAndOutputs.getPrincipalOutputType()),
Input.outputFilename());
Input.getPrimarySpecificPaths()
.SupplementaryOutputs.forEachSetOutputAndType(
[&](const std::string &File, file_types::ID ID) {
// Dont print serialized diagnostics.
if (file_types::isProducedFromDiagnostics(ID))
return;
addOutputKey(InputPath, ID, File);
Outputs.emplace_back(file_types::getTypeName(ID), File);
});
};
llvm::for_each(
@@ -321,8 +315,10 @@ int SwiftCacheToolInvocation::printOutputKeys() {
addFromInputFile);
// Add diagnostics file.
addOutputKey("<cached-diagnostics>", file_types::ID::TY_CachedDiagnostics,
"<cached-diagnostics>");
if (!OutputKeys.empty())
OutputKeys.front().Outputs.emplace_back(
file_types::getTypeName(file_types::ID::TY_CachedDiagnostics),
"<cached-diagnostics>");
if (hasError)
return 1;
@@ -331,10 +327,16 @@ int SwiftCacheToolInvocation::printOutputKeys() {
Out.array([&] {
for (const auto &E : OutputKeys) {
Out.object([&] {
Out.attribute("OutputPath", E.OutputPath);
Out.attribute("OutputKind", E.OutputKind);
Out.attribute("Input", E.InputPath);
Out.attribute("CacheKey", E.CacheKey);
Out.attributeArray("Outputs", [&] {
for (const auto &OutEntry : E.Outputs) {
Out.object([&] {
Out.attribute("Kind", OutEntry.first);
Out.attribute("Path", OutEntry.second);
});
}
});
});
}
});