[InstCombine] Make sure all instructions have arcp and reassoc flags

Author: zjaffal

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp

@@ -1714,10 +1714,12 @@ static Instruction *foldFDivPowDivisor(BinaryOperator &I,
 static Instruction *foldFDivSqrtDivisor(BinaryOperator &I,
                                         InstCombiner::BuilderTy &Builder) {
   // X / sqrt(Y / Z) -->  X * sqrt(Z / Y)
+  if (!I.hasAllowReassoc() || !I.hasAllowReciprocal())
+    return nullptr;
   Value *Op0 = I.getOperand(0), *Op1 = I.getOperand(1);
   auto *II = dyn_cast<IntrinsicInst>(Op1);
   if (!II || II->getIntrinsicID() != Intrinsic::sqrt || !II->hasOneUse() ||
-      !I.hasAllowReassoc() || !I.hasAllowReciprocal())
+      !II->hasAllowReassoc() || !II->hasAllowReciprocal())
     return nullptr;
 
   Value *Y, *Z;
@@ -1727,8 +1729,8 @@ static Instruction *foldFDivSqrtDivisor(BinaryOperator &I,
     return nullptr;
   if (match(DivOp, m_FDiv(m_Value(Y), m_Value(Z)))) {
     Value *SwapDiv = Builder.CreateFDivFMF(Z, Y, DivOp);
-    Value *NewSqrt = Builder.CreateIntrinsic(II->getIntrinsicID(),
-                                             II->getType(), {SwapDiv}, II);
+    Value *NewSqrt =
+        Builder.CreateUnaryIntrinsic(II->getIntrinsicID(), SwapDiv, II);
     return BinaryOperator::CreateFMulFMF(Op0, NewSqrt, &I);
   }
   return nullptr;

llvm/test/Transforms/InstCombine/fdiv-sqrt.ll

@@ -66,9 +66,9 @@ entry:
 define double @sqrt_div_reassoc_missing2(double %x, double %y, double %z) {
 ; CHECK-LABEL: @sqrt_div_reassoc_missing2(
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[TMP0:%.*]] = fdiv reassoc arcp double [[Z:%.*]], [[Y:%.*]]
-; CHECK-NEXT:    [[TMP1:%.*]] = call arcp double @llvm.sqrt.f64(double [[TMP0]])
-; CHECK-NEXT:    [[DIV1:%.*]] = fmul reassoc arcp double [[TMP1]], [[X:%.*]]
+; CHECK-NEXT:    [[DIV:%.*]] = fdiv reassoc arcp double [[Y:%.*]], [[Z:%.*]]
+; CHECK-NEXT:    [[SQRT:%.*]] = call arcp double @llvm.sqrt.f64(double [[DIV]])
+; CHECK-NEXT:    [[DIV1:%.*]] = fdiv reassoc arcp double [[X:%.*]], [[SQRT]]
 ; CHECK-NEXT:    ret double [[DIV1]]
 ;
 entry:
@@ -111,9 +111,9 @@ entry:
 define double @sqrt_div_arcp_missing2(double %x, double %y, double %z) {
 ; CHECK-LABEL: @sqrt_div_arcp_missing2(
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[TMP0:%.*]] = fdiv reassoc arcp double [[Z:%.*]], [[Y:%.*]]
-; CHECK-NEXT:    [[TMP1:%.*]] = call reassoc double @llvm.sqrt.f64(double [[TMP0]])
-; CHECK-NEXT:    [[DIV1:%.*]] = fmul reassoc arcp double [[TMP1]], [[X:%.*]]
+; CHECK-NEXT:    [[DIV:%.*]] = fdiv reassoc arcp double [[Y:%.*]], [[Z:%.*]]
+; CHECK-NEXT:    [[SQRT:%.*]] = call reassoc double @llvm.sqrt.f64(double [[DIV]])
+; CHECK-NEXT:    [[DIV1:%.*]] = fdiv reassoc arcp double [[X:%.*]], [[SQRT]]
 ; CHECK-NEXT:    ret double [[DIV1]]
 ;
 entry: