X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FCodeGen%2FGCMetadata.cpp;h=ef5247c2edff387b5ab51b6605226ab1dd6db228;hb=7c8397081c3d101fe467e8375601b091056465e0;hp=c02a73b70804f0a98a63c75f499db5342cf85335;hpb=5a29c9eed157af51a8d338b5a225b146881819e8;p=oota-llvm.git diff --git a/lib/CodeGen/GCMetadata.cpp b/lib/CodeGen/GCMetadata.cpp index c02a73b7080..ef5247c2edf 100644 --- a/lib/CodeGen/GCMetadata.cpp +++ b/lib/CodeGen/GCMetadata.cpp @@ -1,4 +1,4 @@ -//===-- CollectorMetadata.cpp - Garbage collector metadata ----------------===// +//===-- GCMetadata.cpp - Garbage collector metadata -----------------------===// // // The LLVM Compiler Infrastructure // @@ -7,42 +7,31 @@ // //===----------------------------------------------------------------------===// // -// This file implements the CollectorMetadata and CollectorModuleMetadata -// classes. +// This file implements the GCFunctionInfo class and GCModuleInfo pass. // //===----------------------------------------------------------------------===// #include "llvm/CodeGen/GCMetadata.h" #include "llvm/CodeGen/GCStrategy.h" -#include "llvm/CodeGen/GCs.h" #include "llvm/CodeGen/MachineFrameInfo.h" -#include "llvm/Pass.h" #include "llvm/CodeGen/Passes.h" -#include "llvm/Function.h" -#include "llvm/Support/Compiler.h" - +#include "llvm/IR/Function.h" +#include "llvm/MC/MCSymbol.h" +#include "llvm/Pass.h" +#include "llvm/Support/Debug.h" +#include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/raw_ostream.h" using namespace llvm; namespace { - class VISIBILITY_HIDDEN Printer : public FunctionPass { - static char ID; - std::ostream &OS; - - public: - explicit Printer(std::ostream &OS = *cerr); - - const char *getPassName() const; - void getAnalysisUsage(AnalysisUsage &AU) const; - - bool runOnFunction(Function &F); - }; - - class VISIBILITY_HIDDEN Deleter : public FunctionPass { + class Printer : public FunctionPass { static char ID; + raw_ostream &OS; public: - Deleter(); + explicit Printer(raw_ostream &OS) : FunctionPass(ID), OS(OS) {} + const char *getPassName() const; void getAnalysisUsage(AnalysisUsage &AU) const; @@ -50,85 +39,85 @@ namespace { bool runOnFunction(Function &F); bool doFinalization(Module &M); }; - + } -static RegisterPass -X("collector-metadata", "Create Garbage Collector Module Metadata"); +INITIALIZE_PASS(GCModuleInfo, "collector-metadata", + "Create Garbage Collector Module Metadata", false, false) // ----------------------------------------------------------------------------- -CollectorMetadata::CollectorMetadata(const Function &F, Collector &C) - : F(F), C(C), FrameSize(~0LL) {} +GCFunctionInfo::GCFunctionInfo(const Function &F, GCStrategy &S) + : F(F), S(S), FrameSize(~0LL) {} -CollectorMetadata::~CollectorMetadata() {} +GCFunctionInfo::~GCFunctionInfo() {} // ----------------------------------------------------------------------------- -char CollectorModuleMetadata::ID = 0; +char GCModuleInfo::ID = 0; -CollectorModuleMetadata::CollectorModuleMetadata() - : ImmutablePass((intptr_t)&ID) {} +GCModuleInfo::GCModuleInfo() + : ImmutablePass(ID) { + initializeGCModuleInfoPass(*PassRegistry::getPassRegistry()); +} -CollectorModuleMetadata::~CollectorModuleMetadata() { +GCModuleInfo::~GCModuleInfo() { clear(); } -Collector *CollectorModuleMetadata:: -getOrCreateCollector(const Module *M, const std::string &Name) { - const char *Start = Name.c_str(); - - collector_map_type::iterator NMI = NameMap.find(Start, Start + Name.size()); - if (NMI != NameMap.end()) +GCStrategy *GCModuleInfo::getOrCreateStrategy(const Module *M, + const std::string &Name) { + strategy_map_type::iterator NMI = StrategyMap.find(Name); + if (NMI != StrategyMap.end()) return NMI->getValue(); - for (CollectorRegistry::iterator I = CollectorRegistry::begin(), - E = CollectorRegistry::end(); I != E; ++I) { - if (strcmp(Start, I->getName()) == 0) { - Collector *C = I->instantiate(); - C->M = M; - C->Name = Name; - NameMap.GetOrCreateValue(Start, Start + Name.size()).setValue(C); - Collectors.push_back(C); - return C; + for (GCRegistry::iterator I = GCRegistry::begin(), + E = GCRegistry::end(); I != E; ++I) { + if (Name == I->getName()) { + GCStrategy *S = I->instantiate(); + S->M = M; + S->Name = Name; + StrategyMap.GetOrCreateValue(Name).setValue(S); + StrategyList.push_back(S); + return S; } } - - cerr << "unsupported collector: " << Name << "\n"; - abort(); + + dbgs() << "unsupported GC: " << Name << "\n"; + llvm_unreachable(0); } -CollectorMetadata &CollectorModuleMetadata::get(const Function &F) { - assert(F.hasCollector()); - function_map_type::iterator I = Map.find(&F); - if (I != Map.end()) +GCFunctionInfo &GCModuleInfo::getFunctionInfo(const Function &F) { + assert(!F.isDeclaration() && "Can only get GCFunctionInfo for a definition!"); + assert(F.hasGC()); + + finfo_map_type::iterator I = FInfoMap.find(&F); + if (I != FInfoMap.end()) return *I->second; - - Collector *C = getOrCreateCollector(F.getParent(), F.getCollector()); - CollectorMetadata *MD = C->insertFunctionMetadata(F); - Map[&F] = MD; - return *MD; + + GCStrategy *S = getOrCreateStrategy(F.getParent(), F.getGC()); + GCFunctionInfo *GFI = S->insertFunctionInfo(F); + FInfoMap[&F] = GFI; + return *GFI; } -void CollectorModuleMetadata::clear() { - Map.clear(); - NameMap.clear(); +void GCModuleInfo::clear() { + FInfoMap.clear(); + StrategyMap.clear(); for (iterator I = begin(), E = end(); I != E; ++I) delete *I; - Collectors.clear(); + StrategyList.clear(); } // ----------------------------------------------------------------------------- char Printer::ID = 0; -FunctionPass *llvm::createCollectorMetadataPrinter(std::ostream &OS) { +FunctionPass *llvm::createGCInfoPrinter(raw_ostream &OS) { return new Printer(OS); } -Printer::Printer(std::ostream &OS) - : FunctionPass(intptr_t(&ID)), OS(OS) {} const char *Printer::getPassName() const { return "Print Garbage Collector Information"; @@ -137,76 +126,53 @@ const char *Printer::getPassName() const { void Printer::getAnalysisUsage(AnalysisUsage &AU) const { FunctionPass::getAnalysisUsage(AU); AU.setPreservesAll(); - AU.addRequired(); + AU.addRequired(); } static const char *DescKind(GC::PointKind Kind) { switch (Kind) { - default: assert(0 && "Unknown GC point kind"); case GC::Loop: return "loop"; case GC::Return: return "return"; case GC::PreCall: return "pre-call"; case GC::PostCall: return "post-call"; } + llvm_unreachable("Invalid point kind"); } bool Printer::runOnFunction(Function &F) { - if (F.hasCollector()) { - CollectorMetadata *FD = &getAnalysis().get(F); + if (F.hasGC()) return false; + + GCFunctionInfo *FD = &getAnalysis().getFunctionInfo(F); + + OS << "GC roots for " << FD->getFunction().getName() << ":\n"; + for (GCFunctionInfo::roots_iterator RI = FD->roots_begin(), + RE = FD->roots_end(); RI != RE; ++RI) + OS << "\t" << RI->Num << "\t" << RI->StackOffset << "[sp]\n"; + + OS << "GC safe points for " << FD->getFunction().getName() << ":\n"; + for (GCFunctionInfo::iterator PI = FD->begin(), + PE = FD->end(); PI != PE; ++PI) { - OS << "GC roots for " << FD->getFunction().getNameStart() << ":\n"; - for (CollectorMetadata::roots_iterator RI = FD->roots_begin(), - RE = FD->roots_end(); - RI != RE; ++RI) - OS << "\t" << RI->Num << "\t" << RI->StackOffset << "[sp]\n"; + OS << "\t" << PI->Label->getName() << ": " + << DescKind(PI->Kind) << ", live = {"; - OS << "GC safe points for " << FD->getFunction().getNameStart() << ":\n"; - for (CollectorMetadata::iterator PI = FD->begin(), - PE = FD->end(); PI != PE; ++PI) { - - OS << "\tlabel " << PI->Num << ": " << DescKind(PI->Kind) << ", live = {"; - - for (CollectorMetadata::live_iterator RI = FD->live_begin(PI), - RE = FD->live_end(PI);;) { - OS << " " << RI->Num; - if (++RI == RE) - break; - OS << ","; - } - - OS << " }\n"; + for (GCFunctionInfo::live_iterator RI = FD->live_begin(PI), + RE = FD->live_end(PI);;) { + OS << " " << RI->Num; + if (++RI == RE) + break; + OS << ","; } + + OS << " }\n"; } return false; } -// ----------------------------------------------------------------------------- - -char Deleter::ID = 0; - -FunctionPass *llvm::createCollectorMetadataDeleter() { - return new Deleter(); -} - -Deleter::Deleter() : FunctionPass(intptr_t(&ID)) {} - -const char *Deleter::getPassName() const { - return "Delete Garbage Collector Information"; -} - -void Deleter::getAnalysisUsage(AnalysisUsage &AU) const { - AU.setPreservesAll(); - AU.addRequired(); -} - -bool Deleter::runOnFunction(Function &MF) { - return false; -} - -bool Deleter::doFinalization(Module &M) { - CollectorModuleMetadata *CMM = getAnalysisToUpdate(); - assert(CMM && "Deleter didn't require CollectorModuleMetadata?!"); - CMM->clear(); +bool Printer::doFinalization(Module &M) { + GCModuleInfo *GMI = getAnalysisIfAvailable(); + assert(GMI && "Printer didn't require GCModuleInfo?!"); + GMI->clear(); return false; }