[llvm] r362937 - [InstCombine] allow unordered preds when canonicalizing to fabs()
Sanjay Patel via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 10 07:14:51 PDT 2019
Author: spatel
Date: Mon Jun 10 07:14:51 2019
New Revision: 362937
URL: http://llvm.org/viewvc/llvm-project?rev=362937&view=rev
Log:
[InstCombine] allow unordered preds when canonicalizing to fabs()
PR42179:
https://bugs.llvm.org/show_bug.cgi?id=42179
Modified:
llvm/trunk/lib/Transforms/InstCombine/InstCombineSelect.cpp
llvm/trunk/test/Transforms/InstCombine/fabs.ll
Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineSelect.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineSelect.cpp?rev=362937&r1=362936&r2=362937&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineSelect.cpp (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineSelect.cpp Mon Jun 10 07:14:51 2019
@@ -1895,7 +1895,8 @@ Instruction *InstCombiner::visitSelectIn
match(TrueVal, m_FNeg(m_Specific(FalseVal))) &&
match(TrueVal, m_Instruction(FNeg)) &&
FNeg->hasNoNaNs() && FNeg->hasNoSignedZeros() &&
- (Pred == FCmpInst::FCMP_OLT || Pred == FCmpInst::FCMP_OLE)) {
+ (Pred == FCmpInst::FCMP_OLT || Pred == FCmpInst::FCMP_OLE ||
+ Pred == FCmpInst::FCMP_ULT || Pred == FCmpInst::FCMP_ULE)) {
Value *Fabs = Builder.CreateUnaryIntrinsic(Intrinsic::fabs, FalseVal, FNeg);
return replaceInstUsesWith(SI, Fabs);
}
@@ -1906,7 +1907,8 @@ Instruction *InstCombiner::visitSelectIn
match(FalseVal, m_FNeg(m_Specific(TrueVal))) &&
match(FalseVal, m_Instruction(FNeg)) &&
FNeg->hasNoNaNs() && FNeg->hasNoSignedZeros() &&
- (Pred == FCmpInst::FCMP_OGT || Pred == FCmpInst::FCMP_OGE)) {
+ (Pred == FCmpInst::FCMP_OGT || Pred == FCmpInst::FCMP_OGE ||
+ Pred == FCmpInst::FCMP_UGT || Pred == FCmpInst::FCMP_UGE)) {
Value *Fabs = Builder.CreateUnaryIntrinsic(Intrinsic::fabs, TrueVal, FNeg);
return replaceInstUsesWith(SI, Fabs);
}
Modified: llvm/trunk/test/Transforms/InstCombine/fabs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/fabs.ll?rev=362937&r1=362936&r2=362937&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/fabs.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/fabs.ll Mon Jun 10 07:14:51 2019
@@ -331,10 +331,8 @@ define double @select_fcmp_nnan_nsz_olt_
define double @select_fcmp_nnan_nsz_ult_zero(double %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ult_zero(
-; CHECK-NEXT: [[LTZERO:%.*]] = fcmp ult double [[X:%.*]], 0.000000e+00
-; CHECK-NEXT: [[NEGX:%.*]] = fsub nnan nsz double -0.000000e+00, [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[LTZERO]], double [[NEGX]], double [[X]]
-; CHECK-NEXT: ret double [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call nnan nsz double @llvm.fabs.f64(double [[X:%.*]])
+; CHECK-NEXT: ret double [[TMP1]]
;
%ltzero = fcmp ult double %x, 0.0
%negx = fsub nnan nsz double -0.0, %x
@@ -357,10 +355,8 @@ define double @select_fcmp_nnan_nsz_olt_
define double @select_fcmp_nnan_nsz_ult_zero_unary_fneg(double %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ult_zero_unary_fneg(
-; CHECK-NEXT: [[LTZERO:%.*]] = fcmp ult double [[X:%.*]], 0.000000e+00
-; CHECK-NEXT: [[NEGX:%.*]] = fneg nnan nsz double [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[LTZERO]], double [[NEGX]], double [[X]]
-; CHECK-NEXT: ret double [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call nnan nsz double @llvm.fabs.f64(double [[X:%.*]])
+; CHECK-NEXT: ret double [[TMP1]]
;
%ltzero = fcmp ult double %x, 0.0
%negx = fneg nnan nsz double %x
@@ -385,10 +381,8 @@ define float @select_fcmp_nnan_nsz_olt_n
define float @select_fcmp_nnan_nsz_ult_negzero(float %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ult_negzero(
-; CHECK-NEXT: [[LTZERO:%.*]] = fcmp ult float [[X:%.*]], 0.000000e+00
-; CHECK-NEXT: [[NEGX:%.*]] = fsub nnan ninf nsz float -0.000000e+00, [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[LTZERO]], float [[NEGX]], float [[X]]
-; CHECK-NEXT: ret float [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call nnan ninf nsz float @llvm.fabs.f32(float [[X:%.*]])
+; CHECK-NEXT: ret float [[TMP1]]
;
%ltzero = fcmp ult float %x, -0.0
%negx = fsub nnan ninf nsz float -0.0, %x
@@ -411,10 +405,8 @@ define float @select_fcmp_nnan_nsz_olt_n
define float @select_fcmp_nnan_nsz_ult_negzero_unary_fneg(float %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ult_negzero_unary_fneg(
-; CHECK-NEXT: [[LTZERO:%.*]] = fcmp ult float [[X:%.*]], 0.000000e+00
-; CHECK-NEXT: [[NEGX:%.*]] = fneg nnan ninf nsz float [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[LTZERO]], float [[NEGX]], float [[X]]
-; CHECK-NEXT: ret float [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call nnan ninf nsz float @llvm.fabs.f32(float [[X:%.*]])
+; CHECK-NEXT: ret float [[TMP1]]
;
%ltzero = fcmp ult float %x, -0.0
%negx = fneg nnan ninf nsz float %x
@@ -439,10 +431,8 @@ define double @select_fcmp_nnan_nsz_ole_
define double @select_fcmp_nnan_nsz_ule_zero(double %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ule_zero(
-; CHECK-NEXT: [[LEZERO:%.*]] = fcmp ule double [[X:%.*]], 0.000000e+00
-; CHECK-NEXT: [[NEGX:%.*]] = fsub fast double -0.000000e+00, [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[LEZERO]], double [[NEGX]], double [[X]]
-; CHECK-NEXT: ret double [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call fast double @llvm.fabs.f64(double [[X:%.*]])
+; CHECK-NEXT: ret double [[TMP1]]
;
%lezero = fcmp ule double %x, 0.0
%negx = fsub fast double -0.0, %x
@@ -465,10 +455,8 @@ define double @select_fcmp_nnan_nsz_ole_
define double @select_fcmp_nnan_nsz_ule_zero_unary_fneg(double %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ule_zero_unary_fneg(
-; CHECK-NEXT: [[LEZERO:%.*]] = fcmp ule double [[X:%.*]], 0.000000e+00
-; CHECK-NEXT: [[NEGX:%.*]] = fneg fast double [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[LEZERO]], double [[NEGX]], double [[X]]
-; CHECK-NEXT: ret double [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call fast double @llvm.fabs.f64(double [[X:%.*]])
+; CHECK-NEXT: ret double [[TMP1]]
;
%lezero = fcmp ule double %x, 0.0
%negx = fneg fast double %x
@@ -493,10 +481,8 @@ define float @select_fcmp_nnan_nsz_ole_n
define float @select_fcmp_nnan_nsz_ule_negzero(float %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ule_negzero(
-; CHECK-NEXT: [[LEZERO:%.*]] = fcmp ule float [[X:%.*]], 0.000000e+00
-; CHECK-NEXT: [[NEGX:%.*]] = fsub nnan nsz float -0.000000e+00, [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[LEZERO]], float [[NEGX]], float [[X]]
-; CHECK-NEXT: ret float [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call nnan nsz float @llvm.fabs.f32(float [[X:%.*]])
+; CHECK-NEXT: ret float [[TMP1]]
;
%lezero = fcmp ule float %x, -0.0
%negx = fsub nnan nsz float -0.0, %x
@@ -519,10 +505,8 @@ define float @select_fcmp_nnan_nsz_ole_n
define float @select_fcmp_nnan_nsz_ule_negzero_unary_fneg(float %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ule_negzero_unary_fneg(
-; CHECK-NEXT: [[LEZERO:%.*]] = fcmp ule float [[X:%.*]], 0.000000e+00
-; CHECK-NEXT: [[NEGX:%.*]] = fneg nnan nsz float [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[LEZERO]], float [[NEGX]], float [[X]]
-; CHECK-NEXT: ret float [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call nnan nsz float @llvm.fabs.f32(float [[X:%.*]])
+; CHECK-NEXT: ret float [[TMP1]]
;
%lezero = fcmp ule float %x, -0.0
%negx = fneg nnan nsz float %x
@@ -547,10 +531,8 @@ define <2 x float> @select_fcmp_nnan_nsz
define <2 x float> @select_fcmp_nnan_nsz_ugt_zero(<2 x float> %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ugt_zero(
-; CHECK-NEXT: [[GTZERO:%.*]] = fcmp ugt <2 x float> [[X:%.*]], zeroinitializer
-; CHECK-NEXT: [[NEGX:%.*]] = fsub nnan nsz arcp <2 x float> <float -0.000000e+00, float -0.000000e+00>, [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select <2 x i1> [[GTZERO]], <2 x float> [[X]], <2 x float> [[NEGX]]
-; CHECK-NEXT: ret <2 x float> [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call nnan nsz arcp <2 x float> @llvm.fabs.v2f32(<2 x float> [[X:%.*]])
+; CHECK-NEXT: ret <2 x float> [[TMP1]]
;
%gtzero = fcmp ugt <2 x float> %x, zeroinitializer
%negx = fsub nnan nsz arcp <2 x float> <float -0.0, float -0.0>, %x
@@ -573,10 +555,8 @@ define <2 x float> @select_fcmp_nnan_nsz
define <2 x float> @select_fcmp_nnan_nsz_ugt_zero_unary_fneg(<2 x float> %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ugt_zero_unary_fneg(
-; CHECK-NEXT: [[GTZERO:%.*]] = fcmp ugt <2 x float> [[X:%.*]], zeroinitializer
-; CHECK-NEXT: [[NEGX:%.*]] = fneg nnan nsz arcp <2 x float> [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select <2 x i1> [[GTZERO]], <2 x float> [[X]], <2 x float> [[NEGX]]
-; CHECK-NEXT: ret <2 x float> [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call nnan nsz arcp <2 x float> @llvm.fabs.v2f32(<2 x float> [[X:%.*]])
+; CHECK-NEXT: ret <2 x float> [[TMP1]]
;
%gtzero = fcmp ugt <2 x float> %x, zeroinitializer
%negx = fneg nnan nsz arcp <2 x float> %x
@@ -601,10 +581,8 @@ define half @select_fcmp_nnan_nsz_ogt_ne
define half @select_fcmp_nnan_nsz_ugt_negzero(half %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_ugt_negzero(
-; CHECK-NEXT: [[GTZERO:%.*]] = fcmp ugt half [[X:%.*]], 0xH0000
-; CHECK-NEXT: [[NEGX:%.*]] = fsub fast half 0xH8000, [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[GTZERO]], half [[X]], half [[NEGX]]
-; CHECK-NEXT: ret half [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call fast half @llvm.fabs.f16(half [[X:%.*]])
+; CHECK-NEXT: ret half [[TMP1]]
;
%gtzero = fcmp ugt half %x, -0.0
%negx = fsub fast half 0.0, %x
@@ -629,10 +607,8 @@ define <2 x double> @select_fcmp_nnan_ns
define <2 x double> @select_fcmp_nnan_nsz_uge_zero(<2 x double> %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_uge_zero(
-; CHECK-NEXT: [[GEZERO:%.*]] = fcmp uge <2 x double> [[X:%.*]], zeroinitializer
-; CHECK-NEXT: [[NEGX:%.*]] = fsub reassoc nnan nsz <2 x double> <double -0.000000e+00, double -0.000000e+00>, [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select <2 x i1> [[GEZERO]], <2 x double> [[X]], <2 x double> [[NEGX]]
-; CHECK-NEXT: ret <2 x double> [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call reassoc nnan nsz <2 x double> @llvm.fabs.v2f64(<2 x double> [[X:%.*]])
+; CHECK-NEXT: ret <2 x double> [[TMP1]]
;
%gezero = fcmp uge <2 x double> %x, zeroinitializer
%negx = fsub nnan nsz reassoc <2 x double> <double -0.0, double -0.0>, %x
@@ -655,10 +631,8 @@ define <2 x double> @select_fcmp_nnan_ns
define <2 x double> @select_fcmp_nnan_nsz_uge_zero_unary_fneg(<2 x double> %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_uge_zero_unary_fneg(
-; CHECK-NEXT: [[GEZERO:%.*]] = fcmp uge <2 x double> [[X:%.*]], zeroinitializer
-; CHECK-NEXT: [[NEGX:%.*]] = fneg reassoc nnan nsz <2 x double> [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select <2 x i1> [[GEZERO]], <2 x double> [[X]], <2 x double> [[NEGX]]
-; CHECK-NEXT: ret <2 x double> [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call reassoc nnan nsz <2 x double> @llvm.fabs.v2f64(<2 x double> [[X:%.*]])
+; CHECK-NEXT: ret <2 x double> [[TMP1]]
;
%gezero = fcmp uge <2 x double> %x, zeroinitializer
%negx = fneg nnan nsz reassoc <2 x double> %x
@@ -683,10 +657,8 @@ define half @select_fcmp_nnan_nsz_oge_ne
define half @select_fcmp_nnan_nsz_uge_negzero(half %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_uge_negzero(
-; CHECK-NEXT: [[GEZERO:%.*]] = fcmp uge half [[X:%.*]], 0xH0000
-; CHECK-NEXT: [[NEGX:%.*]] = fsub nnan nsz half 0xH8000, [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[GEZERO]], half [[X]], half [[NEGX]]
-; CHECK-NEXT: ret half [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call nnan nsz half @llvm.fabs.f16(half [[X:%.*]])
+; CHECK-NEXT: ret half [[TMP1]]
;
%gezero = fcmp uge half %x, -0.0
%negx = fsub nnan nsz half -0.0, %x
@@ -709,10 +681,8 @@ define half @select_fcmp_nnan_nsz_oge_ne
define half @select_fcmp_nnan_nsz_uge_negzero_unary_fneg(half %x) {
; CHECK-LABEL: @select_fcmp_nnan_nsz_uge_negzero_unary_fneg(
-; CHECK-NEXT: [[GEZERO:%.*]] = fcmp uge half [[X:%.*]], 0xH0000
-; CHECK-NEXT: [[NEGX:%.*]] = fneg nnan nsz half [[X]]
-; CHECK-NEXT: [[FABS:%.*]] = select i1 [[GEZERO]], half [[X]], half [[NEGX]]
-; CHECK-NEXT: ret half [[FABS]]
+; CHECK-NEXT: [[TMP1:%.*]] = call nnan nsz half @llvm.fabs.f16(half [[X:%.*]])
+; CHECK-NEXT: ret half [[TMP1]]
;
%gezero = fcmp uge half %x, -0.0
%negx = fneg nnan nsz half %x
More information about the llvm-commits
mailing list