@@ -59273,36 +59273,33 @@ static SDValue combineINSERT_SUBVECTOR(SDNode *N, SelectionDAG &DAG,
59273
59273
!(Vec.isUndef() || ISD::isBuildVectorAllZeros(Vec.getNode())))) {
59274
59274
SDValue ExtSrc = SubVec.getOperand(0);
59275
59275
int ExtIdxVal = SubVec.getConstantOperandVal(1);
59276
- if (ExtIdxVal != 0) {
59277
- SmallVector<int, 64> Mask(VecNumElts);
59278
- // First create an identity shuffle mask.
59279
- for (int i = 0; i != VecNumElts; ++i)
59280
- Mask[i] = i;
59281
- // Now insert the extracted portion.
59282
- for (int i = 0; i != SubVecNumElts; ++i)
59283
- Mask[i + IdxVal] = i + ExtIdxVal + VecNumElts;
59276
+ // Create a shuffle mask matching the extraction and insertion.
59277
+ SmallVector<int, 64> Mask(VecNumElts);
59278
+ std::iota(Mask.begin(), Mask.end(), 0);
59279
+ std::iota(Mask.begin() + IdxVal, Mask.begin() + IdxVal + SubVecNumElts,
59280
+ ExtIdxVal + VecNumElts);
59281
+ if (ExtIdxVal != 0)
59284
59282
return DAG.getVectorShuffle(OpVT, dl, Vec, ExtSrc, Mask);
59285
- }
59286
- // If we're broadcasting, see if we can use a blend instead of
59287
- // extract/insert pair. Ensure that the subvector is aligned with the
59288
- // insertion/extractions.
59289
- if ((ExtIdxVal % SubVecNumElts) == 0 && (IdxVal % SubVecNumElts) == 0 &&
59290
- (ExtSrc.getOpcode() == X86ISD::VBROADCAST ||
59291
- ExtSrc.getOpcode() == X86ISD::VBROADCAST_LOAD ||
59292
- (ExtSrc.getOpcode() == X86ISD::SUBV_BROADCAST_LOAD &&
59293
- cast<MemIntrinsicSDNode>(ExtSrc)->getMemoryVT() == SubVecVT))) {
59283
+ // See if we can use a blend instead of extract/insert pair.
59284
+ SmallVector<int, 64> BlendMask(VecNumElts);
59285
+ std::iota(BlendMask.begin(), BlendMask.end(), 0);
59286
+ std::iota(BlendMask.begin() + IdxVal,
59287
+ BlendMask.begin() + IdxVal + SubVecNumElts, VecNumElts + IdxVal);
59288
+ if (isShuffleEquivalent(Mask, BlendMask, Vec, ExtSrc)) {
59289
+ assert((IdxVal == 0 || IdxVal == SubVecNumElts) &&
59290
+ "Unaligned subvector insertion");
59294
59291
if (OpVT.is256BitVector() && SubVecVT.is128BitVector()) {
59295
- uint64_t BlendMask = IdxVal == 0 ? 0x0F : 0xF0;
59296
59292
SDValue Blend = DAG.getNode(
59297
59293
X86ISD::BLENDI, dl, MVT::v8f32, DAG.getBitcast(MVT::v8f32, Vec),
59298
59294
DAG.getBitcast(MVT::v8f32, ExtSrc),
59299
- DAG.getTargetConstant(BlendMask , dl, MVT::i8));
59295
+ DAG.getTargetConstant(IdxVal == 0 ? 0x0F : 0xF0 , dl, MVT::i8));
59300
59296
return DAG.getBitcast(OpVT, Blend);
59301
59297
} else if (OpVT.is512BitVector() && SubVecVT.is256BitVector()) {
59302
- SDValue Lo = DAG.getBitcast(MVT::v8f64, IdxVal == 0 ? ExtSrc : Vec);
59303
- SDValue Hi = DAG.getBitcast(MVT::v8f64, IdxVal == 0 ? Vec : ExtSrc);
59298
+ MVT ShufVT = OpVT.isInteger() ? MVT::v8i64 : MVT::v8f64;
59299
+ SDValue Lo = DAG.getBitcast(ShufVT, IdxVal == 0 ? ExtSrc : Vec);
59300
+ SDValue Hi = DAG.getBitcast(ShufVT, IdxVal == 0 ? Vec : ExtSrc);
59304
59301
SDValue Shuffle =
59305
- DAG.getNode(X86ISD::SHUF128, dl, MVT::v8f64 , Lo, Hi,
59302
+ DAG.getNode(X86ISD::SHUF128, dl, ShufVT , Lo, Hi,
59306
59303
getV4X86ShuffleImm8ForMask({0, 1, 2, 3}, dl, DAG));
59307
59304
return DAG.getBitcast(OpVT, Shuffle);
59308
59305
}
0 commit comments