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

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

Makefile updated: 1.18 -> 1.19
X86.h updated: 1.27 -> 1.28
X86ISelPattern.cpp updated: 1.9 -> 1.10
X86TargetMachine.cpp updated: 1.64 -> 1.65
---
Log message:

Disable the pattern isel


---
Diffs of the changes:  (+13 -25)

Index: llvm/lib/Target/X86/Makefile
diff -u llvm/lib/Target/X86/Makefile:1.18 llvm/lib/Target/X86/Makefile:1.19
--- llvm/lib/Target/X86/Makefile:1.18	Sun Aug  1 01:01:32 2004
+++ llvm/lib/Target/X86/Makefile	Sun Aug 15 18:02:17 2004
@@ -15,8 +15,7 @@
 # Make sure that tblgen is run, first thing.
 $(SourceDepend): X86GenRegisterInfo.h.inc X86GenRegisterNames.inc \
                  X86GenRegisterInfo.inc X86GenInstrNames.inc \
-                 X86GenInstrInfo.inc X86GenAsmWriter.inc \
-                 X86GenInstrSelector.inc
+                 X86GenInstrInfo.inc X86GenAsmWriter.inc
 
 TDFILES = $(SourceDir)/$(TARGET).td $(wildcard $(SourceDir)/*.td) \
           $(SourceDir)/../Target.td
@@ -45,9 +44,9 @@
 	@echo "Building $(TARGET).td assembly writer with tblgen"
 	$(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-asm-writer -o $@
 
-$(TARGET)GenInstrSelector.inc:: $(TDFILES) $(TBLGEN)
-	@echo "Building $(TARGET).td instruction selector with tblgen"
-	$(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-selector -o $@
+#$(TARGET)GenInstrSelector.inc:: $(TDFILES) $(TBLGEN)
+#	@echo "Building $(TARGET).td instruction selector with tblgen"
+#	$(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-selector -o $@
 
 clean::
 	$(VERB) rm -f *.inc


Index: llvm/lib/Target/X86/X86.h
diff -u llvm/lib/Target/X86/X86.h:1.27 llvm/lib/Target/X86/X86.h:1.28
--- llvm/lib/Target/X86/X86.h:1.27	Thu Jul 22 16:30:35 2004
+++ llvm/lib/Target/X86/X86.h	Sun Aug 15 18:02:17 2004
@@ -29,12 +29,6 @@
 ///
 FunctionPass *createX86SimpleInstructionSelector(TargetMachine &TM);
 
-/// createX86PatternInstructionSelector - This pass converts an LLVM function
-/// into a machine code representation using pattern matching and a machine
-/// description file.
-///
-FunctionPass *createX86PatternInstructionSelector(TargetMachine &TM);
-
 /// createX86SSAPeepholeOptimizerPass - Create a pass to perform SSA-based X86
 /// specific peephole optimizations.
 ///


Index: llvm/lib/Target/X86/X86ISelPattern.cpp
diff -u llvm/lib/Target/X86/X86ISelPattern.cpp:1.9 llvm/lib/Target/X86/X86ISelPattern.cpp:1.10
--- llvm/lib/Target/X86/X86ISelPattern.cpp:1.9	Mon Jul 26 13:45:48 2004
+++ llvm/lib/Target/X86/X86ISelPattern.cpp	Sun Aug 15 18:02:17 2004
@@ -14,6 +14,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+/// NOTE: This whole selector is completely disabled.  This is only retained
+/// for historical interest and future work.  It will probably change 
+/// substantially in the future.
+#if 0
+
 #include "X86.h"
 #include "llvm/Pass.h"
 #include "llvm/Function.h"
@@ -122,3 +127,5 @@
 FunctionPass *llvm::createX86PatternInstructionSelector(TargetMachine &TM) {
   return new ISel(TM);  
 }
+
+#endif


Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.64 llvm/lib/Target/X86/X86TargetMachine.cpp:1.65
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.64	Sat Jul 31 22:28:02 2004
+++ llvm/lib/Target/X86/X86TargetMachine.cpp	Sun Aug 15 18:02:17 2004
@@ -26,12 +26,6 @@
 using namespace llvm;
 
 namespace {
-#if 0  // FIXME: This will be used in the future.
-  cl::opt<bool> NoPatternISel("disable-pattern-isel", cl::init(true),
-                        cl::desc("Use the 'simple' X86 instruction selector"));
-#else
-  static const bool NoPatternISel = true;
-#endif
   cl::opt<bool> NoSSAPeephole("disable-ssa-peephole", cl::init(true),
                         cl::desc("Disable the ssa-based peephole optimizer "
                                  "(defaults to disabled)"));
@@ -87,10 +81,7 @@
   // Make sure that no unreachable blocks are instruction selected.
   PM.add(createUnreachableBlockEliminationPass());
 
-  if (NoPatternISel)
-    PM.add(createX86SimpleInstructionSelector(*this));
-  else
-    PM.add(createX86PatternInstructionSelector(*this));
+  PM.add(createX86SimpleInstructionSelector(*this));
 
   // Run optional SSA-based machine code optimizations next...
   if (!NoSSAPeephole)
@@ -145,10 +136,7 @@
   // Make sure that no unreachable blocks are instruction selected.
   PM.add(createUnreachableBlockEliminationPass());
 
-  if (NoPatternISel)
-    PM.add(createX86SimpleInstructionSelector(TM));
-  else
-    PM.add(createX86PatternInstructionSelector(TM));
+  PM.add(createX86SimpleInstructionSelector(TM));
 
   // Run optional SSA-based machine code optimizations next...
   if (!NoSSAPeephole)