diff options
| -rw-r--r-- | llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/Transforms/InstCombine/fmul.ll | 20 | ||||
| -rw-r--r-- | llvm/test/Transforms/Reassociate/fast-basictest.ll | 7 |
3 files changed, 15 insertions, 14 deletions
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp index 2959c09cbb5..1529911c5a9 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp @@ -676,7 +676,7 @@ Instruction *InstCombiner::visitFMul(BinaryOperator &I) { // latency of the instruction Y is amortized by the expression of X*X, // and therefore Y is in a "less critical" position compared to what it // was before the transformation. - if (I.isFast()) { + if (I.hasAllowReassoc()) { if (match(Op0, m_OneUse(m_c_FMul(m_Specific(Op1), m_Value(Y)))) && Op1 != Y) { Value *XX = Builder.CreateFMulFMF(Op1, Op1, &I); diff --git a/llvm/test/Transforms/InstCombine/fmul.ll b/llvm/test/Transforms/InstCombine/fmul.ll index 4c364f97d25..b46897c3830 100644 --- a/llvm/test/Transforms/InstCombine/fmul.ll +++ b/llvm/test/Transforms/InstCombine/fmul.ll @@ -228,15 +228,17 @@ define float @fabs_x_fabs(float %x, float %y) { } ; (X*Y) * X => (X*X) * Y +; The transform only requires 'reassoc', but test other FMF in +; the commuted variants to make sure FMF propagates as expected. define float @reassoc_common_operand1(float %x, float %y) { ; CHECK-LABEL: @reassoc_common_operand1( -; CHECK-NEXT: [[TMP1:%.*]] = fmul fast float [[X:%.*]], [[X]] -; CHECK-NEXT: [[MUL2:%.*]] = fmul fast float [[TMP1]], [[Y:%.*]] +; CHECK-NEXT: [[TMP1:%.*]] = fmul reassoc float [[X:%.*]], [[X]] +; CHECK-NEXT: [[MUL2:%.*]] = fmul reassoc float [[TMP1]], [[Y:%.*]] ; CHECK-NEXT: ret float [[MUL2]] ; %mul1 = fmul float %x, %y - %mul2 = fmul fast float %mul1, %x + %mul2 = fmul reassoc float %mul1, %x ret float %mul2 } @@ -258,13 +260,13 @@ define float @reassoc_common_operand2(float %x, float %y) { define float @reassoc_common_operand3(float %x1, float %y) { ; CHECK-LABEL: @reassoc_common_operand3( ; CHECK-NEXT: [[X:%.*]] = fdiv float [[X1:%.*]], 3.000000e+00 -; CHECK-NEXT: [[TMP1:%.*]] = fmul fast float [[X]], [[X]] -; CHECK-NEXT: [[MUL2:%.*]] = fmul fast float [[TMP1]], [[Y:%.*]] +; CHECK-NEXT: [[TMP1:%.*]] = fmul reassoc nnan float [[X]], [[X]] +; CHECK-NEXT: [[MUL2:%.*]] = fmul reassoc nnan float [[TMP1]], [[Y:%.*]] ; CHECK-NEXT: ret float [[MUL2]] ; %x = fdiv float %x1, 3.0 ; thwart complexity-based canonicalization %mul1 = fmul float %x, %y - %mul2 = fmul fast float %x, %mul1 + %mul2 = fmul reassoc nnan float %x, %mul1 ret float %mul2 } @@ -273,13 +275,13 @@ define float @reassoc_common_operand3(float %x1, float %y) { define float @reassoc_common_operand4(float %x1, float %y) { ; CHECK-LABEL: @reassoc_common_operand4( ; CHECK-NEXT: [[X:%.*]] = fdiv float [[X1:%.*]], 3.000000e+00 -; CHECK-NEXT: [[TMP1:%.*]] = fmul fast float [[X]], [[X]] -; CHECK-NEXT: [[MUL2:%.*]] = fmul fast float [[TMP1]], [[Y:%.*]] +; CHECK-NEXT: [[TMP1:%.*]] = fmul reassoc ninf float [[X]], [[X]] +; CHECK-NEXT: [[MUL2:%.*]] = fmul reassoc ninf float [[TMP1]], [[Y:%.*]] ; CHECK-NEXT: ret float [[MUL2]] ; %x = fdiv float %x1, 3.0 ; thwart complexity-based canonicalization %mul1 = fmul float %y, %x - %mul2 = fmul fast float %x, %mul1 + %mul2 = fmul reassoc ninf float %x, %mul1 ret float %mul2 } diff --git a/llvm/test/Transforms/Reassociate/fast-basictest.ll b/llvm/test/Transforms/Reassociate/fast-basictest.ll index fe9c2d669d8..a4f61c82ad8 100644 --- a/llvm/test/Transforms/Reassociate/fast-basictest.ll +++ b/llvm/test/Transforms/Reassociate/fast-basictest.ll @@ -160,8 +160,8 @@ define float @test7_reassoc(float %A, float %B, float %C) { ; CHECK-LABEL: @test7_reassoc( ; CHECK-NEXT: [[AA:%.*]] = fmul reassoc float [[A:%.*]], [[A]] ; CHECK-NEXT: [[AAB:%.*]] = fmul reassoc float [[AA]], [[B:%.*]] -; CHECK-NEXT: [[AC:%.*]] = fmul reassoc float [[A]], [[C:%.*]] -; CHECK-NEXT: [[AAC:%.*]] = fmul reassoc float [[AC]], [[A]] +; CHECK-NEXT: [[TMP1:%.*]] = fmul reassoc float [[A]], [[A]] +; CHECK-NEXT: [[AAC:%.*]] = fmul reassoc float [[TMP1]], [[C:%.*]] ; CHECK-NEXT: [[R:%.*]] = fadd reassoc float [[AAB]], [[AAC]] ; CHECK-NEXT: ret float [[R]] ; @@ -362,8 +362,7 @@ define float @test15(float %arg) { define float @test15_reassoc(float %arg) { ; CHECK-LABEL: @test15_reassoc( -; CHECK-NEXT: [[T1:%.*]] = fmul reassoc float [[ARG:%.*]], 1.200000e+01 -; CHECK-NEXT: [[T2:%.*]] = fmul reassoc float [[T1]], 1.200000e+01 +; CHECK-NEXT: [[T2:%.*]] = fmul reassoc float [[ARG:%.*]], 1.440000e+02 ; CHECK-NEXT: ret float [[T2]] ; %t1 = fmul reassoc float 1.200000e+01, %arg |
