[X86] Add SCALAR_SINT_TO_FP/SCALAR_UINT_TO_FP ISD opcodes without rounding mode.
After this we no longer need to match FROUND_CURRENT or FROUND_NO_EXC during isel so I remove those. llvm-svn: 355807
This commit is contained in:
Craig Topper
parent
ecbc141dbf
commit
f19d6a4073
|
|
@ -27788,7 +27788,9 @@ const char *X86TargetLowering::getTargetNodeName(unsigned Opcode) const {
|
|||
case X86ISD::VFPCLASS: return "X86ISD::VFPCLASS";
|
||||
case X86ISD::VFPCLASSS: return "X86ISD::VFPCLASSS";
|
||||
case X86ISD::MULTISHIFT: return "X86ISD::MULTISHIFT";
|
||||
case X86ISD::SCALAR_SINT_TO_FP: return "X86ISD::SCALAR_SINT_TO_FP";
|
||||
case X86ISD::SCALAR_SINT_TO_FP_RND: return "X86ISD::SCALAR_SINT_TO_FP_RND";
|
||||
case X86ISD::SCALAR_UINT_TO_FP: return "X86ISD::SCALAR_UINT_TO_FP";
|
||||
case X86ISD::SCALAR_UINT_TO_FP_RND: return "X86ISD::SCALAR_UINT_TO_FP_RND";
|
||||
case X86ISD::CVTPS2PH: return "X86ISD::CVTPS2PH";
|
||||
case X86ISD::MCVTPS2PH: return "X86ISD::MCVTPS2PH";
|
||||
|
|
|
|||
|
|
@ -497,6 +497,7 @@ namespace llvm {
|
|||
|
||||
// Convert Unsigned/Integer to Floating-Point Value with rounding mode.
|
||||
SINT_TO_FP_RND, UINT_TO_FP_RND,
|
||||
SCALAR_SINT_TO_FP, SCALAR_UINT_TO_FP,
|
||||
SCALAR_SINT_TO_FP_RND, SCALAR_UINT_TO_FP_RND,
|
||||
|
||||
// Vector float/double to signed/unsigned integer.
|
||||
|
|
|
|||
|
|
@ -7412,9 +7412,7 @@ multiclass avx512_vcvtsi<bits<8> opc, SDPatternOperator OpNode, X86FoldableSched
|
|||
(ins DstVT.RC:$src1, SrcRC:$src2),
|
||||
!strconcat(asm,"\t{$src2, $src1, $dst|$dst, $src1, $src2}"),
|
||||
[(set DstVT.RC:$dst,
|
||||
(OpNode (DstVT.VT DstVT.RC:$src1),
|
||||
SrcRC:$src2,
|
||||
(i32 FROUND_CURRENT)))]>,
|
||||
(OpNode (DstVT.VT DstVT.RC:$src1), SrcRC:$src2))]>,
|
||||
EVEX_4V, Sched<[sched, ReadDefault, ReadInt2Fpu]>;
|
||||
|
||||
def rm_Int : SI<opc, MRMSrcMem, (outs DstVT.RC:$dst),
|
||||
|
|
@ -7422,8 +7420,7 @@ multiclass avx512_vcvtsi<bits<8> opc, SDPatternOperator OpNode, X86FoldableSched
|
|||
!strconcat(asm,"\t{$src2, $src1, $dst|$dst, $src1, $src2}"),
|
||||
[(set DstVT.RC:$dst,
|
||||
(OpNode (DstVT.VT DstVT.RC:$src1),
|
||||
(ld_frag addr:$src2),
|
||||
(i32 FROUND_CURRENT)))]>,
|
||||
(ld_frag addr:$src2)))]>,
|
||||
EVEX_4V, Sched<[sched.Folded, sched.ReadAfterFold]>;
|
||||
}//isCodeGenOnly = 1
|
||||
}
|
||||
|
|
@ -7442,26 +7439,29 @@ multiclass avx512_vcvtsi_round<bits<8> opc, SDNode OpNode,
|
|||
EVEX_4V, EVEX_B, EVEX_RC, Sched<[sched, ReadDefault, ReadInt2Fpu]>;
|
||||
}
|
||||
|
||||
multiclass avx512_vcvtsi_common<bits<8> opc, SDNode OpNode,
|
||||
multiclass avx512_vcvtsi_common<bits<8> opc, SDNode OpNode, SDNode OpNodeRnd,
|
||||
X86FoldableSchedWrite sched,
|
||||
RegisterClass SrcRC, X86VectorVTInfo DstVT,
|
||||
X86MemOperand x86memop, PatFrag ld_frag, string asm> {
|
||||
defm NAME : avx512_vcvtsi_round<opc, OpNode, sched, SrcRC, DstVT, asm>,
|
||||
defm NAME : avx512_vcvtsi_round<opc, OpNodeRnd, sched, SrcRC, DstVT, asm>,
|
||||
avx512_vcvtsi<opc, OpNode, sched, SrcRC, DstVT, x86memop,
|
||||
ld_frag, asm>, VEX_LIG;
|
||||
}
|
||||
|
||||
let Predicates = [HasAVX512] in {
|
||||
defm VCVTSI2SSZ : avx512_vcvtsi_common<0x2A, X86SintToFpRnd, WriteCvtI2SS, GR32,
|
||||
defm VCVTSI2SSZ : avx512_vcvtsi_common<0x2A, X86SintToFp, X86SintToFpRnd,
|
||||
WriteCvtI2SS, GR32,
|
||||
v4f32x_info, i32mem, loadi32, "cvtsi2ss{l}">,
|
||||
XS, EVEX_CD8<32, CD8VT1>;
|
||||
defm VCVTSI642SSZ: avx512_vcvtsi_common<0x2A, X86SintToFpRnd, WriteCvtI2SS, GR64,
|
||||
defm VCVTSI642SSZ: avx512_vcvtsi_common<0x2A, X86SintToFp, X86SintToFpRnd,
|
||||
WriteCvtI2SS, GR64,
|
||||
v4f32x_info, i64mem, loadi64, "cvtsi2ss{q}">,
|
||||
XS, VEX_W, EVEX_CD8<64, CD8VT1>;
|
||||
defm VCVTSI2SDZ : avx512_vcvtsi<0x2A, null_frag, WriteCvtI2SD, GR32,
|
||||
v2f64x_info, i32mem, loadi32, "cvtsi2sd{l}">,
|
||||
XD, EVEX_CD8<32, CD8VT1>;
|
||||
defm VCVTSI642SDZ: avx512_vcvtsi_common<0x2A, X86SintToFpRnd, WriteCvtI2SD, GR64,
|
||||
defm VCVTSI642SDZ: avx512_vcvtsi_common<0x2A, X86SintToFp, X86SintToFpRnd,
|
||||
WriteCvtI2SD, GR64,
|
||||
v2f64x_info, i64mem, loadi64, "cvtsi2sd{q}">,
|
||||
XD, VEX_W, EVEX_CD8<64, CD8VT1>;
|
||||
|
||||
|
|
@ -7488,16 +7488,19 @@ def : Pat<(f64 (sint_to_fp GR32:$src)),
|
|||
def : Pat<(f64 (sint_to_fp GR64:$src)),
|
||||
(VCVTSI642SDZrr (f64 (IMPLICIT_DEF)), GR64:$src)>;
|
||||
|
||||
defm VCVTUSI2SSZ : avx512_vcvtsi_common<0x7B, X86UintToFpRnd, WriteCvtI2SS, GR32,
|
||||
defm VCVTUSI2SSZ : avx512_vcvtsi_common<0x7B, X86UintToFp, X86UintToFpRnd,
|
||||
WriteCvtI2SS, GR32,
|
||||
v4f32x_info, i32mem, loadi32,
|
||||
"cvtusi2ss{l}">, XS, EVEX_CD8<32, CD8VT1>;
|
||||
defm VCVTUSI642SSZ : avx512_vcvtsi_common<0x7B, X86UintToFpRnd, WriteCvtI2SS, GR64,
|
||||
defm VCVTUSI642SSZ : avx512_vcvtsi_common<0x7B, X86UintToFp, X86UintToFpRnd,
|
||||
WriteCvtI2SS, GR64,
|
||||
v4f32x_info, i64mem, loadi64, "cvtusi2ss{q}">,
|
||||
XS, VEX_W, EVEX_CD8<64, CD8VT1>;
|
||||
defm VCVTUSI2SDZ : avx512_vcvtsi<0x7B, null_frag, WriteCvtI2SD, GR32, v2f64x_info,
|
||||
i32mem, loadi32, "cvtusi2sd{l}">,
|
||||
XD, VEX_LIG, EVEX_CD8<32, CD8VT1>;
|
||||
defm VCVTUSI642SDZ : avx512_vcvtsi_common<0x7B, X86UintToFpRnd, WriteCvtI2SD, GR64,
|
||||
defm VCVTUSI642SDZ : avx512_vcvtsi_common<0x7B, X86UintToFp, X86UintToFpRnd,
|
||||
WriteCvtI2SD, GR64,
|
||||
v2f64x_info, i64mem, loadi64, "cvtusi2sd{q}">,
|
||||
XD, VEX_W, EVEX_CD8<64, CD8VT1>;
|
||||
|
||||
|
|
|
|||
|
|
@ -545,6 +545,8 @@ def X86Vpshufbitqmb : SDNode<"X86ISD::VPSHUFBITQMB",
|
|||
SDTCVecEltisVT<0,i1>,
|
||||
SDTCisSameNumEltsAs<0,1>]>>;
|
||||
|
||||
def SDTintToFP: SDTypeProfile<1, 2, [SDTCisVec<0>, SDTCisFP<0>,
|
||||
SDTCisSameAs<0,1>, SDTCisInt<2>]>;
|
||||
def SDTintToFPRound: SDTypeProfile<1, 3, [SDTCisVec<0>, SDTCisFP<0>,
|
||||
SDTCisSameAs<0,1>, SDTCisInt<2>,
|
||||
SDTCisVT<3, i32>]>;
|
||||
|
|
@ -566,7 +568,9 @@ def SDTVintToFPRound: SDTypeProfile<1, 2, [SDTCisVec<0>, SDTCisVec<1>,
|
|||
SDTCisVT<2, i32>]>;
|
||||
|
||||
// Scalar
|
||||
def X86SintToFp : SDNode<"X86ISD::SCALAR_SINT_TO_FP", SDTintToFP>;
|
||||
def X86SintToFpRnd : SDNode<"X86ISD::SCALAR_SINT_TO_FP_RND", SDTintToFPRound>;
|
||||
def X86UintToFp : SDNode<"X86ISD::SCALAR_UINT_TO_FP", SDTintToFP>;
|
||||
def X86UintToFpRnd : SDNode<"X86ISD::SCALAR_UINT_TO_FP_RND", SDTintToFPRound>;
|
||||
|
||||
def X86cvtts2Int : SDNode<"X86ISD::CVTTS2SI", SDTSFloatToInt>;
|
||||
|
|
@ -932,9 +936,6 @@ def I8Imm : SDNodeXForm<imm, [{
|
|||
return getI8Imm((uint8_t)N->getZExtValue(), SDLoc(N));
|
||||
}]>;
|
||||
|
||||
def FROUND_NO_EXC : PatLeaf<(i32 8)>;
|
||||
def FROUND_CURRENT : PatLeaf<(i32 4)>;
|
||||
|
||||
// BYTE_imm - Transform bit immediates into byte immediates.
|
||||
def BYTE_imm : SDNodeXForm<imm, [{
|
||||
// Transformation function: imm >> 3
|
||||
|
|
|
|||
|
|
@ -425,9 +425,9 @@ static const IntrinsicData IntrinsicsWithoutChain[] = {
|
|||
X86_INTRINSIC_DATA(avx512_conflict_q_128, INTR_TYPE_1OP, X86ISD::CONFLICT, 0),
|
||||
X86_INTRINSIC_DATA(avx512_conflict_q_256, INTR_TYPE_1OP, X86ISD::CONFLICT, 0),
|
||||
X86_INTRINSIC_DATA(avx512_conflict_q_512, INTR_TYPE_1OP, X86ISD::CONFLICT, 0),
|
||||
X86_INTRINSIC_DATA(avx512_cvtsi2sd64, INTR_TYPE_3OP, X86ISD::SCALAR_SINT_TO_FP_RND, 0),
|
||||
X86_INTRINSIC_DATA(avx512_cvtsi2ss32, INTR_TYPE_3OP, X86ISD::SCALAR_SINT_TO_FP_RND, 0),
|
||||
X86_INTRINSIC_DATA(avx512_cvtsi2ss64, INTR_TYPE_3OP, X86ISD::SCALAR_SINT_TO_FP_RND, 0),
|
||||
X86_INTRINSIC_DATA(avx512_cvtsi2sd64, INTR_TYPE_2OP, X86ISD::SCALAR_SINT_TO_FP, X86ISD::SCALAR_SINT_TO_FP_RND),
|
||||
X86_INTRINSIC_DATA(avx512_cvtsi2ss32, INTR_TYPE_2OP, X86ISD::SCALAR_SINT_TO_FP, X86ISD::SCALAR_SINT_TO_FP_RND),
|
||||
X86_INTRINSIC_DATA(avx512_cvtsi2ss64, INTR_TYPE_2OP, X86ISD::SCALAR_SINT_TO_FP, X86ISD::SCALAR_SINT_TO_FP_RND),
|
||||
X86_INTRINSIC_DATA(avx512_cvttsd2si, INTR_TYPE_1OP_SAE, X86ISD::CVTTS2SI, X86ISD::CVTTS2SI_SAE),
|
||||
X86_INTRINSIC_DATA(avx512_cvttsd2si64, INTR_TYPE_1OP_SAE, X86ISD::CVTTS2SI, X86ISD::CVTTS2SI_SAE),
|
||||
X86_INTRINSIC_DATA(avx512_cvttsd2usi, INTR_TYPE_1OP_SAE, X86ISD::CVTTS2UI, X86ISD::CVTTS2UI_SAE),
|
||||
|
|
@ -436,9 +436,9 @@ static const IntrinsicData IntrinsicsWithoutChain[] = {
|
|||
X86_INTRINSIC_DATA(avx512_cvttss2si64, INTR_TYPE_1OP_SAE, X86ISD::CVTTS2SI, X86ISD::CVTTS2SI_SAE),
|
||||
X86_INTRINSIC_DATA(avx512_cvttss2usi, INTR_TYPE_1OP_SAE, X86ISD::CVTTS2UI, X86ISD::CVTTS2UI_SAE),
|
||||
X86_INTRINSIC_DATA(avx512_cvttss2usi64, INTR_TYPE_1OP_SAE, X86ISD::CVTTS2UI, X86ISD::CVTTS2UI_SAE),
|
||||
X86_INTRINSIC_DATA(avx512_cvtusi2ss, INTR_TYPE_3OP, X86ISD::SCALAR_UINT_TO_FP_RND, 0),
|
||||
X86_INTRINSIC_DATA(avx512_cvtusi642sd, INTR_TYPE_3OP, X86ISD::SCALAR_UINT_TO_FP_RND, 0),
|
||||
X86_INTRINSIC_DATA(avx512_cvtusi642ss, INTR_TYPE_3OP, X86ISD::SCALAR_UINT_TO_FP_RND, 0),
|
||||
X86_INTRINSIC_DATA(avx512_cvtusi2ss, INTR_TYPE_2OP, X86ISD::SCALAR_UINT_TO_FP, X86ISD::SCALAR_UINT_TO_FP_RND),
|
||||
X86_INTRINSIC_DATA(avx512_cvtusi642sd, INTR_TYPE_2OP, X86ISD::SCALAR_UINT_TO_FP, X86ISD::SCALAR_UINT_TO_FP_RND),
|
||||
X86_INTRINSIC_DATA(avx512_cvtusi642ss, INTR_TYPE_2OP, X86ISD::SCALAR_UINT_TO_FP, X86ISD::SCALAR_UINT_TO_FP_RND),
|
||||
X86_INTRINSIC_DATA(avx512_dbpsadbw_128, INTR_TYPE_3OP_IMM8, X86ISD::DBPSADBW, 0),
|
||||
X86_INTRINSIC_DATA(avx512_dbpsadbw_256, INTR_TYPE_3OP_IMM8, X86ISD::DBPSADBW, 0),
|
||||
X86_INTRINSIC_DATA(avx512_dbpsadbw_512, INTR_TYPE_3OP_IMM8, X86ISD::DBPSADBW, 0),
|
||||
|
|
|
|||
Loading…
Reference in New Issue