diff options
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 112 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 46 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp | 17 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp | 20 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h | 6 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp | 14 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp | 13 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 1 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 131 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h | 3 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp | 1 |
11 files changed, 358 insertions, 6 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 46c4bb85a742..28fcebbb4a92 100644 --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -484,6 +484,7 @@ namespace { SDValue visitCTTZ_ZERO_UNDEF(SDNode *N); SDValue visitCTPOP(SDNode *N); SDValue visitSELECT(SDNode *N); + SDValue visitCTSELECT(SDNode *N); SDValue visitVSELECT(SDNode *N); SDValue visitVP_SELECT(SDNode *N); SDValue visitSELECT_CC(SDNode *N); @@ -1898,6 +1899,7 @@ void DAGCombiner::Run(CombineLevel AtLevel) { } SDValue DAGCombiner::visit(SDNode *N) { + // clang-format off switch (N->getOpcode()) { default: break; @@ -1968,6 +1970,7 @@ SDValue DAGCombiner::visit(SDNode *N) { case ISD::CTTZ_ZERO_UNDEF: return visitCTTZ_ZERO_UNDEF(N); case ISD::CTPOP: return visitCTPOP(N); case ISD::SELECT: return visitSELECT(N); + case ISD::CTSELECT: return visitCTSELECT(N); case ISD::VSELECT: return visitVSELECT(N); case ISD::SELECT_CC: return visitSELECT_CC(N); case ISD::SETCC: return visitSETCC(N); @@ -6032,6 +6035,7 @@ static SDValue isSaturatingMinMax(SDValue N0, SDValue N1, SDValue N2, N0CC = cast<CondCodeSDNode>(N0.getOperand(4))->get(); break; case ISD::SELECT: + case ISD::CTSELECT: case ISD::VSELECT: if (N0.getOperand(0).getOpcode() != ISD::SETCC) return SDValue(); @@ -12184,8 +12188,9 @@ template <class MatchContextClass> static SDValue foldBoolSelectToLogic(SDNode *N, const SDLoc &DL, SelectionDAG &DAG) { assert((N->getOpcode() == ISD::SELECT || N->getOpcode() == ISD::VSELECT || - N->getOpcode() == ISD::VP_SELECT) && - "Expected a (v)(vp.)select"); + N->getOpcode() == ISD::VP_SELECT || + N->getOpcode() == ISD::CTSELECT) && + "Expected a (v)(vp.)(ct) select"); SDValue Cond = N->getOperand(0); SDValue T = N->getOperand(1), F = N->getOperand(2); EVT VT = N->getValueType(0); @@ -12547,6 +12552,109 @@ SDValue DAGCombiner::visitSELECT(SDNode *N) { return SDValue(); } +SDValue DAGCombiner::visitCTSELECT(SDNode *N) { + SDValue N0 = N->getOperand(0); + SDValue N1 = N->getOperand(1); + SDValue N2 = N->getOperand(2); + EVT VT = N->getValueType(0); + EVT VT0 = N0.getValueType(); + SDLoc DL(N); + SDNodeFlags Flags = N->getFlags(); + + if (SDValue V = foldBoolSelectToLogic<EmptyMatchContext>(N, DL, DAG)) + return V; + + // ctselect (not Cond), N1, N2 -> ctselect Cond, N2, N1 + if (SDValue F = extractBooleanFlip(N0, DAG, TLI, false)) { + SDValue SelectOp = DAG.getNode(ISD::CTSELECT, DL, VT, F, N2, N1); + SelectOp->setFlags(Flags); + return SelectOp; + } + + if (VT0 == MVT::i1) { + // The code in this block deals with the following 2 equivalences: + // select(C0|C1, x, y) <=> select(C0, x, select(C1, x, y)) + // select(C0&C1, x, y) <=> select(C0, select(C1, x, y), y) + // The target can specify its preferred form with the + // shouldNormalizeToSelectSequence() callback. However we always transform + // to the right anyway if we find the inner select exists in the DAG anyway + // and we always transform to the left side if we know that we can further + // optimize the combination of the conditions. + bool normalizeToSequence = + TLI.shouldNormalizeToSelectSequence(*DAG.getContext(), VT); + // ctselect (and Cond0, Cond1), X, Y + // -> ctselect Cond0, (ctselect Cond1, X, Y), Y + if (N0->getOpcode() == ISD::AND && N0->hasOneUse()) { + SDValue Cond0 = N0->getOperand(0); + SDValue Cond1 = N0->getOperand(1); + SDValue InnerSelect = DAG.getNode(ISD::CTSELECT, DL, N1.getValueType(), + Cond1, N1, N2, Flags); + if (normalizeToSequence || !InnerSelect.use_empty()) + return DAG.getNode(ISD::CTSELECT, DL, N1.getValueType(), Cond0, + InnerSelect, N2, Flags); + // Cleanup on failure. + if (InnerSelect.use_empty()) + recursivelyDeleteUnusedNodes(InnerSelect.getNode()); + } + // ctselect (or Cond0, Cond1), X, Y -> ctselect Cond0, X, (ctselect Cond1, + // X, Y) + if (N0->getOpcode() == ISD::OR && N0->hasOneUse()) { + SDValue Cond0 = N0->getOperand(0); + SDValue Cond1 = N0->getOperand(1); + SDValue InnerSelect = DAG.getNode(ISD::CTSELECT, DL, N1.getValueType(), + Cond1, N1, N2, Flags); + if (normalizeToSequence || !InnerSelect.use_empty()) + return DAG.getNode(ISD::CTSELECT, DL, N1.getValueType(), Cond0, N1, + InnerSelect, Flags); + // Cleanup on failure. + if (InnerSelect.use_empty()) + recursivelyDeleteUnusedNodes(InnerSelect.getNode()); + } + + // ctselect Cond0, (ctselect Cond1, X, Y), Y -> ctselect (and Cond0, Cond1), + // X, Y + if (N1->getOpcode() == ISD::CTSELECT && N1->hasOneUse()) { + SDValue N1_0 = N1->getOperand(0); + SDValue N1_1 = N1->getOperand(1); + SDValue N1_2 = N1->getOperand(2); + if (N1_2 == N2 && N0.getValueType() == N1_0.getValueType()) { + // Create the actual and node if we can generate good code for it. + if (!normalizeToSequence) { + SDValue And = DAG.getNode(ISD::AND, DL, N0.getValueType(), N0, N1_0); + return DAG.getNode(ISD::CTSELECT, DL, N1.getValueType(), And, N1_1, + N2, Flags); + } + // Otherwise see if we can optimize the "and" to a better pattern. + if (SDValue Combined = visitANDLike(N0, N1_0, N)) { + return DAG.getNode(ISD::CTSELECT, DL, N1.getValueType(), Combined, + N1_1, N2, Flags); + } + } + } + // ctselect Cond0, X, (ctselect Cond1, X, Y) -> ctselect (or Cond0, Cond1), + // X, Y + if (N2->getOpcode() == ISD::CTSELECT && N2->hasOneUse()) { + SDValue N2_0 = N2->getOperand(0); + SDValue N2_1 = N2->getOperand(1); + SDValue N2_2 = N2->getOperand(2); + if (N2_1 == N1 && N0.getValueType() == N2_0.getValueType()) { + // Create the actual or node if we can generate good code for it. + if (!normalizeToSequence) { + SDValue Or = DAG.getNode(ISD::OR, DL, N0.getValueType(), N0, N2_0); + return DAG.getNode(ISD::CTSELECT, DL, N1.getValueType(), Or, N1, N2_2, + Flags); + } + // Otherwise see if we can optimize to a better pattern. + if (SDValue Combined = visitORLike(N0, N2_0, DL)) + return DAG.getNode(ISD::CTSELECT, DL, N1.getValueType(), Combined, N1, + N2_2, Flags); + } + } + } + + return SDValue(); +} + // This function assumes all the vselect's arguments are CONCAT_VECTOR // nodes and that the condition is a BV of ConstantSDNodes (or undefs). static SDValue ConvertSelectToConcatVector(SDNode *N, SelectionDAG &DAG) { diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp index 431a81002074..8178fd898151 100644 --- a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp @@ -4136,6 +4136,46 @@ bool SelectionDAGLegalize::ExpandNode(SDNode *Node) { } Results.push_back(Tmp1); break; + case ISD::CTSELECT: { + Tmp1 = Node->getOperand(0); + Tmp2 = Node->getOperand(1); + Tmp3 = Node->getOperand(2); + EVT VT = Tmp2.getValueType(); + if (VT.isVector()) { + SmallVector<SDValue> Elements; + unsigned NumElements = VT.getVectorNumElements(); + EVT ScalarVT = VT.getScalarType(); + for (unsigned Idx = 0; Idx < NumElements; ++Idx) { + SDValue IdxVal = DAG.getConstant(Idx, dl, MVT::i64); + SDValue TVal = + DAG.getNode(ISD::EXTRACT_VECTOR_ELT, dl, ScalarVT, Tmp2, IdxVal); + SDValue FVal = + DAG.getNode(ISD::EXTRACT_VECTOR_ELT, dl, ScalarVT, Tmp3, IdxVal); + Elements.push_back( + DAG.getCTSelect(dl, ScalarVT, Tmp1, TVal, FVal, Node->getFlags())); + } + Tmp1 = DAG.getBuildVector(VT, dl, Elements); + } else if (VT.isFloatingPoint()) { + EVT IntegerVT = EVT::getIntegerVT(*DAG.getContext(), VT.getSizeInBits()); + Tmp2 = DAG.getBitcast(IntegerVT, Tmp2); + Tmp3 = DAG.getBitcast(IntegerVT, Tmp3); + Tmp1 = DAG.getBitcast(VT, DAG.getCTSelect(dl, IntegerVT, Tmp1, Tmp2, Tmp3, + Node->getFlags())); + } else { + assert(VT.isInteger()); + EVT HalfVT = VT.getHalfSizedIntegerVT(*DAG.getContext()); + auto [Tmp2Lo, Tmp2Hi] = DAG.SplitScalar(Tmp2, dl, HalfVT, HalfVT); + auto [Tmp3Lo, Tmp3Hi] = DAG.SplitScalar(Tmp3, dl, HalfVT, HalfVT); + SDValue ResLo = + DAG.getCTSelect(dl, HalfVT, Tmp1, Tmp2Lo, Tmp3Lo, Node->getFlags()); + SDValue ResHi = + DAG.getCTSelect(dl, HalfVT, Tmp1, Tmp2Hi, Tmp3Hi, Node->getFlags()); + Tmp1 = DAG.getNode(ISD::BUILD_PAIR, dl, VT, ResLo, ResHi); + Tmp1->setFlags(Node->getFlags()); + } + Results.push_back(Tmp1); + break; + } case ISD::BR_JT: { SDValue Chain = Node->getOperand(0); SDValue Table = Node->getOperand(1); @@ -5474,7 +5514,8 @@ void SelectionDAGLegalize::PromoteNode(SDNode *Node) { Results.push_back(DAG.getNode(ISD::TRUNCATE, dl, OVT, Tmp2)); break; } - case ISD::SELECT: { + case ISD::SELECT: + case ISD::CTSELECT: { unsigned ExtOp, TruncOp; if (Node->getValueType(0).isVector() || Node->getValueType(0).getSizeInBits() == NVT.getSizeInBits()) { @@ -5492,7 +5533,8 @@ void SelectionDAGLegalize::PromoteNode(SDNode *Node) { Tmp2 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(1)); Tmp3 = DAG.getNode(ExtOp, dl, NVT, Node->getOperand(2)); // Perform the larger operation, then round down. - Tmp1 = DAG.getSelect(dl, NVT, Tmp1, Tmp2, Tmp3); + Tmp1 = DAG.getNode(Node->getOpcode(), dl, NVT, Tmp1, Tmp2, Tmp3); + Tmp1->setFlags(Node->getFlags()); if (TruncOp != ISD::FP_ROUND) Tmp1 = DAG.getNode(TruncOp, dl, Node->getValueType(0), Tmp1); else diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp index 58983cb57d7f..855a15a744cf 100644 --- a/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp @@ -159,6 +159,7 @@ void DAGTypeLegalizer::SoftenFloatResult(SDNode *N, unsigned ResNo) { case ISD::ATOMIC_LOAD: R = SoftenFloatRes_ATOMIC_LOAD(N); break; case ISD::ATOMIC_SWAP: R = BitcastToInt_ATOMIC_SWAP(N); break; case ISD::SELECT: R = SoftenFloatRes_SELECT(N); break; + case ISD::CTSELECT: R = SoftenFloatRes_CTSELECT(N); break; case ISD::SELECT_CC: R = SoftenFloatRes_SELECT_CC(N); break; case ISD::FREEZE: R = SoftenFloatRes_FREEZE(N); break; case ISD::STRICT_SINT_TO_FP: @@ -1041,6 +1042,13 @@ SDValue DAGTypeLegalizer::SoftenFloatRes_SELECT(SDNode *N) { LHS.getValueType(), N->getOperand(0), LHS, RHS); } +SDValue DAGTypeLegalizer::SoftenFloatRes_CTSELECT(SDNode *N) { + SDValue LHS = GetSoftenedFloat(N->getOperand(1)); + SDValue RHS = GetSoftenedFloat(N->getOperand(2)); + return DAG.getCTSelect(SDLoc(N), LHS.getValueType(), N->getOperand(0), LHS, + RHS); +} + SDValue DAGTypeLegalizer::SoftenFloatRes_SELECT_CC(SDNode *N) { SDValue LHS = GetSoftenedFloat(N->getOperand(2)); SDValue RHS = GetSoftenedFloat(N->getOperand(3)); @@ -1561,6 +1569,7 @@ void DAGTypeLegalizer::ExpandFloatResult(SDNode *N, unsigned ResNo) { case ISD::POISON: case ISD::UNDEF: SplitRes_UNDEF(N, Lo, Hi); break; case ISD::SELECT: SplitRes_Select(N, Lo, Hi); break; + case ISD::CTSELECT: SplitRes_Select(N, Lo, Hi); break; case ISD::SELECT_CC: SplitRes_SELECT_CC(N, Lo, Hi); break; case ISD::MERGE_VALUES: ExpandRes_MERGE_VALUES(N, ResNo, Lo, Hi); break; @@ -2917,6 +2926,9 @@ void DAGTypeLegalizer::PromoteFloatResult(SDNode *N, unsigned ResNo) { R = PromoteFloatRes_ATOMIC_LOAD(N); break; case ISD::SELECT: R = PromoteFloatRes_SELECT(N); break; + case ISD::CTSELECT: + R = PromoteFloatRes_SELECT(N); + break; case ISD::SELECT_CC: R = PromoteFloatRes_SELECT_CC(N); break; case ISD::SINT_TO_FP: @@ -3219,7 +3231,7 @@ SDValue DAGTypeLegalizer::PromoteFloatRes_SELECT(SDNode *N) { SDValue TrueVal = GetPromotedFloat(N->getOperand(1)); SDValue FalseVal = GetPromotedFloat(N->getOperand(2)); - return DAG.getNode(ISD::SELECT, SDLoc(N), TrueVal->getValueType(0), + return DAG.getNode(N->getOpcode(), SDLoc(N), TrueVal->getValueType(0), N->getOperand(0), TrueVal, FalseVal); } @@ -3403,6 +3415,9 @@ void DAGTypeLegalizer::SoftPromoteHalfResult(SDNode *N, unsigned ResNo) { R = SoftPromoteHalfRes_ATOMIC_LOAD(N); break; case ISD::SELECT: R = SoftPromoteHalfRes_SELECT(N); break; + case ISD::CTSELECT: + R = SoftPromoteHalfRes_SELECT(N); + break; case ISD::SELECT_CC: R = SoftPromoteHalfRes_SELECT_CC(N); break; case ISD::STRICT_SINT_TO_FP: case ISD::STRICT_UINT_TO_FP: diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp index 44e5a187c428..0135b3195438 100644 --- a/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp @@ -95,6 +95,7 @@ void DAGTypeLegalizer::PromoteIntegerResult(SDNode *N, unsigned ResNo) { Res = PromoteIntRes_VECTOR_COMPRESS(N); break; case ISD::SELECT: + case ISD::CTSELECT: case ISD::VSELECT: case ISD::VP_SELECT: case ISD::VP_MERGE: @@ -2013,6 +2014,9 @@ bool DAGTypeLegalizer::PromoteIntegerOperand(SDNode *N, unsigned OpNo) { break; case ISD::VSELECT: case ISD::SELECT: Res = PromoteIntOp_SELECT(N, OpNo); break; + case ISD::CTSELECT: + Res = PromoteIntOp_CTSELECT(N, OpNo); + break; case ISD::SELECT_CC: Res = PromoteIntOp_SELECT_CC(N, OpNo); break; case ISD::VP_SETCC: case ISD::SETCC: Res = PromoteIntOp_SETCC(N, OpNo); break; @@ -2390,6 +2394,19 @@ SDValue DAGTypeLegalizer::PromoteIntOp_SELECT(SDNode *N, unsigned OpNo) { N->getOperand(2)), 0); } +SDValue DAGTypeLegalizer::PromoteIntOp_CTSELECT(SDNode *N, unsigned OpNo) { + assert(OpNo == 0 && "Only know how to promote the condition!"); + SDValue Cond = N->getOperand(0); + EVT OpTy = N->getOperand(1).getValueType(); + + // Promote all the way up to the canonical SetCC type. + EVT OpVT = N->getOpcode() == ISD::CTSELECT ? OpTy.getScalarType() : OpTy; + Cond = PromoteTargetBoolean(Cond, OpVT); + + return SDValue( + DAG.UpdateNodeOperands(N, Cond, N->getOperand(1), N->getOperand(2)), 0); +} + SDValue DAGTypeLegalizer::PromoteIntOp_SELECT_CC(SDNode *N, unsigned OpNo) { assert(OpNo == 0 && "Don't know how to promote this operand!"); @@ -2987,6 +3004,9 @@ void DAGTypeLegalizer::ExpandIntegerResult(SDNode *N, unsigned ResNo) { case ISD::ARITH_FENCE: SplitRes_ARITH_FENCE(N, Lo, Hi); break; case ISD::MERGE_VALUES: SplitRes_MERGE_VALUES(N, ResNo, Lo, Hi); break; case ISD::SELECT: SplitRes_Select(N, Lo, Hi); break; + case ISD::CTSELECT: + SplitRes_Select(N, Lo, Hi); + break; case ISD::SELECT_CC: SplitRes_SELECT_CC(N, Lo, Hi); break; case ISD::POISON: case ISD::UNDEF: SplitRes_UNDEF(N, Lo, Hi); break; diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h index ede522eff6df..62069b4fb03a 100644 --- a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h +++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h @@ -401,6 +401,7 @@ private: SDValue PromoteIntOp_CONCAT_VECTORS(SDNode *N); SDValue PromoteIntOp_ScalarOp(SDNode *N); SDValue PromoteIntOp_SELECT(SDNode *N, unsigned OpNo); + SDValue PromoteIntOp_CTSELECT(SDNode *N, unsigned OpNo); SDValue PromoteIntOp_SELECT_CC(SDNode *N, unsigned OpNo); SDValue PromoteIntOp_SETCC(SDNode *N, unsigned OpNo); SDValue PromoteIntOp_Shift(SDNode *N); @@ -633,6 +634,7 @@ private: SDValue SoftenFloatRes_LOAD(SDNode *N); SDValue SoftenFloatRes_ATOMIC_LOAD(SDNode *N); SDValue SoftenFloatRes_SELECT(SDNode *N); + SDValue SoftenFloatRes_CTSELECT(SDNode *N); SDValue SoftenFloatRes_SELECT_CC(SDNode *N); SDValue SoftenFloatRes_UNDEF(SDNode *N); SDValue SoftenFloatRes_VAARG(SDNode *N); @@ -896,6 +898,7 @@ private: SDValue ScalarizeVecRes_SCALAR_TO_VECTOR(SDNode *N); SDValue ScalarizeVecRes_VSELECT(SDNode *N); SDValue ScalarizeVecRes_SELECT(SDNode *N); + SDValue ScalarizeVecRes_CTSELECT(SDNode *N); SDValue ScalarizeVecRes_SELECT_CC(SDNode *N); SDValue ScalarizeVecRes_SETCC(SDNode *N); SDValue ScalarizeVecRes_UNDEF(SDNode *N); @@ -1224,7 +1227,8 @@ private: SDValue &Lo, SDValue &Hi); void SplitVecRes_AssertZext (SDNode *N, SDValue &Lo, SDValue &Hi); void SplitRes_ARITH_FENCE (SDNode *N, SDValue &Lo, SDValue &Hi); - void SplitRes_Select (SDNode *N, SDValue &Lo, SDValue &Hi); + void SplitRes_Select(SDNode *N, SDValue &Lo, SDValue &Hi); + void SplitRes_CTSELECT(SDNode *N, SDValue &Lo, SDValue &Hi); void SplitRes_SELECT_CC (SDNode *N, SDValue &Lo, SDValue &Hi); void SplitRes_UNDEF (SDNode *N, SDValue &Lo, SDValue &Hi); void SplitRes_FREEZE (SDNode *N, SDValue &Lo, SDValue &Hi); diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp index 88c1af20a321..098368ef2f6b 100644 --- a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp @@ -570,6 +570,20 @@ void DAGTypeLegalizer::SplitRes_Select(SDNode *N, SDValue &Lo, SDValue &Hi) { Hi = DAG.getNode(Opcode, dl, LH.getValueType(), CH, LH, RH, EVLHi); } +void DAGTypeLegalizer::SplitRes_CTSELECT(SDNode *N, SDValue &Lo, SDValue &Hi) { + SDValue LL, LH, RL, RH, CL, CH; + SDLoc dl(N); + GetSplitOp(N->getOperand(1), LL, LH); + GetSplitOp(N->getOperand(2), RL, RH); + + SDValue Cond = N->getOperand(0); + CL = CH = Cond; + assert(!Cond.getValueType().isVector() && "Unsupported vector type"); + + Lo = DAG.getNode(N->getOpcode(), dl, LL.getValueType(), CL, LL, RL); + Hi = DAG.getNode(N->getOpcode(), dl, LH.getValueType(), CH, LH, RH); +} + void DAGTypeLegalizer::SplitRes_SELECT_CC(SDNode *N, SDValue &Lo, SDValue &Hi) { SDValue LL, LH, RL, RH; diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp index bb4a8d9967f9..ed1a199cf757 100644 --- a/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp @@ -77,6 +77,9 @@ void DAGTypeLegalizer::ScalarizeVectorResult(SDNode *N, unsigned ResNo) { case ISD::SIGN_EXTEND_INREG: R = ScalarizeVecRes_InregOp(N); break; case ISD::VSELECT: R = ScalarizeVecRes_VSELECT(N); break; case ISD::SELECT: R = ScalarizeVecRes_SELECT(N); break; + case ISD::CTSELECT: + R = ScalarizeVecRes_CTSELECT(N); + break; case ISD::SELECT_CC: R = ScalarizeVecRes_SELECT_CC(N); break; case ISD::SETCC: R = ScalarizeVecRes_SETCC(N); break; case ISD::POISON: @@ -670,6 +673,12 @@ SDValue DAGTypeLegalizer::ScalarizeVecRes_SELECT(SDNode *N) { GetScalarizedVector(N->getOperand(2))); } +SDValue DAGTypeLegalizer::ScalarizeVecRes_CTSELECT(SDNode *N) { + SDValue LHS = GetScalarizedVector(N->getOperand(1)); + return DAG.getCTSelect(SDLoc(N), LHS.getValueType(), N->getOperand(0), LHS, + GetScalarizedVector(N->getOperand(2))); +} + SDValue DAGTypeLegalizer::ScalarizeVecRes_SELECT_CC(SDNode *N) { SDValue LHS = GetScalarizedVector(N->getOperand(2)); return DAG.getNode(ISD::SELECT_CC, SDLoc(N), LHS.getValueType(), @@ -1204,6 +1213,9 @@ void DAGTypeLegalizer::SplitVectorResult(SDNode *N, unsigned ResNo) { case ISD::SELECT: case ISD::VP_MERGE: case ISD::VP_SELECT: SplitRes_Select(N, Lo, Hi); break; + case ISD::CTSELECT: + SplitRes_CTSELECT(N, Lo, Hi); + break; case ISD::SELECT_CC: SplitRes_SELECT_CC(N, Lo, Hi); break; case ISD::POISON: case ISD::UNDEF: SplitRes_UNDEF(N, Lo, Hi); break; @@ -4869,6 +4881,7 @@ void DAGTypeLegalizer::WidenVectorResult(SDNode *N, unsigned ResNo) { case ISD::SIGN_EXTEND_INREG: Res = WidenVecRes_InregOp(N); break; case ISD::VSELECT: case ISD::SELECT: + case ISD::CTSELECT: case ISD::VP_SELECT: case ISD::VP_MERGE: Res = WidenVecRes_Select(N); diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 379242ec5a15..f960e9961c85 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -8249,6 +8249,7 @@ SDValue SelectionDAG::getNode(unsigned Opcode, const SDLoc &DL, EVT VT, return V; break; } + case ISD::SELECT: case ISD::VSELECT: if (SDValue V = simplifySelect(N1, N2, N3)) diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index fa0c899dfcc2..1f7c0fe0d605 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -6496,6 +6496,105 @@ void SelectionDAGBuilder::visitVectorExtractLastActive(const CallInst &I, setValue(&I, Result); } +/// Fallback implementation for constant-time select using DAG chaining. +/// This implementation uses data dependencies through virtual registers to +/// prevent optimizations from breaking the constant-time property. +/// It handles scalars, vectors (fixed and scalable), and floating-point types. +SDValue SelectionDAGBuilder::createProtectedCtSelectFallback( + SelectionDAG &DAG, const SDLoc &DL, SDValue Cond, SDValue T, SDValue F, + EVT VT) { + + SDValue WorkingT = T; + SDValue WorkingF = F; + EVT WorkingVT = VT; + + SDValue Chain = DAG.getEntryNode(); + MachineRegisterInfo &MRI = DAG.getMachineFunction().getRegInfo(); + + // Handle vector condition: splat scalar condition to vector + if (VT.isVector() && !Cond.getValueType().isVector()) { + ElementCount NumElems = VT.getVectorElementCount(); + EVT CondVT = EVT::getVectorVT(*DAG.getContext(), MVT::i1, NumElems); + + if (VT.isScalableVector()) { + Cond = DAG.getSplatVector(CondVT, DL, Cond); + } else { + Cond = DAG.getSplatBuildVector(CondVT, DL, Cond); + } + } + + // Handle floating-point types: bitcast to integer for bitwise operations + if (VT.isFloatingPoint()) { + if (VT.isVector()) { + // float vector -> int vector + EVT ElemVT = VT.getVectorElementType(); + unsigned int ElemBitWidth = ElemVT.getScalarSizeInBits(); + EVT IntElemVT = EVT::getIntegerVT(*DAG.getContext(), ElemBitWidth); + + WorkingVT = EVT::getVectorVT(*DAG.getContext(), IntElemVT, + VT.getVectorElementCount()); + } else { + WorkingVT = EVT::getIntegerVT(*DAG.getContext(), VT.getSizeInBits()); + } + + WorkingT = DAG.getBitcast(WorkingVT, T); + WorkingF = DAG.getBitcast(WorkingVT, F); + } + + // Create mask: sign-extend condition to all bits + SDValue Mask = DAG.getSExtOrTrunc(Cond, DL, WorkingVT); + + // Create all-ones constant for inversion + SDValue AllOnes; + if (WorkingVT.isScalableVector()) { + unsigned BitWidth = WorkingVT.getScalarSizeInBits(); + APInt AllOnesVal = APInt::getAllOnes(BitWidth); + SDValue ScalarAllOnes = + DAG.getConstant(AllOnesVal, DL, WorkingVT.getScalarType()); + AllOnes = DAG.getSplatVector(WorkingVT, DL, ScalarAllOnes); + } else { + AllOnes = DAG.getAllOnesConstant(DL, WorkingVT); + } + + // Invert mask for false value + SDValue Invert = DAG.getNode(ISD::XOR, DL, WorkingVT, Mask, AllOnes); + + // Compute: (T & Mask) | (F & ~Mask) + // This is constant-time because both branches are always computed + SDValue TM = DAG.getNode(ISD::AND, DL, WorkingVT, Mask, WorkingT); + + // DAG chaining: create data dependency through virtual register + // This prevents optimizations from reordering or eliminating operations + const TargetLowering &TLI = DAG.getTargetLoweringInfo(); + bool CanUseChaining = false; + + if (!WorkingVT.isScalableVector()) { + // For fixed-size vectors and scalars, check if type is legal + CanUseChaining = TLI.isTypeLegal(WorkingVT.getSimpleVT()); + } else { + // For scalable vectors, disable chaining (conservative approach) + CanUseChaining = false; + } + + if (CanUseChaining) { + // Apply chaining through registers for additional protection + const TargetRegisterClass *RC = TLI.getRegClassFor(WorkingVT.getSimpleVT()); + Register TMReg = MRI.createVirtualRegister(RC); + Chain = DAG.getCopyToReg(Chain, DL, TMReg, TM); + TM = DAG.getCopyFromReg(Chain, DL, TMReg, WorkingVT); + } + + SDValue FM = DAG.getNode(ISD::AND, DL, WorkingVT, Invert, WorkingF); + SDValue Result = DAG.getNode(ISD::OR, DL, WorkingVT, TM, FM); + + // Convert back to original type if needed + if (WorkingVT != VT) { + Result = DAG.getBitcast(VT, Result); + } + + return Result; +} + /// Lower the call to the specified intrinsic function. void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I, unsigned Intrinsic) { @@ -6674,6 +6773,38 @@ void SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I, updateDAGForMaybeTailCall(MC); return; } + case Intrinsic::ct_select: { + // Set function attribute to indicate ct.select usage + Function &F = DAG.getMachineFunction().getFunction(); + F.addFnAttr("ct-select"); + + SDLoc DL = getCurSDLoc(); + + SDValue Cond = getValue(I.getArgOperand(0)); // i1 + SDValue A = getValue(I.getArgOperand(1)); // T + SDValue B = getValue(I.getArgOperand(2)); // T + + assert((A.getValueType() == B.getValueType()) && + "Operands are of different types"); + + EVT VT = A.getValueType(); + EVT CondVT = Cond.getValueType(); + + // assert if Cond type is Vector + assert(!CondVT.isVector() && "Vector type cond not supported yet"); + + // Handle scalar types + if (TLI.isSelectSupported( + TargetLoweringBase::SelectSupportKind::CtSelect) && + !CondVT.isVector()) { + SDValue Result = DAG.getNode(ISD::CTSELECT, DL, VT, Cond, A, B); + setValue(&I, Result); + return; + } + + setValue(&I, createProtectedCtSelectFallback(DAG, DL, Cond, A, B, VT)); + return; + } case Intrinsic::call_preallocated_setup: { const CallBase *PreallocatedCall = FindPreallocatedCall(&I); SDValue SrcValue = DAG.getSrcValue(PreallocatedCall); diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h index 47e19f77a15e..5c02bd6b8a4f 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h @@ -219,6 +219,9 @@ private: peelDominantCaseCluster(const SwitchInst &SI, SwitchCG::CaseClusterVector &Clusters, BranchProbability &PeeledCaseProb); + SDValue createProtectedCtSelectFallback(SelectionDAG &DAG, const SDLoc &DL, + SDValue Cond, SDValue T, SDValue F, + EVT VT); private: const TargetMachine &TM; diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp index 77377d348b83..aafbc5e4401c 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp @@ -332,6 +332,7 @@ std::string SDNode::getOperationName(const SelectionDAG *G) const { case ISD::FPOWI: return "fpowi"; case ISD::STRICT_FPOWI: return "strict_fpowi"; case ISD::SETCC: return "setcc"; + case ISD::CTSELECT: return "ctselect"; case ISD::SETCCCARRY: return "setcccarry"; case ISD::STRICT_FSETCC: return "strict_fsetcc"; case ISD::STRICT_FSETCCS: return "strict_fsetccs"; |
