Commit 850657a4 authored by Matt Arsenault's avatar Matt Arsenault
Browse files

NVPTX: Move InferAddressSpaces to generic code 

llvm-svn: 293579
parent 342257ea

llvm/include/llvm/InitializePasses.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ void initializeIfConverterPass(PassRegistry&); 
void initializeImplicitNullChecksPass(PassRegistry&);

void initializeIndVarSimplifyLegacyPassPass(PassRegistry&);

void initializeInductiveRangeCheckEliminationPass(PassRegistry&);

void initializeInferAddressSpacesPass(PassRegistry&);

void initializeInferFunctionAttrsLegacyPassPass(PassRegistry&);

void initializeInlineCostAnalysisPass(PassRegistry&);

void initializeInstCountPass(PassRegistry&);

llvm/include/llvm/Transforms/Scalar.h

+9 −0
Original line number Diff line number Diff line
@@ -410,6 +410,15 @@ Pass *createLowerGuardIntrinsicPass(); 
//

Pass *createCorrelatedValuePropagationPass();



//===----------------------------------------------------------------------===//

//

// InferAddressSpaces - Modify users of addrspacecast instructions with values

// in the source address space if using the destination address space is slower

// on the target.

//

FunctionPass *createInferAddressSpacesPass();

extern char &InferAddressSpacesID;



//===----------------------------------------------------------------------===//

//

// InstructionSimplifier - Remove redundant instructions.

llvm/lib/Target/NVPTX/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ set(NVPTXCodeGen_sources 
  NVPTXISelDAGToDAG.cpp

  NVPTXISelLowering.cpp

  NVPTXImageOptimizer.cpp

  NVPTXInferAddressSpaces.cpp

  NVPTXInstrInfo.cpp

  NVPTXLowerAggrCopies.cpp

  NVPTXLowerArgs.cpp

llvm/lib/Target/NVPTX/NVPTX.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ FunctionPass *createNVPTXISelDag(NVPTXTargetMachine &TM, 
                                 llvm::CodeGenOpt::Level OptLevel);

ModulePass *createNVPTXAssignValidGlobalNamesPass();

ModulePass *createGenericToNVVMPass();

FunctionPass *createNVPTXInferAddressSpacesPass();

FunctionPass *createNVVMIntrRangePass(unsigned int SmVersion);

FunctionPass *createNVVMReflectPass();

MachineFunctionPass *createNVPTXPrologEpilogPass();

llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp

+1 −3
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ void initializeNVVMReflectPass(PassRegistry&); 
void initializeGenericToNVVMPass(PassRegistry&);

void initializeNVPTXAllocaHoistingPass(PassRegistry &);

void initializeNVPTXAssignValidGlobalNamesPass(PassRegistry&);

void initializeNVPTXInferAddressSpacesPass(PassRegistry &);

void initializeNVPTXLowerAggrCopiesPass(PassRegistry &);

void initializeNVPTXLowerArgsPass(PassRegistry &);

void initializeNVPTXLowerAllocaPass(PassRegistry &);
@@ -71,7 +70,6 @@ extern "C" void LLVMInitializeNVPTXTarget() { 
  initializeGenericToNVVMPass(PR);

  initializeNVPTXAllocaHoistingPass(PR);

  initializeNVPTXAssignValidGlobalNamesPass(PR);

  initializeNVPTXInferAddressSpacesPass(PR);

  initializeNVPTXLowerArgsPass(PR);

  initializeNVPTXLowerAllocaPass(PR);

  initializeNVPTXLowerAggrCopiesPass(PR);
@@ -195,7 +193,7 @@ void NVPTXPassConfig::addAddressSpaceInferencePasses() { 
  // be eliminated by SROA.

  addPass(createSROAPass());

  addPass(createNVPTXLowerAllocaPass());

  addPass(createNVPTXInferAddressSpacesPass());

  addPass(createInferAddressSpacesPass());

}



void NVPTXPassConfig::addStraightLineScalarOptimizationPasses() {