[SDAG] Remove special handling for fp min/max libcalls

nikic · nikic · commit f596ebce3623 · 2025-12-09T10:53:44.000+01:00
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -9590,34 +9590,6 @@ void SelectionDAGBuilder::visitCall(const CallInst &I) {
         if (visitUnaryFloatCall(I, ISD::FABS))
           return;
         break;
-      case LibFunc_fmin:
-      case LibFunc_fminf:
-      case LibFunc_fminl:
-        // TODO: Remove this, already canonicalized by the middle-end.
-        if (visitBinaryFloatCall(I, ISD::FMINNUM))
-          return;
-        break;
-      case LibFunc_fmax:
-      case LibFunc_fmaxf:
-      case LibFunc_fmaxl:
-        // TODO: Remove this, already canonicalized by the middle-end.
-        if (visitBinaryFloatCall(I, ISD::FMAXNUM))
-          return;
-        break;
-      case LibFunc_fminimum_num:
-      case LibFunc_fminimum_numf:
-      case LibFunc_fminimum_numl:
-        // TODO: Remove this, already canonicalized by the middle-end.
-        if (visitBinaryFloatCall(I, ISD::FMINIMUMNUM))
-          return;
-        break;
-      case LibFunc_fmaximum_num:
-      case LibFunc_fmaximum_numf:
-      case LibFunc_fmaximum_numl:
-        // TODO: Remove this, already canonicalized by the middle-end.
-        if (visitBinaryFloatCall(I, ISD::FMAXIMUMNUM))
-          return;
-        break;
       case LibFunc_sin:
       case LibFunc_sinf:
       case LibFunc_sinl:
diff --git a/llvm/test/CodeGen/PowerPC/ctr-minmaxnum.ll b/llvm/test/CodeGen/PowerPC/ctr-minmaxnum.ll
@@ -2,13 +2,9 @@
 
 declare float @fabsf(float)
 
-declare float @fminf(float, float)
-declare double @fmin(double, double)
 declare float @llvm.minnum.f32(float, float)
 declare double @llvm.minnum.f64(double, double)
 
-declare float @fmaxf(float, float)
-declare double @fmax(double, double)
 declare float @llvm.maxnum.f32(float, float)
 declare double @llvm.maxnum.f64(double, double)
 
@@ -63,29 +59,6 @@ loop_exit:
 ; CHECK-NOT: xsmindp
 ; CHECK: blr
 
-define void @test1a(float %f, ptr %fp) {
-entry:
-  br label %loop_body
-
-loop_body:
-  %invar_address.dim.0.01 = phi i64 [ 0, %entry ], [ %1, %loop_body ]
-  %0 = call float @fminf(float %f, float 1.0) readnone
-  store float %0, ptr %fp, align 4
-  %1 = add i64 %invar_address.dim.0.01, 1
-  %2 = icmp eq i64 %1, 2
-  br i1 %2, label %loop_exit, label %loop_body
-
-loop_exit:
-  ret void
-}
-
-; CHECK-LABEL: test1a:
-; CHECK-NOT: mtctr
-; CHECK: xsmindp
-; CHECK-NOT: xsmindp
-; CHECK-NOT: mtctr
-; CHECK: blr
-
 define void @test2(float %f, ptr %fp) {
 entry:
   br label %loop_body
@@ -133,29 +106,6 @@ loop_exit:
 ; CHECK-NOT: xsmaxdp
 ; CHECK: blr
 
-define void @test2a(float %f, ptr %fp) {
-entry:
-  br label %loop_body
-
-loop_body:
-  %invar_address.dim.0.01 = phi i64 [ 0, %entry ], [ %1, %loop_body ]
-  %0 = call float @fmaxf(float %f, float 1.0) readnone
-  store float %0, ptr %fp, align 4
-  %1 = add i64 %invar_address.dim.0.01, 1
-  %2 = icmp eq i64 %1, 2
-  br i1 %2, label %loop_exit, label %loop_body
-
-loop_exit:
-  ret void
-}
-
-; CHECK-LABEL: test2a:
-; CHECK-NOT: mtctr
-; CHECK: xsmaxdp
-; CHECK-NOT: xsmaxdp
-; CHECK-NOT: mtctr
-; CHECK: blr
-
 define void @test3(double %f, ptr %fp) {
 entry:
   br label %loop_body
@@ -179,29 +129,6 @@ loop_exit:
 ; CHECK-NOT: mtctr
 ; CHECK: blr
 
-define void @test3a(double %f, ptr %fp) {
-entry:
-  br label %loop_body
-
-loop_body:
-  %invar_address.dim.0.01 = phi i64 [ 0, %entry ], [ %1, %loop_body ]
-  %0 = call double @fmin(double %f, double 1.0) readnone
-  store double %0, ptr %fp, align 8
-  %1 = add i64 %invar_address.dim.0.01, 1
-  %2 = icmp eq i64 %1, 2
-  br i1 %2, label %loop_exit, label %loop_body
-
-loop_exit:
-  ret void
-}
-
-; CHECK-LABEL: test3a:
-; CHECK-NOT: mtctr
-; CHECK: xsmindp
-; CHECK-NOT: xsmindp
-; CHECK-NOT: mtctr
-; CHECK: blr
-
 define void @test4(double %f, ptr %fp) {
 entry:
   br label %loop_body
@@ -224,27 +151,3 @@ loop_exit:
 ; CHECK-NOT: xsmaxdp
 ; CHECK-NOT: mtctr
 ; CHECK: blr
-
-define void @test4a(double %f, ptr %fp) {
-entry:
-  br label %loop_body
-
-loop_body:
-  %invar_address.dim.0.01 = phi i64 [ 0, %entry ], [ %1, %loop_body ]
-  %0 = call double @fmax(double %f, double 1.0) readnone
-  store double %0, ptr %fp, align 8
-  %1 = add i64 %invar_address.dim.0.01, 1
-  %2 = icmp eq i64 %1, 2
-  br i1 %2, label %loop_exit, label %loop_body
-
-loop_exit:
-  ret void
-}
-
-; CHECK-LABEL: test4a:
-; CHECK-NOT: mtctr
-; CHECK: xsmaxdp
-; CHECK-NOT: xsmaxdp
-; CHECK-NOT: mtctr
-; CHECK: blr
-
diff --git a/llvm/test/CodeGen/PowerPC/fminnum.ll b/llvm/test/CodeGen/PowerPC/fminnum.ll
@@ -54,43 +54,43 @@ define ppc_fp128 @test_fminl(ppc_fp128 %x, ppc_fp128 %y) {
 ; CHECK-NEXT:    stw 0, 116(1)
 ; CHECK-NEXT:    .cfi_def_cfa_offset 112
 ; CHECK-NEXT:    .cfi_offset lr, 4
-; CHECK-NEXT:    stfd 1, 40(1)
-; CHECK-NEXT:    lwz 3, 44(1)
-; CHECK-NEXT:    stfd 2, 32(1)
-; CHECK-NEXT:    stw 3, 60(1)
-; CHECK-NEXT:    lwz 3, 40(1)
-; CHECK-NEXT:    stfd 3, 72(1)
-; CHECK-NEXT:    stw 3, 56(1)
-; CHECK-NEXT:    lwz 3, 36(1)
-; CHECK-NEXT:    stfd 4, 64(1)
-; CHECK-NEXT:    stw 3, 52(1)
-; CHECK-NEXT:    lwz 3, 32(1)
-; CHECK-NEXT:    lfd 1, 56(1)
-; CHECK-NEXT:    stw 3, 48(1)
-; CHECK-NEXT:    lwz 3, 76(1)
-; CHECK-NEXT:    lfd 2, 48(1)
-; CHECK-NEXT:    stw 3, 92(1)
-; CHECK-NEXT:    lwz 3, 72(1)
-; CHECK-NEXT:    stw 3, 88(1)
-; CHECK-NEXT:    lwz 3, 68(1)
-; CHECK-NEXT:    lfd 3, 88(1)
-; CHECK-NEXT:    stw 3, 84(1)
-; CHECK-NEXT:    lwz 3, 64(1)
-; CHECK-NEXT:    stw 3, 80(1)
-; CHECK-NEXT:    lfd 4, 80(1)
-; CHECK-NEXT:    bl fminl
-; CHECK-NEXT:    stfd 1, 16(1)
-; CHECK-NEXT:    lwz 3, 20(1)
-; CHECK-NEXT:    stfd 2, 24(1)
+; CHECK-NEXT:    stfd 1, 88(1)
+; CHECK-NEXT:    lwz 3, 92(1)
+; CHECK-NEXT:    stfd 2, 80(1)
 ; CHECK-NEXT:    stw 3, 108(1)
-; CHECK-NEXT:    lwz 3, 16(1)
+; CHECK-NEXT:    lwz 3, 88(1)
+; CHECK-NEXT:    stfd 3, 56(1)
 ; CHECK-NEXT:    stw 3, 104(1)
-; CHECK-NEXT:    lwz 3, 28(1)
-; CHECK-NEXT:    lfd 1, 104(1)
+; CHECK-NEXT:    lwz 3, 84(1)
+; CHECK-NEXT:    stfd 4, 48(1)
 ; CHECK-NEXT:    stw 3, 100(1)
-; CHECK-NEXT:    lwz 3, 24(1)
+; CHECK-NEXT:    lwz 3, 80(1)
+; CHECK-NEXT:    lfd 1, 104(1)
 ; CHECK-NEXT:    stw 3, 96(1)
+; CHECK-NEXT:    lwz 3, 60(1)
 ; CHECK-NEXT:    lfd 2, 96(1)
+; CHECK-NEXT:    stw 3, 76(1)
+; CHECK-NEXT:    lwz 3, 56(1)
+; CHECK-NEXT:    stw 3, 72(1)
+; CHECK-NEXT:    lwz 3, 52(1)
+; CHECK-NEXT:    lfd 3, 72(1)
+; CHECK-NEXT:    stw 3, 68(1)
+; CHECK-NEXT:    lwz 3, 48(1)
+; CHECK-NEXT:    stw 3, 64(1)
+; CHECK-NEXT:    lfd 4, 64(1)
+; CHECK-NEXT:    bl fminl
+; CHECK-NEXT:    stfd 1, 24(1)
+; CHECK-NEXT:    lwz 3, 28(1)
+; CHECK-NEXT:    stfd 2, 16(1)
+; CHECK-NEXT:    stw 3, 44(1)
+; CHECK-NEXT:    lwz 3, 24(1)
+; CHECK-NEXT:    stw 3, 40(1)
+; CHECK-NEXT:    lwz 3, 20(1)
+; CHECK-NEXT:    lfd 1, 40(1)
+; CHECK-NEXT:    stw 3, 36(1)
+; CHECK-NEXT:    lwz 3, 16(1)
+; CHECK-NEXT:    stw 3, 32(1)
+; CHECK-NEXT:    lfd 2, 32(1)
 ; CHECK-NEXT:    lwz 0, 116(1)
 ; CHECK-NEXT:    addi 1, 1, 112
 ; CHECK-NEXT:    mtlr 0
diff --git a/llvm/test/CodeGen/SystemZ/vec-max-05.ll b/llvm/test/CodeGen/SystemZ/vec-max-05.ll
@@ -22,10 +22,15 @@ declare fp128 @llvm.maxnum.f128(fp128, fp128)
 declare fp128 @llvm.maximum.f128(fp128, fp128)
 
 ; Test the fmax library function.
-define double @f1(double %dummy, double %val1, double %val2) {
+define double @f1(double %dummy, double %val1, double %val2) nounwind {
 ; CHECK-LABEL: f1:
 ; CHECK:       # %bb.0:
-; CHECK-NEXT:    wfmaxdb %f0, %f2, %f4, 4
+; CHECK-NEXT:    stmg %r14, %r15, 112(%r15)
+; CHECK-NEXT:    aghi %r15, -160
+; CHECK-NEXT:    ldr %f0, %f2
+; CHECK-NEXT:    ldr %f2, %f4
+; CHECK-NEXT:    brasl %r14, fmax@PLT
+; CHECK-NEXT:    lmg %r14, %r15, 272(%r15)
 ; CHECK-NEXT:    br %r14
   %ret = call double @fmax(double %val1, double %val2) readnone
   ret double %ret
@@ -99,10 +104,15 @@ define <2 x double> @f7(<2 x double> %dummy, <2 x double> %val1, <2 x double> %v
 }
 
 ; Test the fmaxf library function.
-define float @f11(float %dummy, float %val1, float %val2) {
+define float @f11(float %dummy, float %val1, float %val2) nounwind {
 ; CHECK-LABEL: f11:
 ; CHECK:       # %bb.0:
-; CHECK-NEXT:    wfmaxsb %f0, %f2, %f4, 4
+; CHECK-NEXT:    stmg %r14, %r15, 112(%r15)
+; CHECK-NEXT:    aghi %r15, -160
+; CHECK-NEXT:    ldr %f0, %f2
+; CHECK-NEXT:    ldr %f2, %f4
+; CHECK-NEXT:    brasl %r14, fmaxf@PLT
+; CHECK-NEXT:    lmg %r14, %r15, 272(%r15)
 ; CHECK-NEXT:    br %r14
   %ret = call float @fmaxf(float %val1, float %val2) readnone
   ret float %ret
@@ -207,13 +217,23 @@ define <4 x float> @f17(<4 x float> %dummy, <4 x float> %val1,
 }
 
 ; Test the fmaxl library function.
-define void @f21(ptr %ptr1, ptr %ptr2, ptr %dst) {
+define void @f21(ptr %ptr1, ptr %ptr2, ptr %dst) nounwind {
 ; CHECK-LABEL: f21:
 ; CHECK:       # %bb.0:
+; CHECK-NEXT:    stmg %r13, %r15, 104(%r15)
+; CHECK-NEXT:    aghi %r15, -208
 ; CHECK-NEXT:    vl %v0, 0(%r2), 3
 ; CHECK-NEXT:    vl %v1, 0(%r3), 3
-; CHECK-NEXT:    wfmaxxb %v0, %v0, %v1, 4
-; CHECK-NEXT:    vst %v0, 0(%r4), 3
+; CHECK-NEXT:    lgr %r13, %r4
+; CHECK-NEXT:    la %r2, 192(%r15)
+; CHECK-NEXT:    la %r3, 176(%r15)
+; CHECK-NEXT:    la %r4, 160(%r15)
+; CHECK-NEXT:    vst %v1, 160(%r15), 3
+; CHECK-NEXT:    vst %v0, 176(%r15), 3
+; CHECK-NEXT:    brasl %r14, fmaxl@PLT
+; CHECK-NEXT:    vl %v0, 192(%r15), 3
+; CHECK-NEXT:    vst %v0, 0(%r13), 3
+; CHECK-NEXT:    lmg %r13, %r15, 312(%r15)
 ; CHECK-NEXT:    br %r14
   %val1 = load fp128, ptr %ptr1
   %val2 = load fp128, ptr %ptr2
diff --git a/llvm/test/CodeGen/SystemZ/vec-min-05.ll b/llvm/test/CodeGen/SystemZ/vec-min-05.ll
@@ -22,10 +22,15 @@ declare fp128 @llvm.minnum.f128(fp128, fp128)
 declare fp128 @llvm.minimum.f128(fp128, fp128)
 
 ; Test the fmin library function.
-define double @f1(double %dummy, double %val1, double %val2) {
+define double @f1(double %dummy, double %val1, double %val2) nounwind {
 ; CHECK-LABEL: f1:
 ; CHECK:       # %bb.0:
-; CHECK-NEXT:    wfmindb %f0, %f2, %f4, 4
+; CHECK-NEXT:    stmg %r14, %r15, 112(%r15)
+; CHECK-NEXT:    aghi %r15, -160
+; CHECK-NEXT:    ldr %f0, %f2
+; CHECK-NEXT:    ldr %f2, %f4
+; CHECK-NEXT:    brasl %r14, fmin@PLT
+; CHECK-NEXT:    lmg %r14, %r15, 272(%r15)
 ; CHECK-NEXT:    br %r14
   %ret = call double @fmin(double %val1, double %val2) readnone
   ret double %ret
@@ -99,10 +104,15 @@ define <2 x double> @f7(<2 x double> %dummy, <2 x double> %val1, <2 x double> %v
 }
 
 ; Test the fminf library function.
-define float @f11(float %dummy, float %val1, float %val2) {
+define float @f11(float %dummy, float %val1, float %val2) nounwind {
 ; CHECK-LABEL: f11:
 ; CHECK:       # %bb.0:
-; CHECK-NEXT:    wfminsb %f0, %f2, %f4, 4
+; CHECK-NEXT:    stmg %r14, %r15, 112(%r15)
+; CHECK-NEXT:    aghi %r15, -160
+; CHECK-NEXT:    ldr %f0, %f2
+; CHECK-NEXT:    ldr %f2, %f4
+; CHECK-NEXT:    brasl %r14, fminf@PLT
+; CHECK-NEXT:    lmg %r14, %r15, 272(%r15)
 ; CHECK-NEXT:    br %r14
   %ret = call float @fminf(float %val1, float %val2) readnone
   ret float %ret
@@ -207,13 +217,23 @@ define <4 x float> @f17(<4 x float> %dummy, <4 x float> %val1,
 }
 
 ; Test the fminl library function.
-define void @f21(ptr %ptr1, ptr %ptr2, ptr %dst) {
+define void @f21(ptr %ptr1, ptr %ptr2, ptr %dst) nounwind {
 ; CHECK-LABEL: f21:
 ; CHECK:       # %bb.0:
+; CHECK-NEXT:    stmg %r13, %r15, 104(%r15)
+; CHECK-NEXT:    aghi %r15, -208
 ; CHECK-NEXT:    vl %v0, 0(%r2), 3
 ; CHECK-NEXT:    vl %v1, 0(%r3), 3
-; CHECK-NEXT:    wfminxb %v0, %v0, %v1, 4
-; CHECK-NEXT:    vst %v0, 0(%r4), 3
+; CHECK-NEXT:    lgr %r13, %r4
+; CHECK-NEXT:    la %r2, 192(%r15)
+; CHECK-NEXT:    la %r3, 176(%r15)
+; CHECK-NEXT:    la %r4, 160(%r15)
+; CHECK-NEXT:    vst %v1, 160(%r15), 3
+; CHECK-NEXT:    vst %v0, 176(%r15), 3
+; CHECK-NEXT:    brasl %r14, fminl@PLT
+; CHECK-NEXT:    vl %v0, 192(%r15), 3
+; CHECK-NEXT:    vst %v0, 0(%r13), 3
+; CHECK-NEXT:    lmg %r13, %r15, 312(%r15)
 ; CHECK-NEXT:    br %r14
   %val1 = load fp128, ptr %ptr1
   %val2 = load fp128, ptr %ptr2
diff --git a/llvm/test/CodeGen/X86/fmaxnum.ll b/llvm/test/CodeGen/X86/fmaxnum.ll
diff --git a/llvm/test/CodeGen/X86/fminnum.ll b/llvm/test/CodeGen/X86/fminnum.ll
