Skip to content

Commit

Permalink
Revert "[X86][DAGISel] Don't widen shuffle element with AVX512"
Browse files Browse the repository at this point in the history 
This reverts commit 5fb4134.

This patch is causing crashes when building llvm-test-suite when
optimizing for CPUs with AVX512.

Reproducer crashing with llc:

    target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
    target triple = "x86_64-apple-macosx"

    define i32 @test(<32 x i32> %0) #0 {
    entry:
      %1 = mul <32 x i32> %0, <i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1, i32 1>
      %2 = tail call i32 @llvm.vector.reduce.add.v32i32(<32 x i32> %1)
      ret i32 %2
    }

    ; Function Attrs: nocallback nofree nosync nounwind readnone willreturn
    declare i32 @llvm.vector.reduce.add.v32i32(<32 x i32>) #1

    attributes #0 = { "min-legal-vector-width"="0" "target-cpu"="skylake-avx512" }
    attributes #1 = { nocallback nofree nosync nounwind readnone willreturn }
  • Loading branch information
@fhahn
fhahn committed Jul 28, 2022
1 parent be488ba commit f912bab
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 91 deletions.
39 changes: 0 additions & 39 deletions llvm/lib/Target/X86/X86ISelLowering.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19304,44 +19304,6 @@ static bool canonicalizeShuffleMaskWithCommute(ArrayRef<int> Mask) {
return false;
}

static bool canCombineAsMaskOperation(SDValue V1, SDValue V2,
const X86Subtarget &Subtarget) {
if (!Subtarget.hasAVX512())
return false;

MVT VT = V1.getSimpleValueType().getScalarType();
if ((VT == MVT::i16 || VT == MVT::i8) && !Subtarget.hasBWI())
return false;

// i8 is better to be widen to i16, because there is PBLENDW for vXi16
// when the vector bit size is 128 or 256.
if (VT == MVT::i8 && V1.getSimpleValueType().getSizeInBits() < 512)
return false;

auto HasMaskOperation = [&](SDValue V) {
// TODO: Currently we only check limited opcode. We probably extend
// it to all binary operation by checking TLI.isBinOp().
switch (V->getOpcode()) {
default:
return false;
case ISD::ADD:
case ISD::SUB:
case ISD::AND:
case ISD::XOR:
break;
}
if (!V->hasOneUse())
return false;

return true;
};

if (HasMaskOperation(V1) || HasMaskOperation(V2))
return true;

return false;
}

// Forward declaration.
static SDValue canonicalizeShuffleMaskWithHorizOp(
MutableArrayRef<SDValue> Ops, MutableArrayRef<int> Mask,
Expand Down Expand Up @@ -19417,7 +19379,6 @@ static SDValue lowerVECTOR_SHUFFLE(SDValue Op, const X86Subtarget &Subtarget,
// integers to handle flipping the low and high halves of AVX 256-bit vectors.
SmallVector<int, 16> WidenedMask;
if (VT.getScalarSizeInBits() < 64 && !Is1BitVector &&
!canCombineAsMaskOperation(V1, V2, Subtarget) &&
canWidenShuffleElements(OrigMask, Zeroable, V2IsZero, WidenedMask)) {
// Shuffle mask widening should not interfere with a broadcast opportunity
// by obfuscating the operands with bitcasts.
Expand Down
71 changes: 39 additions & 32 deletions llvm/test/CodeGen/X86/avx512-shuffles/shuffle-blend.ll
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc < %s -mtriple=i686-unknown-linux-gnu -mattr=+avx512f | FileCheck %s --check-prefixes=CHECK,AVX512F,X86-AVX512F
; RUN: llc < %s -mtriple=x86_64-unknown-linux-gnu -mattr=+avx512f | FileCheck %s --check-prefixes=CHECK,AVX512F,X64-AVX512F
; RUN: llc < %s -mtriple=i686-unknown-linux-gnu -mattr=+avx512f,+avx512vl,+avx512bw | FileCheck %s --check-prefixes=CHECK,AVX512BW,X86-AVX512BW
; RUN: llc < %s -mtriple=x86_64-unknown-linux-gnu -mattr=+avx512f,+avx512vl,+avx512bw | FileCheck %s --check-prefixes=CHECK,AVX512BW,X64-AVX512BW
; RUN: llc < %s -mtriple=i686-unknown-linux-gnu -mattr=+avx512f,+avx512vl,+avx512bw | FileCheck %s --check-prefixes=CHECK,AVX512BW
; RUN: llc < %s -mtriple=x86_64-unknown-linux-gnu -mattr=+avx512f,+avx512vl,+avx512bw | FileCheck %s --check-prefixes=CHECK,AVX512BW

define <16 x i32> @shuffle_v8i64(<16 x i32> %t0, <16 x i32> %t1) {
; CHECK-LABEL: shuffle_v8i64:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: vpaddd %zmm1, %zmm0, %zmm2
; CHECK-NEXT: vpsubd %zmm1, %zmm0, %zmm0
; CHECK-NEXT: vshufps {{.*#+}} zmm0 = zmm2[0,1],zmm0[2,3],zmm2[4,5],zmm0[6,7],zmm2[8,9],zmm0[10,11],zmm2[12,13],zmm0[14,15]
; CHECK-NEXT: ret{{[l|q]}}
; AVX512F-LABEL: shuffle_v8i64:
; AVX512F: # %bb.0: # %entry
; AVX512F-NEXT: vpaddd %zmm1, %zmm0, %zmm2
; AVX512F-NEXT: vpsubd %zmm1, %zmm0, %zmm0
; AVX512F-NEXT: movb $-86, %al
; AVX512F-NEXT: kmovw %eax, %k1
; AVX512F-NEXT: vmovdqa64 %zmm0, %zmm2 {%k1}
; AVX512F-NEXT: vmovdqa64 %zmm2, %zmm0
; AVX512F-NEXT: ret{{[l|q]}}
;
; AVX512BW-LABEL: shuffle_v8i64:
; AVX512BW: # %bb.0: # %entry
; AVX512BW-NEXT: vpaddd %zmm1, %zmm0, %zmm2
; AVX512BW-NEXT: vpsubd %zmm1, %zmm0, %zmm0
; AVX512BW-NEXT: movb $-86, %al
; AVX512BW-NEXT: kmovd %eax, %k1
; AVX512BW-NEXT: vmovdqa64 %zmm0, %zmm2 {%k1}
; AVX512BW-NEXT: vmovdqa64 %zmm2, %zmm0
; AVX512BW-NEXT: ret{{[l|q]}}
entry:
%t2 = add nsw <16 x i32> %t0, %t1
%t3 = sub nsw <16 x i32> %t0, %t1
Expand Down Expand Up @@ -83,24 +96,15 @@ define <64 x i8> @addb_selectw_64xi8(<64 x i8> %t0, <64 x i8> %t1) {
; X64-AVX512F-NEXT: vpternlogq $216, {{\.?LCPI[0-9]+_[0-9]+}}(%rip), %zmm2, %zmm0
; X64-AVX512F-NEXT: retq
;
; X86-AVX512BW-LABEL: addb_selectw_64xi8:
; X86-AVX512BW: # %bb.0:
; X86-AVX512BW-NEXT: vpaddb %zmm1, %zmm0, %zmm2
; X86-AVX512BW-NEXT: movl $3, %eax
; X86-AVX512BW-NEXT: kmovd %eax, %k0
; X86-AVX512BW-NEXT: kmovd %k0, %k1
; X86-AVX512BW-NEXT: vpsubb %zmm1, %zmm0, %zmm2 {%k1}
; X86-AVX512BW-NEXT: vmovdqa64 %zmm2, %zmm0
; X86-AVX512BW-NEXT: retl
;
; X64-AVX512BW-LABEL: addb_selectw_64xi8:
; X64-AVX512BW: # %bb.0:
; X64-AVX512BW-NEXT: vpaddb %zmm1, %zmm0, %zmm2
; X64-AVX512BW-NEXT: movl $3, %eax
; X64-AVX512BW-NEXT: kmovq %rax, %k1
; X64-AVX512BW-NEXT: vpsubb %zmm1, %zmm0, %zmm2 {%k1}
; X64-AVX512BW-NEXT: vmovdqa64 %zmm2, %zmm0
; X64-AVX512BW-NEXT: retq
; AVX512BW-LABEL: addb_selectw_64xi8:
; AVX512BW: # %bb.0:
; AVX512BW-NEXT: vpaddb %zmm1, %zmm0, %zmm2
; AVX512BW-NEXT: vpsubb %zmm1, %zmm0, %zmm0
; AVX512BW-NEXT: movl $1, %eax
; AVX512BW-NEXT: kmovd %eax, %k1
; AVX512BW-NEXT: vmovdqu16 %zmm0, %zmm2 {%k1}
; AVX512BW-NEXT: vmovdqa64 %zmm2, %zmm0
; AVX512BW-NEXT: ret{{[l|q]}}
%t2 = add nsw <64 x i8> %t0, %t1
%t3 = sub nsw <64 x i8> %t0, %t1
%t4 = shufflevector <64 x i8> %t2, <64 x i8> %t3, <64 x i32> <i32 64, i32 65, i32 2, i32 3, i32 4, i32 5, i32 6, i32 7, i32 8, i32 9, i32 10, i32 11, i32 12, i32 13, i32 14, i32 15, i32 16, i32 17, i32 18, i32 19, i32 20, i32 21, i32 22, i32 23, i32 24, i32 25, i32 26, i32 27, i32 28, i32 29, i32 30, i32 31, i32 32, i32 33, i32 34, i32 35, i32 36, i32 37, i32 38, i32 39, i32 40, i32 41, i32 42, i32 43, i32 44, i32 45, i32 46, i32 47, i32 48, i32 49, i32 50, i32 51, i32 52, i32 53, i32 54, i32 55, i32 56, i32 57, i32 58, i32 59, i32 60, i32 61, i32 62, i32 63>
Expand Down Expand Up @@ -165,9 +169,10 @@ define <32 x i16> @addw_selectd_32xi16(<32 x i16> %t0, <32 x i16> %t1) {
; AVX512BW-LABEL: addw_selectd_32xi16:
; AVX512BW: # %bb.0:
; AVX512BW-NEXT: vpaddw %zmm1, %zmm0, %zmm2
; AVX512BW-NEXT: movl $3, %eax
; AVX512BW-NEXT: vpsubw %zmm1, %zmm0, %zmm0
; AVX512BW-NEXT: movw $1, %ax
; AVX512BW-NEXT: kmovd %eax, %k1
; AVX512BW-NEXT: vpsubw %zmm1, %zmm0, %zmm2 {%k1}
; AVX512BW-NEXT: vmovdqa32 %zmm0, %zmm2 {%k1}
; AVX512BW-NEXT: vmovdqa64 %zmm2, %zmm0
; AVX512BW-NEXT: ret{{[l|q]}}
%t2 = add nsw <32 x i16> %t0, %t1
Expand All @@ -193,18 +198,20 @@ define <16 x i32> @addd_selectq_16xi32(<16 x i32> %t0, <16 x i32> %t1) {
; AVX512F-LABEL: addd_selectq_16xi32:
; AVX512F: # %bb.0:
; AVX512F-NEXT: vpaddd %zmm1, %zmm0, %zmm2
; AVX512F-NEXT: movw $3, %ax
; AVX512F-NEXT: vpsubd %zmm1, %zmm0, %zmm0
; AVX512F-NEXT: movb $1, %al
; AVX512F-NEXT: kmovw %eax, %k1
; AVX512F-NEXT: vpsubd %zmm1, %zmm0, %zmm2 {%k1}
; AVX512F-NEXT: vmovdqa64 %zmm0, %zmm2 {%k1}
; AVX512F-NEXT: vmovdqa64 %zmm2, %zmm0
; AVX512F-NEXT: ret{{[l|q]}}
;
; AVX512BW-LABEL: addd_selectq_16xi32:
; AVX512BW: # %bb.0:
; AVX512BW-NEXT: vpaddd %zmm1, %zmm0, %zmm2
; AVX512BW-NEXT: movw $3, %ax
; AVX512BW-NEXT: vpsubd %zmm1, %zmm0, %zmm0
; AVX512BW-NEXT: movb $1, %al
; AVX512BW-NEXT: kmovd %eax, %k1
; AVX512BW-NEXT: vpsubd %zmm1, %zmm0, %zmm2 {%k1}
; AVX512BW-NEXT: vmovdqa64 %zmm0, %zmm2 {%k1}
; AVX512BW-NEXT: vmovdqa64 %zmm2, %zmm0
; AVX512BW-NEXT: ret{{[l|q]}}
%t2 = add nsw <16 x i32> %t0, %t1
Expand Down
26 changes: 6 additions & 20 deletions llvm/test/CodeGen/X86/combine-sdiv.ll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2889,26 +2889,12 @@ define <8 x i16> @combine_vec_sdiv_nonuniform7(<8 x i16> %x) {
; AVX1-NEXT: vpblendw {{.*#+}} xmm0 = xmm1[0,1,2,3],xmm0[4,5,6,7]
; AVX1-NEXT: retq
;
; AVX2-LABEL: combine_vec_sdiv_nonuniform7:
; AVX2: # %bb.0:
; AVX2-NEXT: vpxor %xmm1, %xmm1, %xmm1
; AVX2-NEXT: vpsubw %xmm0, %xmm1, %xmm1
; AVX2-NEXT: vpblendd {{.*#+}} xmm0 = xmm1[0,1],xmm0[2,3]
; AVX2-NEXT: retq
;
; AVX512F-LABEL: combine_vec_sdiv_nonuniform7:
; AVX512F: # %bb.0:
; AVX512F-NEXT: vpxor %xmm1, %xmm1, %xmm1
; AVX512F-NEXT: vpsubw %xmm0, %xmm1, %xmm1
; AVX512F-NEXT: vpblendd {{.*#+}} xmm0 = xmm1[0,1],xmm0[2,3]
; AVX512F-NEXT: retq
;
; AVX512BW-LABEL: combine_vec_sdiv_nonuniform7:
; AVX512BW: # %bb.0:
; AVX512BW-NEXT: vpxor %xmm1, %xmm1, %xmm1
; AVX512BW-NEXT: vpsubw %xmm0, %xmm1, %xmm1
; AVX512BW-NEXT: vpblendw {{.*#+}} xmm0 = xmm1[0,1,2,3],xmm0[4,5,6,7]
; AVX512BW-NEXT: retq
; AVX2ORLATER-LABEL: combine_vec_sdiv_nonuniform7:
; AVX2ORLATER: # %bb.0:
; AVX2ORLATER-NEXT: vpxor %xmm1, %xmm1, %xmm1
; AVX2ORLATER-NEXT: vpsubw %xmm0, %xmm1, %xmm1
; AVX2ORLATER-NEXT: vpblendd {{.*#+}} xmm0 = xmm1[0,1],xmm0[2,3]
; AVX2ORLATER-NEXT: retq
;
; XOP-LABEL: combine_vec_sdiv_nonuniform7:
; XOP: # %bb.0:
Expand Down

0 comments on commit f912bab

Please sign in to comment.