Merging constants can cause further room for improvement. Iterate until

we converge


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10618 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2003-12-28 07:19:08 +00:00
parent 6cdc42b3d1
commit 0898c78a52

View File

@@ -44,9 +44,16 @@ bool ConstantMerge::run(Module &M) {
// Replacements - This vector contains a list of replacements to perform. // Replacements - This vector contains a list of replacements to perform.
std::vector<std::pair<GlobalVariable*, GlobalVariable*> > Replacements; std::vector<std::pair<GlobalVariable*, GlobalVariable*> > Replacements;
bool MadeChange = false;
// Iterate constant merging while we are still making progress. Merging two
// constants together may allow us to merge other constants together if the
// second level constants have initializers which point to the globals that
// were just merged.
while (1) {
// First pass: identify all globals that can be merged together, filling in // First pass: identify all globals that can be merged together, filling in
// the Replacements vector. We cannot do the replacement in this pass because // the Replacements vector. We cannot do the replacement in this pass
// doing so may cause initializers of other globals to be rewritten, // because doing so may cause initializers of other globals to be rewritten,
// invalidating the Constant* pointers in CMap. // invalidating the Constant* pointers in CMap.
// //
for (Module::giterator GV = M.gbegin(), E = M.gend(); GV != E; ++GV) for (Module::giterator GV = M.gbegin(), E = M.gend(); GV != E; ++GV)
@@ -60,20 +67,22 @@ bool ConstantMerge::run(Module &M) {
if (I == CMap.end()) { // Nope, add it to the map if (I == CMap.end()) { // Nope, add it to the map
CMap.insert(I, std::make_pair(Init, GV)); CMap.insert(I, std::make_pair(Init, GV));
} else if (GV->hasInternalLinkage()) { // Yup, this is a duplicate! } else if (GV->hasInternalLinkage()) { // Yup, this is a duplicate!
// Make all uses of the duplicate constant use the canonical version... // Make all uses of the duplicate constant use the canonical version.
Replacements.push_back(std::make_pair(GV, I->second)); Replacements.push_back(std::make_pair(GV, I->second));
} else if (I->second->hasInternalLinkage()) { } else if (I->second->hasInternalLinkage()) {
// Make all uses of the duplicate constant use the canonical version... // Make all uses of the duplicate constant use the canonical version.
Replacements.push_back(std::make_pair(I->second, GV)); Replacements.push_back(std::make_pair(I->second, GV));
I->second = GV; I->second = GV;
} }
} }
if (Replacements.empty()) return false; if (Replacements.empty())
return MadeChange;
CMap.clear(); CMap.clear();
// Now that we have figured out which replacements must be made, do them all // Now that we have figured out which replacements must be made, do them all
// now. This avoid invalidating the pointers in CMap, which are unneeded now. // now. This avoid invalidating the pointers in CMap, which are unneeded
// now.
for (unsigned i = 0, e = Replacements.size(); i != e; ++i) { for (unsigned i = 0, e = Replacements.size(); i != e; ++i) {
// Eliminate any uses of the dead global... // Eliminate any uses of the dead global...
Replacements[i].first->replaceAllUsesWith(Replacements[i].second); Replacements[i].first->replaceAllUsesWith(Replacements[i].second);
@@ -83,5 +92,6 @@ bool ConstantMerge::run(Module &M) {
} }
NumMerged += Replacements.size(); NumMerged += Replacements.size();
return true; Replacements.clear();
}
} }