Moved enum and command-line option in separate file. Also added function that returns the user selected register allocator to the caller.

llvm-svn: 8819

1 files changed, 2 insertions, 29 deletions

diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp
index 8f6829f6de4..d511de67212 100644
--- a/llvm/lib/Target/X86/X86TargetMachine.cpp
+++ b/llvm/lib/Target/X86/X86TargetMachine.cpp
@@ -16,15 +16,6 @@
 #include "Support/Statistic.h"
 
 namespace {
-  cl::opt<RegAllocName>
-  RegAlloc("regalloc",
-           cl::desc("Register allocator to use: (default = simple)"),
-           cl::Prefix,
-           cl::values(clEnumVal(simple, "  simple register allocator"),
-                      clEnumVal(local,  "  local register allocator"),
-                      0),
-           cl::init(local));
-
   cl::opt<bool> PrintCode("print-machineinstrs",
 			  cl::desc("Print generated machine code"));
   cl::opt<bool> NoPatternISel("disable-pattern-isel", cl::init(true),
@@ -73,16 +64,7 @@ bool X86TargetMachine::addPassesToEmitAssembly(PassManager &PM,
     PM.add(createMachineFunctionPrinterPass());
 
   // Perform register allocation to convert to a concrete x86 representation
-  switch (RegAlloc) {
-  case simple:
-    PM.add(createSimpleRegisterAllocator());
-    break;
-  case local:
-    PM.add(createLocalRegisterAllocator());
-    break;
-  default:
-    assert(0 && "no register allocator selected");
-  }
+  PM.add(createRegisterAllocator());
 
   if (PrintCode)
     PM.add(createMachineFunctionPrinterPass());
@@ -126,16 +108,7 @@ bool X86TargetMachine::addPassesToJITCompile(FunctionPassManager &PM) {
     PM.add(createMachineFunctionPrinterPass());
 
   // Perform register allocation to convert to a concrete x86 representation
-  switch (RegAlloc) {
-  case simple:
-    PM.add(createSimpleRegisterAllocator());
-    break;
-  case local:
-    PM.add(createLocalRegisterAllocator());
-    break;
-  default:
-    assert(0 && "no register allocator selected");
-  }
+  PM.add(createRegisterAllocator());
 
   if (PrintCode)
     PM.add(createMachineFunctionPrinterPass());