adding pattern for broadcastm

[RKSimon]

Please remember to create your diff with context: http://llvm.org/docs/Phabricator.html

test/CodeGen/X86/broadcastm-lowering.ll

3 ↗

(On Diff #116791)

Please don't use -mcpu, use -mattr instead. Something like:

; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mcpu=+avx512f | FileCheck %s --check-prefix=ALL --check-prefix=AVX512F
; RUN: llc < %s -mtriple=x86_64-unknown-unknown -mattr=+avx512vl,+avx512dq  | FileCheck %s --check-prefix=ALL --check-prefix=AVX512DQVL

Also, should i686 triples be tested as well? Not sure if any non-legal i64 issues will arise

[zvi]

The title should have an X86 label, and can you please add a cover message in the summary?

lib/Target/X86/X86ISelLowering.cpp

6695 ↗

(On Diff #116791)

Would isSplatZeroExtended be a better name?
(const BuildVectorSDNode *Op, unsigned &NumElts, MVT& EltType)

6749 ↗

(On Diff #116791)

Please add a comment explaining the change here and in the Summary. Maybe something like:
t0 = (zext_i64 (bitcast_i8 v2i1 X))
t1 = (build_vector t0 t0)
->
(VBROADCASTM v2i1 X)

6749 ↗

(On Diff #116791)

Checking

[zvi]

test/CodeGen/X86/broadcastm-lowering.ll

2 ↗

(On Diff #116791)

instead of -mcpu=skx , you should use -mattr which is more robust to scheduling changes:
-mattr=+avx512cd,+avx512vl

and similarly for knl:
-mattr=+avx512cd

[zvi]

test/CodeGen/X86/broadcastm-lowering.ll

3 ↗

(On Diff #116791)

Simon has already mentioned this

[craig.topper]

lib/Target/X86/X86ISelLowering.cpp

6605 ↗

(On Diff #116926)

vedtor->vector

Also the first word of each sentence in the comment should be capitalized.

6628 ↗

(On Diff #116926)

I think this line should be indented 2 additional spaces?

6635 ↗

(On Diff #116926)

Am I missing something or is this variable and several above it dead?

6667 ↗

(On Diff #116926)

Use is512BitVector here.

6674 ↗

(On Diff #116926)

Does this overflow 80 columns?

[jina.nahias]

lib/Target/X86/X86ISelLowering.cpp

6635 ↗

(On Diff #116926)

those variables are sending as reference to this function.

[RKSimon]

test/CodeGen/X86/broadcastm-lowering.ll

3 ↗

(On Diff #116791)

Please can you tidy the prefixes: AVX512CD, AVX512VLCDBW and X86-AVX512VLCDBW would be more closely match convention.

[RKSimon]

Thanks please can you now commit broadcastm-lowering.ll with trunk's current codegen so that this patch shows the codegen diff?

[RKSimon]

A few minor comments

lib/Target/X86/X86ISelLowering.cpp

6608 ↗

(On Diff #117286)

Describe the function NumElt and EltType, also I'm not convinced that 'isSplatZeroExtended' is suitably descriptive of what the function is actually doing.

6611 ↗

(On Diff #117286)

unsigned NumElts = Op->getNumOperands();
unsigned Delta = NumElts;

6613 ↗

(On Diff #117286)

Comment describing the search you're doing in the loop

for (unsigned i = 1; i < NumElts; i++) {

6624 ↗

(On Diff #117286)

Comment the loop

for (unsigned i = Delta; i < NumElts; i++) {

6633 ↗

(On Diff #117286)

Op->getSimpleValueType(0).getScalaraSizeInBits()

[jina.nahias]

lib/Target/X86/X86ISelLowering.cpp

6608 ↗

(On Diff #117286)

i could not find a better name. do you have one?

[jina.nahias]

I have fixed all comments.
ping.

[m_zuckerman]

lib/Target/X86/X86ISelLowering.cpp

6605 ↗

(On Diff #117302)

Please, add example of the pattern that you are looking for

6639 ↗

(On Diff #117302)

Use NumElts /Delta

6673 ↗

(On Diff #117302)

Why do you set the NumElt to one?
I prefer
unsigned NumElts =BVOp->getNumOperands()
and if it equal to one exit the function (early exiting)

[m_zuckerman]

lib/Target/X86/X86ISelLowering.cpp

6674 ↗

(On Diff #117302)

if(NumElts!=1&&SDValue ZeroExtended = isSplatZeroExtended(BVOp, NumElts, EltType))

[m_zuckerman]

lib/Target/X86/X86ISelLowering.cpp

6674 ↗

(On Diff #117302)

sorry without NumElts!=1

[m_zuckerman]

LGTM

[jina.nahias]

committed in r316921

llvm/trunk/lib/Target/X86/X86ISelLowering.cpp

for (auto *U : N->uses()) {
     if (isTargetShuffle(U->getOpcode()))
       return true;
     if (U->getOpcode() == ISD::BITCAST) // Ignore bitcasts
       return isUseOfShuffle(U);
   }
   return false;
 }
 
+// Check if the current node of build vector is a zero extended vector.
+// If so, return the value extended.
+// For example: (0,0,0,a,0,0,0,a,0,0,0,a,0,0,0,a) returns a.
+// NumElt - return the number of zero extended identical values.
+// EltType - return the type of the value include the zero extend.
+static SDValue isSplatZeroExtended(const BuildVectorSDNode *Op,
+                                   unsigned &NumElt, MVT &EltType) {
+  SDValue ExtValue = Op->getOperand(0);
+  unsigned NumElts = Op->getNumOperands();
+  unsigned Delta = NumElts;
+
+  for (unsigned i = 1; i < NumElts; i++) {
+    if (Op->getOperand(i) == ExtValue) {
+      Delta = i;
+      break;
+    }
+    if (!(Op->getOperand(i).isUndef() || isNullConstant(Op->getOperand(i))))
+      return SDValue();
+  }
+  if (!isPowerOf2_32(Delta) || Delta == 1)
+    return SDValue();
+
+  for (unsigned i = Delta; i < NumElts; i++) {
+    if (i % Delta == 0) {
+      if (Op->getOperand(i) != ExtValue)
+        return SDValue();
+    } else if (!(isNullConstant(Op->getOperand(i)) ||
+                 Op->getOperand(i).isUndef()))
+      return SDValue();
+  }
+  unsigned EltSize =
+      Op->getSimpleValueType(0).getScalarSizeInBits();
+  unsigned ExtVTSize = EltSize * Delta;
+  EltType = MVT::getIntegerVT(ExtVTSize);
+  NumElt = NumElts / Delta;
+  return ExtValue;
+}
+
 /// Attempt to use the vbroadcast instruction to generate a splat value
 /// from a splat BUILD_VECTOR which uses:
 ///  a. A single scalar load, or a constant.
 ///  b. Repeated pattern of constants (e.g. <0,1,0,1> or <0,1,2,3,0,1,2,3>).
 ///
 /// The VBROADCAST node is returned when a pattern is found,
 /// or SDValue() otherwise.
 static SDValue lowerBuildVectorAsBroadcast(BuildVectorSDNode *BVOp,
                                            const X86Subtarget &Subtarget,
                                            SelectionDAG &DAG) {
   // VBROADCAST requires AVX.
   // TODO: Splats could be generated for non-AVX CPUs using SSE
   // instructions, but there's less potential gain for only 128-bit vectors.
   if (!Subtarget.hasAVX())
     return SDValue();
 
   MVT VT = BVOp->getSimpleValueType(0);
   SDLoc dl(BVOp);
 
   assert((VT.is128BitVector() || VT.is256BitVector() || VT.is512BitVector()) &&
          "Unsupported vector type for broadcast.");
 
+  // Attempt to use VBROADCASTM
+  // From this paterrn:
+  //  a. t0 = (zext_i64 (bitcast_i8 v2i1 X))
+  //  b. t1 = (build_vector t0 t0)
+  //
+  // Create (VBROADCASTM v2i1 X)
+  if (Subtarget.hasCDI() && (VT.is512BitVector() || Subtarget.hasVLX())) {
+    MVT EltType;
+    unsigned NumElts;
+    SDValue ZeroExtended = isSplatZeroExtended(BVOp, NumElts, EltType);
+    if (ZeroExtended && ZeroExtended.getOpcode() == ISD::BITCAST) {
+      SDValue BOperand = ZeroExtended.getOperand(0);
+      if (BOperand.getSimpleValueType().getVectorElementType() == MVT::i1) {
+        if ((EltType == MVT::i64 &&
+             VT.getVectorElementType() == MVT::i8) || // for broadcastmb2q
+            (EltType == MVT::i32 &&
+             VT.getVectorElementType() == MVT::i16)) { // for broadcastmw2d
+          SDValue Brdcst =
+              DAG.getNode(X86ISD::VBROADCASTM, dl,
+                          MVT::getVectorVT(EltType, NumElts), BOperand);
+          return DAG.getBitcast(VT, Brdcst);
+        }
+      }
+    }
+  }
+
   BitVector UndefElements;
   SDValue Ld = BVOp->getSplatValue(&UndefElements);
 
   // We need a splat of a single value to use broadcast, and it doesn't
   // make any sense if the value is only in one element of the vector.
   if (!Ld || (VT.getVectorNumElements() - UndefElements.count()) <= 1) {
     APInt SplatValue, Undef;
     unsigned SplatBitSize;

llvm/trunk/test/CodeGen/X86/broadcastm-lowering.ll

 ; AVX512CD-NEXT:    vpinsrb $0, %eax, %xmm0, %xmm0
 ; AVX512CD-NEXT:    vpinsrb $8, %eax, %xmm0, %xmm0
 ; AVX512CD-NEXT:    vzeroupper
 ; AVX512CD-NEXT:    retq
 ;
 ; AVX512VLCDBW-LABEL: test_mm_epi64:
 ; AVX512VLCDBW:       # BB#0: # %entry
 ; AVX512VLCDBW-NEXT:    vpcmpeqw %xmm1, %xmm0, %k0
-; AVX512VLCDBW-NEXT:    kmovd %k0, %eax
-; AVX512VLCDBW-NEXT:    vpxor %xmm0, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrb $0, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrb $8, %eax, %xmm0, %xmm0
+; AVX512VLCDBW-NEXT:    vpbroadcastmb2q %k0, %xmm0
 ; AVX512VLCDBW-NEXT:    retq
 ;
 ; X86-AVX512VLCDBW-LABEL: test_mm_epi64:
 ; X86-AVX512VLCDBW:       # BB#0: # %entry
 ; X86-AVX512VLCDBW-NEXT:    vpcmpeqw %xmm1, %xmm0, %k0
 ; X86-AVX512VLCDBW-NEXT:    kmovd %k0, %eax
 ; X86-AVX512VLCDBW-NEXT:    movzbl %al, %eax
 ; X86-AVX512VLCDBW-NEXT:    vmovd %eax, %xmm0

 ; AVX512CD-NEXT:    vpinsrw $4, %eax, %xmm0, %xmm0
 ; AVX512CD-NEXT:    vpinsrw $6, %eax, %xmm0, %xmm0
 ; AVX512CD-NEXT:    vzeroupper
 ; AVX512CD-NEXT:    retq
 ;
 ; AVX512VLCDBW-LABEL: test_mm_epi32:
 ; AVX512VLCDBW:       # BB#0: # %entry
 ; AVX512VLCDBW-NEXT:    vpcmpeqb %xmm1, %xmm0, %k0
-; AVX512VLCDBW-NEXT:    kmovd %k0, %eax
-; AVX512VLCDBW-NEXT:    vpxor %xmm0, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $0, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $2, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $4, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $6, %eax, %xmm0, %xmm0
+; AVX512VLCDBW-NEXT:    vpbroadcastmw2d %k0, %xmm0
 ; AVX512VLCDBW-NEXT:    retq
 ;
 ; X86-AVX512VLCDBW-LABEL: test_mm_epi32:
 ; X86-AVX512VLCDBW:       # BB#0: # %entry
 ; X86-AVX512VLCDBW-NEXT:    vpcmpeqb %xmm1, %xmm0, %k0
-; X86-AVX512VLCDBW-NEXT:    kmovd %k0, %eax
-; X86-AVX512VLCDBW-NEXT:    vpxor %xmm0, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $0, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $2, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $4, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $6, %eax, %xmm0, %xmm0
+; X86-AVX512VLCDBW-NEXT:    vpbroadcastmw2d %k0, %xmm0
 ; X86-AVX512VLCDBW-NEXT:    retl
 entry:
   %0 = icmp eq <16 x i8> %a, %b
   %1 = bitcast <16 x i1> %0 to i16
   %conv.i = zext i16 %1 to i32
   %vecinit.i.i = insertelement <4 x i32> undef, i32 %conv.i, i32 0
   %vecinit3.i.i = shufflevector <4 x i32> %vecinit.i.i, <4 x i32> undef, <4 x i32> zeroinitializer
   ret <4 x i32> %vecinit3.i.i
 }
 
 define <16 x i32> @test_mm512_epi32(<16 x i32> %a, <16 x i32> %b) {
 ; AVX512CD-LABEL: test_mm512_epi32:
 ; AVX512CD:       # BB#0: # %entry
 ; AVX512CD-NEXT:    vpcmpeqd %zmm1, %zmm0, %k0
 ; AVX512CD-NEXT:    kmovw %k0, %eax
 ; AVX512CD-NEXT:    vpbroadcastd %eax, %zmm0
 ; AVX512CD-NEXT:    retq
 ;
 ; AVX512VLCDBW-LABEL: test_mm512_epi32:
 ; AVX512VLCDBW:       # BB#0: # %entry
 ; AVX512VLCDBW-NEXT:    vpcmpeqd %zmm1, %zmm0, %k0
-; AVX512VLCDBW-NEXT:    kmovd %k0, %eax
-; AVX512VLCDBW-NEXT:    vpxor %xmm0, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $0, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $2, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $4, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $6, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vinserti128 $1, %xmm0, %ymm0, %ymm0
-; AVX512VLCDBW-NEXT:    vinserti64x4 $1, %ymm0, %zmm0, %zmm0
+; AVX512VLCDBW-NEXT:    vpbroadcastmw2d %k0, %zmm0
 ; AVX512VLCDBW-NEXT:    retq
 ;
 ; X86-AVX512VLCDBW-LABEL: test_mm512_epi32:
 ; X86-AVX512VLCDBW:       # BB#0: # %entry
 ; X86-AVX512VLCDBW-NEXT:    vpcmpeqd %zmm1, %zmm0, %k0
-; X86-AVX512VLCDBW-NEXT:    kmovd %k0, %eax
-; X86-AVX512VLCDBW-NEXT:    vpxor %xmm0, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $0, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $2, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $4, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $6, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vinserti128 $1, %xmm0, %ymm0, %ymm0
-; X86-AVX512VLCDBW-NEXT:    vinserti64x4 $1, %ymm0, %zmm0, %zmm0
+; X86-AVX512VLCDBW-NEXT:    vpbroadcastmw2d %k0, %zmm0
 ; X86-AVX512VLCDBW-NEXT:    retl
 entry:
   %0 = icmp eq <16 x i32> %a, %b
   %1 = bitcast <16 x i1> %0 to i16
   %conv.i = zext i16 %1 to i32
   %vecinit.i.i = insertelement <16 x i32> undef, i32 %conv.i, i32 0
   %vecinit15.i.i = shufflevector <16 x i32> %vecinit.i.i, <16 x i32> undef, <16 x i32> zeroinitializer
   ret <16 x i32> %vecinit15.i.i
 }
 
 define <8 x i64> @test_mm512_epi64(<8 x i32> %a, <8 x i32> %b) {
 ; AVX512CD-LABEL: test_mm512_epi64:
 ; AVX512CD:       # BB#0: # %entry
 ; AVX512CD-NEXT:    # kill: %YMM1<def> %YMM1<kill> %ZMM1<def>
 ; AVX512CD-NEXT:    # kill: %YMM0<def> %YMM0<kill> %ZMM0<def>
 ; AVX512CD-NEXT:    vpcmpeqd %zmm1, %zmm0, %k0
 ; AVX512CD-NEXT:    kmovw %k0, %eax
 ; AVX512CD-NEXT:    movzbl %al, %eax
 ; AVX512CD-NEXT:    vpbroadcastq %rax, %zmm0
 ; AVX512CD-NEXT:    retq
 ;
 ; AVX512VLCDBW-LABEL: test_mm512_epi64:
 ; AVX512VLCDBW:       # BB#0: # %entry
 ; AVX512VLCDBW-NEXT:    vpcmpeqd %ymm1, %ymm0, %k0
-; AVX512VLCDBW-NEXT:    kmovd %k0, %eax
-; AVX512VLCDBW-NEXT:    vpxor %xmm0, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrb $0, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrb $8, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vinserti128 $1, %xmm0, %ymm0, %ymm0
-; AVX512VLCDBW-NEXT:    vinserti64x4 $1, %ymm0, %zmm0, %zmm0
+; AVX512VLCDBW-NEXT:    vpbroadcastmb2q %k0, %zmm0
 ; AVX512VLCDBW-NEXT:    retq
 ;
 ; X86-AVX512VLCDBW-LABEL: test_mm512_epi64:
 ; X86-AVX512VLCDBW:       # BB#0: # %entry
 ; X86-AVX512VLCDBW-NEXT:    vpcmpeqd %ymm1, %ymm0, %k0
 ; X86-AVX512VLCDBW-NEXT:    kmovd %k0, %eax
 ; X86-AVX512VLCDBW-NEXT:    movzbl %al, %eax
 ; X86-AVX512VLCDBW-NEXT:    vmovd %eax, %xmm0

 ; AVX512CD-NEXT:    vpinsrb $0, %eax, %xmm0, %xmm0
 ; AVX512CD-NEXT:    vpinsrb $8, %eax, %xmm0, %xmm0
 ; AVX512CD-NEXT:    vinserti128 $1, %xmm0, %ymm0, %ymm0
 ; AVX512CD-NEXT:    retq
 ;
 ; AVX512VLCDBW-LABEL: test_mm256_epi64:
 ; AVX512VLCDBW:       # BB#0: # %entry
 ; AVX512VLCDBW-NEXT:    vpcmpeqd %ymm1, %ymm0, %k0
-; AVX512VLCDBW-NEXT:    kmovd %k0, %eax
-; AVX512VLCDBW-NEXT:    vpxor %xmm0, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrb $0, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrb $8, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vinserti128 $1, %xmm0, %ymm0, %ymm0
+; AVX512VLCDBW-NEXT:    vpbroadcastmb2q %k0, %ymm0
 ; AVX512VLCDBW-NEXT:    retq
 ;
 ; X86-AVX512VLCDBW-LABEL: test_mm256_epi64:
 ; X86-AVX512VLCDBW:       # BB#0: # %entry
 ; X86-AVX512VLCDBW-NEXT:    vpcmpeqd %ymm1, %ymm0, %k0
 ; X86-AVX512VLCDBW-NEXT:    kmovd %k0, %eax
 ; X86-AVX512VLCDBW-NEXT:    movzbl %al, %eax
 ; X86-AVX512VLCDBW-NEXT:    vmovd %eax, %xmm0

 ; AVX512CD-NEXT:    vpinsrw $4, %eax, %xmm0, %xmm0
 ; AVX512CD-NEXT:    vpinsrw $6, %eax, %xmm0, %xmm0
 ; AVX512CD-NEXT:    vinserti128 $1, %xmm0, %ymm0, %ymm0
 ; AVX512CD-NEXT:    retq
 ;
 ; AVX512VLCDBW-LABEL: test_mm256_epi32:
 ; AVX512VLCDBW:       # BB#0: # %entry
 ; AVX512VLCDBW-NEXT:    vpcmpeqw %ymm1, %ymm0, %k0
-; AVX512VLCDBW-NEXT:    kmovd %k0, %eax
-; AVX512VLCDBW-NEXT:    vpxor %xmm0, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $0, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $2, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $4, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vpinsrw $6, %eax, %xmm0, %xmm0
-; AVX512VLCDBW-NEXT:    vinserti128 $1, %xmm0, %ymm0, %ymm0
+; AVX512VLCDBW-NEXT:    vpbroadcastmw2d %k0, %ymm0
 ; AVX512VLCDBW-NEXT:    retq
 ;
 ; X86-AVX512VLCDBW-LABEL: test_mm256_epi32:
 ; X86-AVX512VLCDBW:       # BB#0: # %entry
 ; X86-AVX512VLCDBW-NEXT:    vpcmpeqw %ymm1, %ymm0, %k0
-; X86-AVX512VLCDBW-NEXT:    kmovd %k0, %eax
-; X86-AVX512VLCDBW-NEXT:    vpxor %xmm0, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $0, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $2, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $4, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vpinsrw $6, %eax, %xmm0, %xmm0
-; X86-AVX512VLCDBW-NEXT:    vinserti128 $1, %xmm0, %ymm0, %ymm0
+; X86-AVX512VLCDBW-NEXT:    vpbroadcastmw2d %k0, %ymm0
 ; X86-AVX512VLCDBW-NEXT:    retl
 entry:
   %0 = icmp eq <16 x i16> %a, %b
   %1 = bitcast <16 x i1> %0 to i16
   %conv.i = zext i16 %1 to i32
   %vecinit.i.i = insertelement <8 x i32> undef, i32 %conv.i, i32 0
   %vecinit7.i.i = shufflevector <8 x i32> %vecinit.i.i, <8 x i32> undef, <8 x i32> zeroinitializer
   ret <8 x i32> %vecinit7.i.i
 }