[llvm-commits] [regalloc_linearscan] CVS: llvm/lib/Target/X86/X86TargetMachine.cpp

[Alkis Evlogimenos]

Changes in directory llvm/lib/Target/X86:

X86TargetMachine.cpp updated: 1.25.2.3 -> 1.25.2.4

---
Log message:

Merge-in from main


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.25.2.3 llvm/lib/Target/X86/X86TargetMachine.cpp:1.25.2.4
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.25.2.3	Thu Oct  2 02:26:01 2003
+++ llvm/lib/Target/X86/X86TargetMachine.cpp	Thu Oct  2 12:19:46 2003
@@ -16,16 +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"),
-                      clEnumVal(linearscan, "  linear scan global 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),
@@ -74,18 +64,7 @@
     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;
-  case linearscan:
-    PM.add(createLocalRegisterAllocator());
-  default:
-    assert(0 && "no register allocator selected");
-  }
+  PM.add(createRegisterAllocator());
 
   if (PrintCode)
     PM.add(createMachineFunctionPrinterPass());
@@ -129,19 +108,7 @@
     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;
-  case linearscan:
-    PM.add(createLinearScanRegisterAllocator());
-    break;
-  default:
-    assert(0 && "no register allocator selected");
-  }
+  PM.add(createRegisterAllocator());
 
   if (PrintCode)
     PM.add(createMachineFunctionPrinterPass());