llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-amdgpu Author: Matt Arsenault (arsenm) <details> <summary>Changes</summary> R600 has a separate CodeGenPassBuilder anyway. --- Full diff: https://github.com/llvm/llvm-project/pull/102805.diff 4 Files Affected: - (modified) llvm/lib/Target/AMDGPU/AMDGPUCodeGenPassBuilder.cpp (+1-1) - (modified) llvm/lib/Target/AMDGPU/AMDGPUCodeGenPassBuilder.h (+3-3) - (modified) llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp (+8-8) - (modified) llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h (+6-6) ``````````diff diff --git a/llvm/lib/Target/AMDGPU/AMDGPUCodeGenPassBuilder.cpp b/llvm/lib/Target/AMDGPU/AMDGPUCodeGenPassBuilder.cpp index cc4285f130fc8..0d829b6aeafe8 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUCodeGenPassBuilder.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUCodeGenPassBuilder.cpp @@ -15,7 +15,7 @@ using namespace llvm; AMDGPUCodeGenPassBuilder::AMDGPUCodeGenPassBuilder( - AMDGPUTargetMachine &TM, const CGPassBuilderOption &Opts, + GCNTargetMachine &TM, const CGPassBuilderOption &Opts, PassInstrumentationCallbacks *PIC) : CodeGenPassBuilder(TM, Opts, PIC) { Opt.RequiresCodeGenSCCOrder = true; diff --git a/llvm/lib/Target/AMDGPU/AMDGPUCodeGenPassBuilder.h b/llvm/lib/Target/AMDGPU/AMDGPUCodeGenPassBuilder.h index 5f79e309703a3..e656e166b3eb2 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUCodeGenPassBuilder.h +++ b/llvm/lib/Target/AMDGPU/AMDGPUCodeGenPassBuilder.h @@ -14,12 +14,12 @@ namespace llvm { -class AMDGPUTargetMachine; +class GCNTargetMachine; class AMDGPUCodeGenPassBuilder - : public CodeGenPassBuilder<AMDGPUCodeGenPassBuilder, AMDGPUTargetMachine> { + : public CodeGenPassBuilder<AMDGPUCodeGenPassBuilder, GCNTargetMachine> { public: - AMDGPUCodeGenPassBuilder(AMDGPUTargetMachine &TM, + AMDGPUCodeGenPassBuilder(GCNTargetMachine &TM, const CGPassBuilderOption &Opts, PassInstrumentationCallbacks *PIC); diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp index 202466f18d1bd..62cf9c6cd6114 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp @@ -660,14 +660,6 @@ parseAMDGPUAtomicOptimizerStrategy(StringRef Params) { return make_error<StringError>("invalid parameter", inconvertibleErrorCode()); } -Error AMDGPUTargetMachine::buildCodeGenPipeline( - ModulePassManager &MPM, raw_pwrite_stream &Out, raw_pwrite_stream *DwoOut, - CodeGenFileType FileType, const CGPassBuilderOption &Opts, - PassInstrumentationCallbacks *PIC) { - AMDGPUCodeGenPassBuilder CGPB(*this, Opts, PIC); - return CGPB.buildPipeline(MPM, Out, DwoOut, FileType); -} - void AMDGPUTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) { #define GET_PASS_REGISTRY "AMDGPUPassRegistry.def" @@ -900,6 +892,14 @@ GCNTargetMachine::getTargetTransformInfo(const Function &F) const { return TargetTransformInfo(GCNTTIImpl(this, F)); } +Error GCNTargetMachine::buildCodeGenPipeline( + ModulePassManager &MPM, raw_pwrite_stream &Out, raw_pwrite_stream *DwoOut, + CodeGenFileType FileType, const CGPassBuilderOption &Opts, + PassInstrumentationCallbacks *PIC) { + AMDGPUCodeGenPassBuilder CGPB(*this, Opts, PIC); + return CGPB.buildPipeline(MPM, Out, DwoOut, FileType); +} + //===----------------------------------------------------------------------===// // AMDGPU Pass Setup //===----------------------------------------------------------------------===// diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h index 0f74fbc22fa84..6bb8788cc73b0 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h +++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h @@ -52,12 +52,6 @@ class AMDGPUTargetMachine : public LLVMTargetMachine { return TLOF.get(); } - Error buildCodeGenPipeline(ModulePassManager &MPM, raw_pwrite_stream &Out, - raw_pwrite_stream *DwoOut, - CodeGenFileType FileType, - const CGPassBuilderOption &Opts, - PassInstrumentationCallbacks *PIC) override; - void registerPassBuilderCallbacks(PassBuilder &PB) override; void registerDefaultAliasAnalyses(AAManager &) override; @@ -103,6 +97,12 @@ class GCNTargetMachine final : public AMDGPUTargetMachine { return true; } + Error buildCodeGenPipeline(ModulePassManager &MPM, raw_pwrite_stream &Out, + raw_pwrite_stream *DwoOut, + CodeGenFileType FileType, + const CGPassBuilderOption &Opts, + PassInstrumentationCallbacks *PIC) override; + void registerMachineRegisterInfoCallback(MachineFunction &MF) const override; MachineFunctionInfo * `````````` </details> https://github.com/llvm/llvm-project/pull/102805 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
