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

[CSOptimizer] Record best scores for each disjunction and use them in selectDisjunction

Browse Source 
If there is no single best disjunction use best scores first
to determine minimum with fallback to favored and/or active
choice counts.
This commit is contained in:
Pavel Yaskevich
2024-09-07 16:49:04 -07:00
parent cf05405eae
commit 3819ddfb40
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/Sema/CSOptimizer.cpp
View File

@@ -102,7 +102,8 @@ static bool isOverloadedDeclRef(Constraint *disjunction) {
/// favored choices in the current context.
static Constraint *determineBestChoicesInContext(
ConstraintSystem &cs, SmallVectorImpl<Constraint *> &disjunctions,
llvm::DenseMap<Constraint *, llvm::TinyPtrVector<Constraint *>>
llvm::DenseMap<Constraint *,
std::pair<double, llvm::TinyPtrVector<Constraint *>>>
&favorings) {
double bestOverallScore = 0.0;
// Tops scores across all of the disjunctions.
@@ -617,11 +618,10 @@ static Constraint *determineBestChoicesInContext(
}
for (auto &entry : disjunctionScores) {
if (entry.second != bestOverallScore)
continue;
TinyPtrVector<Constraint *> favoredChoices;
for (auto *choice : favoredChoicesPerDisjunction[entry.first])
favorings[entry.first].push_back(choice);
favoredChoices.push_back(choice);
favorings[entry.first] = std::make_pair(entry.second, favoredChoices);
}
if (bestOverallScore == 0)
@@ -710,10 +710,12 @@ ConstraintSystem::selectDisjunction() {
if (auto *disjunction = selectBestBindingDisjunction(*this, disjunctions))
return std::make_pair(disjunction, llvm::TinyPtrVector<Constraint *>());
llvm::DenseMap<Constraint *, llvm::TinyPtrVector<Constraint *>> favorings;
llvm::DenseMap<Constraint *,
std::pair</*bestScore=*/double, llvm::TinyPtrVector<Constraint *>>>
favorings;
if (auto *bestDisjunction =
determineBestChoicesInContext(*this, disjunctions, favorings))
return std::make_pair(bestDisjunction, favorings[bestDisjunction]);
return std::make_pair(bestDisjunction, favorings[bestDisjunction].second);
// Pick the disjunction with the smallest number of favored, then active
// choices.
@@ -722,21 +724,29 @@ ConstraintSystem::selectDisjunction() {
[&](Constraint *first, Constraint *second) -> bool {
unsigned firstActive = first->countActiveNestedConstraints();
unsigned secondActive = second->countActiveNestedConstraints();
unsigned firstFavored = favorings[first].size();
unsigned secondFavored = favorings[second].size();
if (firstFavored == secondFavored) {
auto &[firstScore, firstFavoredChoices] = favorings[first];
auto &[secondScore, secondFavoredChoices] = favorings[second];
if (firstScore > secondScore)
return true;
unsigned numFirstFavored = firstFavoredChoices.size();
unsigned numSecondFavored = secondFavoredChoices.size();
if (numFirstFavored == numSecondFavored) {
if (firstActive != secondActive)
return firstActive < secondActive;
}
firstFavored = firstFavored ? firstFavored : firstActive;
secondFavored = secondFavored ? secondFavored : secondActive;
return firstFavored < secondFavored;
numFirstFavored = numFirstFavored ? numFirstFavored : firstActive;
numSecondFavored = numSecondFavored ? numSecondFavored : secondActive;
return numFirstFavored < numSecondFavored;
});
if (bestDisjunction != disjunctions.end())
return std::make_pair(*bestDisjunction, favorings[*bestDisjunction]);
return std::make_pair(*bestDisjunction, favorings[*bestDisjunction].second);
return std::nullopt;
}