6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-13 04:38:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix another problem where LSR was being nondeterminstic. Also remove elements

Browse Source 
from the end of a vector instead of the beginning


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23697 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2005-10-11 18:30:57 +00:00
parent 4b43159c55
commit 7b445c521b
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Transforms/Scalar/LoopStrengthReduce.cpp
View File

@ -474,10 +474,6 @@ namespace {
void RewriteInstructionToUseNewBase(const SCEVHandle &NewBase, void RewriteInstructionToUseNewBase(const SCEVHandle &NewBase,
SCEVExpander &Rewriter, Loop *L, SCEVExpander &Rewriter, Loop *L,
Pass *P); Pass *P);
// Sort by the Base field.
bool operator<(const BasedUser &BU) const { return Base < BU.Base; }
void dump() const; void dump() const;
}; };
} }
@ -878,9 +874,8 @@ void LoopStrengthReduce::StrengthReduceStridedIVUsers(const SCEVHandle &Stride,
// Sort by the base value, so that all IVs with identical bases are next to // Sort by the base value, so that all IVs with identical bases are next to
// each other. // each other.
std::sort(UsersToProcess.begin(), UsersToProcess.end());
while (!UsersToProcess.empty()) { while (!UsersToProcess.empty()) {
SCEVHandle Base = UsersToProcess.front().Base; SCEVHandle Base = UsersToProcess.back().Base;
DEBUG(std::cerr << " INSERTING code for BASE = " << *Base << ":\n"); DEBUG(std::cerr << " INSERTING code for BASE = " << *Base << ":\n");
@ -901,8 +896,9 @@ void LoopStrengthReduce::StrengthReduceStridedIVUsers(const SCEVHandle &Stride,
// Emit the code to add the immediate offset to the Phi value, just before // Emit the code to add the immediate offset to the Phi value, just before
// the instructions that we identified as using this stride and base. // the instructions that we identified as using this stride and base.
while (!UsersToProcess.empty() && UsersToProcess.front().Base == Base) { unsigned ScanPos = 0;
BasedUser &User = UsersToProcess.front(); do {
BasedUser &User = UsersToProcess.back();
// If this instruction wants to use the post-incremented value, move it // If this instruction wants to use the post-incremented value, move it
// after the post-inc and use its value instead of the PHI. // after the post-inc and use its value instead of the PHI.
@ -933,9 +929,19 @@ void LoopStrengthReduce::StrengthReduceStridedIVUsers(const SCEVHandle &Stride,
// if we just replaced the last use of that value. // if we just replaced the last use of that value.
DeadInsts.insert(cast<Instruction>(User.OperandValToReplace)); DeadInsts.insert(cast<Instruction>(User.OperandValToReplace));
UsersToProcess.erase(UsersToProcess.begin()); UsersToProcess.pop_back();
++NumReduced; ++NumReduced;
// If there are any more users to process with the same base, move one of
// them to the end of the list so that we will process it.
if (!UsersToProcess.empty()) {
for (unsigned e = UsersToProcess.size(); ScanPos != e; ++ScanPos)
if (UsersToProcess[ScanPos].Base == Base) {
std::swap(UsersToProcess[ScanPos], UsersToProcess.back());
break;
} }
}
} while (!UsersToProcess.empty() && UsersToProcess.back().Base == Base);
// TODO: Next, find out which base index is the most common, pull it out. // TODO: Next, find out which base index is the most common, pull it out.
} }