diff options
4 files changed, 10 insertions, 19 deletions
diff --git a/llvm/lib/Target/X86/InstPrinter/X86InstComments.cpp b/llvm/lib/Target/X86/InstPrinter/X86InstComments.cpp index 5aa739059bc..a901fba1707 100644 --- a/llvm/lib/Target/X86/InstPrinter/X86InstComments.cpp +++ b/llvm/lib/Target/X86/InstPrinter/X86InstComments.cpp @@ -696,6 +696,7 @@ bool llvm::EmitAnyX86InstComments(const MCInst *MI, raw_ostream &OS, case X86::MOVDI2PDIrm: case X86::VMOVDI2PDIrm: + case X86::VMOVDI2PDIZrm: DecodeZeroMoveLowMask(MVT::v4i32, ShuffleMask); DestName = getRegName(MI->getOperand(0).getReg()); break; diff --git a/llvm/test/CodeGen/X86/merge-consecutive-loads-128.ll b/llvm/test/CodeGen/X86/merge-consecutive-loads-128.ll index 64d5ef9c337..459ec10e4e5 100644 --- a/llvm/test/CodeGen/X86/merge-consecutive-loads-128.ll +++ b/llvm/test/CodeGen/X86/merge-consecutive-loads-128.ll @@ -244,20 +244,10 @@ define <4 x i32> @merge_4i32_i32_3zuu(i32* %ptr) nounwind uwtable noinline ssp { ; SSE-NEXT: movd {{.*#+}} xmm0 = mem[0],zero,zero,zero ; SSE-NEXT: retq ; -; AVX1-LABEL: merge_4i32_i32_3zuu: -; AVX1: # BB#0: -; AVX1-NEXT: vmovd {{.*#+}} xmm0 = mem[0],zero,zero,zero -; AVX1-NEXT: retq -; -; AVX2-LABEL: merge_4i32_i32_3zuu: -; AVX2: # BB#0: -; AVX2-NEXT: vmovd {{.*#+}} xmm0 = mem[0],zero,zero,zero -; AVX2-NEXT: retq -; -; AVX512F-LABEL: merge_4i32_i32_3zuu: -; AVX512F: # BB#0: -; AVX512F-NEXT: vmovd 12(%rdi), %xmm0 -; AVX512F-NEXT: retq +; AVX-LABEL: merge_4i32_i32_3zuu: +; AVX: # BB#0: +; AVX-NEXT: vmovd {{.*#+}} xmm0 = mem[0],zero,zero,zero +; AVX-NEXT: retq %ptr0 = getelementptr inbounds i32, i32* %ptr, i64 3 %val0 = load i32, i32* %ptr0 %res0 = insertelement <4 x i32> undef, i32 %val0, i32 0 diff --git a/llvm/test/CodeGen/X86/merge-consecutive-loads-256.ll b/llvm/test/CodeGen/X86/merge-consecutive-loads-256.ll index f05117939a9..4de30e4f1a6 100644 --- a/llvm/test/CodeGen/X86/merge-consecutive-loads-256.ll +++ b/llvm/test/CodeGen/X86/merge-consecutive-loads-256.ll @@ -358,7 +358,7 @@ define <8 x i32> @merge_8i32_i32_56zz9uzz(i32* %ptr) nounwind uwtable noinline s ; AVX512F-LABEL: merge_8i32_i32_56zz9uzz: ; AVX512F: # BB#0: ; AVX512F-NEXT: vmovq {{.*#+}} xmm0 = mem[0],zero -; AVX512F-NEXT: vmovd 36(%rdi), %xmm1 +; AVX512F-NEXT: vmovd {{.*#+}} xmm1 = mem[0],zero,zero,zero ; AVX512F-NEXT: vinserti128 $1, %xmm1, %ymm0, %ymm0 ; AVX512F-NEXT: retq %ptr0 = getelementptr inbounds i32, i32* %ptr, i64 5 @@ -402,11 +402,11 @@ define <8 x i32> @merge_8i32_i32_1u3u5zu8(i32* %ptr) nounwind uwtable noinline s ; ; AVX512F-LABEL: merge_8i32_i32_1u3u5zu8: ; AVX512F: # BB#0: -; AVX512F-NEXT: vmovd 20(%rdi), %xmm0 -; AVX512F-NEXT: vmovd 32(%rdi), %xmm1 +; AVX512F-NEXT: vmovd {{.*#+}} xmm0 = mem[0],zero,zero,zero +; AVX512F-NEXT: vmovd {{.*#+}} xmm1 = mem[0],zero,zero,zero ; AVX512F-NEXT: vpshufd {{.*#+}} xmm1 = xmm1[0,1,1,0] ; AVX512F-NEXT: vpblendd {{.*#+}} xmm0 = xmm0[0,1],xmm1[2,3] -; AVX512F-NEXT: vmovd 4(%rdi), %xmm1 +; AVX512F-NEXT: vmovd {{.*#+}} xmm1 = mem[0],zero,zero,zero ; AVX512F-NEXT: vpinsrd $2, 12(%rdi), %xmm1, %xmm1 ; AVX512F-NEXT: vinserti128 $1, %xmm0, %ymm1, %ymm0 ; AVX512F-NEXT: retq diff --git a/llvm/test/CodeGen/X86/merge-consecutive-loads-512.ll b/llvm/test/CodeGen/X86/merge-consecutive-loads-512.ll index 3f093d60719..d84aa44e669 100644 --- a/llvm/test/CodeGen/X86/merge-consecutive-loads-512.ll +++ b/llvm/test/CodeGen/X86/merge-consecutive-loads-512.ll @@ -344,7 +344,7 @@ define <16 x i32> @merge_16i32_i32_0uu3zzuuuuuzCuEF(i32* %ptr) nounwind uwtable ; ALL-LABEL: merge_16i32_i32_0uu3zzuuuuuzCuEF: ; ALL: # BB#0: ; ALL-NEXT: vmovq {{.*#+}} xmm0 = mem[0],zero -; ALL-NEXT: vmovd 48(%rdi), %xmm1 +; ALL-NEXT: vmovd {{.*#+}} xmm1 = mem[0],zero,zero,zero ; ALL-NEXT: vpunpcklqdq {{.*#+}} xmm0 = xmm1[0],xmm0[0] ; ALL-NEXT: vinserti128 $1, %xmm0, %ymm0, %ymm0 ; ALL-NEXT: vmovdqu (%rdi), %xmm1 |