Commit 8c32fe0e authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merge from mainline 

llvm-svn: 37217
parent 2e406e7d

llvm/lib/Target/X86/X86ISelLowering.cpp

+5 −2
Original line number Diff line number Diff line
@@ -2675,7 +2675,8 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDOperand Op, SelectionDAG &DAG) { 
      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 @@ X86TargetLowering::LowerVECTOR_SHUFFLE(SDOperand Op, SelectionDAG &DAG) { 
    }

  }



  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;