Revert "[InlineOrder] Plugin Inline Order"

This commit is causing a CMake error on AIX. Will recommit with
a fix.

This reverts commit e46d8a7.

llvm/include/llvm/Analysis/InlineOrder.h

@@ -32,52 +32,7 @@ template <typename T> class InlineOrder {
 };
 
 std::unique_ptr<InlineOrder<std::pair<CallBase *, int>>>
-getDefaultInlineOrder(FunctionAnalysisManager &FAM, const InlineParams &Params,
-                      ModuleAnalysisManager &MAM, Module &M);
-
-std::unique_ptr<InlineOrder<std::pair<CallBase *, int>>>
-getInlineOrder(FunctionAnalysisManager &FAM, const InlineParams &Params,
-               ModuleAnalysisManager &MAM, Module &M);
-
-/// Used for dynamically loading instances of InlineOrder as plugins
-///
-/// Plugins must implement an InlineOrderFactory, for an example refer to:
-/// llvm/unittests/Analysis/InlineOrderPlugin/InlineOrderPlugin.cpp
-///
-/// If a PluginInlineOrderAnalysis has been registered with the
-/// current ModuleAnalysisManager, llvm::getInlineOrder returns an
-/// InlineOrder created by the PluginInlineOrderAnalysis' Factory.
-///
-class PluginInlineOrderAnalysis
-    : public AnalysisInfoMixin<PluginInlineOrderAnalysis> {
-public:
-  static AnalysisKey Key;
-
-  typedef std::unique_ptr<InlineOrder<std::pair<CallBase *, int>>> (
-      *InlineOrderFactory)(FunctionAnalysisManager &FAM,
-                           const InlineParams &Params,
-                           ModuleAnalysisManager &MAM, Module &M);
-
-  PluginInlineOrderAnalysis(InlineOrderFactory Factory) : Factory(Factory) {
-    HasBeenRegistered = true;
-    assert(Factory != nullptr &&
-           "The plugin inline order factory should not be a null pointer.");
-  }
-
-  struct Result {
-    InlineOrderFactory Factory;
-  };
-
-  Result run(Module &, ModuleAnalysisManager &) { return {Factory}; }
-  Result getResult() { return {Factory}; }
-
-  static bool isRegistered() { return HasBeenRegistered; }
-  static void unregister() { HasBeenRegistered = false; }
-
-private:
-  static bool HasBeenRegistered;
-  InlineOrderFactory Factory;
-};
+getInlineOrder(FunctionAnalysisManager &FAM, const InlineParams &Params);
 
 } // namespace llvm
 #endif // LLVM_ANALYSIS_INLINEORDER_H

llvm/lib/Analysis/InlineOrder.cpp

@@ -33,7 +33,8 @@ static cl::opt<InlinePriorityMode> UseInlinePriority(
                           "Use inline cost priority."),
                clEnumValN(InlinePriorityMode::CostBenefit, "cost-benefit",
                           "Use cost-benefit ratio."),
-               clEnumValN(InlinePriorityMode::ML, "ml", "Use ML.")));
+               clEnumValN(InlinePriorityMode::ML, "ml",
+                          "Use ML.")));
 
 static cl::opt<int> ModuleInlinerTopPriorityThreshold(
     "moudle-inliner-top-priority-threshold", cl::Hidden, cl::init(0),
@@ -280,13 +281,8 @@ class PriorityInlineOrder : public InlineOrder<std::pair<CallBase *, int>> {
 
 } // namespace
 
-AnalysisKey llvm::PluginInlineOrderAnalysis::Key;
-bool llvm::PluginInlineOrderAnalysis::HasBeenRegistered;
-
 std::unique_ptr<InlineOrder<std::pair<CallBase *, int>>>
-llvm::getDefaultInlineOrder(FunctionAnalysisManager &FAM,
-                            const InlineParams &Params,
-                            ModuleAnalysisManager &MAM, Module &M) {
+llvm::getInlineOrder(FunctionAnalysisManager &FAM, const InlineParams &Params) {
   switch (UseInlinePriority) {
   case InlinePriorityMode::Size:
     LLVM_DEBUG(dbgs() << "    Current used priority: Size priority ---- \n");
@@ -299,22 +295,11 @@ llvm::getDefaultInlineOrder(FunctionAnalysisManager &FAM,
   case InlinePriorityMode::CostBenefit:
     LLVM_DEBUG(
         dbgs() << "    Current used priority: cost-benefit priority ---- \n");
-    return std::make_unique<PriorityInlineOrder<CostBenefitPriority>>(FAM,
-                                                                      Params);
+    return std::make_unique<PriorityInlineOrder<CostBenefitPriority>>(FAM, Params);
   case InlinePriorityMode::ML:
-    LLVM_DEBUG(dbgs() << "    Current used priority: ML priority ---- \n");
+    LLVM_DEBUG(
+        dbgs() << "    Current used priority: ML priority ---- \n");
     return std::make_unique<PriorityInlineOrder<MLPriority>>(FAM, Params);
   }
   return nullptr;
 }
-
-std::unique_ptr<InlineOrder<std::pair<CallBase *, int>>>
-llvm::getInlineOrder(FunctionAnalysisManager &FAM, const InlineParams &Params,
-                     ModuleAnalysisManager &MAM, Module &M) {
-  if (llvm::PluginInlineOrderAnalysis::isRegistered()) {
-    LLVM_DEBUG(dbgs() << "    Current used priority: plugin ---- \n");
-    return MAM.getResult<PluginInlineOrderAnalysis>(M).Factory(FAM, Params, MAM,
-                                                               M);
-  }
-  return getDefaultInlineOrder(FAM, Params, MAM, M);
-}

llvm/lib/Transforms/IPO/ModuleInliner.cpp

@@ -138,7 +138,7 @@ PreservedAnalyses ModuleInlinerPass::run(Module &M,
   //
   // TODO: Here is a huge amount duplicate code between the module inliner and
   // the SCC inliner, which need some refactoring.
-  auto Calls = getInlineOrder(FAM, Params, MAM, M);
+  auto Calls = getInlineOrder(FAM, Params);
   assert(Calls != nullptr && "Expected an initialized InlineOrder");
 
   // Populate the initial list of calls in this module.

llvm/unittests/Analysis/CMakeLists.txt

@@ -39,7 +39,6 @@ set(ANALYSIS_TEST_SOURCES
   MLModelRunnerTest.cpp
   PhiValuesTest.cpp
   PluginInlineAdvisorAnalysisTest.cpp
-  PluginInlineOrderAnalysisTest.cpp
   ProfileSummaryInfoTest.cpp
   ScalarEvolutionTest.cpp
   VectorFunctionABITest.cpp
@@ -74,4 +73,3 @@ if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
 endif()
 
 add_subdirectory(InlineAdvisorPlugin)
-add_subdirectory(InlineOrderPlugin)

llvm/unittests/Analysis/PluginInlineAdvisorAnalysisTest.cpp

@@ -10,8 +10,6 @@
 
 namespace llvm {
 
-namespace {
-
 void anchor() {}
 
 static std::string libPath(const std::string Name = "InlineAdvisorPlugin") {
@@ -86,12 +84,6 @@ struct CompilerInstance {
                                   ThinOrFullLTOPhase::None));
   }
 
-  ~CompilerInstance() {
-    // Reset the static variable that tracks if the plugin has been registered.
-    // This is needed to allow the test to run multiple times.
-    PluginInlineAdvisorAnalysis::HasBeenRegistered = false;
-  }
-
   std::string output;
   std::unique_ptr<Module> outputM;
 
@@ -264,8 +256,6 @@ define i32 @fib_check(){
 }
   )"};
 
-} // namespace
-
 // check that loading a plugin works
 // the plugin being loaded acts identically to the default inliner
 TEST(PluginInlineAdvisorTest, PluginLoad) {