address reviews, use #else

llvm · Jan 23, 2025 · 37f96a9 · 37f96a9
1 parent 7538d53
commit 37f96a9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/llvm/include/llvm/CodeGen/RegAllocEvictionAdvisor.h b/llvm/include/llvm/CodeGen/RegAllocEvictionAdvisor.h
@@ -20,6 +20,7 @@
 #include "llvm/IR/PassManager.h"
 #include "llvm/MC/MCRegister.h"
 #include "llvm/Pass.h"
+#include "llvm/Support/Compiler.h"
 
 namespace llvm {
 class AllocationOrder;
@@ -279,7 +280,7 @@ RegAllocEvictionAdvisorAnalysisLegacy *createReleaseModeAdvisorAnalysisLegacy();
 RegAllocEvictionAdvisorAnalysisLegacy *
 createDevelopmentModeAdvisorAnalysisLegacy();
 
-RegAllocEvictionAdvisorProvider *
+LLVM_ATTRIBUTE_RETURNS_NONNULL RegAllocEvictionAdvisorProvider *
 createReleaseModeAdvisorProvider(LLVMContext &Ctx);
 
 RegAllocEvictionAdvisorProvider *

diff --git a/llvm/lib/CodeGen/MLRegAllocEvictAdvisor.cpp b/llvm/lib/CodeGen/MLRegAllocEvictAdvisor.cpp
@@ -603,9 +603,6 @@ class DevelopmentModeEvictionAdvisorAnalysisLegacy final
     AU.addRequired<MachineLoopInfoWrapperPass>();
     RegAllocEvictionAdvisorAnalysisLegacy::getAnalysisUsage(AU);
   }
-
-private:
-  // std::unique_ptr<DevelopmentModeEvictionAdvisorProvider> Provider;
 };
 
 #endif // #ifdef LLVM_HAVE_TFLITE

diff --git a/llvm/lib/CodeGen/RegAllocEvictionAdvisor.cpp b/llvm/lib/CodeGen/RegAllocEvictionAdvisor.cpp
@@ -122,20 +122,20 @@ void RegAllocEvictionAdvisorAnalysis::initializeProvider(
   case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Default:
     Provider.reset(
         new DefaultEvictionAdvisorProvider(/*NotAsRequested=*/false, Ctx));
-    break;
+    return;
   case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Development:
 #if defined(LLVM_HAVE_TFLITE)
     Provider.reset(createDevelopmentModeAdvisorProvider(Ctx));
+#else
+    Provider.reset(
+        new DefaultEvictionAdvisorProvider(/*NotAsRequested=*/true, Ctx));
 #endif
-    break;
+    assert(Provider && "EvictionAdvisorProvider cannot be null");
+    return;
   case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Release:
     Provider.reset(createReleaseModeAdvisorProvider(Ctx));
-    break;
+    return;
   }
-
-  if (!Provider)
-    Provider.reset(
-        new DefaultEvictionAdvisorProvider(/*NotAsRequested=*/true, Ctx));
 }
 
 RegAllocEvictionAdvisorAnalysis::Result
@@ -151,20 +151,21 @@ Pass *llvm::callDefaultCtor<RegAllocEvictionAdvisorAnalysisLegacy>() {
   Pass *Ret = nullptr;
   switch (Mode) {
   case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Default:
-    Ret = new DefaultEvictionAdvisorAnalysisLegacy(/*NotAsRequested*/ false);
+    return new DefaultEvictionAdvisorAnalysisLegacy(/*NotAsRequested*/ false);
+  case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Release:
+    Ret = createReleaseModeAdvisorAnalysisLegacy();
     break;
   case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Development:
 #if defined(LLVM_HAVE_TFLITE)
     Ret = createDevelopmentModeAdvisorAnalysisLegacy();
 #endif
     break;
-  case RegAllocEvictionAdvisorAnalysisLegacy::AdvisorMode::Release:
-    Ret = createReleaseModeAdvisorAnalysisLegacy();
-    break;
   }
-  if (Ret)
-    return Ret;
-  return new DefaultEvictionAdvisorAnalysisLegacy(/*NotAsRequested*/ true);
+
+  // release or development mode advisor may not be supported
+  if (!Ret)
+    Ret = new DefaultEvictionAdvisorAnalysisLegacy(/*NotAsRequested*/ true);
+  return Ret;
 }
 
 StringRef RegAllocEvictionAdvisorAnalysisLegacy::getPassName() const {