hokein created this revision.
hokein added a reviewer: sammccall.
Herald added a subscriber: kadircet.
Herald added a project: All.
hokein requested review of this revision.
Herald added a subscriber: ilya-biryukov.
Herald added a project: clang.
Similar to getFileIDLocal patch, but for the version for load module.
Test with clangd (building AST with preamble), FileID scans in binary
search is reduced:
SemaExpr.cpp: 142K -> 137K (-3%)
FindTarget.cpp: 368K -> 343K (-6%)
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D135258
Files:
clang/lib/Basic/SourceManager.cpp
Index: clang/lib/Basic/SourceManager.cpp
===================================================================
--- clang/lib/Basic/SourceManager.cpp
+++ clang/lib/Basic/SourceManager.cpp
@@ -863,36 +863,37 @@
}
// Essentially the same as the local case, but the loaded array is sorted
- // in the other direction.
+ // in the other direction (decreasing order).
+ // GreaterIndex is the one where the offset is greater, which is actually a
+ // lower index!
+ unsigned GreaterIndex = 0;
+ unsigned LessIndex = LoadedSLocEntryTable.size();
+ if (LastFileIDLookup.ID < 0) {
+ // Prune the search space.
+ int LastID = LastFileIDLookup.ID;
+ if (getLoadedSLocEntryByID(LastID).getOffset() >= SLocOffset)
+ GreaterIndex = (-LastID - 2) + 1;
+ else
+ LessIndex = -LastID - 2;
+ }
// First do a linear scan from the last lookup position, if possible.
- unsigned I;
- int LastID = LastFileIDLookup.ID;
- if (LastID >= 0 || getLoadedSLocEntryByID(LastID).getOffset() < SLocOffset)
- I = 0;
- else
- I = (-LastID - 2) + 1;
-
unsigned NumProbes;
bool Invalid = false;
- for (NumProbes = 0; NumProbes < 8; ++NumProbes, ++I) {
+ for (NumProbes = 0; NumProbes < 8; ++NumProbes, ++GreaterIndex) {
// Make sure the entry is loaded!
- const SrcMgr::SLocEntry &E = getLoadedSLocEntry(I, &Invalid);
+ const SrcMgr::SLocEntry &E = getLoadedSLocEntry(GreaterIndex, &Invalid);
if (Invalid)
return FileID(); // invalid entry.
if (E.getOffset() <= SLocOffset) {
- FileID Res = FileID::get(-int(I) - 2);
+ FileID Res = FileID::get(-int(GreaterIndex) - 2);
LastFileIDLookup = Res;
NumLinearScans += NumProbes + 1;
return Res;
}
}
- // Linear scan failed. Do the binary search. Note the reverse sorting of the
- // table: GreaterIndex is the one where the offset is greater, which is
- // actually a lower index!
- unsigned GreaterIndex = I;
- unsigned LessIndex = LoadedSLocEntryTable.size();
+ // Linear scan failed. Do the binary search.
NumProbes = 0;
while (true) {
++NumProbes;
Index: clang/lib/Basic/SourceManager.cpp
===================================================================
--- clang/lib/Basic/SourceManager.cpp
+++ clang/lib/Basic/SourceManager.cpp
@@ -863,36 +863,37 @@
}
// Essentially the same as the local case, but the loaded array is sorted
- // in the other direction.
+ // in the other direction (decreasing order).
+ // GreaterIndex is the one where the offset is greater, which is actually a
+ // lower index!
+ unsigned GreaterIndex = 0;
+ unsigned LessIndex = LoadedSLocEntryTable.size();
+ if (LastFileIDLookup.ID < 0) {
+ // Prune the search space.
+ int LastID = LastFileIDLookup.ID;
+ if (getLoadedSLocEntryByID(LastID).getOffset() >= SLocOffset)
+ GreaterIndex = (-LastID - 2) + 1;
+ else
+ LessIndex = -LastID - 2;
+ }
// First do a linear scan from the last lookup position, if possible.
- unsigned I;
- int LastID = LastFileIDLookup.ID;
- if (LastID >= 0 || getLoadedSLocEntryByID(LastID).getOffset() < SLocOffset)
- I = 0;
- else
- I = (-LastID - 2) + 1;
-
unsigned NumProbes;
bool Invalid = false;
- for (NumProbes = 0; NumProbes < 8; ++NumProbes, ++I) {
+ for (NumProbes = 0; NumProbes < 8; ++NumProbes, ++GreaterIndex) {
// Make sure the entry is loaded!
- const SrcMgr::SLocEntry &E = getLoadedSLocEntry(I, &Invalid);
+ const SrcMgr::SLocEntry &E = getLoadedSLocEntry(GreaterIndex, &Invalid);
if (Invalid)
return FileID(); // invalid entry.
if (E.getOffset() <= SLocOffset) {
- FileID Res = FileID::get(-int(I) - 2);
+ FileID Res = FileID::get(-int(GreaterIndex) - 2);
LastFileIDLookup = Res;
NumLinearScans += NumProbes + 1;
return Res;
}
}
- // Linear scan failed. Do the binary search. Note the reverse sorting of the
- // table: GreaterIndex is the one where the offset is greater, which is
- // actually a lower index!
- unsigned GreaterIndex = I;
- unsigned LessIndex = LoadedSLocEntryTable.size();
+ // Linear scan failed. Do the binary search.
NumProbes = 0;
while (true) {
++NumProbes;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
