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

Remove explicit passing of SCC's around as objects.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8267 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2003-08-31 19:46:48 +00:00
parent 0c6a271d91
commit fe8d8806f7
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Analysis/MemoryDepAnalysis.h
View File

@ -15,7 +15,6 @@
#include "llvm/Analysis/DependenceGraph.h" #include "llvm/Analysis/DependenceGraph.h"
#include "llvm/Pass.h" #include "llvm/Pass.h"
#include "Support/TarjanSCCIterator.h"
#include "Support/hash_map" #include "Support/hash_map"
class ModRefTable; class ModRefTable;
@ -43,7 +42,8 @@ class MemoryDepAnalysis : public Pass {
const FunctionModRefInfo* funcModRef; const FunctionModRefInfo* funcModRef;
/// Internal routine that processes each SCC of the CFG. /// Internal routine that processes each SCC of the CFG.
void ProcessSCC(SCC<Function*>& S, ModRefTable& ModRefAfter); void ProcessSCC(std::vector<BasicBlock*> &SCC, ModRefTable& ModRefAfter,
bool HasLoop);
friend class PgmDependenceGraph; friend class PgmDependenceGraph;

11
lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
View File

@ -271,14 +271,12 @@ void MemoryDepAnalysis::getAnalysisUsage(AnalysisUsage &AU) const {
/// } /// }
/// ///
/// ///
void MemoryDepAnalysis::ProcessSCC(SCC<Function*>& S, void MemoryDepAnalysis::ProcessSCC(std::vector<BasicBlock*> &S,
ModRefTable& ModRefAfter) { ModRefTable& ModRefAfter, bool hasLoop) {
ModRefTable ModRefCurrent; ModRefTable ModRefCurrent;
ModRefTable::ModRefMap& mapCurrent = ModRefCurrent.modRefMap; ModRefTable::ModRefMap& mapCurrent = ModRefCurrent.modRefMap;
ModRefTable::ModRefMap& mapAfter = ModRefAfter.modRefMap; ModRefTable::ModRefMap& mapAfter = ModRefAfter.modRefMap;
bool hasLoop = S.HasLoop();
// Builder class fills out a ModRefTable one instruction at a time. // Builder class fills out a ModRefTable one instruction at a time.
// To use it, we just invoke it's visit function for each basic block: // To use it, we just invoke it's visit function for each basic block:
// //
@ -290,7 +288,8 @@ void MemoryDepAnalysis::ProcessSCC(SCC<Function*>& S,
// : Add I to ModRefCurrent.users if it uses any node // : Add I to ModRefCurrent.users if it uses any node
// //
ModRefInfoBuilder builder(*funcGraph, *funcModRef, ModRefCurrent); ModRefInfoBuilder builder(*funcGraph, *funcModRef, ModRefCurrent);
for (SCC<Function*>::iterator BI=S.begin(), BE=S.end(); BI != BE; ++BI) for (std::vector<BasicBlock*>::iterator BI = S.begin(), BE = S.end();
BI != BE; ++BI)
// Note: BBs in the SCC<> created by TarjanSCCIterator are in postorder. // Note: BBs in the SCC<> created by TarjanSCCIterator are in postorder.
for (BasicBlock::reverse_iterator II=(*BI)->rbegin(), IE=(*BI)->rend(); for (BasicBlock::reverse_iterator II=(*BI)->rbegin(), IE=(*BI)->rend();
II != IE; ++II) II != IE; ++II)
@ -442,7 +441,7 @@ bool MemoryDepAnalysis::runOnFunction(Function &F) {
SCC<Function*>* nextSCC; SCC<Function*>* nextSCC;
for (TarjanSCC_iterator<Function*> I = tarj_begin(&F), E = tarj_end(&F); for (TarjanSCC_iterator<Function*> I = tarj_begin(&F), E = tarj_end(&F);
I != E; ++I) I != E; ++I)
ProcessSCC(*I, ModRefAfter); ProcessSCC(*I, ModRefAfter, (*I).HasLoop());
return true; return true;
} }

11
lib/Analysis/IPA/MemoryDepAnalysis.cpp
View File

@ -271,14 +271,12 @@ void MemoryDepAnalysis::getAnalysisUsage(AnalysisUsage &AU) const {
/// } /// }
/// ///
/// ///
void MemoryDepAnalysis::ProcessSCC(SCC<Function*>& S, void MemoryDepAnalysis::ProcessSCC(std::vector<BasicBlock*> &S,
ModRefTable& ModRefAfter) { ModRefTable& ModRefAfter, bool hasLoop) {
ModRefTable ModRefCurrent; ModRefTable ModRefCurrent;
ModRefTable::ModRefMap& mapCurrent = ModRefCurrent.modRefMap; ModRefTable::ModRefMap& mapCurrent = ModRefCurrent.modRefMap;
ModRefTable::ModRefMap& mapAfter = ModRefAfter.modRefMap; ModRefTable::ModRefMap& mapAfter = ModRefAfter.modRefMap;
bool hasLoop = S.HasLoop();
// Builder class fills out a ModRefTable one instruction at a time. // Builder class fills out a ModRefTable one instruction at a time.
// To use it, we just invoke it's visit function for each basic block: // To use it, we just invoke it's visit function for each basic block:
// //
@ -290,7 +288,8 @@ void MemoryDepAnalysis::ProcessSCC(SCC<Function*>& S,
// : Add I to ModRefCurrent.users if it uses any node // : Add I to ModRefCurrent.users if it uses any node
// //
ModRefInfoBuilder builder(*funcGraph, *funcModRef, ModRefCurrent); ModRefInfoBuilder builder(*funcGraph, *funcModRef, ModRefCurrent);
for (SCC<Function*>::iterator BI=S.begin(), BE=S.end(); BI != BE; ++BI) for (std::vector<BasicBlock*>::iterator BI = S.begin(), BE = S.end();
BI != BE; ++BI)
// Note: BBs in the SCC<> created by TarjanSCCIterator are in postorder. // Note: BBs in the SCC<> created by TarjanSCCIterator are in postorder.
for (BasicBlock::reverse_iterator II=(*BI)->rbegin(), IE=(*BI)->rend(); for (BasicBlock::reverse_iterator II=(*BI)->rbegin(), IE=(*BI)->rend();
II != IE; ++II) II != IE; ++II)
@ -442,7 +441,7 @@ bool MemoryDepAnalysis::runOnFunction(Function &F) {
SCC<Function*>* nextSCC; SCC<Function*>* nextSCC;
for (TarjanSCC_iterator<Function*> I = tarj_begin(&F), E = tarj_end(&F); for (TarjanSCC_iterator<Function*> I = tarj_begin(&F), E = tarj_end(&F);
I != E; ++I) I != E; ++I)
ProcessSCC(*I, ModRefAfter); ProcessSCC(*I, ModRefAfter, (*I).HasLoop());
return true; return true;
} }