@@ -517,7 +517,7 @@ static void removeRedundantCanonicalIVs(VPlan &Plan) {
517517 // everything WidenNewIV's users need. That is, WidenOriginalIV will
518518 // generate a vector phi or all users of WidenNewIV demand the first lane
519519 // only.
520- if (!vputils::onlyUsedByScalars (WidenOriginalIV) ||
520+ if (!vputils::onlyScalarValuesUsed (WidenOriginalIV) ||
521521 vputils::onlyFirstLaneUsed (WidenNewIV)) {
522522 WidenNewIV->replaceAllUsesWith (WidenOriginalIV);
523523 WidenNewIV->eraseFromParent ();
@@ -1261,7 +1261,7 @@ static void narrowToSingleScalarRecipes(VPlan &Plan) {
12611261 // scalar results used. In the latter case, we would introduce extra
12621262 // broadcasts.
12631263 if (!vputils::isSingleScalar (RepOrWidenR) ||
1264- !vputils::onlyUsedByScalars (RepOrWidenR))
1264+ !vputils::onlyScalarValuesUsed (RepOrWidenR))
12651265 continue ;
12661266
12671267 auto *Clone = new VPReplicateRecipe (RepOrWidenR->getUnderlyingInstr (),
@@ -3214,7 +3214,7 @@ void VPlanTransforms::materializeBroadcasts(VPlan &Plan) {
32143214
32153215 auto *VectorPreheader = Plan.getVectorPreheader ();
32163216 for (VPValue *VPV : VPValues) {
3217- if (vputils::onlyUsedByScalars (VPV) ||
3217+ if (vputils::onlyScalarValuesUsed (VPV) ||
32183218 (VPV->isLiveIn () && VPV->getLiveInIRValue () &&
32193219 isa<Constant>(VPV->getLiveInIRValue ())))
32203220 continue ;
@@ -3370,7 +3370,7 @@ void VPlanTransforms::materializeVFAndVFxUF(VPlan &Plan, VPBasicBlock *VectorPH,
33703370 // For users of the runtime VF, compute it as VF * vscale, and VFxUF as (VF *
33713371 // vscale) * UF.
33723372 VPValue *RuntimeVF = Builder.createElementCount (TCTy, VFEC);
3373- if (!vputils::onlyUsedByScalars (&VF)) {
3373+ if (!vputils::onlyScalarValuesUsed (&VF)) {
33743374 VPValue *BC = Builder.createNaryOp (VPInstruction::Broadcast, RuntimeVF);
33753375 VF.replaceUsesWithIf (
33763376 BC, [&VF](VPUser &U, unsigned ) { return !U.usesScalars (&VF); });
0 commit comments