@@ -41586,8 +41586,8 @@ static SDValue combineX86ShufflesRecursively(SDValue Op, SelectionDAG &DAG,
4158641586 const X86Subtarget &Subtarget) {
4158741587 return combineX86ShufflesRecursively(
4158841588 {Op}, 0, Op.getOpcode(), Op.getSimpleValueType(), {0}, {}, /*Depth=*/0,
41589- X86::MaxShuffleCombineDepth, /*AllowCrossLaneVarMask =*/true,
41590- /*AllowPerLaneVarMask =*/true, isMaskableNode(Op, Subtarget), DAG,
41589+ X86::MaxShuffleCombineDepth, /*AllowVariableCrossLaneMask =*/true,
41590+ /*AllowVariablePerLaneMask =*/true, isMaskableNode(Op, Subtarget), DAG,
4159141591 SDLoc(Op), Subtarget);
4159241592}
4159341593
@@ -42241,7 +42241,8 @@ static SDValue combineTargetShuffle(SDValue N, const SDLoc &DL,
4224142241 if (SDValue Res = combineX86ShufflesRecursively(
4224242242 {BC}, 0, BC.getOpcode(), BC.getSimpleValueType(), DemandedMask,
4224342243 {}, /*Depth=*/0, X86::MaxShuffleCombineDepth,
42244- /*AllowCrossLaneVarMask=*/true, /*AllowPerLaneVarMask=*/true,
42244+ /*AllowVariableCrossLaneMask=*/true,
42245+ /*AllowVariablePerLaneMask=*/true,
4224542246 /*IsMaskedShuffle=*/false, DAG, DL, Subtarget))
4224642247 return DAG.getNode(X86ISD::VBROADCAST, DL, VT,
4224742248 DAG.getBitcast(SrcVT, Res));
@@ -44388,9 +44389,10 @@ bool X86TargetLowering::SimplifyDemandedVectorEltsForTargetNode(
4438844389
4438944390 SDValue NewShuffle = combineX86ShufflesRecursively(
4439044391 {Op}, 0, Op.getOpcode(), Op.getSimpleValueType(), DemandedMask, {}, 0,
44391- X86::MaxShuffleCombineDepth - Depth, /*AllowCrossLaneVarMask=*/true,
44392- /*AllowPerLaneVarMask=*/true, isMaskableNode(Op, Subtarget), TLO.DAG,
44393- SDLoc(Op), Subtarget);
44392+ X86::MaxShuffleCombineDepth - Depth,
44393+ /*AllowVariableCrossLaneMask=*/true,
44394+ /*AllowVariablePerLaneMask=*/true, isMaskableNode(Op, Subtarget),
44395+ TLO.DAG, SDLoc(Op), Subtarget);
4439444396 if (NewShuffle)
4439544397 return TLO.CombineTo(Op, NewShuffle);
4439644398 }
@@ -52056,7 +52058,8 @@ static SDValue combineAnd(SDNode *N, SelectionDAG &DAG,
5205652058 if (SDValue Shuffle = combineX86ShufflesRecursively(
5205752059 {SrcVec}, 0, SrcVec.getOpcode(), SrcVec.getSimpleValueType(),
5205852060 ShuffleMask, {}, /*Depth=*/1, X86::MaxShuffleCombineDepth,
52059- /*AllowVarCrossLaneMask=*/true, /*AllowVarPerLaneMask=*/true,
52061+ /*AllowVariableCrossLaneMask=*/true,
52062+ /*AllowVariablePerLaneMask=*/true,
5206052063 /*IsMaskedShuffle=*/false, DAG, SDLoc(SrcVec), Subtarget))
5206152064 return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, dl, VT, Shuffle,
5206252065 N0.getOperand(1));
0 commit comments