Remove OpenCilk support for old pass manager

llvm/include/llvm/InitializePasses.h

@@ -48,9 +48,6 @@ void initializeGlobalISel(PassRegistry&);
 /// Initialize all passes linked into the CodeGen library.
 void initializeTarget(PassRegistry&);
 
-/// Initialize all passes linked into the TapirOpts library.
-void initializeTapirOpts(PassRegistry&);
-
 void initializeAAResultsWrapperPassPass(PassRegistry&);
 void initializeAlwaysInlinerLegacyPassPass(PassRegistry&);
 void initializeAssignmentTrackingAnalysisPass(PassRegistry &);

llvm/include/llvm/LinkAllPasses.h

@@ -100,7 +100,6 @@ namespace {
       (void) llvm::createLowerGlobalDtorsLegacyPass();
       (void) llvm::createLowerInvokePass();
       (void) llvm::createLowerSwitchPass();
-      (void) llvm::createLowerTapirToTargetPass();
       (void) llvm::createNaryReassociatePass();
       (void) llvm::createObjCARCContractPass();
       (void) llvm::createPromoteMemoryToRegisterPass();

llvm/lib/Transforms/Tapir/CMakeLists.txt

@@ -13,7 +13,6 @@ add_llvm_component_library(LLVMTapirOpts
   QthreadsABI.cpp
   SerialABI.cpp
   SerializeSmallTasks.cpp
-  Tapir.cpp
   TapirToTarget.cpp
   TapirLoopInfo.cpp
 

llvm/lib/Transforms/Tapir/TapirToTarget.cpp

@@ -509,62 +509,3 @@ PreservedAnalyses TapirToTargetPass::run(Module &M, ModuleAnalysisManager &AM) {
     return PreservedAnalyses::none();
   return PreservedAnalyses::all();
 }
-
-namespace {
-struct LowerTapirToTarget : public ModulePass {
-  static char ID; // Pass identification, replacement for typeid
-  explicit LowerTapirToTarget() : ModulePass(ID) {
-    initializeLowerTapirToTargetPass(*PassRegistry::getPassRegistry());
-  }
-
-  StringRef getPassName() const override { return "Lower Tapir to target"; }
-
-  bool runOnModule(Module &M) override;
-
-  void getAnalysisUsage(AnalysisUsage &AU) const override {
-    AU.addRequired<AssumptionCacheTracker>();
-    AU.addRequired<DominatorTreeWrapperPass>();
-    AU.addRequired<TargetLibraryInfoWrapperPass>();
-    AU.addRequired<TaskInfoWrapperPass>();
-  }
-};
-} // End of anonymous namespace
-
-char LowerTapirToTarget::ID = 0;
-INITIALIZE_PASS_BEGIN(LowerTapirToTarget, "tapir2target",
-                      "Lower Tapir to Target ABI", false, false)
-INITIALIZE_PASS_DEPENDENCY(AssumptionCacheTracker)
-INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass)
-INITIALIZE_PASS_DEPENDENCY(TargetLibraryInfoWrapperPass)
-INITIALIZE_PASS_DEPENDENCY(TaskInfoWrapperPass)
-INITIALIZE_PASS_END(LowerTapirToTarget, "tapir2target",
-                    "Lower Tapir to Target ABI", false, false)
-
-bool LowerTapirToTarget::runOnModule(Module &M) {
-  if (skipModule(M))
-    return false;
-  auto GetAA = [this](Function &F) -> AAResults & {
-    return this->getAnalysis<AAResultsWrapperPass>(F).getAAResults();
-  };
-  auto GetDT = [this](Function &F) -> DominatorTree & {
-    return this->getAnalysis<DominatorTreeWrapperPass>(F).getDomTree();
-  };
-  auto GetTI = [this](Function &F) -> TaskInfo & {
-    return this->getAnalysis<TaskInfoWrapperPass>(F).getTaskInfo();
-  };
-  AssumptionCacheTracker *ACT = &getAnalysis<AssumptionCacheTracker>();
-  auto GetAC = [&ACT](Function &F) -> AssumptionCache & {
-    return ACT->getAssumptionCache(F);
-  };
-  auto GetTLI = [this](Function &F) -> TargetLibraryInfo & {
-    return this->getAnalysis<TargetLibraryInfoWrapperPass>().getTLI(F);
-  };
-
-  return TapirToTargetImpl(M, GetAA, GetDT, GetTI, GetAC, GetTLI).run();
-}
-
-// createLowerTapirToTargetPass - Provide an entry point to create this pass.
-//
-namespace llvm {
-ModulePass *createLowerTapirToTargetPass() { return new LowerTapirToTarget(); }
-} // namespace llvm

llvm/tools/bugpoint/bugpoint.cpp

@@ -105,7 +105,6 @@ int main(int argc, char **argv) {
   initializeCore(Registry);
   initializeScalarOpts(Registry);
   initializeVectorization(Registry);
-  initializeTapirOpts(Registry);
   initializeIPO(Registry);
   initializeAnalysis(Registry);
   initializeTransformUtils(Registry);

llvm/tools/opt/opt.cpp

@@ -413,7 +413,6 @@ int main(int argc, char **argv) {
   initializeCore(Registry);
   initializeScalarOpts(Registry);
   initializeVectorization(Registry);
-  initializeTapirOpts(Registry);
   initializeIPO(Registry);
   initializeAnalysis(Registry);
   initializeTransformUtils(Registry);