Author: tstellar Date: Wed Jun 1 23:32:11 2016 New Revision: 271483 URL: http://llvm.org/viewvc/llvm-project?rev=271483&view=rev Log: Merging r258319:
------------------------------------------------------------------------ r258319 | thomas.stellard | 2016-01-20 07:48:27 -0800 (Wed, 20 Jan 2016) | 8 lines Correctly initialize SIAnnotateControlFlow Reviewers: arsenm Subscribers: arsenm, llvm-commits Differential Revision: http://reviews.llvm.org/D16304 ------------------------------------------------------------------------ Modified: llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.h llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp llvm/branches/release_38/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp Modified: llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.h URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.h?rev=271483&r1=271482&r2=271483&view=diff ============================================================================== --- llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.h (original) +++ llvm/branches/release_38/lib/Target/AMDGPU/AMDGPU.h Wed Jun 1 23:32:11 2016 @@ -86,6 +86,9 @@ extern char &SIFixSGPRLiveRangesID; void initializeAMDGPUAnnotateUniformValuesPass(PassRegistry&); extern char &AMDGPUAnnotateUniformValuesPassID; +void initializeSIAnnotateControlFlowPass(PassRegistry&); +extern char &SIAnnotateControlFlowPassID; + extern Target TheAMDGPUTarget; extern Target TheGCNTarget; Modified: llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp?rev=271483&r1=271482&r2=271483&view=diff ============================================================================== --- llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp (original) +++ llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp Wed Jun 1 23:32:11 2016 @@ -52,6 +52,7 @@ extern "C" void LLVMInitializeAMDGPUTarg initializeSILoadStoreOptimizerPass(*PR); initializeAMDGPUAnnotateKernelFeaturesPass(*PR); initializeAMDGPUAnnotateUniformValuesPass(*PR); + initializeSIAnnotateControlFlowPass(*PR); } static std::unique_ptr<TargetLoweringObjectFile> createTLOF(const Triple &TT) { Modified: llvm/branches/release_38/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp?rev=271483&r1=271482&r2=271483&view=diff ============================================================================== --- llvm/branches/release_38/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp (original) +++ llvm/branches/release_38/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp Wed Jun 1 23:32:11 2016 @@ -44,8 +44,6 @@ static const char *const EndCfIntrinsic class SIAnnotateControlFlow : public FunctionPass { - static char ID; - Type *Boolean; Type *Void; Type *Int64; @@ -90,6 +88,8 @@ class SIAnnotateControlFlow : public Fun void closeControlFlow(BasicBlock *BB); public: + static char ID; + SIAnnotateControlFlow(): FunctionPass(ID) { } @@ -112,6 +112,11 @@ public: } // end anonymous namespace +INITIALIZE_PASS_BEGIN(SIAnnotateControlFlow, DEBUG_TYPE, + "Annotate SI Control Flow", false, false) +INITIALIZE_PASS_END(SIAnnotateControlFlow, DEBUG_TYPE, + "Annotate SI Control Flow", false, false) + char SIAnnotateControlFlow::ID = 0; /// \brief Initialize all the types and constants used in the pass _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
