Skip to content

Commit

Permalink
InstCombine: Reduce minnum/maxnum if inputs are casted
Browse files Browse the repository at this point in the history
  • Loading branch information
@arsenm
arsenm committed Apr 3, 2020
1 parent 56decd9 commit 57a5531
Show file tree
Hide file tree
Showing 6 changed files with 204 additions and 17 deletions.
16 changes: 16 additions & 0 deletions llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp
View file
Expand Up @@ -2316,6 +2316,22 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) {
}
}

Value *ExtSrc0;
Value *ExtSrc1;

// minnum (fpext x), (fpext y) -> minnum x, y
// maxnum (fpext x), (fpext y) -> maxnum x, y
if (match(II->getArgOperand(0), m_OneUse(m_FPExt(m_Value(ExtSrc0)))) &&
match(II->getArgOperand(1), m_OneUse(m_FPExt(m_Value(ExtSrc1)))) &&
ExtSrc0->getType() == ExtSrc1->getType()) {
Value *F = Intrinsic::getDeclaration(II->getModule(), II->getIntrinsicID(),
{ ExtSrc0->getType() });
CallInst *NewCall = Builder.CreateCall(F, { ExtSrc0, ExtSrc1 });
NewCall->copyFastMathFlags(II);
NewCall->takeName(II);
return new FPExtInst(NewCall, II->getType());
}

break;
}
case Intrinsic::fmuladd: {
Expand Down
12 changes: 7 additions & 5 deletions llvm/test/Transforms/InstCombine/double-float-shrink-1.ll
View file
Expand Up @@ -529,12 +529,14 @@ define float @max1(float %a, float %b) {

define float @fake_fmin(float %a, float %b) {
; CHECK-LABEL: @fake_fmin(
; CHECK-NEXT: [[C:%.*]] = fpext float [[A:%.*]] to fp128
; CHECK-NEXT: [[D:%.*]] = fpext float [[B:%.*]] to fp128
; ISC99-NEXT: [[E:%.*]] = call nsz fp128 @llvm.minnum.f128(fp128 [[C]], fp128 [[D]])
; ISC99-NEXT: [[MIN:%.*]] = call nsz float @llvm.minnum.f32(float %a, float %b)
; ISC99-NEXT: ret float [[MIN]]

; ISC89-NEXT: [[C:%.*]] = fpext float [[A:%.*]] to fp128
; ISC89-NEXT: [[D:%.*]] = fpext float [[B:%.*]] to fp128
; ISC89-NEXT: [[E:%.*]] = call fp128 @fmin(fp128 [[C]], fp128 [[D]])
; CHECK-NEXT: [[F:%.*]] = fptrunc fp128 [[E]] to float
; CHECK-NEXT: ret float [[F]]
; ISC89-NEXT: [[F:%.*]] = fptrunc fp128 [[E]] to float
; ISC89-NEXT: ret float [[F]]
;
%c = fpext float %a to fp128
%d = fpext float %b to fp128
Expand Down
24 changes: 24 additions & 0 deletions llvm/test/Transforms/InstCombine/maximum.ll
View file
Expand Up @@ -361,3 +361,27 @@ define float @unary_neg_neg_extra_use_x_and_y(float %x, float %y) {
call void @use(float %negy)
ret float %r
}

define float @reduce_precision(float %x, float %y) {
; CHECK-LABEL: @reduce_precision(
; CHECK-NEXT: [[MAXIMUM:%.*]] = call float @llvm.maximum.f32(float [[X:%.*]], float [[Y:%.*]])
; CHECK-NEXT: ret float [[MAXIMUM]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
%maximum = call double @llvm.maximum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %maximum to float
ret float %trunc
}

define float @reduce_precision_fmf(float %x, float %y) {
; CHECK-LABEL: @reduce_precision_fmf(
; CHECK-NEXT: [[MAXIMUM:%.*]] = call nnan float @llvm.maximum.f32(float [[X:%.*]], float [[Y:%.*]])
; CHECK-NEXT: ret float [[MAXIMUM]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
%maximum = call nnan double @llvm.maximum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %maximum to float
ret float %trunc
}
58 changes: 58 additions & 0 deletions llvm/test/Transforms/InstCombine/maxnum.ll
View file
Expand Up @@ -355,3 +355,61 @@ define float @unary_neg_neg_extra_use_x_and_y(float %x, float %y) {
call void @use(float %negy)
ret float %r
}

define float @reduce_precision(float %x, float %y) {
; CHECK-LABEL: @reduce_precision(
; CHECK-NEXT: [[MAXNUM:%.*]] = call float @llvm.maxnum.f32(float [[X:%.*]], float [[Y:%.*]])
; CHECK-NEXT: ret float [[MAXNUM]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
%maxnum = call double @llvm.maxnum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %maxnum to float
ret float %trunc
}

define float @reduce_precision_fmf(float %x, float %y) {
; CHECK-LABEL: @reduce_precision_fmf(
; CHECK-NEXT: [[MAXNUM:%.*]] = call nnan float @llvm.maxnum.f32(float [[X:%.*]], float [[Y:%.*]])
; CHECK-NEXT: ret float [[MAXNUM]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
%maxnum = call nnan double @llvm.maxnum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %maxnum to float
ret float %trunc
}

define float @reduce_precision_multi_use_0(float %x, float %y) {
; CHECK-LABEL: @reduce_precision_multi_use_0(
; CHECK-NEXT: [[X_EXT:%.*]] = fpext float [[X:%.*]] to double
; CHECK-NEXT: [[Y_EXT:%.*]] = fpext float [[Y:%.*]] to double
; CHECK-NEXT: store double [[X_EXT]], double* undef, align 8
; CHECK-NEXT: [[MAXNUM:%.*]] = call double @llvm.maxnum.f64(double [[X_EXT]], double [[Y_EXT]])
; CHECK-NEXT: [[TRUNC:%.*]] = fptrunc double [[MAXNUM]] to float
; CHECK-NEXT: ret float [[TRUNC]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
store double %x.ext, double* undef
%maxnum = call double @llvm.maxnum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %maxnum to float
ret float %trunc
}

define float @reduce_precision_multi_use_1(float %x, float %y) {
; CHECK-LABEL: @reduce_precision_multi_use_1(
; CHECK-NEXT: [[X_EXT:%.*]] = fpext float [[X:%.*]] to double
; CHECK-NEXT: [[Y_EXT:%.*]] = fpext float [[Y:%.*]] to double
; CHECK-NEXT: store double [[Y_EXT]], double* undef, align 8
; CHECK-NEXT: [[MAXNUM:%.*]] = call double @llvm.maxnum.f64(double [[X_EXT]], double [[Y_EXT]])
; CHECK-NEXT: [[TRUNC:%.*]] = fptrunc double [[MAXNUM]] to float
; CHECK-NEXT: ret float [[TRUNC]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
store double %y.ext, double* undef
%maxnum = call double @llvm.maxnum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %maxnum to float
ret float %trunc
}
54 changes: 42 additions & 12 deletions llvm/test/Transforms/InstCombine/minimum.ll
View file
Expand Up @@ -149,53 +149,59 @@ define float @minimum_f32_val_nan(float %x) {

define float @minimum_f32_1_minimum_val_p0(float %x) {
; CHECK-LABEL: @minimum_f32_1_minimum_val_p0(
; CHECK-NEXT: [[RES:%.*]] = call float @llvm.minimum.f32(float %x, float 0.000000e+00)
; CHECK-NEXT: ret float [[RES]]
; CHECK-NEXT: [[TMP1:%.*]] = call float @llvm.minimum.f32(float [[X:%.*]], float 0.000000e+00)
; CHECK-NEXT: ret float [[TMP1]]
;
%y = call float @llvm.minimum.f32(float %x, float 0.0)
%z = call float @llvm.minimum.f32(float %y, float 1.0)
ret float %z
}

define float @minimum_f32_1_minimum_p0_val_fast(float %x) {
; CHECK-LABEL: @minimum_f32_1_minimum_p0_val_fast(
; CHECK-NEXT: [[RES:%.*]] = call fast float @llvm.minimum.f32(float %x, float 0.000000e+00)
; CHECK-NEXT: ret float [[RES]]
; CHECK-NEXT: [[TMP1:%.*]] = call fast float @llvm.minimum.f32(float [[X:%.*]], float 0.000000e+00)
; CHECK-NEXT: ret float [[TMP1]]
;
%y = call float @llvm.minimum.f32(float 0.0, float %x)
%z = call fast float @llvm.minimum.f32(float %y, float 1.0)
ret float %z
}

define float @minimum_f32_1_minimum_p0_val_nnan_ninf(float %x) {
; CHECK-LABEL: @minimum_f32_1_minimum_p0_val_nnan_ninf(
; CHECK-NEXT: [[RES:%.*]] = call nnan ninf float @llvm.minimum.f32(float %x, float 0.000000e+00)
; CHECK-NEXT: ret float [[RES]]
; CHECK-NEXT: [[TMP1:%.*]] = call nnan ninf float @llvm.minimum.f32(float [[X:%.*]], float 0.000000e+00)
; CHECK-NEXT: ret float [[TMP1]]
;
%y = call float @llvm.minimum.f32(float 0.0, float %x)
%z = call nnan ninf float @llvm.minimum.f32(float %y, float 1.0)
ret float %z
}

define float @minimum_f32_p0_minimum_val_n0(float %x) {
; CHECK-LABEL: @minimum_f32_p0_minimum_val_n0(
; CHECK-NEXT: [[RES:%.*]] = call float @llvm.minimum.f32(float %x, float -0.000000e+00)
; CHECK-NEXT: ret float [[RES]]
; CHECK-NEXT: [[TMP1:%.*]] = call float @llvm.minimum.f32(float [[X:%.*]], float -0.000000e+00)
; CHECK-NEXT: ret float [[TMP1]]
;
%y = call float @llvm.minimum.f32(float %x, float -0.0)
%z = call float @llvm.minimum.f32(float %y, float 0.0)
ret float %z
}

define float @minimum_f32_1_minimum_p0_val(float %x) {
; CHECK-LABEL: @minimum_f32_1_minimum_p0_val(
; CHECK-NEXT: [[RES:%.*]] = call float @llvm.minimum.f32(float %x, float 0.000000e+00)
; CHECK-NEXT: ret float [[RES]]
; CHECK-NEXT: [[TMP1:%.*]] = call float @llvm.minimum.f32(float [[X:%.*]], float 0.000000e+00)
; CHECK-NEXT: ret float [[TMP1]]
;
%y = call float @llvm.minimum.f32(float 0.0, float %x)
%z = call float @llvm.minimum.f32(float %y, float 1.0)
ret float %z
}

define <2 x float> @minimum_f32_1_minimum_val_p0_val_v2f32(<2 x float> %x) {
; CHECK-LABEL: @minimum_f32_1_minimum_val_p0_val_v2f32(
; CHECK-NEXT: [[RES:%.*]] = call <2 x float> @llvm.minimum.v2f32(<2 x float> %x, <2 x float> zeroinitializer)
; CHECK-NEXT: ret <2 x float> [[RES]]
; CHECK-NEXT: [[TMP1:%.*]] = call <2 x float> @llvm.minimum.v2f32(<2 x float> [[X:%.*]], <2 x float> zeroinitializer)
; CHECK-NEXT: ret <2 x float> [[TMP1]]
;
%y = call <2 x float> @llvm.minimum.v2f32(<2 x float> %x, <2 x float> zeroinitializer)
%z = call <2 x float> @llvm.minimum.v2f32(<2 x float> %y, <2 x float><float 1.0, float 1.0>)
ret <2 x float> %z
Expand Down Expand Up @@ -386,3 +392,27 @@ define double @unary_neg_neg_extra_use_x_and_y(double %x, double %y) {
call void @use(double %negy)
ret double %r
}

define float @reduce_precision(float %x, float %y) {
; CHECK-LABEL: @reduce_precision(
; CHECK-NEXT: [[MINIMUM:%.*]] = call float @llvm.minimum.f32(float [[X:%.*]], float [[Y:%.*]])
; CHECK-NEXT: ret float [[MINIMUM]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
%minimum = call double @llvm.minimum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %minimum to float
ret float %trunc
}

define float @reduce_precision_fmf(float %x, float %y) {
; CHECK-LABEL: @reduce_precision_fmf(
; CHECK-NEXT: [[MINIMUM:%.*]] = call nnan float @llvm.minimum.f32(float [[X:%.*]], float [[Y:%.*]])
; CHECK-NEXT: ret float [[MINIMUM]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
%minimum = call nnan double @llvm.minimum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %minimum to float
ret float %trunc
}
57 changes: 57 additions & 0 deletions llvm/test/Transforms/InstCombine/minnum.ll
View file
Expand Up @@ -393,3 +393,60 @@ define double @unary_neg_neg_extra_use_x_and_y(double %x, double %y) {
ret double %r
}

define float @reduce_precision(float %x, float %y) {
; CHECK-LABEL: @reduce_precision(
; CHECK-NEXT: [[MINNUM:%.*]] = call float @llvm.minnum.f32(float [[X:%.*]], float [[Y:%.*]])
; CHECK-NEXT: ret float [[MINNUM]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
%minnum = call double @llvm.minnum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %minnum to float
ret float %trunc
}

define float @reduce_precision_fmf(float %x, float %y) {
; CHECK-LABEL: @reduce_precision_fmf(
; CHECK-NEXT: [[MINNUM:%.*]] = call nnan float @llvm.minnum.f32(float [[X:%.*]], float [[Y:%.*]])
; CHECK-NEXT: ret float [[MINNUM]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
%minnum = call nnan double @llvm.minnum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %minnum to float
ret float %trunc
}

define float @reduce_precision_multi_use_0(float %x, float %y) {
; CHECK-LABEL: @reduce_precision_multi_use_0(
; CHECK-NEXT: [[X_EXT:%.*]] = fpext float [[X:%.*]] to double
; CHECK-NEXT: [[Y_EXT:%.*]] = fpext float [[Y:%.*]] to double
; CHECK-NEXT: store double [[X_EXT]], double* undef, align 8
; CHECK-NEXT: [[MINNUM:%.*]] = call double @llvm.minnum.f64(double [[X_EXT]], double [[Y_EXT]])
; CHECK-NEXT: [[TRUNC:%.*]] = fptrunc double [[MINNUM]] to float
; CHECK-NEXT: ret float [[TRUNC]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
store double %x.ext, double* undef
%minnum = call double @llvm.minnum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %minnum to float
ret float %trunc
}

define float @reduce_precision_multi_use_1(float %x, float %y) {
; CHECK-LABEL: @reduce_precision_multi_use_1(
; CHECK-NEXT: [[X_EXT:%.*]] = fpext float [[X:%.*]] to double
; CHECK-NEXT: [[Y_EXT:%.*]] = fpext float [[Y:%.*]] to double
; CHECK-NEXT: store double [[Y_EXT]], double* undef, align 8
; CHECK-NEXT: [[MINNUM:%.*]] = call double @llvm.minnum.f64(double [[X_EXT]], double [[Y_EXT]])
; CHECK-NEXT: [[TRUNC:%.*]] = fptrunc double [[MINNUM]] to float
; CHECK-NEXT: ret float [[TRUNC]]
;
%x.ext = fpext float %x to double
%y.ext = fpext float %y to double
store double %y.ext, double* undef
%minnum = call double @llvm.minnum.f64(double %x.ext, double %y.ext)
%trunc = fptrunc double %minnum to float
ret float %trunc
}

0 comments on commit 57a5531

Please sign in to comment.