Use IRBuilder functions for creating Ldexp, FMA intrinsic call

Author: frederik-h

llvm/lib/CodeGen/ExpandFp.cpp

@@ -101,11 +101,6 @@ class FRemExpander {
         ExTy(B.getInt32Ty()), Bits(ConstantInt::get(ExTy, Bits)),
         One(ConstantInt::get(ExTy, 1)), Signbit(Signbit) {};
 
-  Value *createLdexp(Value *Base, Value *Exp, const Twine &Name) const {
-    return B.CreateIntrinsic(Intrinsic::ldexp, {ComputeFpTy, B.getInt32Ty()},
-                             {Base, Exp}, {}, Name);
-  }
-
   Value *createRcp(Value *V, const Twine &Name) const {
     return B.CreateFDiv(ConstantFP::get(ComputeFpTy, 1.0), V, Name);
   }
@@ -121,8 +116,7 @@ class FRemExpander {
     //   ax = clt ? axp : ax;
     Value *Q = B.CreateUnaryIntrinsic(Intrinsic::rint, B.CreateFMul(Ax, Ayinv),
                                       {}, "q");
-    Value *AxUpdate = B.CreateIntrinsic(Intrinsic::fma, {ComputeFpTy},
-                                        {B.CreateFNeg(Q), Ay, Ax}, {}, "ax");
+    Value *AxUpdate = B.CreateFMA(B.CreateFNeg(Q), Ay, Ax, {}, "ax");
     Value *Clt = B.CreateFCmp(CmpInst::FCMP_OLT, AxUpdate,
                               ConstantFP::get(ComputeFpTy, 0.0), "clt");
     Value *Axp = B.CreateFAdd(AxUpdate, Ay, "axp");
@@ -148,7 +142,7 @@ class FRemExpander {
     Value *Exp = B.CreateExtractValue(Frexp, {1});
 
     Exp = B.CreateSub(Exp, One, ExName);
-    Value *Pow = createLdexp(Mant, NewExp, PowName);
+    Value *Pow = B.CreateLdexp(Mant, NewExp, {}, PowName);
 
     return {Pow, Exp};
   }
@@ -197,7 +191,7 @@ class FRemExpander {
     AxPhi->addIncoming(Ax, PreheaderBB);
 
     Value *AxPhiUpdate = buildUpdateAx(AxPhi, Ay, Ayinv);
-    AxPhiUpdate = createLdexp(AxPhiUpdate, Bits, "ax_update");
+    AxPhiUpdate = B.CreateLdexp(AxPhiUpdate, Bits, {}, "ax_update");
     AxPhi->addIncoming(AxPhiUpdate, LoopBB);
     NbIv->addIncoming(B.CreateSub(NbIv, Bits, "nb_update"), LoopBB);
 
@@ -215,14 +209,14 @@ class FRemExpander {
     NbExitPhi->addIncoming(NbIv, LoopBB);
     NbExitPhi->addIncoming(Nb, PreheaderBB);
 
-    Value *AxFinal = createLdexp(
-        AxPhiExit, B.CreateAdd(B.CreateSub(NbExitPhi, Bits), One), "ax");
+    Value *AxFinal = B.CreateLdexp(
+        AxPhiExit, B.CreateAdd(B.CreateSub(NbExitPhi, Bits), One), {}, "ax");
     AxFinal = buildUpdateAx(AxFinal, Ay, Ayinv);
 
     // Build:
     //    ax = BUILTIN_FLDEXP_ComputeFpTy(ax, ey);
     //    ret = AS_FLOAT((AS_INT(x) & SIGNBIT_SP32) ^ AS_INT(ax));
-    AxFinal = createLdexp(AxFinal, Ey, "ax");
+    AxFinal = B.CreateLdexp(AxFinal, Ey, {}, "ax");
 
     Value *XAsInt = B.CreateBitCast(X, IntTy, "x_as_int");
     if (ComputeFpTy != X->getType())