Skip to content

Commit c531804

Browse files
committed
Fix code style
1 parent f9b709f commit c531804

File tree

2 files changed

+12
-26
lines changed

2 files changed

+12
-26
lines changed

llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2583,7 +2583,7 @@ bool DAGTypeLegalizer::PromoteFloatOperand(SDNode *N, unsigned OpNo) {
25832583
case ISD::LLROUND:
25842584
case ISD::LRINT:
25852585
case ISD::LLRINT: R = PromoteFloatOp_UnaryOp(N, OpNo); break;
2586-
case ISD::AssertNoFPClass: R = PromoteFloatOp_UnaryOpExt1(N, OpNo); break;
2586+
case ISD::AssertNoFPClass: R = PromoteFloatOp_AssertNoFPClass(N, OpNo); break;
25872587
case ISD::FP_TO_SINT_SAT:
25882588
case ISD::FP_TO_UINT_SAT:
25892589
R = PromoteFloatOp_FP_TO_XINT_SAT(N, OpNo); break;
@@ -2643,7 +2643,8 @@ SDValue DAGTypeLegalizer::PromoteFloatOp_UnaryOp(SDNode *N, unsigned OpNo) {
26432643
}
26442644

26452645
// Convert the promoted float value to the desired integer type
2646-
SDValue DAGTypeLegalizer::PromoteFloatOp_UnaryOpExt1(SDNode *N, unsigned OpNo) {
2646+
SDValue DAGTypeLegalizer::PromoteFloatOp_AssertNoFPClass(SDNode *N,
2647+
unsigned OpNo) {
26472648
SDValue Op = GetPromotedFloat(N->getOperand(0));
26482649
return DAG.getNode(N->getOpcode(), SDLoc(N), N->getValueType(0), Op,
26492650
N->getOperand(1));
@@ -2814,7 +2815,7 @@ void DAGTypeLegalizer::PromoteFloatResult(SDNode *N, unsigned ResNo) {
28142815
case ISD::FTANH:
28152816
case ISD::FCANONICALIZE: R = PromoteFloatRes_UnaryOp(N); break;
28162817
case ISD::AssertNoFPClass:
2817-
R = PromoteFloatRes_UnaryOpExt1(N);
2818+
R = PromoteFloatRes_AssertNoFPClass(N);
28182819
break;
28192820

28202821
// Binary FP Operations
@@ -3014,7 +3015,7 @@ SDValue DAGTypeLegalizer::PromoteFloatRes_UnaryOp(SDNode *N) {
30143015
// Unary operation with a more non-float operand where the result and the
30153016
// operand have PromoteFloat type action. Construct a new SDNode with the
30163017
// promoted float value of the old operand.
3017-
SDValue DAGTypeLegalizer::PromoteFloatRes_UnaryOpExt1(SDNode *N) {
3018+
SDValue DAGTypeLegalizer::PromoteFloatRes_AssertNoFPClass(SDNode *N) {
30183019
EVT VT = N->getValueType(0);
30193020
EVT NVT = TLI.getTypeToTransformTo(*DAG.getContext(), VT);
30203021
SDValue Op = GetPromotedFloat(N->getOperand(0));
@@ -3302,7 +3303,7 @@ void DAGTypeLegalizer::SoftPromoteHalfResult(SDNode *N, unsigned ResNo) {
33023303
case ISD::FTANH:
33033304
case ISD::FCANONICALIZE: R = SoftPromoteHalfRes_UnaryOp(N); break;
33043305
case ISD::AssertNoFPClass:
3305-
R = SoftPromoteHalfRes_UnaryOpExt1(N);
3306+
R = SoftPromoteHalfRes_AssertNoFPClass(N);
33063307
break;
33073308

33083309
// Binary FP Operations
@@ -3630,19 +3631,8 @@ SDValue DAGTypeLegalizer::SoftPromoteHalfRes_UnaryOp(SDNode *N) {
36303631
return DAG.getNode(GetPromotionOpcode(NVT, OVT), dl, MVT::i16, Res);
36313632
}
36323633

3633-
SDValue DAGTypeLegalizer::SoftPromoteHalfRes_UnaryOpExt1(SDNode *N) {
3634-
EVT OVT = N->getValueType(0);
3635-
EVT NVT = TLI.getTypeToTransformTo(*DAG.getContext(), OVT);
3636-
SDValue Op = GetSoftPromotedHalf(N->getOperand(0));
3637-
SDLoc dl(N);
3638-
3639-
// Promote to the larger FP type.
3640-
Op = DAG.getNode(GetPromotionOpcode(OVT, NVT), dl, NVT, Op);
3641-
3642-
SDValue Res = DAG.getNode(N->getOpcode(), dl, NVT, Op, N->getOperand(1));
3643-
3644-
// Convert back to FP16 as an integer.
3645-
return DAG.getNode(GetPromotionOpcode(NVT, OVT), dl, MVT::i16, Res);
3634+
SDValue DAGTypeLegalizer::SoftPromoteHalfRes_AssertNoFPClass(SDNode *N) {
3635+
return GetSoftPromotedHalf(N->getOperand(0));
36463636
}
36473637

36483638
SDValue DAGTypeLegalizer::SoftPromoteHalfRes_BinOp(SDNode *N) {

llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ class LLVM_LIBRARY_VISIBILITY DAGTypeLegalizer {
8080
/// Pretend all of this node's results are legal.
8181
bool IgnoreNodeResults(SDNode *N) const {
8282
return N->getOpcode() == ISD::TargetConstant ||
83-
N->getOpcode() == ISD::Register ||
84-
(N->getOpcode() == ISD::AssertNoFPClass &&
85-
IgnoreNodeResults(N->getOperand(0).getNode()));
83+
N->getOpcode() == ISD::Register;
8684
}
8785

8886
// Bijection from SDValue to unique id. As each created node gets a
@@ -774,7 +772,7 @@ class LLVM_LIBRARY_VISIBILITY DAGTypeLegalizer {
774772
SDValue PromoteFloatRes_SELECT(SDNode *N);
775773
SDValue PromoteFloatRes_SELECT_CC(SDNode *N);
776774
SDValue PromoteFloatRes_UnaryOp(SDNode *N);
777-
SDValue PromoteFloatRes_UnaryOpExt1(SDNode *N);
775+
SDValue PromoteFloatRes_AssertNoFPClass(SDNode *N);
778776
SDValue PromoteFloatRes_UNDEF(SDNode *N);
779777
SDValue BitcastToInt_ATOMIC_SWAP(SDNode *N);
780778
SDValue PromoteFloatRes_XINT_TO_FP(SDNode *N);
@@ -788,7 +786,7 @@ class LLVM_LIBRARY_VISIBILITY DAGTypeLegalizer {
788786
SDValue PromoteFloatOp_FP_EXTEND(SDNode *N, unsigned OpNo);
789787
SDValue PromoteFloatOp_STRICT_FP_EXTEND(SDNode *N, unsigned OpNo);
790788
SDValue PromoteFloatOp_UnaryOp(SDNode *N, unsigned OpNo);
791-
SDValue PromoteFloatOp_UnaryOpExt1(SDNode *N, unsigned OpNo);
789+
SDValue PromoteFloatOp_AssertNoFPClass(SDNode *N, unsigned OpNo);
792790
SDValue PromoteFloatOp_FP_TO_XINT_SAT(SDNode *N, unsigned OpNo);
793791
SDValue PromoteFloatOp_STORE(SDNode *N, unsigned OpNo);
794792
SDValue PromoteFloatOp_ATOMIC_STORE(SDNode *N, unsigned OpNo);
@@ -800,8 +798,6 @@ class LLVM_LIBRARY_VISIBILITY DAGTypeLegalizer {
800798
//===--------------------------------------------------------------------===//
801799

802800
SDValue GetSoftPromotedHalf(SDValue Op) {
803-
while (Op.getNode()->getOpcode() == ISD::AssertNoFPClass)
804-
Op = Op.getNode()->getOperand(0);
805801
TableId &PromotedId = SoftPromotedHalfs[getTableId(Op)];
806802
SDValue PromotedOp = getSDValue(PromotedId);
807803
assert(PromotedOp.getNode() && "Operand wasn't promoted?");
@@ -826,7 +822,7 @@ class LLVM_LIBRARY_VISIBILITY DAGTypeLegalizer {
826822
SDValue SoftPromoteHalfRes_SELECT(SDNode *N);
827823
SDValue SoftPromoteHalfRes_SELECT_CC(SDNode *N);
828824
SDValue SoftPromoteHalfRes_UnaryOp(SDNode *N);
829-
SDValue SoftPromoteHalfRes_UnaryOpExt1(SDNode *N);
825+
SDValue SoftPromoteHalfRes_AssertNoFPClass(SDNode *N);
830826
SDValue SoftPromoteHalfRes_XINT_TO_FP(SDNode *N);
831827
SDValue SoftPromoteHalfRes_UNDEF(SDNode *N);
832828
SDValue SoftPromoteHalfRes_VECREDUCE(SDNode *N);

0 commit comments

Comments
 (0)