Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions llvm/lib/Target/X86/X86ISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7557,6 +7557,19 @@ static SDValue EltsFromConsecutiveLoads(EVT VT, ArrayRef<SDValue> Elts,
}
}

// REVERSE - attempt to match the loads in reverse and then shuffle back.
// TODO: Do this for any permute or mismatching element counts.
if (Depth == 0 && !ZeroMask && TLI.isTypeLegal(VT) && VT.isVector() &&
NumElems == VT.getVectorNumElements()) {
SmallVector<SDValue, 16> ReverseElts(Elts.rbegin(), Elts.rend());
if (SDValue RevLd = EltsFromConsecutiveLoads(
VT, ReverseElts, DL, DAG, Subtarget, IsAfterLegalize, Depth + 1)) {
SmallVector<int, 16> ReverseMask(NumElems);
std::iota(ReverseMask.rbegin(), ReverseMask.rend(), 0);
return DAG.getVectorShuffle(VT, DL, RevLd, DAG.getUNDEF(VT), ReverseMask);
}
}

return SDValue();
}

Expand Down Expand Up @@ -59490,8 +59503,8 @@ static SDValue combineConcatVectorOps(const SDLoc &DL, MVT VT,
if (TLI->allowsMemoryAccess(Ctx, DAG.getDataLayout(), VT,
*FirstLd->getMemOperand(), &Fast) &&
Fast) {
if (SDValue Ld =
EltsFromConsecutiveLoads(VT, Ops, DL, DAG, Subtarget, false))
if (SDValue Ld = EltsFromConsecutiveLoads(VT, Ops, DL, DAG, Subtarget,
false, Depth + 1))
return Ld;
}
}
Expand Down
20 changes: 8 additions & 12 deletions llvm/test/CodeGen/X86/bitcnt-big-integer.ll
Original file line number Diff line number Diff line change
Expand Up @@ -844,13 +844,11 @@ define i32 @test_ctlz_i512(i512 %a0) nounwind {
; AVX512-NEXT: vmovq %rcx, %xmm2
; AVX512-NEXT: vpunpcklqdq {{.*#+}} xmm1 = xmm2[0],xmm1[0]
; AVX512-NEXT: vinserti128 $1, %xmm0, %ymm1, %ymm0
; AVX512-NEXT: vmovq %r8, %xmm1
; AVX512-NEXT: vmovq %r9, %xmm2
; AVX512-NEXT: vpunpcklqdq {{.*#+}} xmm1 = xmm2[0],xmm1[0]
; AVX512-NEXT: vmovq {{.*#+}} xmm2 = mem[0],zero
; AVX512-NEXT: vmovq {{.*#+}} xmm3 = mem[0],zero
; AVX512-NEXT: vpshufd {{.*#+}} xmm1 = mem[2,3,0,1]
; AVX512-NEXT: vmovq %r8, %xmm2
; AVX512-NEXT: vmovq %r9, %xmm3
; AVX512-NEXT: vpunpcklqdq {{.*#+}} xmm2 = xmm3[0],xmm2[0]
; AVX512-NEXT: vinserti128 $1, %xmm1, %ymm2, %ymm1
; AVX512-NEXT: vinserti128 $1, %xmm2, %ymm1, %ymm1
; AVX512-NEXT: vinserti64x4 $1, %ymm0, %zmm1, %zmm0
; AVX512-NEXT: vplzcntq %zmm0, %zmm1
; AVX512-NEXT: vpaddq {{\.?LCPI[0-9]+_[0-9]+}}(%rip), %zmm1, %zmm1
Expand Down Expand Up @@ -2071,13 +2069,11 @@ define i32 @test_ctlz_undef_i512(i512 %a0) nounwind {
; AVX512-NEXT: vmovq %rcx, %xmm2
; AVX512-NEXT: vpunpcklqdq {{.*#+}} xmm1 = xmm2[0],xmm1[0]
; AVX512-NEXT: vinserti128 $1, %xmm0, %ymm1, %ymm0
; AVX512-NEXT: vmovq %r8, %xmm1
; AVX512-NEXT: vmovq %r9, %xmm2
; AVX512-NEXT: vpunpcklqdq {{.*#+}} xmm1 = xmm2[0],xmm1[0]
; AVX512-NEXT: vmovq {{.*#+}} xmm2 = mem[0],zero
; AVX512-NEXT: vmovq {{.*#+}} xmm3 = mem[0],zero
; AVX512-NEXT: vpshufd {{.*#+}} xmm1 = mem[2,3,0,1]
; AVX512-NEXT: vmovq %r8, %xmm2
; AVX512-NEXT: vmovq %r9, %xmm3
; AVX512-NEXT: vpunpcklqdq {{.*#+}} xmm2 = xmm3[0],xmm2[0]
; AVX512-NEXT: vinserti128 $1, %xmm1, %ymm2, %ymm1
; AVX512-NEXT: vinserti128 $1, %xmm2, %ymm1, %ymm1
; AVX512-NEXT: vinserti64x4 $1, %ymm0, %zmm1, %zmm0
; AVX512-NEXT: vptestmq %zmm0, %zmm0, %k1
; AVX512-NEXT: vplzcntq %zmm0, %zmm0
Expand Down
5 changes: 2 additions & 3 deletions llvm/test/CodeGen/X86/build-vector-256.ll
Original file line number Diff line number Diff line change
Expand Up @@ -417,9 +417,8 @@ define <32 x i8> @test_buildvector_v32i8(i8 %a0, i8 %a1, i8 %a2, i8 %a3, i8 %a4,
define <4 x double> @test_buildvector_4f64_2_var(double %a0, double %a1) {
; AVX1-32-LABEL: test_buildvector_4f64_2_var:
; AVX1-32: # %bb.0:
; AVX1-32-NEXT: vmovups {{[0-9]+}}(%esp), %xmm0
; AVX1-32-NEXT: vmovsd {{.*#+}} xmm1 = mem[0],zero
; AVX1-32-NEXT: vmovhps {{.*#+}} xmm1 = xmm1[0,1],mem[0,1]
; AVX1-32-NEXT: vmovupd {{[0-9]+}}(%esp), %xmm0
; AVX1-32-NEXT: vshufpd {{.*#+}} xmm1 = xmm0[1,0]
; AVX1-32-NEXT: vinsertf128 $1, %xmm1, %ymm0, %ymm0
; AVX1-32-NEXT: retl
;
Expand Down
3 changes: 1 addition & 2 deletions llvm/test/CodeGen/X86/chain_order.ll
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ define void @cftx020(ptr nocapture %a) {
; CHECK-LABEL: cftx020:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: vmovsd {{.*#+}} xmm0 = mem[0],zero
; CHECK-NEXT: vmovsd {{.*#+}} xmm1 = mem[0],zero
; CHECK-NEXT: vmovhpd {{.*#+}} xmm0 = xmm0[0],mem[0]
; CHECK-NEXT: vmovhpd {{.*#+}} xmm1 = xmm1[0],mem[0]
; CHECK-NEXT: vpermilpd {{.*#+}} xmm1 = mem[1,0]
; CHECK-NEXT: vaddpd %xmm1, %xmm0, %xmm0
; CHECK-NEXT: vmovupd (%rdi), %xmm1
; CHECK-NEXT: vmovupd %xmm0, (%rdi)
Expand Down
Loading
Loading