[llvm-commits] [release_20] CVS: llvm/lib/Target/X86/X86ISelLowering.cpp

[Tanya Lattner]

Changes in directory llvm/lib/Target/X86:

X86ISelLowering.cpp updated: 1.399.2.1 -> 1.399.2.2
---
Log message:

Merge from mainline


---
Diffs of the changes:  (+5 -2)

 X86ISelLowering.cpp |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.399.2.1 llvm/lib/Target/X86/X86ISelLowering.cpp:1.399.2.2
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.399.2.1	Fri May 18 00:59:52 2007
+++ llvm/lib/Target/X86/X86ISelLowering.cpp	Fri May 18 01:21:50 2007
@@ -2675,7 +2675,8 @@
       return Op;
     }
 
-    if (X86::isSHUFPMask(PermMask.Val))
+    if (X86::isSHUFPMask(PermMask.Val) &&
+        MVT::getSizeInBits(VT) != 64)    // Don't do this for MMX.
       return Op;
 
     // Handle v8i16 shuffle high / low shuffle node pair.
@@ -2712,7 +2713,9 @@
     }
   }
 
-  if (NumElems == 4) {
+  if (NumElems == 4 && 
+      // Don't do this for MMX.
+      MVT::getSizeInBits(VT) != 64) {
     MVT::ValueType MaskVT = PermMask.getValueType();
     MVT::ValueType MaskEVT = MVT::getVectorBaseType(MaskVT);
     SmallVector<std::pair<int, int>, 8> Locs;