[CodeGen] Add flag to populate target pass names (#76328)

paperchalice · web-flow · commit ffb1f20e0d8d · 2024-01-03T09:07:02.000+08:00
`print-pipeline-passes` can show target pass names.
diff --git a/llvm/include/llvm/Target/TargetMachine.h b/llvm/include/llvm/Target/TargetMachine.h
@@ -362,7 +362,9 @@ class TargetMachine {
   virtual TargetTransformInfo getTargetTransformInfo(const Function &F) const;
 
   /// Allow the target to modify the pass pipeline.
-  virtual void registerPassBuilderCallbacks(PassBuilder &) {}
+  // TODO: Populate all pass names by using <Target>PassRegistry.def.
+  virtual void registerPassBuilderCallbacks(PassBuilder &,
+                                            bool PopulateClassToPassNames) {}
 
   /// Allow the target to register alias analyses with the AAManager for use
   /// with the new pass manager. Only affects the "default" AAManager.
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
@@ -452,9 +452,10 @@ PassBuilder::PassBuilder(TargetMachine *TM, PipelineTuningOptions PTO,
                          std::optional<PGOOptions> PGOOpt,
                          PassInstrumentationCallbacks *PIC)
     : TM(TM), PTO(PTO), PGOOpt(PGOOpt), PIC(PIC) {
+  bool ShouldPopulateClassToPassNames = PIC && shouldPopulateClassToPassNames();
   if (TM)
-    TM->registerPassBuilderCallbacks(*this);
-  if (PIC && shouldPopulateClassToPassNames()) {
+    TM->registerPassBuilderCallbacks(*this, ShouldPopulateClassToPassNames);
+  if (ShouldPopulateClassToPassNames) {
 #define MODULE_PASS(NAME, CREATE_PASS)                                         \
   PIC->addClassToPassName(decltype(CREATE_PASS)::name(), NAME);
 #define MODULE_PASS_WITH_PARAMS(NAME, CLASS, CREATE_PASS, PARSER, PARAMS)      \
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
@@ -620,7 +620,8 @@ void AMDGPUTargetMachine::registerDefaultAliasAnalyses(AAManager &AAM) {
   AAM.registerFunctionAnalysis<AMDGPUAA>();
 }
 
-void AMDGPUTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
+void AMDGPUTargetMachine::registerPassBuilderCallbacks(
+    PassBuilder &PB, bool PopulateClassToPassNames) {
   PB.registerPipelineParsingCallback(
       [this](StringRef PassName, ModulePassManager &PM,
              ArrayRef<PassBuilder::PipelineElement>) {
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h
@@ -51,7 +51,8 @@ class AMDGPUTargetMachine : public LLVMTargetMachine {
     return TLOF.get();
   }
 
-  void registerPassBuilderCallbacks(PassBuilder &PB) override;
+  void registerPassBuilderCallbacks(PassBuilder &PB,
+                                    bool PopulateClassToPassNames) override;
   void registerDefaultAliasAnalyses(AAManager &) override;
 
   /// Get the integer value of a null pointer in the given address space.
diff --git a/llvm/lib/Target/BPF/BPFTargetMachine.cpp b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
@@ -108,7 +108,8 @@ TargetPassConfig *BPFTargetMachine::createPassConfig(PassManagerBase &PM) {
   return new BPFPassConfig(*this, PM);
 }
 
-void BPFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
+void BPFTargetMachine::registerPassBuilderCallbacks(
+    PassBuilder &PB, bool PopulateClassToPassNames) {
   PB.registerPipelineParsingCallback(
       [](StringRef PassName, FunctionPassManager &FPM,
          ArrayRef<PassBuilder::PipelineElement>) {
diff --git a/llvm/lib/Target/BPF/BPFTargetMachine.h b/llvm/lib/Target/BPF/BPFTargetMachine.h
@@ -42,7 +42,8 @@ class BPFTargetMachine : public LLVMTargetMachine {
     return TLOF.get();
   }
 
-  void registerPassBuilderCallbacks(PassBuilder &PB) override;
+  void registerPassBuilderCallbacks(PassBuilder &PB,
+                                    bool PopulateClassToPassNames) override;
 };
 }
 
diff --git a/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp b/llvm/lib/Target/DirectX/DirectXTargetMachine.cpp
@@ -100,7 +100,8 @@ DirectXTargetMachine::DirectXTargetMachine(const Target &T, const Triple &TT,
 
 DirectXTargetMachine::~DirectXTargetMachine() {}
 
-void DirectXTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
+void DirectXTargetMachine::registerPassBuilderCallbacks(
+    PassBuilder &PB, bool PopulateClassToPassNames) {
   PB.registerPipelineParsingCallback(
       [](StringRef PassName, ModulePassManager &PM,
          ArrayRef<PassBuilder::PipelineElement>) {
diff --git a/llvm/lib/Target/DirectX/DirectXTargetMachine.h b/llvm/lib/Target/DirectX/DirectXTargetMachine.h
@@ -47,7 +47,8 @@ class DirectXTargetMachine : public LLVMTargetMachine {
   }
 
   TargetTransformInfo getTargetTransformInfo(const Function &F) const override;
-  void registerPassBuilderCallbacks(PassBuilder &PB) override;
+  void registerPassBuilderCallbacks(PassBuilder &PB,
+                                    bool PopulateClassToPassNames) override;
 };
 } // namespace llvm
 
diff --git a/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp b/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp
@@ -274,7 +274,8 @@ HexagonTargetMachine::getSubtargetImpl(const Function &F) const {
   return I.get();
 }
 
-void HexagonTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
+void HexagonTargetMachine::registerPassBuilderCallbacks(
+    PassBuilder &PB, bool PopulateClassToPassNames) {
   PB.registerLateLoopOptimizationsEPCallback(
       [=](LoopPassManager &LPM, OptimizationLevel Level) {
         LPM.addPass(HexagonLoopIdiomRecognitionPass());
diff --git a/llvm/lib/Target/Hexagon/HexagonTargetMachine.h b/llvm/lib/Target/Hexagon/HexagonTargetMachine.h
@@ -34,7 +34,8 @@ class HexagonTargetMachine : public LLVMTargetMachine {
   ~HexagonTargetMachine() override;
   const HexagonSubtarget *getSubtargetImpl(const Function &F) const override;
 
-  void registerPassBuilderCallbacks(PassBuilder &PB) override;
+  void registerPassBuilderCallbacks(PassBuilder &PB,
+                                    bool PopulateClassToPassNames) override;
   TargetPassConfig *createPassConfig(PassManagerBase &PM) override;
   TargetTransformInfo getTargetTransformInfo(const Function &F) const override;
 
diff --git a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
@@ -225,7 +225,8 @@ void NVPTXTargetMachine::registerDefaultAliasAnalyses(AAManager &AAM) {
   AAM.registerFunctionAnalysis<NVPTXAA>();
 }
 
-void NVPTXTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
+void NVPTXTargetMachine::registerPassBuilderCallbacks(
+    PassBuilder &PB, bool PopulateClassToPassNames) {
   PB.registerPipelineParsingCallback(
       [](StringRef PassName, FunctionPassManager &PM,
          ArrayRef<PassBuilder::PipelineElement>) {
diff --git a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h
@@ -69,7 +69,8 @@ class NVPTXTargetMachine : public LLVMTargetMachine {
 
   void registerDefaultAliasAnalyses(AAManager &AAM) override;
 
-  void registerPassBuilderCallbacks(PassBuilder &PB) override;
+  void registerPassBuilderCallbacks(PassBuilder &PB,
+                                    bool PopulateClassToPassNames) override;
 
   TargetTransformInfo getTargetTransformInfo(const Function &F) const override;
 

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,8 @@ void AMDGPUTargetMachine::registerDefaultAliasAnalyses(AAManager &AAM) {`
`620`	`620`	`AAM.registerFunctionAnalysis<AMDGPUAA>();`
`621`	`621`	`}`
`622`	`622`
`623`		`-void AMDGPUTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {`
	`623`	`+void AMDGPUTargetMachine::registerPassBuilderCallbacks(`
	`624`	`+ PassBuilder &PB, bool PopulateClassToPassNames) {`
`624`	`625`	`PB.registerPipelineParsingCallback(`
`625`	`626`	`[this](StringRef PassName, ModulePassManager &PM,`
`626`	`627`	`ArrayRef<PassBuilder::PipelineElement>) {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ class AMDGPUTargetMachine : public LLVMTargetMachine {`
`51`	`51`	`return TLOF.get();`
`52`	`52`	`}`
`53`	`53`
`54`		`- void registerPassBuilderCallbacks(PassBuilder &PB) override;`
	`54`	`+ void registerPassBuilderCallbacks(PassBuilder &PB,`
	`55`	`+ bool PopulateClassToPassNames) override;`
`55`	`56`	`void registerDefaultAliasAnalyses(AAManager &) override;`
`56`	`57`
`57`	`58`	`/// Get the integer value of a null pointer in the given address space.`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ TargetPassConfig *BPFTargetMachine::createPassConfig(PassManagerBase &PM) {`
`108`	`108`	`return new BPFPassConfig(*this, PM);`
`109`	`109`	`}`
`110`	`110`
`111`		`-void BPFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {`
	`111`	`+void BPFTargetMachine::registerPassBuilderCallbacks(`
	`112`	`+ PassBuilder &PB, bool PopulateClassToPassNames) {`
`112`	`113`	`PB.registerPipelineParsingCallback(`
`113`	`114`	`[](StringRef PassName, FunctionPassManager &FPM,`
`114`	`115`	`ArrayRef<PassBuilder::PipelineElement>) {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ class BPFTargetMachine : public LLVMTargetMachine {`
`42`	`42`	`return TLOF.get();`
`43`	`43`	`}`
`44`	`44`
`45`		`- void registerPassBuilderCallbacks(PassBuilder &PB) override;`
	`45`	`+ void registerPassBuilderCallbacks(PassBuilder &PB,`
	`46`	`+ bool PopulateClassToPassNames) override;`
`46`	`47`	`};`
`47`	`48`	`}`
`48`	`49`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ class DirectXTargetMachine : public LLVMTargetMachine {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`TargetTransformInfo getTargetTransformInfo(const Function &F) const override;`
`50`		`- void registerPassBuilderCallbacks(PassBuilder &PB) override;`
	`50`	`+ void registerPassBuilderCallbacks(PassBuilder &PB,`
	`51`	`+ bool PopulateClassToPassNames) override;`
`51`	`52`	`};`
`52`	`53`	`} // namespace llvm`
`53`	`54`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,8 @@ HexagonTargetMachine::getSubtargetImpl(const Function &F) const {`
`274`	`274`	`return I.get();`
`275`	`275`	`}`
`276`	`276`
`277`		`-void HexagonTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {`
	`277`	`+void HexagonTargetMachine::registerPassBuilderCallbacks(`
	`278`	`+ PassBuilder &PB, bool PopulateClassToPassNames) {`
`278`	`279`	`PB.registerLateLoopOptimizationsEPCallback(`
`279`	`280`	`[=](LoopPassManager &LPM, OptimizationLevel Level) {`
`280`	`281`	`LPM.addPass(HexagonLoopIdiomRecognitionPass());`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,8 @@ void NVPTXTargetMachine::registerDefaultAliasAnalyses(AAManager &AAM) {`
`225`	`225`	`AAM.registerFunctionAnalysis<NVPTXAA>();`
`226`	`226`	`}`
`227`	`227`
`228`		`-void NVPTXTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {`
	`228`	`+void NVPTXTargetMachine::registerPassBuilderCallbacks(`
	`229`	`+ PassBuilder &PB, bool PopulateClassToPassNames) {`
`229`	`230`	`PB.registerPipelineParsingCallback(`
`230`	`231`	`[](StringRef PassName, FunctionPassManager &PM,`
`231`	`232`	`ArrayRef<PassBuilder::PipelineElement>) {`