@@ -27525,36 +27525,25 @@ static SDValue scalarizeBinOpOfSplats(SDNode *N, SelectionDAG &DAG,
27525
27525
if ((Opcode == ISD::MULHS || Opcode == ISD::MULHU) && !TLI.isTypeLegal(EltVT))
27526
27526
return SDValue();
27527
27527
27528
- SDValue IndexC = DAG.getVectorIdxConstant(Index0, DL);
27529
- SDValue X = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, EltVT, Src0, IndexC);
27530
- SDValue Y = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, EltVT, Src1, IndexC);
27531
- SDValue ScalarBO = DAG.getNode(Opcode, DL, EltVT, X, Y, N->getFlags());
27532
-
27533
27528
// If all lanes but 1 are undefined, no need to splat the scalar result.
27534
27529
// TODO: Keep track of undefs and use that info in the general case.
27535
27530
if (N0.getOpcode() == ISD::BUILD_VECTOR && N0.getOpcode() == N1.getOpcode()) {
27536
27531
// bo (build_vec ..undef, X, undef...), (build_vec ..undef, Y, undef...) -->
27537
- // insert_vector_elt undef, (bo X, Y), index
27538
-
27539
- SmallVector<SDValue, 16> EltsX, EltsY;
27532
+ // build_vec ..undef, (bo X, Y), undef...
27533
+ SmallVector<SDValue, 16> EltsX, EltsY, EltsResult;
27540
27534
DAG.ExtractVectorElements(Src0, EltsX);
27541
27535
DAG.ExtractVectorElements(Src1, EltsY);
27542
27536
27543
- SmallVector<SDValue, 16> EltsResult;
27544
-
27545
- unsigned NonUndefElements = 0;
27546
- for (auto [X, Y] : zip(EltsX, EltsY)) {
27547
- SDValue ScalarBO = DAG.getNode(Opcode, DL, EltVT, X, Y, N->getFlags());
27548
- if (!ScalarBO.isUndef())
27549
- if (NonUndefElements++ > 1)
27550
- break;
27551
- EltsResult.push_back(ScalarBO);
27552
- }
27553
-
27554
- if (NonUndefElements == 1)
27555
- return DAG.getBuildVector(VT, DL, EltsResult);
27537
+ for (auto [X, Y] : zip(EltsX, EltsY))
27538
+ EltsResult.push_back(DAG.getNode(Opcode, DL, EltVT, X, Y, N->getFlags()));
27539
+ return DAG.getBuildVector(VT, DL, EltsResult);
27556
27540
}
27557
27541
27542
+ SDValue IndexC = DAG.getVectorIdxConstant(Index0, DL);
27543
+ SDValue X = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, EltVT, Src0, IndexC);
27544
+ SDValue Y = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, DL, EltVT, Src1, IndexC);
27545
+ SDValue ScalarBO = DAG.getNode(Opcode, DL, EltVT, X, Y, N->getFlags());
27546
+
27558
27547
// bo (splat X, Index), (splat Y, Index) --> splat (bo X, Y), Index
27559
27548
return DAG.getSplat(VT, DL, ScalarBO);
27560
27549
}
0 commit comments