Remove createProvider*(), add new method in ML.cpp

Author: optimisan

llvm/include/llvm/CodeGen/RegAllocEvictionAdvisor.h

@@ -233,11 +233,6 @@ class RegAllocEvictionAdvisorProvider {
  const AdvisorMode Mode;
 };
 
-RegAllocEvictionAdvisorProvider *
-createReleaseModeAdvisorProvider(LLVMContext &Ctx);
-RegAllocEvictionAdvisorProvider *
-createDevelopmentModeAdvisorProvider(LLVMContext &Ctx);
-
 /// A MachineFunction analysis for fetching the Eviction Advisor.
 /// This sets up the Provider lazily and caches it.
 /// - in the ML implementation case, the evaluator is stateless but (especially
@@ -276,7 +271,13 @@ class RegAllocEvictionAdvisorAnalysis
  Result run(MachineFunction &MF, MachineFunctionAnalysisManager &MAM);
 
 private:
- void initializeProvider(LLVMContext &Ctx);
+ void
+ initializeProvider(RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode Mode,
+ LLVMContext &Ctx);
+ void
+ initializeMLProvider(RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode Mode,
+ LLVMContext &Ctx);
+
  std::unique_ptr<RegAllocEvictionAdvisorProvider> Provider;
 };
 

llvm/lib/CodeGen/MLRegAllocEvictAdvisor.cpp

@@ -1159,11 +1159,6 @@ void llvm::extractMBBFrequency(
 // Development mode-specific implementations
 #ifdef LLVM_HAVE_TFLITE
 
-RegAllocEvictionAdvisorProvider *
-llvm::createDevelopmentModeAdvisorProvider(LLVMContext &Ctx) {
- return new DevelopmentModeEvictionAdvisorProvider(Ctx);
-}
-
 RegAllocEvictionAdvisorAnalysisLegacy *
 llvm::createDevelopmentModeAdvisorAnalysisLegacy() {
  return new DevelopmentModeEvictionAdvisorAnalysisLegacy();
@@ -1240,9 +1235,22 @@ bool RegAllocScoring::runOnMachineFunction(MachineFunction &MF) {
 }
 #endif // #ifdef LLVM_HAVE_TFLITE
 
-RegAllocEvictionAdvisorProvider *
-llvm::createReleaseModeAdvisorProvider(LLVMContext &Ctx) {
- return new ReleaseModeEvictionAdvisorProvider(Ctx);
+void RegAllocEvictionAdvisorAnalysis::initializeMLProvider(
+ RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode Mode, LLVMContext &Ctx) {
+ if (Provider)
+ return;
+ switch (Mode) {
+ case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Development:
+#if defined(LLVM_HAVE_TFLITE)
+ Provider.reset(new DevelopmentModeEvictionAdvisorProvider(Ctx));
+#endif
+ break;
+ case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Release:
+ Provider.reset(new ReleaseModeEvictionAdvisorProvider(Ctx));
+ break;
+ default:
+ break;
+ }
 }
 
 RegAllocEvictionAdvisorAnalysisLegacy *

llvm/lib/CodeGen/RegAllocEvictionAdvisor.cpp

@@ -120,23 +120,15 @@ class DefaultEvictionAdvisorAnalysisLegacy final
 
 AnalysisKey RegAllocEvictionAdvisorAnalysis::Key;
 
-void RegAllocEvictionAdvisorAnalysis::initializeProvider(LLVMContext &Ctx) {
+void RegAllocEvictionAdvisorAnalysis::initializeProvider(
+ RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode Mode, LLVMContext &Ctx) {
  if (Provider)
  return;
- switch (Mode) {
- case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Default:
+ if (Mode == RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Default)
  Provider.reset(
  new DefaultEvictionAdvisorProvider(/*NotAsRequested*/ false, 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;
- }
+ else
+ initializeMLProvider(Mode, Ctx);
  if (!Provider)
  Provider.reset(
  new DefaultEvictionAdvisorProvider(/*NotAsRequested*/ true, Ctx));
@@ -146,7 +138,7 @@ RegAllocEvictionAdvisorAnalysis::Result
 RegAllocEvictionAdvisorAnalysis::run(MachineFunction &MF,
  MachineFunctionAnalysisManager &MFAM) {
  // Lazy initialization of the provider.
- initializeProvider(MF.getFunction().getContext());
+ initializeProvider(::Mode, MF.getFunction().getContext());
  auto *MBFI = &MFAM.getResult<MachineBlockFrequencyAnalysis>(MF);
  auto *Loops = &MFAM.getResult<MachineLoopAnalysis>(MF);
  Provider->setAnalyses(MBFI, Loops);