1 files changed, 41 insertions, 56 deletions
diff --git a/llvm/test/CodeGen/X86/machine-cp.ll b/llvm/test/CodeGen/X86/machine-cp.ll
index 65da1190452..a4fe112e1a7 100644
--- a/llvm/test/CodeGen/X86/machine-cp.ll
+++ b/llvm/test/CodeGen/X86/machine-cp.ll
@@ -99,100 +99,85 @@ while.end:                                        ; preds = %while.body, %entry
 define <16 x float> @foo(<16 x float> %x) {
 ; CHECK-LABEL: foo:
 ; CHECK:       ## BB#0: ## %bb
-; CHECK-NEXT:    xorps %xmm4, %xmm4
+; CHECK-NEXT:    movaps %xmm3, %xmm8
+; CHECK-NEXT:    xorps %xmm3, %xmm3
 ; CHECK-NEXT:    pxor %xmm6, %xmm6
 ; CHECK-NEXT:    pcmpgtd %xmm0, %xmm6
 ; CHECK-NEXT:    movdqa {{.*#+}} xmm5 = [255,255,255,255]
 ; CHECK-NEXT:    pand %xmm6, %xmm5
+; CHECK-NEXT:    packuswb %xmm5, %xmm5
+; CHECK-NEXT:    packuswb %xmm5, %xmm5
 ; CHECK-NEXT:    cvttps2dq %xmm0, %xmm13
 ; CHECK-NEXT:    movdqa %xmm0, %xmm10
-; CHECK-NEXT:    cmpltps %xmm4, %xmm10
-; CHECK-NEXT:    movdqa %xmm6, %xmm8
-; CHECK-NEXT:    pxor %xmm10, %xmm8
+; CHECK-NEXT:    cmpltps %xmm3, %xmm10
+; CHECK-NEXT:    movdqa %xmm6, %xmm9
+; CHECK-NEXT:    pxor %xmm10, %xmm9
 ; CHECK-NEXT:    cvttps2dq %xmm1, %xmm14
 ; CHECK-NEXT:    movaps %xmm1, %xmm11
-; CHECK-NEXT:    cmpltps %xmm4, %xmm11
-; CHECK-NEXT:    movdqa %xmm6, %xmm9
-; CHECK-NEXT:    pxor %xmm11, %xmm9
-; CHECK-NEXT:    cvttps2dq %xmm2, %xmm1
-; CHECK-NEXT:    cmpltps %xmm4, %xmm2
+; CHECK-NEXT:    cmpltps %xmm3, %xmm11
 ; CHECK-NEXT:    movdqa %xmm6, %xmm7
-; CHECK-NEXT:    pxor %xmm2, %xmm7
-; CHECK-NEXT:    cvttps2dq %xmm3, %xmm12
-; CHECK-NEXT:    cmpltps %xmm4, %xmm3
-; CHECK-NEXT:    pxor %xmm3, %xmm6
+; CHECK-NEXT:    pxor %xmm11, %xmm7
+; CHECK-NEXT:    cvttps2dq %xmm2, %xmm1
+; CHECK-NEXT:    cmpltps %xmm3, %xmm2
+; CHECK-NEXT:    movdqa %xmm6, %xmm4
+; CHECK-NEXT:    pxor %xmm2, %xmm4
+; CHECK-NEXT:    cvttps2dq %xmm8, %xmm12
+; CHECK-NEXT:    cmpltps %xmm3, %xmm8
+; CHECK-NEXT:    pxor %xmm8, %xmm6
 ; CHECK-NEXT:    movdqa {{.*#+}} xmm0 = [1,1,1,1]
 ; CHECK-NEXT:    pand %xmm0, %xmm6
+; CHECK-NEXT:    pand %xmm0, %xmm4
 ; CHECK-NEXT:    pand %xmm0, %xmm7
 ; CHECK-NEXT:    pand %xmm0, %xmm9
-; CHECK-NEXT:    pand %xmm0, %xmm8
 ; CHECK-NEXT:    cvtdq2ps %xmm13, %xmm15
 ; CHECK-NEXT:    cvtdq2ps %xmm14, %xmm14
 ; CHECK-NEXT:    cvtdq2ps %xmm1, %xmm13
 ; CHECK-NEXT:    cvtdq2ps %xmm12, %xmm12
 ; CHECK-NEXT:    pxor %xmm0, %xmm0
 ; CHECK-NEXT:    cmpltps %xmm12, %xmm0
-; CHECK-NEXT:    pshuflw {{.*#+}} xmm0 = xmm0[0,2,2,3,4,5,6,7]
-; CHECK-NEXT:    pshufhw {{.*#+}} xmm0 = xmm0[0,1,2,3,4,6,6,7]
-; CHECK-NEXT:    pshufd {{.*#+}} xmm0 = xmm0[0,2,2,3]
 ; CHECK-NEXT:    xorps %xmm1, %xmm1
 ; CHECK-NEXT:    cmpltps %xmm13, %xmm1
-; CHECK-NEXT:    pshuflw {{.*#+}} xmm1 = xmm1[0,2,2,3,4,5,6,7]
-; CHECK-NEXT:    pshufhw {{.*#+}} xmm1 = xmm1[0,1,2,3,4,6,6,7]
-; CHECK-NEXT:    pshufd {{.*#+}} xmm1 = xmm1[0,2,2,3]
-; CHECK-NEXT:    punpcklqdq {{.*#+}} xmm1 = xmm1[0],xmm0[0]
-; CHECK-NEXT:    pxor %xmm0, %xmm0
+; CHECK-NEXT:    packssdw %xmm0, %xmm1
+; CHECK-NEXT:    xorps %xmm0, %xmm0
 ; CHECK-NEXT:    cmpltps %xmm14, %xmm0
-; CHECK-NEXT:    pshuflw {{.*#+}} xmm0 = xmm0[0,2,2,3,4,5,6,7]
-; CHECK-NEXT:    pshufhw {{.*#+}} xmm0 = xmm0[0,1,2,3,4,6,6,7]
-; CHECK-NEXT:    pshufd {{.*#+}} xmm0 = xmm0[0,2,2,3]
-; CHECK-NEXT:    cmpltps %xmm15, %xmm4
-; CHECK-NEXT:    pshuflw {{.*#+}} xmm4 = xmm4[0,2,2,3,4,5,6,7]
-; CHECK-NEXT:    pshufhw {{.*#+}} xmm4 = xmm4[0,1,2,3,4,6,6,7]
-; CHECK-NEXT:    pshufd {{.*#+}} xmm4 = xmm4[0,2,2,3]
-; CHECK-NEXT:    punpcklqdq {{.*#+}} xmm4 = xmm4[0],xmm0[0]
-; CHECK-NEXT:    movdqa {{.*#+}} xmm0 = [255,255,255,255,255,255,255,255]
-; CHECK-NEXT:    pand %xmm0, %xmm1
-; CHECK-NEXT:    pand %xmm0, %xmm4
-; CHECK-NEXT:    packuswb %xmm5, %xmm5
-; CHECK-NEXT:    packuswb %xmm5, %xmm5
-; CHECK-NEXT:    packuswb %xmm1, %xmm4
-; CHECK-NEXT:    pand %xmm5, %xmm4
-; CHECK-NEXT:    movdqa %xmm4, %xmm1
+; CHECK-NEXT:    cmpltps %xmm15, %xmm3
+; CHECK-NEXT:    packssdw %xmm0, %xmm3
+; CHECK-NEXT:    packsswb %xmm1, %xmm3
+; CHECK-NEXT:    pand %xmm5, %xmm3
+; CHECK-NEXT:    movdqa %xmm3, %xmm1
 ; CHECK-NEXT:    punpcklbw {{.*#+}} xmm1 = xmm1[0],xmm0[0],xmm1[1],xmm0[1],xmm1[2],xmm0[2],xmm1[3],xmm0[3],xmm1[4],xmm0[4],xmm1[5],xmm0[5],xmm1[6],xmm0[6],xmm1[7],xmm0[7]
 ; CHECK-NEXT:    movdqa %xmm1, %xmm0
 ; CHECK-NEXT:    punpcklwd {{.*#+}} xmm0 = xmm0[0,0,1,1,2,2,3,3]
 ; CHECK-NEXT:    pslld $31, %xmm0
 ; CHECK-NEXT:    psrad $31, %xmm0
-; CHECK-NEXT:    pxor %xmm8, %xmm0
-; CHECK-NEXT:    pxor %xmm15, %xmm0
 ; CHECK-NEXT:    punpckhwd {{.*#+}} xmm1 = xmm1[4],xmm0[4],xmm1[5],xmm0[5],xmm1[6],xmm0[6],xmm1[7],xmm0[7]
 ; CHECK-NEXT:    pslld $31, %xmm1
 ; CHECK-NEXT:    psrad $31, %xmm1
-; CHECK-NEXT:    punpckhbw {{.*#+}} xmm4 = xmm4[8],xmm0[8],xmm4[9],xmm0[9],xmm4[10],xmm0[10],xmm4[11],xmm0[11],xmm4[12],xmm0[12],xmm4[13],xmm0[13],xmm4[14],xmm0[14],xmm4[15],xmm0[15]
-; CHECK-NEXT:    pxor %xmm9, %xmm1
-; CHECK-NEXT:    pxor %xmm14, %xmm1
-; CHECK-NEXT:    movdqa %xmm4, %xmm5
+; CHECK-NEXT:    punpckhbw {{.*#+}} xmm3 = xmm3[8],xmm0[8],xmm3[9],xmm0[9],xmm3[10],xmm0[10],xmm3[11],xmm0[11],xmm3[12],xmm0[12],xmm3[13],xmm0[13],xmm3[14],xmm0[14],xmm3[15],xmm0[15]
+; CHECK-NEXT:    movdqa %xmm3, %xmm5
 ; CHECK-NEXT:    punpcklwd {{.*#+}} xmm5 = xmm5[0],xmm0[0],xmm5[1],xmm0[1],xmm5[2],xmm0[2],xmm5[3],xmm0[3]
 ; CHECK-NEXT:    pslld $31, %xmm5
 ; CHECK-NEXT:    psrad $31, %xmm5
-; CHECK-NEXT:    pxor %xmm7, %xmm5
+; CHECK-NEXT:    punpckhwd {{.*#+}} xmm3 = xmm3[4],xmm0[4],xmm3[5],xmm0[5],xmm3[6],xmm0[6],xmm3[7],xmm0[7]
+; CHECK-NEXT:    pslld $31, %xmm3
+; CHECK-NEXT:    psrad $31, %xmm3
+; CHECK-NEXT:    pxor %xmm9, %xmm0
+; CHECK-NEXT:    pxor %xmm15, %xmm0
+; CHECK-NEXT:    pxor %xmm7, %xmm1
+; CHECK-NEXT:    pxor %xmm14, %xmm1
+; CHECK-NEXT:    pxor %xmm4, %xmm5
 ; CHECK-NEXT:    pxor %xmm13, %xmm5
-; CHECK-NEXT:    punpckhwd {{.*#+}} xmm4 = xmm4[4],xmm0[4],xmm4[5],xmm0[5],xmm4[6],xmm0[6],xmm4[7],xmm0[7]
-; CHECK-NEXT:    pslld $31, %xmm4
-; CHECK-NEXT:    psrad $31, %xmm4
-; CHECK-NEXT:    pxor %xmm6, %xmm4
-; CHECK-NEXT:    pxor %xmm12, %xmm4
-; CHECK-NEXT:    pand %xmm3, %xmm4
+; CHECK-NEXT:    pxor %xmm6, %xmm3
+; CHECK-NEXT:    pxor %xmm12, %xmm3
+; CHECK-NEXT:    pand %xmm8, %xmm3
 ; CHECK-NEXT:    pand %xmm2, %xmm5
 ; CHECK-NEXT:    pand %xmm11, %xmm1
 ; CHECK-NEXT:    pand %xmm10, %xmm0
-; CHECK-NEXT:    pxor %xmm8, %xmm0
-; CHECK-NEXT:    pxor %xmm9, %xmm1
-; CHECK-NEXT:    pxor %xmm7, %xmm5
-; CHECK-NEXT:    pxor %xmm6, %xmm4
+; CHECK-NEXT:    pxor %xmm9, %xmm0
+; CHECK-NEXT:    pxor %xmm7, %xmm1
+; CHECK-NEXT:    pxor %xmm4, %xmm5
+; CHECK-NEXT:    pxor %xmm6, %xmm3
 ; CHECK-NEXT:    movdqa %xmm5, %xmm2
-; CHECK-NEXT:    movdqa %xmm4, %xmm3
 ; CHECK-NEXT:    retq
 bb:
   %v3 = icmp slt <16 x i32> undef, zeroinitializer