AS, remove initializeMLProvider()

Author: optimisan

llvm/include/llvm/CodeGen/RegAllocPriorityAdvisor.h

@@ -161,6 +161,12 @@ createReleaseModePriorityAdvisorAnalysis();
 RegAllocPriorityAdvisorAnalysisLegacy *
 createDevelopmentModePriorityAdvisorAnalysis();
 
+LLVM_ATTRIBUTE_RETURNS_NONNULL RegAllocPriorityAdvisorProvider *
+createReleaseModePriorityAdvisorProvider();
+
+LLVM_ATTRIBUTE_RETURNS_NONNULL RegAllocPriorityAdvisorProvider *
+createDevelopmentModePriorityAdvisorProvider(LLVMContext &Ctx);
+
 } // namespace llvm
 
 #endif // LLVM_CODEGEN_REGALLOCPRIORITYADVISOR_H

llvm/lib/CodeGen/MLRegAllocPriorityAdvisor.cpp

@@ -388,22 +388,14 @@ DevelopmentModePriorityAdvisor::getPriority(const LiveInterval &LI) const {
   return static_cast<unsigned>(Prio);
 }
 
+RegAllocPriorityAdvisorProvider *
+llvm::createDevelopmentModePriorityAdvisorProvider(LLVMContext &Ctx) {
+  return new DevelopmentModePriorityAdvisorProvider(Ctx);
+}
+
 #endif // #ifdef LLVM_HAVE_TFLITE
 
-void RegAllocPriorityAdvisorAnalysis::initializeMLProvider(
-    RegAllocPriorityAdvisorProvider::AdvisorMode Mode, LLVMContext &Ctx) {
-  if (Provider)
-    return;
-  switch (Mode) {
-  case RegAllocPriorityAdvisorProvider::AdvisorMode::Development:
-#if defined(LLVM_HAVE_TFLITE)
-    Provider.reset(new DevelopmentModePriorityAdvisorProvider(Ctx));
-#endif
-    break;
-  case RegAllocPriorityAdvisorProvider::AdvisorMode::Release:
-    Provider.reset(new ReleaseModePriorityAdvisorProvider());
-    break;
-  default:
-    break;
-  }
+RegAllocPriorityAdvisorProvider *
+llvm::createReleaseModePriorityAdvisorProvider() {
+  return new ReleaseModePriorityAdvisorProvider();
 }

llvm/lib/CodeGen/RegAllocPriorityAdvisor.cpp

@@ -136,16 +136,27 @@ class DummyPriorityAdvisorAnalysis final
 void RegAllocPriorityAdvisorAnalysis::initializeProvider(LLVMContext &Ctx) {
   if (Provider)
     return;
-  if (Mode == RegAllocPriorityAdvisorProvider::AdvisorMode::Dummy)
+  switch (Mode) {
+  case RegAllocPriorityAdvisorProvider::AdvisorMode::Dummy:
     Provider.reset(new DummyPriorityAdvisorProvider());
-  else if (Mode == RegAllocPriorityAdvisorProvider::AdvisorMode::Default)
+    return;
+  case RegAllocPriorityAdvisorProvider::AdvisorMode::Default:
     Provider.reset(
         new DefaultPriorityAdvisorProvider(/*NotAsRequested=*/false, Ctx));
-  else
-    initializeMLProvider(Mode, Ctx);
-  if (!Provider)
+    return;
+  case RegAllocPriorityAdvisorProvider::AdvisorMode::Development:
+#if defined(LLVM_HAVE_TFLITE)
+    Provider.reset(createDevelopmentModePriorityAdvisorProvider(Ctx));
+#else
     Provider.reset(
         new DefaultPriorityAdvisorProvider(/*NotAsRequested=*/true, Ctx));
+#endif
+    assert(Provider && "PriorityAdvisorProvider cannot be null");
+    return;
+  case RegAllocPriorityAdvisorProvider::AdvisorMode::Release:
+    Provider.reset(createReleaseModePriorityAdvisorProvider());
+    return;
+  }
 }
 
 AnalysisKey RegAllocPriorityAdvisorAnalysis::Key;