forked from OSchip/llvm-project
[reassociate] Switch two std::sort calls into std::stable_sort calls as
their inputs come from std::stable_sort and they are not total orders. I'm not a huge fan of this, but the really bad std::stable_sort is right at the beginning of Reassociate. After we commit to stable-sort based consistent respect of source order, the downstream sorts shouldn't undo that unless they have a total order or they are used in an order-insensitive way. Neither appears to be true for these cases. I don't have particularly good test cases, but this jumped out by inspection when looking for output instability in this pass due to changes in the ordering of std::sort. llvm-svn: 202196
This commit is contained in:
parent
fd0d86c322
commit
7b8e112407
|
@ -1292,7 +1292,7 @@ Value *Reassociate::OptimizeXor(Instruction *I,
|
|||
// the same symbolic value cluster together. For instance, the input operand
|
||||
// sequence ("x | 123", "y & 456", "x & 789") will be sorted into:
|
||||
// ("x | 123", "x & 789", "y & 456").
|
||||
std::sort(OpndPtrs.begin(), OpndPtrs.end(), XorOpnd::PtrSortFunctor());
|
||||
std::stable_sort(OpndPtrs.begin(), OpndPtrs.end(), XorOpnd::PtrSortFunctor());
|
||||
|
||||
// Step 3: Combine adjacent operands
|
||||
XorOpnd *PrevOpnd = 0;
|
||||
|
@ -1618,7 +1618,7 @@ bool Reassociate::collectMultiplyFactors(SmallVectorImpl<ValueEntry> &Ops,
|
|||
// below our mininum of '4'.
|
||||
assert(FactorPowerSum >= 4);
|
||||
|
||||
std::sort(Factors.begin(), Factors.end(), Factor::PowerDescendingSorter());
|
||||
std::stable_sort(Factors.begin(), Factors.end(), Factor::PowerDescendingSorter());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue