<div dir="ltr">This was supposed to have been squashed with the commit after it. I have reverted it in r335566 to squash into one commit.<div><br><div><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature">~Craig</div></div><br></div></div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jun 25, 2018 at 5:48 PM Craig Topper via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ctopper<br>
Date: Mon Jun 25 17:43:34 2018<br>
New Revision: 335562<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=335562&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=335562&view=rev</a><br>
Log:<br>
foo<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/IR/IntrinsicsX86.td<br>
llvm/trunk/lib/IR/AutoUpgrade.cpp<br>
llvm/trunk/lib/Target/X86/X86ISelLowering.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/IR/IntrinsicsX86.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/IntrinsicsX86.td?rev=335562&r1=335561&r2=335562&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/IntrinsicsX86.td?rev=335562&r1=335561&r2=335562&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/IR/IntrinsicsX86.td (original)<br>
+++ llvm/trunk/include/llvm/IR/IntrinsicsX86.td Mon Jun 25 17:43:34 2018<br>
@@ -1251,28 +1251,22 @@ let TargetPrefix = "x86" in { // All in<br>
llvm_v4i64_ty], [IntrNoMem]>;<br>
<br>
def int_x86_avx512_mask_fpclass_pd_128 :<br>
- GCCBuiltin<"__builtin_ia32_fpclasspd128_mask">,<br>
- Intrinsic<[llvm_i8_ty], [llvm_v2f64_ty, llvm_i32_ty, llvm_i8_ty],<br>
+ Intrinsic<[llvm_v2i1_ty], [llvm_v2f64_ty, llvm_i32_ty],<br>
[IntrNoMem]>;<br>
def int_x86_avx512_mask_fpclass_pd_256 :<br>
- GCCBuiltin<"__builtin_ia32_fpclasspd256_mask">,<br>
- Intrinsic<[llvm_i8_ty], [llvm_v4f64_ty, llvm_i32_ty, llvm_i8_ty],<br>
+ Intrinsic<[llvm_v4i1_ty], [llvm_v4f64_ty, llvm_i32_ty],<br>
[IntrNoMem]>;<br>
def int_x86_avx512_mask_fpclass_pd_512 :<br>
- GCCBuiltin<"__builtin_ia32_fpclasspd512_mask">,<br>
- Intrinsic<[llvm_i8_ty], [llvm_v8f64_ty, llvm_i32_ty, llvm_i8_ty],<br>
+ Intrinsic<[llvm_v8i1_ty], [llvm_v8f64_ty, llvm_i32_ty],<br>
[IntrNoMem]>;<br>
def int_x86_avx512_mask_fpclass_ps_128 :<br>
- GCCBuiltin<"__builtin_ia32_fpclassps128_mask">,<br>
- Intrinsic<[llvm_i8_ty], [llvm_v4f32_ty, llvm_i32_ty, llvm_i8_ty],<br>
+ Intrinsic<[llvm_v4i1_ty], [llvm_v4f32_ty, llvm_i32_ty],<br>
[IntrNoMem]>;<br>
def int_x86_avx512_mask_fpclass_ps_256 :<br>
- GCCBuiltin<"__builtin_ia32_fpclassps256_mask">,<br>
- Intrinsic<[llvm_i8_ty], [llvm_v8f32_ty, llvm_i32_ty, llvm_i8_ty],<br>
+ Intrinsic<[llvm_v8i1_ty], [llvm_v8f32_ty, llvm_i32_ty],<br>
[IntrNoMem]>;<br>
def int_x86_avx512_mask_fpclass_ps_512 :<br>
- GCCBuiltin<"__builtin_ia32_fpclassps512_mask">,<br>
- Intrinsic<[llvm_i16_ty], [llvm_v16f32_ty, llvm_i32_ty, llvm_i16_ty],<br>
+ Intrinsic<[llvm_v16i1_ty], [llvm_v16f32_ty, llvm_i32_ty],<br>
[IntrNoMem]>;<br>
def int_x86_avx512_mask_fpclass_sd :<br>
GCCBuiltin<"__builtin_ia32_fpclasssd_mask">,<br>
<br>
Modified: llvm/trunk/lib/IR/AutoUpgrade.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AutoUpgrade.cpp?rev=335562&r1=335561&r2=335562&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AutoUpgrade.cpp?rev=335562&r1=335561&r2=335562&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/AutoUpgrade.cpp (original)<br>
+++ llvm/trunk/lib/IR/AutoUpgrade.cpp Mon Jun 25 17:43:34 2018<br>
@@ -406,6 +406,24 @@ static bool UpgradeX86IntrinsicFunction(<br>
if (Name == "avx512.mask.cmp.ps.512") // Added in 7.0<br>
return UpgradeX86MaskedFPCompare(F, Intrinsic::x86_avx512_mask_cmp_ps_512,<br>
NewFn);<br>
+ if (Name == "avx512.mask.fpclass.pd.128") // Added in 7.0<br>
+ return UpgradeX86MaskedFPCompare(F, Intrinsic::x86_avx512_mask_fpclass_pd_128,<br>
+ NewFn);<br>
+ if (Name == "avx512.mask.fpclass.pd.256") // Added in 7.0<br>
+ return UpgradeX86MaskedFPCompare(F, Intrinsic::x86_avx512_mask_fpclass_pd_256,<br>
+ NewFn);<br>
+ if (Name == "avx512.mask.fpclass.pd.512") // Added in 7.0<br>
+ return UpgradeX86MaskedFPCompare(F, Intrinsic::x86_avx512_mask_fpclass_pd_512,<br>
+ NewFn);<br>
+ if (Name == "avx512.mask.fpclass.ps.128") // Added in 7.0<br>
+ return UpgradeX86MaskedFPCompare(F, Intrinsic::x86_avx512_mask_fpclass_ps_128,<br>
+ NewFn);<br>
+ if (Name == "avx512.mask.fpclass.ps.256") // Added in 7.0<br>
+ return UpgradeX86MaskedFPCompare(F, Intrinsic::x86_avx512_mask_fpclass_ps_256,<br>
+ NewFn);<br>
+ if (Name == "avx512.mask.fpclass.ps.512") // Added in 7.0<br>
+ return UpgradeX86MaskedFPCompare(F, Intrinsic::x86_avx512_mask_fpclass_ps_512,<br>
+ NewFn);<br>
<br>
// frcz.ss/sd may need to have an argument dropped. Added in 3.2<br>
if (Name.startswith("xop.vfrcz.ss") && F->arg_size() == 2) {<br>
@@ -3116,6 +3134,31 @@ void llvm::UpgradeIntrinsicCall(CallInst<br>
NumElts);<br>
<br>
std::string Name = CI->getName();<br>
+ if (!Name.empty()) {<br>
+ CI->setName(Name + ".old");<br>
+ NewCall->setName(Name);<br>
+ }<br>
+ CI->replaceAllUsesWith(Res);<br>
+ CI->eraseFromParent();<br>
+ return;<br>
+ }<br>
+<br>
+ case Intrinsic::x86_avx512_mask_fpclass_pd_128:<br>
+ case Intrinsic::x86_avx512_mask_fpclass_pd_256:<br>
+ case Intrinsic::x86_avx512_mask_fpclass_pd_512:<br>
+ case Intrinsic::x86_avx512_mask_fpclass_ps_128:<br>
+ case Intrinsic::x86_avx512_mask_fpclass_ps_256:<br>
+ case Intrinsic::x86_avx512_mask_fpclass_ps_512: {<br>
+ SmallVector<Value *, 4> Args;<br>
+ Args.push_back(CI->getArgOperand(0));<br>
+ Args.push_back(CI->getArgOperand(1));<br>
+<br>
+ NewCall = Builder.CreateCall(NewFn, Args);<br>
+ unsigned NumElts = Args[0]->getType()->getVectorNumElements();<br>
+ Value *Res = ApplyX86MaskOn1BitsVec(Builder, NewCall, CI->getArgOperand(2),<br>
+ NumElts);<br>
+<br>
+ std::string Name = CI->getName();<br>
if (!Name.empty()) {<br>
CI->setName(Name + ".old");<br>
NewCall->setName(Name);<br>
<br>
Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=335562&r1=335561&r2=335562&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=335562&r1=335561&r2=335562&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)<br>
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Mon Jun 25 17:43:34 2018<br>
@@ -20748,23 +20748,11 @@ SDValue X86TargetLowering::LowerINTRINSI<br>
Mask, PassThru, Subtarget, DAG);<br>
}<br>
case FPCLASS: {<br>
- // FPclass intrinsics with mask<br>
- SDValue Src1 = Op.getOperand(1);<br>
- MVT VT = Src1.getSimpleValueType();<br>
- MVT MaskVT = MVT::getVectorVT(MVT::i1, VT.getVectorNumElements());<br>
- SDValue Imm = Op.getOperand(2);<br>
- SDValue Mask = Op.getOperand(3);<br>
- MVT BitcastVT = MVT::getVectorVT(MVT::i1,<br>
- Mask.getSimpleValueType().getSizeInBits());<br>
- SDValue FPclass = DAG.getNode(IntrData->Opc0, dl, MaskVT, Src1, Imm);<br>
- SDValue FPclassMask = getVectorMaskingNode(FPclass, Mask, SDValue(),<br>
- Subtarget, DAG);<br>
- // Need to fill with zeros to ensure the bitcast will produce zeroes<br>
- // for the upper bits in the v2i1/v4i1 case.<br>
- SDValue Res = DAG.getNode(ISD::INSERT_SUBVECTOR, dl, BitcastVT,<br>
- DAG.getConstant(0, dl, BitcastVT),<br>
- FPclassMask, DAG.getIntPtrConstant(0, dl));<br>
- return DAG.getBitcast(Op.getValueType(), Res);<br>
+ // FPclass intrinsics<br>
+ SDValue Src1 = Op.getOperand(1);<br>
+ MVT MaskVT = Op.getSimpleValueType();<br>
+ SDValue Imm = Op.getOperand(2);<br>
+ return DAG.getNode(IntrData->Opc0, dl, MaskVT, Src1, Imm);<br>
}<br>
case FPCLASSS: {<br>
SDValue Src1 = Op.getOperand(1);<br>
@@ -20808,8 +20796,7 @@ SDValue X86TargetLowering::LowerINTRINSI<br>
}<br>
<br>
case CMP_MASK_CC: {<br>
- MVT VT = Op.getOperand(1).getSimpleValueType();<br>
- MVT MaskVT = MVT::getVectorVT(MVT::i1, VT.getVectorNumElements());<br>
+ MVT MaskVT = Op.getSimpleValueType();<br>
SDValue Cmp;<br>
SDValue CC = Op.getOperand(3);<br>
CC = DAG.getNode(ISD::TRUNCATE, dl, MVT::i8, CC);<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>