Remove initializeMLProvider

Author: optimisan

llvm/include/llvm/CodeGen/RegAllocEvictionAdvisor.h

@@ -266,9 +266,6 @@ class RegAllocEvictionAdvisorAnalysis
   void
   initializeProvider(RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode Mode,
                      LLVMContext &Ctx);
-  void
-  initializeMLProvider(RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode Mode,
-                       LLVMContext &Ctx);
 
   std::unique_ptr<RegAllocEvictionAdvisorProvider> Provider;
 };
@@ -282,6 +279,12 @@ RegAllocEvictionAdvisorAnalysisLegacy *createReleaseModeAdvisorAnalysisLegacy();
 RegAllocEvictionAdvisorAnalysisLegacy *
 createDevelopmentModeAdvisorAnalysisLegacy();
 
+RegAllocEvictionAdvisorProvider *
+createReleaseModeAdvisorProvider(LLVMContext &Ctx);
+
+RegAllocEvictionAdvisorProvider *
+createDevelopmentModeAdvisorProvider(LLVMContext &Ctx);
+
 // TODO: move to RegAllocEvictionAdvisor.cpp when we move implementation
 // out of RegAllocGreedy.cpp
 class DefaultEvictionAdvisor : public RegAllocEvictionAdvisor {

llvm/lib/CodeGen/MLRegAllocEvictAdvisor.cpp

@@ -1251,22 +1251,17 @@ bool RegAllocScoring::runOnMachineFunction(MachineFunction &MF) {
 }
 #endif // #ifdef LLVM_HAVE_TFLITE
 
-void RegAllocEvictionAdvisorAnalysis::initializeMLProvider(
-    RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode Mode, LLVMContext &Ctx) {
-  if (Provider)
-    return;
-  switch (Mode) {
-  case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Development:
+RegAllocEvictionAdvisorProvider *
+llvm::createReleaseModeAdvisorProvider(LLVMContext &Ctx) {
+  return new ReleaseModeEvictionAdvisorProvider(Ctx);
+}
+
+RegAllocEvictionAdvisorProvider *
+llvm::createDevelopmentModeAdvisorProvider(LLVMContext &Ctx) {
 #if defined(LLVM_HAVE_TFLITE)
-    Provider.reset(new DevelopmentModeEvictionAdvisorProvider(Ctx));
+  return new DevelopmentModeEvictionAdvisorProvider(Ctx);
 #endif
-    break;
-  case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Release:
-    Provider.reset(new ReleaseModeEvictionAdvisorProvider(Ctx));
-    break;
-  default:
-    break;
-  }
+  return nullptr;
 }
 
 RegAllocEvictionAdvisorAnalysisLegacy *

llvm/lib/CodeGen/RegAllocEvictionAdvisor.cpp

@@ -118,11 +118,21 @@ void RegAllocEvictionAdvisorAnalysis::initializeProvider(
     RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode Mode, LLVMContext &Ctx) {
   if (Provider)
     return;
-  if (Mode == RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Default)
+  switch (Mode) {
+  case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Default:
     Provider.reset(
         new DefaultEvictionAdvisorProvider(/*NotAsRequested=*/false, Ctx));
-  else
-    initializeMLProvider(Mode, Ctx);
+    break;
+  case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Development:
+#if defined(LLVM_HAVE_TFLITE)
+    Provider.reset(createDevelopmentModeAdvisorProvider(Ctx));
+#endif
+    break;
+  case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Release:
+    Provider.reset(createReleaseModeAdvisorProvider(Ctx));
+    break;
+  }
+
   if (!Provider)
     Provider.reset(
         new DefaultEvictionAdvisorProvider(/*NotAsRequested=*/true, Ctx));