Skip to content

Commit ed0fcdc

Browse files
RKSimonJaddyen
authored andcommitted
[X86] lowerV8F32Shuffle - use lowerShufflePairAsUNPCKAndPermute on AVX1 targets (llvm#140881)
If we're not going to split the v8f32 shuffle anyway, attempt to match with lowerShufflePairAsUNPCKAndPermute
1 parent 292cae2 commit ed0fcdc

File tree

3 files changed

+135
-194
lines changed

3 files changed

+135
-194
lines changed

llvm/lib/Target/X86/X86ISelLowering.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16705,10 +16705,11 @@ static SDValue lowerV8F32Shuffle(const SDLoc &DL, ArrayRef<int> Mask,
1670516705

1670616706
// Try to match an interleave of two v8f32s and lower them as unpck and
1670716707
// permutes using ymms. This needs to go before we try to split the vectors.
16708-
//
16709-
// TODO: Expand this to AVX1. Currently v8i32 is casted to v8f32 and hits
16710-
// this path inadvertently.
16711-
if (Subtarget.hasAVX2() && !Subtarget.hasAVX512())
16708+
// Don't attempt on AVX1 if we're likely to split vectors anyway.
16709+
if ((Subtarget.hasAVX2() ||
16710+
!(isFreeToSplitVector(peekThroughBitcasts(V1), DAG) ||
16711+
isFreeToSplitVector(peekThroughBitcasts(V2), DAG))) &&
16712+
!Subtarget.hasAVX512())
1671216713
if (SDValue V = lowerShufflePairAsUNPCKAndPermute(DL, MVT::v8f32, V1, V2,
1671316714
Mask, DAG))
1671416715
return V;

llvm/test/CodeGen/X86/vector-interleave.ll

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -265,15 +265,10 @@ define <16 x i32> @interleave2x8i32(<8 x i32> %a, <8 x i32> %b) {
265265
;
266266
; AVX1-LABEL: interleave2x8i32:
267267
; AVX1: # %bb.0:
268-
; AVX1-NEXT: vunpckhps {{.*#+}} xmm2 = xmm0[2],xmm1[2],xmm0[3],xmm1[3]
269-
; AVX1-NEXT: vunpcklps {{.*#+}} xmm3 = xmm0[0],xmm1[0],xmm0[1],xmm1[1]
270-
; AVX1-NEXT: vinsertf128 $1, %xmm2, %ymm3, %ymm2
271-
; AVX1-NEXT: vextractf128 $1, %ymm1, %xmm1
272-
; AVX1-NEXT: vextractf128 $1, %ymm0, %xmm0
273-
; AVX1-NEXT: vunpckhps {{.*#+}} xmm3 = xmm0[2],xmm1[2],xmm0[3],xmm1[3]
274-
; AVX1-NEXT: vunpcklps {{.*#+}} xmm0 = xmm0[0],xmm1[0],xmm0[1],xmm1[1]
275-
; AVX1-NEXT: vinsertf128 $1, %xmm3, %ymm0, %ymm1
276-
; AVX1-NEXT: vmovaps %ymm2, %ymm0
268+
; AVX1-NEXT: vunpckhps {{.*#+}} ymm2 = ymm0[2],ymm1[2],ymm0[3],ymm1[3],ymm0[6],ymm1[6],ymm0[7],ymm1[7]
269+
; AVX1-NEXT: vunpcklps {{.*#+}} ymm0 = ymm0[0],ymm1[0],ymm0[1],ymm1[1],ymm0[4],ymm1[4],ymm0[5],ymm1[5]
270+
; AVX1-NEXT: vperm2f128 {{.*#+}} ymm1 = ymm0[2,3],ymm2[2,3]
271+
; AVX1-NEXT: vinsertf128 $1, %xmm2, %ymm0, %ymm0
277272
; AVX1-NEXT: retq
278273
;
279274
; AVX2-LABEL: interleave2x8i32:

0 commit comments

Comments
 (0)