<div dir="ltr">Merged in r323742.<br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 29, 2018 at 7:45 PM, Amara Emerson <span dir="ltr"><<a href="mailto:aemerson@apple.com" target="_blank">aemerson@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi Hans,<br>
<br>
Can we merge this into 6.0 please.<br>
<br>
Thanks,<br>
Amara<br>
<div class="gmail-HOEnZb"><div class="gmail-h5"><br>
> On Jan 26, 2018, at 11:07 PM, Amara Emerson via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br>
><br>
> Author: aemerson<br>
> Date: Fri Jan 26 23:07:20 2018<br>
> New Revision: 323582<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=323582&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=323582&view=rev</a><br>
> Log:<br>
> [GlobalISel][Legalizer] Convert the FP constants to the right APFloat type for G_FCONSTANT.<br>
><br>
> We weren't converting the immediate ConstantFP during legalization, which caused<br>
> the wrong bit patterns to be emitted for half type FP constants.<br>
><br>
> Fixes PR36106.<br>
><br>
> Modified:<br>
>    llvm/trunk/lib/CodeGen/<wbr>GlobalISel/LegalizerHelper.cpp<br>
>    llvm/trunk/test/CodeGen/<wbr>AArch64/GlobalISel/legalize-<wbr>constant.mir<br>
><br>
> Modified: llvm/trunk/lib/CodeGen/<wbr>GlobalISel/LegalizerHelper.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/GlobalISel/LegalizerHelper.cpp?rev=323582&r1=323581&r2=323582&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>CodeGen/GlobalISel/<wbr>LegalizerHelper.cpp?rev=<wbr>323582&r1=323581&r2=323582&<wbr>view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- llvm/trunk/lib/CodeGen/<wbr>GlobalISel/LegalizerHelper.cpp (original)<br>
> +++ llvm/trunk/lib/CodeGen/<wbr>GlobalISel/LegalizerHelper.cpp Fri Jan 26 23:07:20 2018<br>
> @@ -715,7 +715,24 @@ LegalizerHelper::widenScalar(<wbr>MachineInst<br>
>   }<br>
>   case TargetOpcode::G_FCONSTANT: {<br>
>     unsigned DstExt = MRI.<wbr>createGenericVirtualRegister(<wbr>WideTy);<br>
> -    MIRBuilder.buildFConstant(<wbr>DstExt, *MI.getOperand(1).getFPImm());<br>
> +    const ConstantFP *CFP = MI.getOperand(1).getFPImm();<br>
> +    APFloat Val = CFP->getValueAPF();<br>
> +    LLVMContext &Ctx = MIRBuilder.getMF().<wbr>getFunction().getContext();<br>
> +    auto LLT2Sem = [](LLT Ty) {<br>
> +      switch (Ty.getSizeInBits()) {<br>
> +      case 32:<br>
> +        return &APFloat::IEEEsingle();<br>
> +        break;<br>
> +      case 64:<br>
> +        return &APFloat::IEEEdouble();<br>
> +        break;<br>
> +      default:<br>
> +        llvm_unreachable("Unhandled fp widen type");<br>
> +      }<br>
> +    };<br>
> +    bool LosesInfo;<br>
> +    Val.convert(*LLT2Sem(WideTy), APFloat::rmTowardZero, &LosesInfo);<br>
> +    MIRBuilder.buildFConstant(<wbr>DstExt, *ConstantFP::get(Ctx, Val));<br>
>     MIRBuilder.buildFPTrunc(MI.<wbr>getOperand(0).getReg(), DstExt);<br>
>     MI.eraseFromParent();<br>
>     return Legalized;<br>
><br>
> Modified: llvm/trunk/test/CodeGen/<wbr>AArch64/GlobalISel/legalize-<wbr>constant.mir<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AArch64/GlobalISel/legalize-constant.mir?rev=323582&r1=323581&r2=323582&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/test/<wbr>CodeGen/AArch64/GlobalISel/<wbr>legalize-constant.mir?rev=<wbr>323582&r1=323581&r2=323582&<wbr>view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- llvm/trunk/test/CodeGen/<wbr>AArch64/GlobalISel/legalize-<wbr>constant.mir (original)<br>
> +++ llvm/trunk/test/CodeGen/<wbr>AArch64/GlobalISel/legalize-<wbr>constant.mir Fri Jan 26 23:07:20 2018<br>
> @@ -75,7 +75,7 @@ body: |<br>
>     ; CHECK: %w0 = COPY [[C]](s32)<br>
>     ; CHECK: [[C1:%[0-9]+]]:_(s64) = G_FCONSTANT double 2.000000e+00<br>
>     ; CHECK: %x0 = COPY [[C1]](s64)<br>
> -    ; CHECK: [[C2:%[0-9]+]]:_(s32) = G_FCONSTANT half 0xH0000<br>
> +    ; CHECK: [[C2:%[0-9]+]]:_(s32) = G_FCONSTANT float 0.000000e+00<br>
>     ; CHECK: [[FPTRUNC:%[0-9]+]]:_(s16) = G_FPTRUNC [[C2]](s32)<br>
>     ; CHECK: [[ANYEXT:%[0-9]+]]:_(s32) = G_ANYEXT [[FPTRUNC]](s16)<br>
>     ; CHECK: %w0 = COPY [[ANYEXT]](s32)<br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">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/<wbr>mailman/listinfo/llvm-commits</a><br>
<br>
</div></div></blockquote></div><br></div></div>