diff --git a/bench/darktable/optimized/blend_gui.ll b/bench/darktable/optimized/blend_gui.ll index e948fb29888..4357167f760 100644 --- a/bench/darktable/optimized/blend_gui.ll +++ b/bench/darktable/optimized/blend_gui.ll @@ -6397,7 +6397,7 @@ define internal float @log10_scale_callback(ptr readnone captures(none) %0, floa %18 = fmul reassoc nsz arcp contract afn double %17, 0x40026BB1BBB55516 %19 = tail call reassoc nsz arcp contract afn double @llvm.exp.f64(double %18) %.inv = fcmp reassoc nsz arcp contract afn oge double %19, 1.000000e+00 - %20 = select reassoc nsz arcp contract afn i1 %.inv, double 1.000000e+00, double %19 + %20 = select i1 %.inv, double 1.000000e+00, double %19 %21 = fptrunc double %20 to float %22 = fcmp reassoc nsz arcp contract afn ugt float %21, 0x3F1A36E2E0000000 %.1 = select nsz i1 %22, float %21, float 0.000000e+00 diff --git a/bench/ffmpeg/optimized/af_adeclick.ll b/bench/ffmpeg/optimized/af_adeclick.ll index 6fa8b31b618..d0c191a3c2b 100644 --- a/bench/ffmpeg/optimized/af_adeclick.ll +++ b/bench/ffmpeg/optimized/af_adeclick.ll @@ -546,7 +546,7 @@ define internal range(i32 -2147483648, 1) i32 @config_input(ptr noundef %0) #2 { %19 = fmul nsz double %18, %16 %20 = fdiv nsz double %19, 1.000000e+03 %.inv = fcmp nsz ole double %20, 1.000000e+02 - %21 = select nsz i1 %.inv, double 1.000000e+02, double %20 + %21 = select i1 %.inv, double 1.000000e+02, double %20 %22 = fptosi double %21 to i32 %23 = getelementptr inbounds nuw i8, ptr %12, i64 68 store i32 %22, ptr %23, align 4, !tbaa !49 @@ -573,7 +573,7 @@ define internal range(i32 -2147483648, 1) i32 @config_input(ptr noundef %0) #2 { %42 = fsub nsz double 1.000000e+00, %41 %43 = fmul nsz double %42, %24 %.inv197 = fcmp nsz ole double %43, 1.000000e+00 - %44 = select nsz i1 %.inv197, double 1.000000e+00, double %43 + %44 = select i1 %.inv197, double 1.000000e+00, double %43 %45 = fptosi double %44 to i32 %46 = getelementptr inbounds nuw i8, ptr %12, i64 72 store i32 %45, ptr %46, align 8, !tbaa !74 diff --git a/bench/ffmpeg/optimized/agm.ll b/bench/ffmpeg/optimized/agm.ll index a265ac50247..98ef5b594cd 100644 --- a/bench/ffmpeg/optimized/agm.ll +++ b/bench/ffmpeg/optimized/agm.ll @@ -2644,7 +2644,7 @@ define internal fastcc void @compute_quant_matrix(ptr noundef captures(none) %0, %40 = uitofp i8 %39 to double %41 = fmul nsz double %6, %40 %.inv = fcmp nsz ole double %41, 1.000000e+00 - %42 = select nsz i1 %.inv, double 1.000000e+00, double %41 + %42 = select i1 %.inv, double 1.000000e+00, double %41 %43 = fptosi double %42 to i32 %44 = getelementptr inbounds nuw [64 x i32], ptr %3, i64 0, i64 %indvars.iv96 store i32 %43, ptr %44, align 4, !tbaa !72 @@ -2653,7 +2653,7 @@ define internal fastcc void @compute_quant_matrix(ptr noundef captures(none) %0, %47 = uitofp i8 %46 to double %48 = fmul nsz double %6, %47 %.inv74 = fcmp nsz ole double %48, 1.000000e+00 - %49 = select nsz i1 %.inv74, double 1.000000e+00, double %48 + %49 = select i1 %.inv74, double 1.000000e+00, double %48 %50 = fptosi double %49 to i32 %51 = getelementptr inbounds nuw [64 x i32], ptr %4, i64 0, i64 %indvars.iv96 store i32 %50, ptr %51, align 4, !tbaa !72 @@ -2677,7 +2677,7 @@ define internal fastcc void @compute_quant_matrix(ptr noundef captures(none) %0, %62 = fneg nsz double %61 %63 = tail call nsz double @llvm.fmuladd.f64(double %62, double %6, double 2.550000e+02) %.inv75 = fcmp nsz ole double %63, 1.000000e+00 - %64 = select nsz i1 %.inv75, double 1.000000e+00, double %63 + %64 = select i1 %.inv75, double 1.000000e+00, double %63 %65 = fptosi double %64 to i32 %66 = getelementptr inbounds nuw [64 x i32], ptr %3, i64 0, i64 %indvars.iv100 store i32 %65, ptr %66, align 4, !tbaa !72 @@ -2688,7 +2688,7 @@ define internal fastcc void @compute_quant_matrix(ptr noundef captures(none) %0, %71 = fneg nsz double %70 %72 = tail call nsz double @llvm.fmuladd.f64(double %71, double %6, double 2.550000e+02) %.inv76 = fcmp nsz ole double %72, 1.000000e+00 - %73 = select nsz i1 %.inv76, double 1.000000e+00, double %72 + %73 = select i1 %.inv76, double 1.000000e+00, double %72 %74 = fptosi double %73 to i32 %75 = getelementptr inbounds nuw [64 x i32], ptr %4, i64 0, i64 %indvars.iv100 store i32 %74, ptr %75, align 4, !tbaa !72 diff --git a/bench/flac/optimized/lpc.ll b/bench/flac/optimized/lpc.ll index 4b4323e3142..45184da0b36 100644 --- a/bench/flac/optimized/lpc.ll +++ b/bench/flac/optimized/lpc.ll @@ -7040,7 +7040,7 @@ define hidden double @FLAC__lpc_compute_expected_bits_per_residual_sample(double %8 = tail call reassoc nsz arcp double @log(double noundef %7) #13, !tbaa !3 %9 = fmul reassoc nsz arcp double %8, 0x3FE71547652B82FE %.inv.i = fcmp reassoc nsz arcp oge double %9, 0.000000e+00 - %..i = select reassoc nsz arcp i1 %.inv.i, double %9, double 0.000000e+00 + %..i = select nsz i1 %.inv.i, double %9, double 0.000000e+00 br label %FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale.exit 10: ; preds = %2 @@ -7063,7 +7063,7 @@ define hidden double @FLAC__lpc_compute_expected_bits_per_residual_sample_with_e %6 = tail call reassoc nsz arcp double @log(double noundef %5) #13, !tbaa !3 %7 = fmul reassoc nsz arcp double %6, 0x3FE71547652B82FE %.inv = fcmp reassoc nsz arcp oge double %7, 0.000000e+00 - %. = select reassoc nsz arcp i1 %.inv, double %7, double 0.000000e+00 + %. = select nsz i1 %.inv, double %7, double 0.000000e+00 br label %10 8: ; preds = %2 @@ -7106,7 +7106,7 @@ define hidden i32 @FLAC__lpc_compute_best_order(ptr noundef readonly captures(no %14 = tail call reassoc nsz arcp double @log(double noundef %13) #13, !tbaa !3 %15 = fmul reassoc nsz arcp double %14, 0x3FE71547652B82FE %.inv.i = fcmp reassoc nsz arcp oge double %15, 0.000000e+00 - %..i = select reassoc nsz arcp i1 %.inv.i, double %15, double 0.000000e+00 + %..i = select nsz i1 %.inv.i, double %15, double 0.000000e+00 br label %FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale.exit 16: ; preds = %7 diff --git a/bench/ncnn/optimized/roialign.ll b/bench/ncnn/optimized/roialign.ll index cbbeb0faa42..2913782fe31 100644 --- a/bench/ncnn/optimized/roialign.ll +++ b/bench/ncnn/optimized/roialign.ll @@ -602,8 +602,8 @@ define internal void @_ZNK4ncnn8ROIAlign7forwardERKSt6vectorINS_3MatESaIS2_EERS4 br label %.noexc.us.us .noexc.us.us: ; preds = %.noexc.us.us.preheader, %._crit_edge120.split.us.us.us - %indvars.iv153 = phi i64 [ %47, %.noexc.us.us.preheader ], [ %indvars.iv.next154, %._crit_edge120.split.us.us.us ] - %indvar = phi i64 [ 0, %.noexc.us.us.preheader ], [ %indvar.next, %._crit_edge120.split.us.us.us ] + %indvars.iv153 = phi i64 [ %47, %.noexc.us.us.preheader ], [ %indvars.iv.next154, %._crit_edge121.split.us.us.us ] + %indvar = phi i64 [ 0, %.noexc.us.us.preheader ], [ %indvar.next, %._crit_edge121.split.us.us.us ] %.reass.us.us = mul i64 %factor.op.mul, %indvars.iv153 %53 = getelementptr inbounds nuw i8, ptr %28, i64 %.reass.us.us %54 = load i32, ptr %6, align 4 @@ -632,8 +632,8 @@ define internal void @_ZNK4ncnn8ROIAlign7forwardERKSt6vectorINS_3MatESaIS2_EERS4 br i1 %exitcond156.not, label %._crit_edge, label %.noexc.us.us .preheader99.us.us.us.us: ; preds = %.preheader99.us.us.us.us.preheader, %._crit_edge.split.us.us.us.us.us - %.061119.us.us.us.us = phi i32 [ %67, %._crit_edge.split.us.us.us.us.us ], [ 0, %.preheader99.us.us.us.us.preheader ] - %.062116.us.us.us.us = phi ptr [ %66, %._crit_edge.split.us.us.us.us.us ], [ %59, %.preheader99.us.us.us.us.preheader ] + %.061119.us.us.us.us = phi i32 [ %67, %._crit_edge.split.us.us.us.us.us ], [ 0, %.preheader100.us.us.us.us.preheader ] + %.062116.us.us.us.us = phi ptr [ %66, %._crit_edge.split.us.us.us.us.us ], [ %59, %.preheader100.us.us.us.us.preheader ] %61 = uitofp nneg i32 %.061119.us.us.us.us to float %62 = load i32, ptr %9, align 4 %63 = icmp sgt i32 %62, 0 @@ -655,7 +655,7 @@ define internal void @_ZNK4ncnn8ROIAlign7forwardERKSt6vectorINS_3MatESaIS2_EERS4 br i1 %exitcond152.not, label %._crit_edge120.split.us.us.us, label %.preheader99.us.us.us.us, !llvm.loop !69 .preheader.us.us.us.us.us.us: ; preds = %.preheader.us.us.us.us.us.us.preheader, %._crit_edge106.split.us.us.us.us.us.us.us - %indvars.iv = phi i64 [ 0, %.preheader.us.us.us.us.us.us.preheader ], [ %indvars.iv.next, %._crit_edge106.split.us.us.us.us.us.us.us ] + %indvars.iv = phi i64 [ 0, %.preheader.us.us.us.us.us.us.preheader ], [ %indvars.iv.next, %._crit_edge107.split.us.us.us.us.us.us.us ] %68 = load float, ptr %7, align 4, !tbaa !44 %69 = load float, ptr %8, align 4, !tbaa !44 %70 = fmul fast float %69, %61 @@ -705,8 +705,10 @@ define internal void @_ZNK4ncnn8ROIAlign7forwardERKSt6vectorINS_3MatESaIS2_EERS4 br i1 %or.cond, label %141, label %100 100: ; preds = %96 - %.2.us.us.us.us.us.us.us = call fast float @llvm.maxnum.f32(float %.055101.us.us.us.us.us.us.us, float 0.000000e+00) - %.053.us.us.us.us.us.us.us = call fast float @llvm.maxnum.f32(float %94, float 0.000000e+00) + %.inv.us.us.us.us.us.us.us = fcmp fast ole float %.055101.us.us.us.us.us.us.us, 0.000000e+00 + %.2.us.us.us.us.us.us.us = select nsz i1 %.inv.us.us.us.us.us.us.us, float 0.000000e+00, float %.055102.us.us.us.us.us.us.us + %.inv99.us.us.us.us.us.us.us = fcmp fast ole float %94, 0.000000e+00 + %.053.us.us.us.us.us.us.us = select nsz i1 %.inv99.us.us.us.us.us.us.us, float 0.000000e+00, float %94 %101 = fptosi float %.053.us.us.us.us.us.us.us to i32 %102 = add nsw i32 %101, 1 %103 = fptosi float %.2.us.us.us.us.us.us.us to i32 @@ -799,9 +801,6 @@ declare void @_ZdlPvm(ptr noundef, i64 noundef) local_unnamed_addr #8 ; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none) declare i32 @llvm.smin.i32(i32, i32) #9 -; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none) -declare float @llvm.maxnum.f32(float, float) #9 - ; Function Attrs: nocallback nofree nounwind willreturn memory(argmem: write) declare void @llvm.memset.p0.i64(ptr writeonly captures(none), i8, i64, i1 immarg) #10 diff --git a/bench/ncnn/optimized/roialign_x86.ll b/bench/ncnn/optimized/roialign_x86.ll index 998a153becb..d93f021deef 100644 --- a/bench/ncnn/optimized/roialign_x86.ll +++ b/bench/ncnn/optimized/roialign_x86.ll @@ -880,16 +880,16 @@ define linkonce_odr hidden void @_ZN4ncnn44detectron2_pre_calc_for_bilinear_inte br label %.preheader110.us.us.us .preheader110.us.us.us: ; preds = %.preheader110.us.us.us.preheader, %._crit_edge.split.us.split.us.us.us.us - %.0141.us.us.us = phi i32 [ %.us-phi.us.us.us.us.us.us, %._crit_edge.split.us.split.us.us.us.us ], [ 0, %.preheader110.us.us.us.preheader ] - %.087140.us.us.us = phi i32 [ %83, %._crit_edge.split.us.split.us.us.us.us ], [ 0, %.preheader110.us.us.us.preheader ] + %.0141.us.us.us = phi i32 [ %.us-phi.us.us.us.us.us.us, %._crit_edge.split.us.split.us.us.us.us ], [ 0, %.preheader111.us.us.us.preheader ] + %.087140.us.us.us = phi i32 [ %83, %._crit_edge.split.us.split.us.us.us.us ], [ 0, %.preheader111.us.us.us.preheader ] %30 = uitofp nneg i32 %.087140.us.us.us to float %31 = fmul fast float %8, %30 %32 = fadd fast float %31, %6 br label %.preheader.us.us.us.us.us .preheader.us.us.us.us.us: ; preds = %._crit_edge116.split.us.us.us.us.us.us, %.preheader110.us.us.us - %.1134.us.us.us.us.us = phi i32 [ %.0141.us.us.us, %.preheader110.us.us.us ], [ %.us-phi.us.us.us.us.us.us, %._crit_edge116.split.us.us.us.us.us.us ] - %.088133.us.us.us.us.us = phi i32 [ 0, %.preheader110.us.us.us ], [ %82, %._crit_edge116.split.us.us.us.us.us.us ] + %.1134.us.us.us.us.us = phi i32 [ %.0141.us.us.us, %.preheader111.us.us.us ], [ %.us-phi.us.us.us.us.us.us, %._crit_edge117.split.us.us.us.us.us.us ] + %.088133.us.us.us.us.us = phi i32 [ 0, %.preheader111.us.us.us ], [ %82, %._crit_edge117.split.us.us.us.us.us.us ] %33 = uitofp nneg i32 %.088133.us.us.us.us.us to float %34 = fmul fast float %9, %33 %35 = fadd fast float %34, %7 @@ -906,7 +906,8 @@ define linkonce_odr hidden void @_ZN4ncnn44detectron2_pre_calc_for_bilinear_inte %41 = fcmp fast olt float %40, -1.000000e+00 %42 = fcmp fast ogt float %40, %17 %or.cond.us.us.us.us.us.us = select i1 %41, i1 true, i1 %42 - %.093.us.us.us.us.us.us = tail call fast float @llvm.maxnum.f32(float %40, float 0.000000e+00) + %.inv.us.us.us.us.us.us = fcmp fast ole float %40, 0.000000e+00 + %.093.us.us.us.us.us.us = select nsz i1 %.inv.us.us.us.us.us.us, float 0.000000e+00, float %40 %43 = fptosi float %.093.us.us.us.us.us.us to i32 %.not.us.us.us.us.us.us = icmp sgt i32 %19, %43 %44 = add nsw i32 %43, 1 @@ -944,7 +945,8 @@ define linkonce_odr hidden void @_ZN4ncnn44detectron2_pre_calc_for_bilinear_inte br i1 %or.cond109.us.us.us.us.us.us, label %76, label %61 61: ; preds = %.lr.ph.split.us130.us.us.us.us.us - %.091.us.us.us.us.us.us = tail call fast float @llvm.maxnum.f32(float %58, float 0.000000e+00) + %.inv110.us.us.us.us.us.us = fcmp fast ole float %58, 0.000000e+00 + %.091.us.us.us.us.us.us = select nsz i1 %.inv110.us.us.us.us.us.us, float 0.000000e+00, float %58 %62 = fptosi float %.091.us.us.us.us.us.us to i32 %.not105.us.us.us.us.us.us = icmp sgt i32 %21, %62 %63 = add nsw i32 %62, 1 @@ -996,7 +998,7 @@ define linkonce_odr hidden void @_ZN4ncnn44detectron2_pre_calc_for_bilinear_inte br label %._crit_edge.us.us.us.us.us.us ._crit_edge.us.us.us.us.us.us: ; preds = %._crit_edge.us.us.us.us.us.us.loopexit151, %.lr.ph.split.us.us.us.us.us.us.us.preheader - %.us-phi.us.us.us.us.us.us = phi i32 [ %53, %.lr.ph.split.us.us.us.us.us.us.us.preheader ], [ %80, %._crit_edge.us.us.us.us.us.us.loopexit151 ] + %.us-phi.us.us.us.us.us.us = phi i32 [ %53, %.lr.ph.split.us.us.us.us.us.us.us.preheader ], [ %80, %._crit_edge.us.us.us.us.us.us.loopexit152 ] %81 = add nuw nsw i32 %.089113.us.us.us.us.us.us, 1 %exitcond160.not = icmp eq i32 %81, %4 br i1 %exitcond160.not, label %._crit_edge116.split.us.us.us.us.us.us, label %.lr.ph.us.us.us.us.us.us, !llvm.loop !85 @@ -1238,9 +1240,6 @@ declare void @_ZdlPvm(ptr noundef, i64 noundef) local_unnamed_addr #13 ; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none) declare i32 @llvm.smin.i32(i32, i32) #14 -; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none) -declare float @llvm.maxnum.f32(float, float) #14 - ; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none) declare i32 @llvm.smax.i32(i32, i32) #14 diff --git a/scripts/setup_pre_commit_patch.sh b/scripts/setup_pre_commit_patch.sh index c5409e09ef4..dbb951a4b42 100755 --- a/scripts/setup_pre_commit_patch.sh +++ b/scripts/setup_pre_commit_patch.sh @@ -2,7 +2,7 @@ set -euo pipefail shopt -s inherit_errexit -export GITHUB_PATCH_ID="/llvm-project/commit/" +export GITHUB_PATCH_ID=llvm/llvm-project/pull/141010 export COMPTIME_MODE=0 # Please rebase manually