On Jan 6, 2008, at 5:30 PM, Gordon Henriksen wrote: Hi Gordon,
I don't know much about the GC work. But it is really necessary for AsmPrinter to use any analysis info? That seems odd to me. Evan > Author: gordon > > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/include/llvm/CodeGen/AsmPrinter.h (original) > +++ llvm/trunk/include/llvm/CodeGen/AsmPrinter.h Sun Jan 6 19:30:38 > 2008 > @@ -118,6 +118,10 @@ > std::string getCurrentFunctionEHName(const MachineFunction *MF); > > protected: > + /// getAnalysisUsage - Record analysis usage. > + /// > + void getAnalysisUsage(AnalysisUsage &AU) const; > + > /// doInitialization - Set up the AsmPrinter when we are working > on a new > /// module. If your pass overrides this, it must make sure to > explicitly > /// call this implementation. > > Modified: llvm/trunk/lib/CodeGen/AsmPrinter.cpp > URL: > http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter.cpp?rev=45669&r1=45668&r2=45669&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/CodeGen/AsmPrinter.cpp (original) > +++ llvm/trunk/lib/CodeGen/AsmPrinter.cpp Sun Jan 6 19:30:38 2008 > @@ -16,6 +16,8 @@ > #include "llvm/DerivedTypes.h" > #include "llvm/Constants.h" > #include "llvm/Module.h" > +#include "llvm/CodeGen/Collector.h" > +#include "llvm/CodeGen/CollectorMetadata.h" > #include "llvm/CodeGen/MachineConstantPool.h" > #include "llvm/CodeGen/MachineJumpTableInfo.h" > #include "llvm/CodeGen/MachineModuleInfo.h" > @@ -94,9 +96,20 @@ > } > > > +void AsmPrinter::getAnalysisUsage(AnalysisUsage &AU) const { > + MachineFunctionPass::getAnalysisUsage(AU); > + AU.addRequired<CollectorModuleMetadata>(); > +} > + > bool AsmPrinter::doInitialization(Module &M) { > Mang = new Mangler(M, TAI->getGlobalPrefix()); > > + CollectorModuleMetadata *CMM = > getAnalysisToUpdate<CollectorModuleMetadata>(); > + assert(CMM && "AsmPrinter didn't require > CollectorModuleMetadata?"); > + for (CollectorModuleMetadata::iterator I = CMM->begin(), > + E = CMM->end(); I != E; ++I) > + (*I)->beginAssembly(O, *this, *TAI); > + > if (!M.getModuleInlineAsm().empty()) > O << TAI->getCommentString() << " Start of file scope inline > assembly\n" > << M.getModuleInlineAsm() > @@ -158,6 +171,12 @@ > } > } > > + CollectorModuleMetadata *CMM = > getAnalysisToUpdate<CollectorModuleMetadata>(); > + assert(CMM && "AsmPrinter didn't require > CollectorModuleMetadata?"); > + for (CollectorModuleMetadata::iterator I = CMM->end(), > + E = CMM->begin(); I != E; ) > + (*--I)->finishAssembly(O, *this, *TAI); > + > delete Mang; Mang = 0; > return false; > } > > Modified: llvm/trunk/lib/CodeGen/README.txt > URL: > http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/README.txt?rev=45669&r1=45668&r2=45669&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/CodeGen/README.txt (original) > +++ llvm/trunk/lib/CodeGen/README.txt Sun Jan 6 19:30:38 2008 > @@ -187,3 +187,8 @@ > assembly. > > // > = > = > = > --------------------------------------------------------------------- > ===// > + > +It would be good to detect collector/target compatibility instead > of silently > +doing the wrong thing. > + > +// > = > = > = > --------------------------------------------------------------------- > ===// > > Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp > URL: > http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=45669&r1=45668&r2=45669&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp > (original) > +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Sun > Jan 6 19:30:38 2008 > @@ -26,6 +26,7 @@ > #include "llvm/Intrinsics.h" > #include "llvm/IntrinsicInst.h" > #include "llvm/ParameterAttributes.h" > +#include "llvm/CodeGen/Collector.h" > #include "llvm/CodeGen/MachineFunction.h" > #include "llvm/CodeGen/MachineFrameInfo.h" > #include "llvm/CodeGen/MachineInstrBuilder.h" > @@ -426,12 +427,16 @@ > /// FuncInfo - Information about the function as a whole. > /// > FunctionLoweringInfo &FuncInfo; > + > + /// GCI - Garbage collection metadata for the function. > + CollectorMetadata *GCI; > > SelectionDAGLowering(SelectionDAG &dag, TargetLowering &tli, > AliasAnalysis &aa, > - FunctionLoweringInfo &funcinfo) > + FunctionLoweringInfo &funcinfo, > + CollectorMetadata *gci) > : TLI(tli), DAG(dag), TD(DAG.getTarget().getTargetData()), AA(aa), > - FuncInfo(funcinfo) { > + FuncInfo(funcinfo), GCI(gci) { > } > > /// getRoot - Return the current virtual root of the Selection DAG. > @@ -2907,6 +2912,22 @@ > DAG.setRoot(Tmp.getValue(1)); > return 0; > } > + > + case Intrinsic::gcroot: > + if (GCI) { > + Value *Alloca = I.getOperand(1); > + Constant *TypeMap = cast<Constant>(I.getOperand(2)); > + > + FrameIndexSDNode *FI = > cast<FrameIndexSDNode>(getValue(Alloca).Val); > + GCI->addStackRoot(FI->getIndex(), TypeMap); > + } > + return 0; > + > + case Intrinsic::gcread: > + case Intrinsic::gcwrite: > + assert(0 && "Collector failed to lower gcread/gcwrite > intrinsics!"); > + return 0; > + > case Intrinsic::flt_rounds: { > setValue(&I, DAG.getNode(ISD::FLT_ROUNDS, MVT::i32)); > return 0; > @@ -4368,6 +4389,7 @@ > > void SelectionDAGISel::getAnalysisUsage(AnalysisUsage &AU) const { > AU.addRequired<AliasAnalysis>(); > + AU.addRequired<CollectorModuleMetadata>(); > AU.setPreservesAll(); > } > > @@ -4378,6 +4400,10 @@ > AA = &getAnalysis<AliasAnalysis>(); > > MachineFunction &MF = MachineFunction::construct(&Fn, > TLI.getTargetMachine()); > + if (MF.getFunction()->hasCollector()) > + GCI = > &getAnalysis<CollectorModuleMetadata>().get(*MF.getFunction()); > + else > + GCI = 0; > RegInfo = &MF.getRegInfo(); > DOUT << "\n\n\n=== " << Fn.getName() << "\n"; > > @@ -4515,7 +4541,7 @@ > void SelectionDAGISel::BuildSelectionDAG(SelectionDAG &DAG, > BasicBlock *LLVMBB, > std::vector<std::pair<MachineInstr*, unsigned> > > &PHINodesToUpdate, > FunctionLoweringInfo > &FuncInfo) { > - SelectionDAGLowering SDL(DAG, TLI, *AA, FuncInfo); > + SelectionDAGLowering SDL(DAG, TLI, *AA, FuncInfo, GCI); > > std::vector<SDOperand> UnorderedChains; > > @@ -4774,7 +4800,7 @@ > if (!BitTestCases[i].Emitted) { > SelectionDAG HSDAG(TLI, MF, > getAnalysisToUpdate<MachineModuleInfo>()); > CurDAG = &HSDAG; > - SelectionDAGLowering HSDL(HSDAG, TLI, *AA, FuncInfo); > + SelectionDAGLowering HSDL(HSDAG, TLI, *AA, FuncInfo, GCI); > // Set the current basic block to the mbb we wish to insert > the code into > BB = BitTestCases[i].Parent; > HSDL.setCurrentBasicBlock(BB); > @@ -4787,7 +4813,7 @@ > for (unsigned j = 0, ej = BitTestCases[i].Cases.size(); j != ej; > ++j) { > SelectionDAG BSDAG(TLI, MF, > getAnalysisToUpdate<MachineModuleInfo>()); > CurDAG = &BSDAG; > - SelectionDAGLowering BSDL(BSDAG, TLI, *AA, FuncInfo); > + SelectionDAGLowering BSDL(BSDAG, TLI, *AA, FuncInfo, GCI); > // Set the current basic block to the mbb we wish to insert > the code into > BB = BitTestCases[i].Cases[j].ThisBB; > BSDL.setCurrentBasicBlock(BB); > @@ -4844,7 +4870,7 @@ > if (!JTCases[i].first.Emitted) { > SelectionDAG HSDAG(TLI, MF, > getAnalysisToUpdate<MachineModuleInfo>()); > CurDAG = &HSDAG; > - SelectionDAGLowering HSDL(HSDAG, TLI, *AA, FuncInfo); > + SelectionDAGLowering HSDL(HSDAG, TLI, *AA, FuncInfo, GCI); > // Set the current basic block to the mbb we wish to insert > the code into > BB = JTCases[i].first.HeaderBB; > HSDL.setCurrentBasicBlock(BB); > @@ -4856,7 +4882,7 @@ > > SelectionDAG JSDAG(TLI, MF, > getAnalysisToUpdate<MachineModuleInfo>()); > CurDAG = &JSDAG; > - SelectionDAGLowering JSDL(JSDAG, TLI, *AA, FuncInfo); > + SelectionDAGLowering JSDL(JSDAG, TLI, *AA, FuncInfo, GCI); > // Set the current basic block to the mbb we wish to insert the > code into > BB = JTCases[i].second.MBB; > JSDL.setCurrentBasicBlock(BB); > @@ -4904,7 +4930,7 @@ > for (unsigned i = 0, e = SwitchCases.size(); i != e; ++i) { > SelectionDAG SDAG(TLI, MF, > getAnalysisToUpdate<MachineModuleInfo>()); > CurDAG = &SDAG; > - SelectionDAGLowering SDL(SDAG, TLI, *AA, FuncInfo); > + SelectionDAGLowering SDL(SDAG, TLI, *AA, FuncInfo, GCI); > > // Set the current basic block to the mbb we wish to insert the > code into > BB = SwitchCases[i].ThisBB; > > Modified: llvm/trunk/lib/Target/CBackend/CBackend.cpp > URL: > http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/CBackend/CBackend.cpp?rev=45669&r1=45668&r2=45669&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/Target/CBackend/CBackend.cpp (original) > +++ llvm/trunk/lib/Target/CBackend/CBackend.cpp Sun Jan 6 19:30:38 > 2008 > @@ -28,6 +28,7 @@ > #include "llvm/Analysis/ConstantsScanner.h" > #include "llvm/Analysis/FindUsedTypes.h" > #include "llvm/Analysis/LoopInfo.h" > +#include "llvm/CodeGen/Passes.h" > #include "llvm/CodeGen/IntrinsicLowering.h" > #include "llvm/Transforms/Scalar.h" > #include "llvm/Target/TargetMachineRegistry.h" > @@ -2946,11 +2947,12 @@ > bool Fast) { > if (FileType != TargetMachine::AssemblyFile) return true; > > - PM.add(createLowerGCPass()); > + PM.add(createGCLoweringPass()); > PM.add(createLowerAllocationsPass(true)); > PM.add(createLowerInvokePass()); > PM.add(createCFGSimplificationPass()); // clean up after lower > invoke. > PM.add(new CBackendNameAllUsedStructsAndMergeFunctions()); > PM.add(new CWriter(o)); > + PM.add(createCollectorMetadataDeleter()); > return false; > } > > Modified: llvm/trunk/lib/Target/MSIL/MSILWriter.cpp > URL: > http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSIL/MSILWriter.cpp?rev=45669&r1=45668&r2=45669&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/lib/Target/MSIL/MSILWriter.cpp (original) > +++ llvm/trunk/lib/Target/MSIL/MSILWriter.cpp Sun Jan 6 19:30:38 2008 > @@ -24,6 +24,7 @@ > #include "llvm/Support/MathExtras.h" > #include "llvm/Transforms/Scalar.h" > #include "llvm/ADT/StringExtras.h" > +#include "llvm/CodeGen/Passes.h" > > namespace { > // TargetMachine for the MSIL > @@ -1647,12 +1648,13 @@ > { > if (FileType != TargetMachine::AssemblyFile) return true; > MSILWriter* Writer = new MSILWriter(o); > - PM.add(createLowerGCPass()); > + PM.add(createGCLoweringPass()); > PM.add(createLowerAllocationsPass(true)); > // FIXME: Handle switch trougth native IL instruction "switch" > PM.add(createLowerSwitchPass()); > PM.add(createCFGSimplificationPass()); > PM.add(new MSILModule(Writer->UsedTypes,Writer->TD)); > PM.add(Writer); > + PM.add(createCollectorMetadataDeleter()); > return false; > } > > > _______________________________________________ > llvm-commits mailing list > llvm-commits@cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
