Skip to content

Commit f581149

Browse files
zjaffalarsenm
andauthored
check if operand is div in fold FDivSqrtDivisor (#81970)
This patch fixes the issues introduced in bb5c389. I moved the check for the instruction to be div before I check for the fast math flags which resolves the crash in ``` float a, b; double sqrt(); void c() { b = a / sqrt(a); } ``` --------- Co-authored-by: Matt Arsenault <[email protected]>
1 parent 57a2229 commit f581149

File tree

2 files changed

+56
-9
lines changed

2 files changed

+56
-9
lines changed

llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,6 +1709,34 @@ static Instruction *foldFDivPowDivisor(BinaryOperator &I,
17091709
return BinaryOperator::CreateFMulFMF(Op0, Pow, &I);
17101710
}
17111711

1712+
/// Convert div to mul if we have an sqrt divisor iff sqrt's operand is a fdiv
1713+
/// instruction.
1714+
static Instruction *foldFDivSqrtDivisor(BinaryOperator &I,
1715+
InstCombiner::BuilderTy &Builder) {
1716+
// X / sqrt(Y / Z) --> X * sqrt(Z / Y)
1717+
if (!I.hasAllowReassoc() || !I.hasAllowReciprocal())
1718+
return nullptr;
1719+
Value *Op0 = I.getOperand(0), *Op1 = I.getOperand(1);
1720+
auto *II = dyn_cast<IntrinsicInst>(Op1);
1721+
if (!II || II->getIntrinsicID() != Intrinsic::sqrt || !II->hasOneUse() ||
1722+
!II->hasAllowReassoc() || !II->hasAllowReciprocal())
1723+
return nullptr;
1724+
1725+
Value *Y, *Z;
1726+
auto *DivOp = dyn_cast<Instruction>(II->getOperand(0));
1727+
if (!DivOp)
1728+
return nullptr;
1729+
if (!match(DivOp, m_FDiv(m_Value(Y), m_Value(Z))))
1730+
return nullptr;
1731+
if (!DivOp->hasAllowReassoc() || !I.hasAllowReciprocal() ||
1732+
!DivOp->hasOneUse())
1733+
return nullptr;
1734+
Value *SwapDiv = Builder.CreateFDivFMF(Z, Y, DivOp);
1735+
Value *NewSqrt =
1736+
Builder.CreateUnaryIntrinsic(II->getIntrinsicID(), SwapDiv, II);
1737+
return BinaryOperator::CreateFMulFMF(Op0, NewSqrt, &I);
1738+
}
1739+
17121740
Instruction *InstCombinerImpl::visitFDiv(BinaryOperator &I) {
17131741
Module *M = I.getModule();
17141742

@@ -1816,6 +1844,9 @@ Instruction *InstCombinerImpl::visitFDiv(BinaryOperator &I) {
18161844
if (Instruction *Mul = foldFDivPowDivisor(I, Builder))
18171845
return Mul;
18181846

1847+
if (Instruction *Mul = foldFDivSqrtDivisor(I, Builder))
1848+
return Mul;
1849+
18191850
// pow(X, Y) / X --> pow(X, Y-1)
18201851
if (I.hasAllowReassoc() &&
18211852
match(Op0, m_OneUse(m_Intrinsic<Intrinsic::pow>(m_Specific(Op1),

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

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ declare double @llvm.sqrt.f64(double)
66
define double @sqrt_div_fast(double %x, double %y, double %z) {
77
; CHECK-LABEL: @sqrt_div_fast(
88
; CHECK-NEXT: entry:
9-
; CHECK-NEXT: [[DIV:%.*]] = fdiv fast double [[Y:%.*]], [[Z:%.*]]
10-
; CHECK-NEXT: [[SQRT:%.*]] = call fast double @llvm.sqrt.f64(double [[DIV]])
11-
; CHECK-NEXT: [[DIV1:%.*]] = fdiv fast double [[X:%.*]], [[SQRT]]
9+
; CHECK-NEXT: [[TMP0:%.*]] = fdiv fast double [[Z:%.*]], [[Y:%.*]]
10+
; CHECK-NEXT: [[TMP1:%.*]] = call fast double @llvm.sqrt.f64(double [[TMP0]])
11+
; CHECK-NEXT: [[DIV1:%.*]] = fmul fast double [[TMP1]], [[X:%.*]]
1212
; CHECK-NEXT: ret double [[DIV1]]
1313
;
1414
entry:
@@ -36,9 +36,9 @@ entry:
3636
define double @sqrt_div_reassoc_arcp(double %x, double %y, double %z) {
3737
; CHECK-LABEL: @sqrt_div_reassoc_arcp(
3838
; CHECK-NEXT: entry:
39-
; CHECK-NEXT: [[DIV:%.*]] = fdiv reassoc arcp double [[Y:%.*]], [[Z:%.*]]
40-
; CHECK-NEXT: [[SQRT:%.*]] = call reassoc arcp double @llvm.sqrt.f64(double [[DIV]])
41-
; CHECK-NEXT: [[DIV1:%.*]] = fdiv reassoc arcp double [[X:%.*]], [[SQRT]]
39+
; CHECK-NEXT: [[TMP0:%.*]] = fdiv reassoc arcp double [[Z:%.*]], [[Y:%.*]]
40+
; CHECK-NEXT: [[TMP1:%.*]] = call reassoc arcp double @llvm.sqrt.f64(double [[TMP0]])
41+
; CHECK-NEXT: [[DIV1:%.*]] = fmul reassoc arcp double [[TMP1]], [[X:%.*]]
4242
; CHECK-NEXT: ret double [[DIV1]]
4343
;
4444
entry:
@@ -96,9 +96,9 @@ entry:
9696
define double @sqrt_div_arcp_missing(double %x, double %y, double %z) {
9797
; CHECK-LABEL: @sqrt_div_arcp_missing(
9898
; CHECK-NEXT: entry:
99-
; CHECK-NEXT: [[DIV:%.*]] = fdiv reassoc double [[Y:%.*]], [[Z:%.*]]
100-
; CHECK-NEXT: [[SQRT:%.*]] = call reassoc arcp double @llvm.sqrt.f64(double [[DIV]])
101-
; CHECK-NEXT: [[DIV1:%.*]] = fdiv reassoc arcp double [[X:%.*]], [[SQRT]]
99+
; CHECK-NEXT: [[TMP0:%.*]] = fdiv reassoc double [[Z:%.*]], [[Y:%.*]]
100+
; CHECK-NEXT: [[TMP1:%.*]] = call reassoc arcp double @llvm.sqrt.f64(double [[TMP0]])
101+
; CHECK-NEXT: [[DIV1:%.*]] = fmul reassoc arcp double [[TMP1]], [[X:%.*]]
102102
; CHECK-NEXT: ret double [[DIV1]]
103103
;
104104
entry:
@@ -173,3 +173,19 @@ entry:
173173
ret double %div1
174174
}
175175

176+
define float @sqrt_non_div_operator(float %a) {
177+
; CHECK-LABEL: @sqrt_non_div_operator(
178+
; CHECK-NEXT: entry:
179+
; CHECK-NEXT: [[CONV:%.*]] = fpext float [[A:%.*]] to double
180+
; CHECK-NEXT: [[SQRT:%.*]] = call fast double @llvm.sqrt.f64(double [[CONV]])
181+
; CHECK-NEXT: [[DIV:%.*]] = fdiv fast double [[CONV]], [[SQRT]]
182+
; CHECK-NEXT: [[CONV2:%.*]] = fptrunc double [[DIV]] to float
183+
; CHECK-NEXT: ret float [[CONV2]]
184+
;
185+
entry:
186+
%conv = fpext float %a to double
187+
%sqrt = call fast double @llvm.sqrt.f64(double %conv)
188+
%div = fdiv fast double %conv, %sqrt
189+
%conv2 = fptrunc double %div to float
190+
ret float %conv2
191+
}

0 commit comments

Comments
 (0)