[llvm-branch-commits] [clang] Speed up diagnostic state file lookup (PR #241234)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Wed Nov 11 03:25:37 PST 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang
Author: Pengcheng Wang (wangpc-pp)
<details>
<summary>Changes</summary>
Store File records behind stable pointers in a DenseMap instead of a
std::map. Keep dumps and serialized mappings ordered by FileID,
and create deserialized entries lazily.
Three interleaved CTMark pairs reduce median compile time by 0.218%
and geomean by 0.131%.
Assisted-by: TRAE CLI (GPT-6)
---
Full diff: https://github.com/llvm/llvm-project/pull/241234.diff
4 Files Affected:
- (modified) clang/include/clang/Basic/Diagnostic.h (+1-2)
- (modified) clang/lib/Basic/Diagnostic.cpp (+14-7)
- (modified) clang/lib/Serialization/ASTReader.cpp (+11-3)
- (modified) clang/lib/Serialization/ASTWriter.cpp (+14-6)
``````````diff
diff --git a/clang/include/clang/Basic/Diagnostic.h b/clang/include/clang/Basic/Diagnostic.h
index 95b9cbc4e8cbb..cfe79b0ce2af7 100644
--- a/clang/include/clang/Basic/Diagnostic.h
+++ b/clang/include/clang/Basic/Diagnostic.h
@@ -34,7 +34,6 @@
#include <cstdint>
#include <limits>
#include <list>
-#include <map>
#include <memory>
#include <optional>
#include <string>
@@ -503,7 +502,7 @@ class DiagnosticsEngine : public RefCountedBase<DiagnosticsEngine> {
};
/// The diagnostic states for each file.
- mutable std::map<FileID, File> Files;
+ mutable llvm::DenseMap<FileID, std::unique_ptr<File>> Files;
/// One-entry cache for getFile(): Files gets large, and most
/// lookups are for the same FileID as the previous one.
diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp
index 251c8ba6e13db..c5d60ca9d27cd 100644
--- a/clang/lib/Basic/Diagnostic.cpp
+++ b/clang/lib/Basic/Diagnostic.cpp
@@ -231,10 +231,10 @@ DiagnosticsEngine::DiagStateMap::File *
DiagnosticsEngine::DiagStateMap::getFileUncached(SourceManager &SrcMgr,
FileID ID) const {
// Get or insert the File for this ID.
- auto Range = Files.equal_range(ID);
- if (Range.first != Range.second)
- return &Range.first->second;
- auto &F = Files.insert(Range.first, std::make_pair(ID, File()))->second;
+ auto [It, Inserted] = Files.try_emplace(ID);
+ if (!Inserted)
+ return It->second.get();
+ auto &F = *(It->second = std::make_unique<File>());
// We created a new File; look up the diagnostic state at the start of it and
// initialize it.
@@ -262,9 +262,16 @@ void DiagnosticsEngine::DiagStateMap::dump(SourceManager &SrcMgr,
CurDiagStateLoc.print(llvm::errs(), SrcMgr);
llvm::errs() << ": " << CurDiagState << "\n";
- for (auto &F : Files) {
+ SmallVector<std::pair<FileID, File *>, 16> SortedFiles;
+ for (auto &F : Files)
+ SortedFiles.emplace_back(F.first, F.second.get());
+ llvm::sort(SortedFiles, [](const auto &LHS, const auto &RHS) {
+ return LHS.first.getOpaqueValue() < RHS.first.getOpaqueValue();
+ });
+
+ for (auto &F : SortedFiles) {
FileID ID = F.first;
- File &File = F.second;
+ File &File = *F.second;
bool PrintedOuterHeading = false;
auto PrintOuterHeading = [&] {
@@ -275,7 +282,7 @@ void DiagnosticsEngine::DiagStateMap::dump(SourceManager &SrcMgr,
llvm::errs() << "File " << &File << " <FileID " << ID.getHashValue()
<< ">: " << SrcMgr.getBufferOrFake(ID).getBufferIdentifier();
- if (F.second.Parent) {
+ if (File.Parent) {
FileIDAndOffset Decomp = SrcMgr.getDecomposedIncludedLoc(ID);
assert(File.ParentOffset == Decomp.second);
llvm::errs() << " parent " << File.Parent << " <FileID "
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index cd7d9f24924f8..49a30cf66aa00 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -7372,6 +7372,14 @@ void ASTReader::ReadPragmaDiagnosticMappings(DiagnosticsEngine &Diag) {
return NewState;
};
+ auto GetDiagStateFile =
+ [&](FileID FID) -> DiagnosticsEngine::DiagStateMap::File & {
+ auto &File = Diag.DiagStatesByLoc.Files[FID];
+ if (!File)
+ File = std::make_unique<DiagnosticsEngine::DiagStateMap::File>();
+ return *File;
+ };
+
// Read the first state.
DiagState *FirstState;
if (F.Kind == MK_ImplicitModule) {
@@ -7406,7 +7414,7 @@ void ASTReader::ReadPragmaDiagnosticMappings(DiagnosticsEngine &Diag) {
// Set up the root buffer of the module to start with the initial
// diagnostic state of the module itself, to cover files that contain no
// explicit transitions (for which we did not serialize anything).
- Diag.DiagStatesByLoc.Files[F.OriginalSourceFileID]
+ GetDiagStateFile(F.OriginalSourceFileID)
.StateTransitions.push_back({FirstState, 0});
} else {
// For prefix ASTs, start with whatever the user configured on the
@@ -7428,7 +7436,7 @@ void ASTReader::ReadPragmaDiagnosticMappings(DiagnosticsEngine &Diag) {
// we won't be changing the diagnostic state within imported FileIDs
// (other than perhaps appending to the main source file, which has no
// parent).
- auto &F = Diag.DiagStatesByLoc.Files[FID];
+ auto &F = GetDiagStateFile(FID);
F.StateTransitions.reserve(F.StateTransitions.size() + Transitions);
for (unsigned I = 0; I != Transitions; ++I) {
unsigned Offset = Record[Idx++];
@@ -7450,7 +7458,7 @@ void ASTReader::ReadPragmaDiagnosticMappings(DiagnosticsEngine &Diag) {
// Preserve the property that the imaginary root file describes the
// current state.
FileID NullFile;
- auto &T = Diag.DiagStatesByLoc.Files[NullFile].StateTransitions;
+ auto &T = GetDiagStateFile(NullFile).StateTransitions;
if (T.empty())
T.push_back({CurState, 0});
else
diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
index de1c2449138e5..55a68378202e4 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -3418,16 +3418,24 @@ void ASTWriter::WritePragmaDiagnosticMappings(const DiagnosticsEngine &Diag,
// Emit the state transitions.
unsigned NumLocations = 0;
- for (auto &FileIDAndFile : Diag.DiagStatesByLoc.Files) {
- if (!FileIDAndFile.first.isValid() ||
- !FileIDAndFile.second.HasLocalTransitions)
+ SmallVector<std::pair<FileID, const DiagnosticsEngine::DiagStateMap::File *>,
+ 16>
+ Files;
+ for (auto &FileIDAndFile : Diag.DiagStatesByLoc.Files)
+ Files.emplace_back(FileIDAndFile.first, FileIDAndFile.second.get());
+ llvm::sort(Files, [](const auto &LHS, const auto &RHS) {
+ return LHS.first.getOpaqueValue() < RHS.first.getOpaqueValue();
+ });
+
+ for (auto [FID, File] : Files) {
+ if (!FID.isValid() || !File->HasLocalTransitions)
continue;
++NumLocations;
- AddFileID(FileIDAndFile.first, Record);
+ AddFileID(FID, Record);
- Record.push_back(FileIDAndFile.second.StateTransitions.size());
- for (auto &StatePoint : FileIDAndFile.second.StateTransitions) {
+ Record.push_back(File->StateTransitions.size());
+ for (auto &StatePoint : File->StateTransitions) {
Record.push_back(StatePoint.Offset);
AddDiagState(StatePoint.State, false);
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/241234
More information about the llvm-branch-commits
mailing list