InstCombine: Fold fneg (ldexp x, n) -> ldexp (fneg x), n

[goldstein.w.n]

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

2562–2563

Seems like 2 changes at once? The change to oneuse checks of (fneg (fmul/fdiv)) and the new transform. Maybe split?

llvm/test/Transforms/InstCombine/fneg.ll

989

Can you precommit the tests?

[arsenm]

Precommit test

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

2562–2563

It's not behaviorally changing, it's just avoiding repeating it 3x

[arsenm]

Rebase

[goldstein.w.n]

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

2566

style: No branches around single expression if

2571

ibid

2579–2588

IRBuilder is unused?

llvm/test/Transforms/InstCombine/fneg.ll

989

This was erroneously marked done?

[arsenm]

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

2566

It covers multiple lines

2579–2588

It's a flag guard, it only does anything on destruct. The actual builder is the member

[jcranmer-intel]

llvm/test/Transforms/InstCombine/fneg.ll

840

The optimization doesn't seem to be kicking in for these tests?

[arsenm]

Fix diff after test split

[arsenm]

Rebase and ping

[goldstein.w.n]

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

2573

Doesn't exponent need to by odd for this? I.e

-(X ^ 2) != ((-X) ^ 2).

[arsenm]

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

2573

It’s not a square, it’s X * 2^N

[goldstein.w.n]

LGTM.

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

2573

Err yeah :/

[arsenm]

f7f5d348a315d96c907b57e6cafea4cbcb620340

[foad]

llvm/lib/Transforms/InstCombine/InstCombineInternal.h

395

Function needs a comment and a better name, since it doesn't just handle fmul and fdiv now.

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

static Instruction *foldFNegIntoConstant(Instruction &I, const DataLayout &DL) {
   // -(X + C) --> -X + -C --> -C - X
   if (I.hasNoSignedZeros() && match(FNegOp, m_FAdd(m_Value(X), m_Constant(C))))
     if (Constant *NegC = ConstantFoldUnaryOpOperand(Instruction::FNeg, C, DL))
       return BinaryOperator::CreateFSubFMF(NegC, X, &I);
 
   return nullptr;
 }
 
-static Instruction *hoistFNegAboveFMulFDiv(Value *FNegOp,
-                                           Instruction &FMFSource,
-                                           InstCombiner::BuilderTy &Builder) {
+Instruction *InstCombinerImpl::hoistFNegAboveFMulFDiv(Value *FNegOp,
+                                                      Instruction &FMFSource) {
   Value *X, *Y;
-  if (match(FNegOp, m_FMul(m_Value(X), m_Value(Y))))
-    return BinaryOperator::CreateFMulFMF(Builder.CreateFNegFMF(X, &FMFSource),
-                                         Y, &FMFSource);
-
-  if (match(FNegOp, m_FDiv(m_Value(X), m_Value(Y))))
-    return BinaryOperator::CreateFDivFMF(Builder.CreateFNegFMF(X, &FMFSource),
-                                         Y, &FMFSource);
+  if (match(FNegOp, m_FMul(m_Value(X), m_Value(Y)))) {
+    return cast<Instruction>(Builder.CreateFMulFMF(
+        Builder.CreateFNegFMF(X, &FMFSource), Y, &FMFSource));
+  }
+
+  if (match(FNegOp, m_FDiv(m_Value(X), m_Value(Y)))) {
+    return cast<Instruction>(Builder.CreateFDivFMF(
+        Builder.CreateFNegFMF(X, &FMFSource), Y, &FMFSource));
+  }
+
+  if (IntrinsicInst *II = dyn_cast<IntrinsicInst>(FNegOp)) {
+    // Make sure to preserve flags and metadata on the call.
+    if (II->getIntrinsicID() == Intrinsic::ldexp) {
+      FastMathFlags FMF = FMFSource.getFastMathFlags();
+      FMF |= II->getFastMathFlags();
+
+      IRBuilder<>::FastMathFlagGuard FMFGuard(Builder);
+      Builder.setFastMathFlags(FMF);
+
+      CallInst *New = Builder.CreateCall(
+          II->getCalledFunction(),
+          {Builder.CreateFNeg(II->getArgOperand(0)), II->getArgOperand(1)});
+      New->copyMetadata(*II);
+      return New;
+    }
+  }
 
   return nullptr;
 }
 
 Instruction *InstCombinerImpl::visitFNeg(UnaryOperator &I) {
   Value *Op = I.getOperand(0);
 
   if (Value *V = simplifyFNegInst(Op, I.getFastMathFlags(),
Instruction *InstCombinerImpl::visitFNeg(UnaryOperator &I) {
   if (I.hasNoSignedZeros() &&
       match(Op, m_OneUse(m_FSub(m_Value(X), m_Value(Y)))))
     return BinaryOperator::CreateFSubFMF(Y, X, &I);
 
   Value *OneUse;
   if (!match(Op, m_OneUse(m_Value(OneUse))))
     return nullptr;
 
-  if (Instruction *R = hoistFNegAboveFMulFDiv(OneUse, I, Builder))
-    return R;
+  if (Instruction *R = hoistFNegAboveFMulFDiv(OneUse, I))
+    return replaceInstUsesWith(I, R);
 
   // Try to eliminate fneg if at least 1 arm of the select is negated.
   Value *Cond;
   if (match(OneUse, m_Select(m_Value(Cond), m_Value(X), m_Value(Y)))) {
     // Unlike most transforms, this one is not safe to propagate nsz unless
     // it is present on the original select. We union the flags from the select
     // and fneg and then remove nsz if needed.
     auto propagateSelectFMF = [&](SelectInst *S, bool CommonOperand) {

llvm/lib/Transforms/InstCombine/InstCombineInternal.h

private:
 
   // Optimize one of these forms:
   //   and i1 Op, SI / select i1 Op, i1 SI, i1 false (if IsAnd = true)
   //   or i1 Op, SI  / select i1 Op, i1 true, i1 SI  (if IsAnd = false)
   // into simplier select instruction using isImpliedCondition.
   Instruction *foldAndOrOfSelectUsingImpliedCond(Value *Op, SelectInst &SI,
                                                  bool IsAnd);
 
+  Instruction *hoistFNegAboveFMulFDiv(Value *FNegOp, Instruction &FMFSource);
+
 public:
   /// Create and insert the idiom we use to indicate a block is unreachable
   /// without having to rewrite the CFG from within InstCombine.
   void CreateNonTerminatorUnreachable(Instruction *InsertAt) {
     auto &Ctx = InsertAt->getContext();
     auto *SI = new StoreInst(ConstantInt::getTrue(Ctx),
                              PoisonValue::get(PointerType::getUnqual(Ctx)),
                              /*isVolatile*/ false, Align(1));

llvm/test/Transforms/InstCombine/fneg.ll

;
   %s = select i1 %b, float %nx, float %y
   call void @use(float %s)
   %r = fneg float %s
   ret float %r
 }
 
 define float @fneg_ldexp(float %x, i32 %n) {
 ; CHECK-LABEL: @fneg_ldexp(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]])
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fneg float %ldexp
   ret float %neg
 }
 
 define float @fsub_fneg_ldexp(float %x, i32 %n) {
 ; CHECK-LABEL: @fsub_fneg_ldexp(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]])
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fsub float -0.0, %ldexp
   ret float %neg
 }
 
 define float @fsub_fneg_ldexp_nsz(float %x, i32 %n) {
 ; CHECK-LABEL: @fsub_fneg_ldexp_nsz(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg nsz float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg nsz float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call nsz float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]])
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fsub nsz float -0.0, %ldexp
   ret float %neg
 }
 
 define float @fsub_fneg_ldexp_p0_nsz(float %x, i32 %n) {
 ; CHECK-LABEL: @fsub_fneg_ldexp_p0_nsz(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg nsz float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg nsz float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call nsz float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]])
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fsub nsz float 0.0, %ldexp
   ret float %neg
 }
 
 define float @fsub_fneg_ldexp_p0(float %x, i32 %n) {
 ; CHECK-LABEL: @fsub_fneg_ldexp_p0(
 ; CHECK-NEXT:    [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
 ; CHECK-NEXT:    [[NEG:%.*]] = fsub float 0.000000e+00, [[LDEXP]]
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fsub float 0.0, %ldexp
   ret float %neg
 }
 
 define <2 x float> @fneg_ldexp_vector(<2 x float> %x, <2 x i32> %n) {
 ; CHECK-LABEL: @fneg_ldexp_vector(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call <2 x float> @llvm.ldexp.v2f32.v2i32(<2 x float> [[X:%.*]], <2 x i32> [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg <2 x float> [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg <2 x float> [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call <2 x float> @llvm.ldexp.v2f32.v2i32(<2 x float> [[TMP1]], <2 x i32> [[N:%.*]])
 ; CHECK-NEXT:    ret <2 x float> [[NEG]]
 ;
   %ldexp = call <2 x float> @llvm.ldexp.v2f32.v2i32(<2 x float> %x, <2 x i32> %n)
   %neg = fneg <2 x float> %ldexp
   ret <2 x float> %neg
 }
 
 define float @fneg_ldexp_multiuse(float %x, i32 %n, ptr %ptr) {
 ; CHECK-LABEL: @fneg_ldexp_multiuse(
 ; CHECK-NEXT:    [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
 ; CHECK-NEXT:    store float [[LDEXP]], ptr [[PTR:%.*]], align 4
 ; CHECK-NEXT:    [[NEG:%.*]] = fneg float [[LDEXP]]
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 %n)
   store float %ldexp, ptr %ptr
   %neg = fneg float %ldexp
   ret float %neg
 }
 
 define float @fneg_ldexp_fmf_ldexp(float %x, i32 %n) {
 ; CHECK-LABEL: @fneg_ldexp_fmf_ldexp(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call nnan float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg nnan float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call nnan float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]])
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call nnan float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fneg float %ldexp
   ret float %neg
 }
 
 define float @fneg_ldexp_fmf_neg(float %x, i32 %n) {
 ; CHECK-LABEL: @fneg_ldexp_fmf_neg(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg nnan float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg nnan float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call nnan float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]])
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fneg nnan float %ldexp
   ret float %neg
 }
 
 define float @fneg_ldexp_fmf(float %x, i32 %n) {
 ; CHECK-LABEL: @fneg_ldexp_fmf(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call ninf float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg nnan float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg nnan ninf float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call nnan ninf float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]])
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call ninf float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fneg nnan float %ldexp
   ret float %neg
 }
 
 define float @fneg_ldexp_contract0(float %x, i32 %n) {
 ; CHECK-LABEL: @fneg_ldexp_contract0(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call contract float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg contract float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call contract float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]])
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call contract float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fneg float %ldexp
   ret float %neg
 }
 
 define float @fneg_ldexp_contract1(float %x, i32 %n) {
 ; CHECK-LABEL: @fneg_ldexp_contract1(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg contract float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg contract float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call contract float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]])
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fneg contract float %ldexp
   ret float %neg
 }
 
 define float @fneg_ldexp_contract(float %x, i32 %n) {
 ; CHECK-LABEL: @fneg_ldexp_contract(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call contract float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]])
-; CHECK-NEXT:    [[NEG:%.*]] = fneg contract float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg contract float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call contract float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]])
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call contract float @llvm.ldexp.f32.i32(float %x, i32 %n)
   %neg = fneg contract float %ldexp
   ret float %neg
 }
 
 define float @fneg_ldexp_metadata(float %x, i32 %n) {
 ; CHECK-LABEL: @fneg_ldexp_metadata(
-; CHECK-NEXT:    [[LDEXP:%.*]] = call float @llvm.ldexp.f32.i32(float [[X:%.*]], i32 [[N:%.*]]), !arst !0
-; CHECK-NEXT:    [[NEG:%.*]] = fneg float [[LDEXP]]
+; CHECK-NEXT:    [[TMP1:%.*]] = fneg float [[X:%.*]]
+; CHECK-NEXT:    [[NEG:%.*]] = call float @llvm.ldexp.f32.i32(float [[TMP1]], i32 [[N:%.*]]), !arst !0
 ; CHECK-NEXT:    ret float [[NEG]]
 ;
   %ldexp = call float @llvm.ldexp.f32.i32(float %x, i32 %n), !arst !0
   %neg = fneg float %ldexp
   ret float %neg
 }
 
 !0 = !{}