[llvm] r295053 - [X86][SSE] Move unary inputs handling inside matchVectorShuffleWithUNPCK.

[Simon Pilgrim via llvm-commits]

Author: rksimon
Date: Tue Feb 14 07:47:17 2017
New Revision: 295053

URL: http://llvm.org/viewvc/llvm-project?rev=295053&view=rev
Log:
[X86][SSE] Move unary inputs handling inside matchVectorShuffleWithUNPCK.

Modified:
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=295053&r1=295052&r2=295053&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Feb 14 07:47:17 2017
@@ -8230,12 +8230,14 @@ static bool matchVectorShuffleWithUNPCK(
   createUnpackShuffleMask(VT, Unpckl, /* Lo = */ true, IsUnary);
   if (isTargetShuffleEquivalent(TargetMask, Unpckl)) {
     UnpackOpcode = X86ISD::UNPCKL;
+    V2 = IsUnary ? V1 : V2;
     return true;
   }
 
   createUnpackShuffleMask(VT, Unpckh, /* Lo = */ false, IsUnary);
   if (isTargetShuffleEquivalent(TargetMask, Unpckh)) {
     UnpackOpcode = X86ISD::UNPCKH;
+    V2 = IsUnary ? V1 : V2;
     return true;
   }
 
@@ -26608,8 +26610,7 @@ static bool matchBinaryVectorShuffle(MVT
       (MaskVT.is256BitVector() && 32 <= EltSizeInBits && Subtarget.hasAVX()) ||
       (MaskVT.is256BitVector() && Subtarget.hasAVX2()) ||
       (MaskVT.is512BitVector() && Subtarget.hasAVX512())) {
-    if (matchVectorShuffleWithUNPCK(MaskVT, V1, IsUnary ? V1 : V2, Shuffle,
-                                    IsUnary, Mask)) {
+    if (matchVectorShuffleWithUNPCK(MaskVT, V1, V2, Shuffle, IsUnary, Mask)) {
       ShuffleVT = MaskVT;
       if (ShuffleVT.is256BitVector() && !Subtarget.hasAVX2())
         ShuffleVT = (32 == EltSizeInBits ? MVT::v8f32 : MVT::v4f64);