@@ -41920,7 +41920,6 @@ static SDValue canonicalizeLaneShuffleWithRepeatedOps(SDValue V,
4192041920
4192141921static SDValue combineConcatVectorOps(const SDLoc &DL, MVT VT,
4192241922 ArrayRef<SDValue> Ops, SelectionDAG &DAG,
41923- TargetLowering::DAGCombinerInfo &DCI,
4192441923 const X86Subtarget &Subtarget,
4192541924 unsigned Depth = 0);
4192641925
@@ -42669,7 +42668,7 @@ static SDValue combineTargetShuffle(SDValue N, const SDLoc &DL,
4266942668 if (CanConcat) {
4267042669 SDValue Ops[] = {N.getOperand(0), N.getOperand(2)};
4267142670 if (SDValue ConcatSrc =
42672- combineConcatVectorOps(DL, WideVT, Ops, DAG, DCI, Subtarget)) {
42671+ combineConcatVectorOps(DL, WideVT, Ops, DAG, Subtarget)) {
4267342672 SDValue Mask = widenSubVector(N.getOperand(1), false, Subtarget, DAG,
4267442673 DL, WideVT.getSizeInBits());
4267542674 SDValue Perm = DAG.getNode(X86ISD::VPERMV, DL, WideVT, Mask, ConcatSrc);
@@ -42684,7 +42683,7 @@ static SDValue combineTargetShuffle(SDValue N, const SDLoc &DL,
4268442683 // See if we can concatenate the commuted operands.
4268542684 if (CanConcat) {
4268642685 if (SDValue ConcatSrc = combineConcatVectorOps(
42687- DL, WideVT, {N.getOperand(2), N.getOperand(0)}, DAG, DCI,
42686+ DL, WideVT, {N.getOperand(2), N.getOperand(0)}, DAG,
4268842687 Subtarget)) {
4268942688 ShuffleVectorSDNode::commuteMask(Mask);
4269042689 Mask.append(NumElts, SM_SentinelUndef);
@@ -42714,7 +42713,7 @@ static SDValue combineTargetShuffle(SDValue N, const SDLoc &DL,
4271442713 m_InsertSubvector(m_Undef(), m_Value(Ops[1]), m_Zero())) &&
4271542714 Ops[0].getValueType() == HalfVT && Ops[1].getValueType() == HalfVT) {
4271642715 if (SDValue ConcatSrc =
42717- combineConcatVectorOps(DL, VT, Ops, DAG, DCI, Subtarget)) {
42716+ combineConcatVectorOps(DL, VT, Ops, DAG, Subtarget)) {
4271842717 for (int &M : Mask)
4271942718 M = (M < (int)NumElts ? M : (M - (NumElts / 2)));
4272042719 return lowerShuffleWithPERMV(DL, VT, Mask, ConcatSrc,
@@ -57822,7 +57821,6 @@ CastIntSETCCtoFP(MVT VT, ISD::CondCode CC, unsigned NumSignificantBitsLHS,
5782257821/// ISD::INSERT_SUBVECTOR). The ops are assumed to be of the same type.
5782357822static SDValue combineConcatVectorOps(const SDLoc &DL, MVT VT,
5782457823 ArrayRef<SDValue> Ops, SelectionDAG &DAG,
57825- TargetLowering::DAGCombinerInfo &DCI,
5782657824 const X86Subtarget &Subtarget,
5782757825 unsigned Depth) {
5782857826 assert(Subtarget.hasAVX() && "AVX assumed for concat_vectors");
@@ -57980,8 +57978,7 @@ static SDValue combineConcatVectorOps(const SDLoc &DL, MVT VT,
5798057978 }
5798157979 if (AllConstants)
5798257980 return DAG.getNode(ISD::CONCAT_VECTORS, DL, VT, Subs);
57983- return combineConcatVectorOps(DL, VT, Subs, DAG, DCI, Subtarget,
57984- Depth + 1);
57981+ return combineConcatVectorOps(DL, VT, Subs, DAG, Subtarget, Depth + 1);
5798557982 };
5798657983
5798757984 switch (Op0.getOpcode()) {
@@ -58663,7 +58660,7 @@ static SDValue combineCONCAT_VECTORS(SDNode *N, SelectionDAG &DAG,
5866358660
5866458661 if (Subtarget.hasAVX() && TLI.isTypeLegal(VT) && TLI.isTypeLegal(SrcVT)) {
5866558662 if (SDValue R = combineConcatVectorOps(SDLoc(N), VT.getSimpleVT(), Ops, DAG,
58666- DCI, Subtarget))
58663+ Subtarget))
5866758664 return R;
5866858665 }
5866958666
@@ -58765,7 +58762,7 @@ static SDValue combineINSERT_SUBVECTOR(SDNode *N, SelectionDAG &DAG,
5876558762 SmallVector<SDValue, 2> SubVectorOps;
5876658763 if (collectConcatOps(N, SubVectorOps, DAG)) {
5876758764 if (SDValue Fold =
58768- combineConcatVectorOps(dl, OpVT, SubVectorOps, DAG, DCI, Subtarget))
58765+ combineConcatVectorOps(dl, OpVT, SubVectorOps, DAG, Subtarget))
5876958766 return Fold;
5877058767
5877158768 // If we're inserting all zeros into the upper half, change this to
0 commit comments