diff options
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/IR/AutoUpgrade.cpp | 20 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86IntrinsicsInfo.h | 4 | ||||
| -rw-r--r-- | llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/llvm/lib/IR/AutoUpgrade.cpp b/llvm/lib/IR/AutoUpgrade.cpp index 9d603146b00..0a3ecaed6d7 100644 --- a/llvm/lib/IR/AutoUpgrade.cpp +++ b/llvm/lib/IR/AutoUpgrade.cpp @@ -181,6 +181,8 @@ static bool ShouldUpgradeX86Intrinsic(Function *F, StringRef Name) { Name == "avx512.mask.cvttps2dq.256" || // Added in 7.0 Name == "avx512.mask.cvtps2pd.128" || // Added in 7.0 Name == "avx512.mask.cvtps2pd.256" || // Added in 7.0 + Name == "avx512.mask.permvar.sf.256" || // Added in 7.0 + Name == "avx512.mask.permvar.si.256" || // Added in 7.0 Name == "sse2.pmulu.dq" || // Added in 7.0 Name == "sse41.pmuldq" || // Added in 7.0 Name == "avx2.pmulu.dq" || // Added in 7.0 @@ -1190,19 +1192,23 @@ static bool upgradeAVX512MaskToSelect(StringRef Name, IRBuilder<> &Builder, else llvm_unreachable("Unexpected intrinsic"); } else if (Name == "cvtdq2ps.128") { - IID = Intrinsic::x86_sse2_cvtdq2ps; + IID = Intrinsic::x86_sse2_cvtdq2ps; } else if (Name == "cvtdq2ps.256") { - IID = Intrinsic::x86_avx_cvtdq2_ps_256; + IID = Intrinsic::x86_avx_cvtdq2_ps_256; } else if (Name == "cvtpd2dq.256") { - IID = Intrinsic::x86_avx_cvt_pd2dq_256; + IID = Intrinsic::x86_avx_cvt_pd2dq_256; } else if (Name == "cvtpd2ps.256") { - IID = Intrinsic::x86_avx_cvt_pd2_ps_256; + IID = Intrinsic::x86_avx_cvt_pd2_ps_256; } else if (Name == "cvttpd2dq.256") { - IID = Intrinsic::x86_avx_cvtt_pd2dq_256; + IID = Intrinsic::x86_avx_cvtt_pd2dq_256; } else if (Name == "cvttps2dq.128") { - IID = Intrinsic::x86_sse2_cvttps2dq; + IID = Intrinsic::x86_sse2_cvttps2dq; } else if (Name == "cvttps2dq.256") { - IID = Intrinsic::x86_avx_cvtt_ps2dq_256; + IID = Intrinsic::x86_avx_cvtt_ps2dq_256; + } else if (Name == "permvar.sf.256") { + IID = Intrinsic::x86_avx2_permps; + } else if (Name == "permvar.si.256") { + IID = Intrinsic::x86_avx2_permd; } else return false; diff --git a/llvm/lib/Target/X86/X86IntrinsicsInfo.h b/llvm/lib/Target/X86/X86IntrinsicsInfo.h index 483aafedc82..2078e1f9baa 100644 --- a/llvm/lib/Target/X86/X86IntrinsicsInfo.h +++ b/llvm/lib/Target/X86/X86IntrinsicsInfo.h @@ -817,12 +817,8 @@ static const IntrinsicData IntrinsicsWithoutChain[] = { X86ISD::VPERMV, 0), X86_INTRINSIC_DATA(avx512_mask_permvar_qi_512, VPERM_2OP_MASK, X86ISD::VPERMV, 0), - X86_INTRINSIC_DATA(avx512_mask_permvar_sf_256, VPERM_2OP_MASK, - X86ISD::VPERMV, 0), X86_INTRINSIC_DATA(avx512_mask_permvar_sf_512, VPERM_2OP_MASK, X86ISD::VPERMV, 0), - X86_INTRINSIC_DATA(avx512_mask_permvar_si_256, VPERM_2OP_MASK, - X86ISD::VPERMV, 0), X86_INTRINSIC_DATA(avx512_mask_permvar_si_512, VPERM_2OP_MASK, X86ISD::VPERMV, 0), X86_INTRINSIC_DATA(avx512_mask_pmov_db_128, INTR_TYPE_1OP_MASK, diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp index c323bfc3519..ff3fb9387d2 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -2796,9 +2796,7 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) { case Intrinsic::x86_avx512_mask_permvar_qi_128: case Intrinsic::x86_avx512_mask_permvar_qi_256: case Intrinsic::x86_avx512_mask_permvar_qi_512: - case Intrinsic::x86_avx512_mask_permvar_sf_256: case Intrinsic::x86_avx512_mask_permvar_sf_512: - case Intrinsic::x86_avx512_mask_permvar_si_256: case Intrinsic::x86_avx512_mask_permvar_si_512: if (Value *V = simplifyX86vpermv(*II, Builder)) { // We simplified the permuting, now create a select for the masking. |
