[PATCH] D29755: Cache FileID when translating diagnostics in PCH files
This revision was automatically updated to reflect the committed changes. Closed by commit rL295301: Cache FileID when translating diagnostics in PCH files (authored by erikjv). Changed prior to commit: https://reviews.llvm.org/D29755?vs=88366=88701#toc Repository: rL LLVM https://reviews.llvm.org/D29755 Files: cfe/trunk/lib/Frontend/ASTUnit.cpp Index: cfe/trunk/lib/Frontend/ASTUnit.cpp === --- cfe/trunk/lib/Frontend/ASTUnit.cpp +++ cfe/trunk/lib/Frontend/ASTUnit.cpp @@ -2541,14 +2541,19 @@ SmallVectorResult; Result.reserve(Diags.size()); + const FileEntry *PreviousFE = nullptr; + FileID FID; for (const StandaloneDiagnostic : Diags) { // Rebuild the StoredDiagnostic. if (SD.Filename.empty()) continue; const FileEntry *FE = FileMgr.getFile(SD.Filename); if (!FE) continue; -FileID FID = SrcMgr.translateFile(FE); +if (FE != PreviousFE) { + FID = SrcMgr.translateFile(FE); + PreviousFE = FE; +} SourceLocation FileLoc = SrcMgr.getLocForStartOfFile(FID); if (FileLoc.isInvalid()) continue; Index: cfe/trunk/lib/Frontend/ASTUnit.cpp === --- cfe/trunk/lib/Frontend/ASTUnit.cpp +++ cfe/trunk/lib/Frontend/ASTUnit.cpp @@ -2541,14 +2541,19 @@ SmallVector Result; Result.reserve(Diags.size()); + const FileEntry *PreviousFE = nullptr; + FileID FID; for (const StandaloneDiagnostic : Diags) { // Rebuild the StoredDiagnostic. if (SD.Filename.empty()) continue; const FileEntry *FE = FileMgr.getFile(SD.Filename); if (!FE) continue; -FileID FID = SrcMgr.translateFile(FE); +if (FE != PreviousFE) { + FID = SrcMgr.translateFile(FE); + PreviousFE = FE; +} SourceLocation FileLoc = SrcMgr.getLocForStartOfFile(FID); if (FileLoc.isInvalid()) continue; ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D29755: Cache FileID when translating diagnostics in PCH files
bkramer accepted this revision. bkramer added a comment. This revision is now accepted and ready to land. lg https://reviews.llvm.org/D29755 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D29755: Cache FileID when translating diagnostics in PCH files
erikjv updated this revision to Diff 88366. https://reviews.llvm.org/D29755 Files: lib/Frontend/ASTUnit.cpp Index: lib/Frontend/ASTUnit.cpp === --- lib/Frontend/ASTUnit.cpp +++ lib/Frontend/ASTUnit.cpp @@ -2539,14 +2539,19 @@ SmallVectorResult; Result.reserve(Diags.size()); + const FileEntry *PreviousFE = nullptr; + FileID FID; for (const StandaloneDiagnostic : Diags) { // Rebuild the StoredDiagnostic. if (SD.Filename.empty()) continue; const FileEntry *FE = FileMgr.getFile(SD.Filename); if (!FE) continue; -FileID FID = SrcMgr.translateFile(FE); +if (FE != PreviousFE) { + FID = SrcMgr.translateFile(FE); + PreviousFE = FE; +} SourceLocation FileLoc = SrcMgr.getLocForStartOfFile(FID); if (FileLoc.isInvalid()) continue; Index: lib/Frontend/ASTUnit.cpp === --- lib/Frontend/ASTUnit.cpp +++ lib/Frontend/ASTUnit.cpp @@ -2539,14 +2539,19 @@ SmallVector Result; Result.reserve(Diags.size()); + const FileEntry *PreviousFE = nullptr; + FileID FID; for (const StandaloneDiagnostic : Diags) { // Rebuild the StoredDiagnostic. if (SD.Filename.empty()) continue; const FileEntry *FE = FileMgr.getFile(SD.Filename); if (!FE) continue; -FileID FID = SrcMgr.translateFile(FE); +if (FE != PreviousFE) { + FID = SrcMgr.translateFile(FE); + PreviousFE = FE; +} SourceLocation FileLoc = SrcMgr.getLocForStartOfFile(FID); if (FileLoc.isInvalid()) continue; ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D29755: Cache FileID when translating diagnostics in PCH files
ahatanak added inline comments. Comment at: lib/Frontend/ASTUnit.cpp:2551 continue; -FileID FID = SrcMgr.translateFile(FE); +FileID FID; +if (FE == CachedFE) { Since FID is always equal to CachedFID, I think you can simplify this a bit by removing FID and using just CachedFID. https://reviews.llvm.org/D29755 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D29755: Cache FileID when translating diagnostics in PCH files
erikjv created this revision. Modules/preambles/PCH files can contain diagnostics, which, when used, are added to the current ASTUnit. For that to work, they are translated to use the current FileManager's FileIDs. When the entry is not the main file, all local source locations will be checked by a linear search. Now this is a problem, when there are lots of diagnostics (say, 25000. and lots of local source locations (say, 44), and end up taking seconds when using such a preamble. The fix is to cache the last FileID, because many subsequent diagnostics refer to the same file. This reduces the time spent in ASTUnit::TranslateStoredDiagnostics from seconds to a few milliseconds for files with many slocs/diagnostics. This fixes PR31353. https://reviews.llvm.org/D29755 Files: lib/Frontend/ASTUnit.cpp Index: lib/Frontend/ASTUnit.cpp === --- lib/Frontend/ASTUnit.cpp +++ lib/Frontend/ASTUnit.cpp @@ -2539,14 +2539,22 @@ SmallVectorResult; Result.reserve(Diags.size()); + const FileEntry *CachedFE = nullptr; + FileID CachedFID; for (const StandaloneDiagnostic : Diags) { // Rebuild the StoredDiagnostic. if (SD.Filename.empty()) continue; const FileEntry *FE = FileMgr.getFile(SD.Filename); if (!FE) continue; -FileID FID = SrcMgr.translateFile(FE); +FileID FID; +if (FE == CachedFE) { + FID = CachedFID; +} else { + CachedFID = FID = SrcMgr.translateFile(FE); + CachedFE = FE; +} SourceLocation FileLoc = SrcMgr.getLocForStartOfFile(FID); if (FileLoc.isInvalid()) continue; Index: lib/Frontend/ASTUnit.cpp === --- lib/Frontend/ASTUnit.cpp +++ lib/Frontend/ASTUnit.cpp @@ -2539,14 +2539,22 @@ SmallVector Result; Result.reserve(Diags.size()); + const FileEntry *CachedFE = nullptr; + FileID CachedFID; for (const StandaloneDiagnostic : Diags) { // Rebuild the StoredDiagnostic. if (SD.Filename.empty()) continue; const FileEntry *FE = FileMgr.getFile(SD.Filename); if (!FE) continue; -FileID FID = SrcMgr.translateFile(FE); +FileID FID; +if (FE == CachedFE) { + FID = CachedFID; +} else { + CachedFID = FID = SrcMgr.translateFile(FE); + CachedFE = FE; +} SourceLocation FileLoc = SrcMgr.getLocForStartOfFile(FID); if (FileLoc.isInvalid()) continue; ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits