@@ -9409,10 +9409,7 @@ SDValue RISCVTargetLowering::lowerVectorMaskVecReduction(SDValue Op,
9409
9409
getDefaultVLOps(VecVT, ContainerVT, DL, DAG, Subtarget);
9410
9410
}
9411
9411
9412
- unsigned BaseOpc;
9413
9412
ISD::CondCode CC;
9414
- SDValue Zero = DAG.getConstant(0, DL, XLenVT);
9415
-
9416
9413
switch (Op.getOpcode()) {
9417
9414
default:
9418
9415
llvm_unreachable("Unhandled reduction");
@@ -9423,15 +9420,13 @@ SDValue RISCVTargetLowering::lowerVectorMaskVecReduction(SDValue Op,
9423
9420
Vec = DAG.getNode(RISCVISD::VMXOR_VL, DL, ContainerVT, Vec, TrueMask, VL);
9424
9421
Vec = DAG.getNode(RISCVISD::VCPOP_VL, DL, XLenVT, Vec, Mask, VL);
9425
9422
CC = ISD::SETEQ;
9426
- BaseOpc = ISD::AND;
9427
9423
break;
9428
9424
}
9429
9425
case ISD::VECREDUCE_OR:
9430
9426
case ISD::VP_REDUCE_OR:
9431
9427
// vcpop x != 0
9432
9428
Vec = DAG.getNode(RISCVISD::VCPOP_VL, DL, XLenVT, Vec, Mask, VL);
9433
9429
CC = ISD::SETNE;
9434
- BaseOpc = ISD::OR;
9435
9430
break;
9436
9431
case ISD::VECREDUCE_XOR:
9437
9432
case ISD::VP_REDUCE_XOR: {
@@ -9440,11 +9435,11 @@ SDValue RISCVTargetLowering::lowerVectorMaskVecReduction(SDValue Op,
9440
9435
Vec = DAG.getNode(RISCVISD::VCPOP_VL, DL, XLenVT, Vec, Mask, VL);
9441
9436
Vec = DAG.getNode(ISD::AND, DL, XLenVT, Vec, One);
9442
9437
CC = ISD::SETNE;
9443
- BaseOpc = ISD::XOR;
9444
9438
break;
9445
9439
}
9446
9440
}
9447
9441
9442
+ SDValue Zero = DAG.getConstant(0, DL, XLenVT);
9448
9443
SDValue SetCC = DAG.getSetCC(DL, XLenVT, Vec, Zero, CC);
9449
9444
SetCC = DAG.getNode(ISD::TRUNCATE, DL, Op.getValueType(), SetCC);
9450
9445
@@ -9457,6 +9452,7 @@ SDValue RISCVTargetLowering::lowerVectorMaskVecReduction(SDValue Op,
9457
9452
// 0 for an inactive vector, and so we've already received the neutral value:
9458
9453
// AND gives us (0 == 0) -> 1 and OR/XOR give us (0 != 0) -> 0. Therefore we
9459
9454
// can simply include the start value.
9455
+ unsigned BaseOpc = ISD::getVecReduceBaseOpcode(Op.getOpcode());
9460
9456
return DAG.getNode(BaseOpc, DL, Op.getValueType(), SetCC, Op.getOperand(0));
9461
9457
}
9462
9458
0 commit comments