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

[Evan Cheng]

Changes in directory llvm/lib/Target/X86:

X86TargetMachine.cpp updated: 1.90 -> 1.91
X86.h updated: 1.38 -> 1.39
---
Log message:

Only lower SELECT when using DAG based isel.


---
Diffs of the changes:  (+8 -4)

 X86.h                |    1 +
 X86TargetMachine.cpp |   11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.90 llvm/lib/Target/X86/X86TargetMachine.cpp:1.91
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.90	Mon Dec 12 14:12:20 2005
+++ llvm/lib/Target/X86/X86TargetMachine.cpp	Fri Dec 16 19:22:13 2005
@@ -27,6 +27,7 @@
 
 X86VectorEnum llvm::X86Vector = NoSSE;
 bool llvm::X86ScalarSSE = false;
+bool llvm::X86DAGIsel = false;
 
 /// X86TargetMachineModule - Note that this is used on hosts that cannot link
 /// in a library unless there are references into the library.  In particular,
@@ -44,8 +45,10 @@
                 cl::location(X86ScalarSSE),
                 cl::init(false));
 
-  cl::opt<bool> EnableX86DAGDAG("enable-x86-dag-isel", cl::Hidden,
-                      cl::desc("Enable DAG-to-DAG isel for X86"));
+  cl::opt<bool, true> EnableX86DAGDAG("enable-x86-dag-isel", cl::Hidden,
+                      cl::desc("Enable DAG-to-DAG isel for X86"),
+                      cl::location(X86DAGIsel),
+                      cl::init(false));
   
   // FIXME: This should eventually be handled with target triples and
   // subtarget support!
@@ -124,7 +127,7 @@
   PM.add(createUnreachableBlockEliminationPass());
 
   // Install an instruction selector.
-  if (EnableX86DAGDAG)
+  if (X86DAGIsel)
     PM.add(createX86ISelDag(*this));
   else
     PM.add(createX86ISelPattern(*this));
@@ -191,7 +194,7 @@
   PM.add(createUnreachableBlockEliminationPass());
 
   // Install an instruction selector.
-  if (EnableX86DAGDAG)
+  if (X86DAGIsel)
     PM.add(createX86ISelDag(TM));
   else
     PM.add(createX86ISelPattern(TM));


Index: llvm/lib/Target/X86/X86.h
diff -u llvm/lib/Target/X86/X86.h:1.38 llvm/lib/Target/X86/X86.h:1.39
--- llvm/lib/Target/X86/X86.h:1.38	Mon Dec 12 14:12:20 2005
+++ llvm/lib/Target/X86/X86.h	Fri Dec 16 19:22:13 2005
@@ -31,6 +31,7 @@
 
 extern X86VectorEnum X86Vector;
 extern bool X86ScalarSSE;
+extern bool X86DAGIsel;
 
 /// createX86ISelPattern - This pass converts an LLVM function into a 
 /// machine code representation using pattern matching and a machine