Move to CGSCC pass.

Author: kerbowa

llvm/lib/Target/AMDGPU/AMDGPU.h

@@ -13,6 +13,7 @@
 #include "llvm/CodeGen/MachinePassManager.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/Pass.h"
+#include "llvm/Analysis/CallGraphSCCPass.h"
 #include "llvm/Support/AMDGPUAddrSpace.h"
 #include "llvm/Support/CodeGen.h"
 
@@ -111,7 +112,7 @@ ModulePass *createAMDGPUCtorDtorLoweringLegacyPass();
 void initializeAMDGPUCtorDtorLoweringLegacyPass(PassRegistry &);
 extern char &AMDGPUCtorDtorLoweringLegacyPassID;
 
-ModulePass *createAMDGPULowerKernelArgumentsLegacyPass(const TargetMachine *TM);
+CallGraphSCCPass *createAMDGPULowerKernelArgumentsLegacyPass(const TargetMachine *TM);
 void initializeAMDGPULowerKernelArgumentsLegacyPass(PassRegistry &);
 extern char &AMDGPULowerKernelArgumentsLegacyPassID;
 

llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp

@@ -14,6 +14,7 @@
 #include "AMDGPU.h"
 #include "GCNSubtarget.h"
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/Analysis/CallGraph.h"
 #include "llvm/Analysis/ValueTracking.h"
 #include "llvm/CodeGen/TargetPassConfig.h"
 #include "llvm/IR/IRBuilder.h"
@@ -252,11 +253,21 @@ class PreloadKernelArgInfo {
 };
 
 class AMDGPULowerKernelArguments {
-  const TargetMachine &TM;
-  SmallVector<Function *> FunctionsToErase;
+private:
+  SmallVector<Function *, 4> FunctionsToErase;
 
 public:
-  AMDGPULowerKernelArguments(const TargetMachine &TM) : TM(TM) {}
+  AMDGPULowerKernelArguments() {}
+
+  bool eraseTaggedFunctions() {
+    if (FunctionsToErase.empty())
+      return false;
+
+    for (Function *F : FunctionsToErase)
+      F->eraseFromParent();
+
+    return true;
+  }
 
   // skip allocas
   static BasicBlock::iterator getInsertPt(BasicBlock &BB) {
@@ -273,7 +284,7 @@ class AMDGPULowerKernelArguments {
     return InsPt;
   }
 
-  bool lowerKernelArguments(Function &F) {
+  bool lowerKernelArguments(Function &F, const TargetMachine &TM) {
     CallingConv::ID CC = F.getCallingConv();
     if (CC != CallingConv::AMDGPU_KERNEL || F.arg_empty())
       return false;
@@ -474,34 +485,53 @@ class AMDGPULowerKernelArguments {
     return true;
   }
 
-  bool runOnModule(Module &M) {
+  bool runOnSCC(CallGraphSCC &SCC, const TargetMachine &TM) {
+    bool Changed = false;
+    for (CallGraphNode *I : SCC) {
+      Function *F = I->getFunction();
+      if (!F || F->isDeclaration())
+        continue;
+
+      Changed |= lowerKernelArguments(*F, TM);
+    }
+
+    return Changed;
+  }
+
+  bool runOnModule(Module &M, const TargetMachine &TM) {
     bool Changed = false;
 
     for (Function &F : M)
-      Changed |= lowerKernelArguments(F);
+      Changed |= lowerKernelArguments(F, TM);
 
-    for (Function *F : FunctionsToErase)
-      F->eraseFromParent();
+    Changed |= eraseTaggedFunctions();
 
     return Changed;
   }
 };
 
-class AMDGPULowerKernelArgumentsLegacy : public ModulePass {
+class AMDGPULowerKernelArgumentsLegacy : public CallGraphSCCPass {
+private:
+  AMDGPULowerKernelArguments Impl;
+
 public:
   static char ID;
   const TargetMachine *TM;
 
   AMDGPULowerKernelArgumentsLegacy(const TargetMachine *TM = nullptr)
-      : ModulePass(ID), TM(TM) {}
+      : CallGraphSCCPass(ID), TM(TM) {}
 
-  bool runOnModule(Module &M) override {
+  bool runOnSCC(CallGraphSCC &SCC) override {
     if (!TM) {
       auto &TPC = getAnalysis<TargetPassConfig>();
       TM = &TPC.getTM<TargetMachine>();
     }
 
-    return AMDGPULowerKernelArguments(*TM).runOnModule(M);
+    return Impl.runOnSCC(SCC, *TM);
+  }
+
+  bool doFinalization(CallGraph &CG) override {
+    return Impl.eraseTaggedFunctions();
   }
 
   void getAnalysisUsage(AnalysisUsage &AU) const override {
@@ -521,14 +551,14 @@ INITIALIZE_PASS_END(AMDGPULowerKernelArgumentsLegacy, DEBUG_TYPE,
 
 char AMDGPULowerKernelArgumentsLegacy::ID = 0;
 
-ModulePass *
+CallGraphSCCPass *
 llvm::createAMDGPULowerKernelArgumentsLegacyPass(const TargetMachine *TM) {
   return new AMDGPULowerKernelArgumentsLegacy(TM);
 }
 
 PreservedAnalyses
 AMDGPULowerKernelArgumentsPass::run(Module &M, ModuleAnalysisManager &AM) {
-  return AMDGPULowerKernelArguments(TM).runOnModule(M)
+  return AMDGPULowerKernelArguments().runOnModule(M, TM)
              ? PreservedAnalyses::none()
              : PreservedAnalyses::all();
 }

llvm/test/CodeGen/AMDGPU/llc-pipeline.ll

@@ -50,7 +50,7 @@
 ; GCN-O0-NEXT:    CallGraph Construction
 ; GCN-O0-NEXT:    Call Graph SCC Pass Manager
 ; GCN-O0-NEXT:      AMDGPU Annotate Kernel Features
-; GCN-O0-NEXT:    AMDGPU Lower Kernel Arguments
+; GCN-O0-NEXT:      AMDGPU Lower Kernel Arguments
 ; GCN-O0-NEXT:    Lower buffer fat pointer operations to buffer resources
 ; GCN-O0-NEXT:    CallGraph Construction
 ; GCN-O0-NEXT:    Call Graph SCC Pass Manager
@@ -229,7 +229,7 @@
 ; GCN-O1-NEXT:    CallGraph Construction
 ; GCN-O1-NEXT:    Call Graph SCC Pass Manager
 ; GCN-O1-NEXT:      AMDGPU Annotate Kernel Features
-; GCN-O1-NEXT:    AMDGPU Lower Kernel Arguments
+; GCN-O1-NEXT:      AMDGPU Lower Kernel Arguments
 ; GCN-O1-NEXT:    Lower buffer fat pointer operations to buffer resources
 ; GCN-O1-NEXT:    CallGraph Construction
 ; GCN-O1-NEXT:    Call Graph SCC Pass Manager
@@ -522,7 +522,7 @@
 ; GCN-O1-OPTS-NEXT:    CallGraph Construction
 ; GCN-O1-OPTS-NEXT:    Call Graph SCC Pass Manager
 ; GCN-O1-OPTS-NEXT:      AMDGPU Annotate Kernel Features
-; GCN-O1-OPTS-NEXT:    AMDGPU Lower Kernel Arguments
+; GCN-O1-OPTS-NEXT:      AMDGPU Lower Kernel Arguments
 ; GCN-O1-OPTS-NEXT:    Lower buffer fat pointer operations to buffer resources
 ; GCN-O1-OPTS-NEXT:    CallGraph Construction
 ; GCN-O1-OPTS-NEXT:    Call Graph SCC Pass Manager
@@ -833,7 +833,7 @@
 ; GCN-O2-NEXT:    CallGraph Construction
 ; GCN-O2-NEXT:    Call Graph SCC Pass Manager
 ; GCN-O2-NEXT:      AMDGPU Annotate Kernel Features
-; GCN-O2-NEXT:    AMDGPU Lower Kernel Arguments
+; GCN-O2-NEXT:      AMDGPU Lower Kernel Arguments
 ; GCN-O2-NEXT:    Lower buffer fat pointer operations to buffer resources
 ; GCN-O2-NEXT:    CallGraph Construction
 ; GCN-O2-NEXT:    Call Graph SCC Pass Manager
@@ -1159,7 +1159,7 @@
 ; GCN-O3-NEXT:    CallGraph Construction
 ; GCN-O3-NEXT:    Call Graph SCC Pass Manager
 ; GCN-O3-NEXT:      AMDGPU Annotate Kernel Features
-; GCN-O3-NEXT:    AMDGPU Lower Kernel Arguments
+; GCN-O3-NEXT:      AMDGPU Lower Kernel Arguments
 ; GCN-O3-NEXT:    Lower buffer fat pointer operations to buffer resources
 ; GCN-O3-NEXT:    CallGraph Construction
 ; GCN-O3-NEXT:    Call Graph SCC Pass Manager