diff --git a/bench/duckdb/optimized/ub_duckdb_storage_compression.ll b/bench/duckdb/optimized/ub_duckdb_storage_compression.ll index 4940b57f9db..98d3d9f280e 100644 --- a/bench/duckdb/optimized/ub_duckdb_storage_compression.ll +++ b/bench/duckdb/optimized/ub_duckdb_storage_compression.ll @@ -30359,13 +30359,9 @@ _ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.i.preheader: ; pr %.not49.i12 = icmp eq i64 %11, 1 br i1 %.not49.i12, label %.preheader.i.preheader, label %.lr.ph -_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.preheader.i: ; preds = %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.lr.ph.i - %umax.i = call i64 @llvm.umax.i64(i64 %11, i64 1) - br label %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.i - -_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.i: ; preds = %.loopexit.us.i, %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.preheader.i - %.01544.us.i = phi i64 [ %.3.us.i, %.loopexit.us.i ], [ 0, %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.preheader.i ] - %.03043.us.i = phi i64 [ %14, %.loopexit.us.i ], [ 0, %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.preheader.i ] +_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.preheader.i: ; preds = %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.lr.ph.i, %.loopexit.us.i + %.01544.us.i = phi i64 [ %.3.us.i, %.loopexit.us.i ], [ 0, %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.lr.ph.i ] + %.03043.us.i = phi i64 [ %14, %.loopexit.us.i ], [ 0, %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.lr.ph.i ] %14 = add nuw nsw i64 %.03043.us.i, 1 %15 = getelementptr inbounds nuw i64, ptr %7, i64 %.03043.us.i %16 = load i64, ptr %15, align 8, !tbaa !19 @@ -30389,7 +30385,7 @@ _ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.i: ; preds = % .loopexit.us.i: ; preds = %.lr.ph.us.i, %20, %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.i %.3.us.i = phi i64 [ %21, %20 ], [ %.01544.us.i, %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.i ], [ %19, %.lr.ph.us.i ] - %exitcond57.not.i = icmp eq i64 %14, %umax.i + %exitcond57.not.i = icmp eq i64 %14, %11 br i1 %exitcond57.not.i, label %_ZNK6duckdb21TemplatedValidityMaskImE10CountValidEm.exit, label %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.us.i .preheader.i.preheader: ; preds = %.loopexit.i, %_ZNK6duckdb21TemplatedValidityMaskImE16GetValidityEntryEm.exit.i.preheader diff --git a/bench/php/optimized/ir_cfg.ll b/bench/php/optimized/ir_cfg.ll index 7798aebf17b..2c7903893e3 100644 --- a/bench/php/optimized/ir_cfg.ll +++ b/bench/php/optimized/ir_cfg.ll @@ -2131,9 +2131,9 @@ define internal fastcc void @ir_build_dominators_tree_iterative(ptr noundef read 61: ; preds = %60, %._crit_edge %.1 = phi i1 [ true, %60 ], [ %.080138, %._crit_edge ] - %62 = add nuw i32 %.182137, 1 + %62 = add i32 %.182137, 1 %63 = getelementptr inbounds nuw i8, ptr %.195136, i64 52 - %.not101.not = icmp ult i32 %.182137, %7 + %.not101.not = icmp ule i32 %62, %7 %brmerge = select i1 %.not101.not, i1 true, i1 %.1 %.1.mux = select i1 %.not101.not, i1 %.1, i1 false %.mux = select i1 %.not101.not, i32 %62, i32 2 diff --git a/bench/quantlib/optimized/simplex.ll b/bench/quantlib/optimized/simplex.ll index d85f3343ff1..bc9824c8d0d 100644 --- a/bench/quantlib/optimized/simplex.ll +++ b/bench/quantlib/optimized/simplex.ll @@ -1484,6 +1484,7 @@ do.body88.preheader: ; preds = %invoke.cont79 %n_.i.i170 = getelementptr inbounds nuw i8, ptr %this, i64 64 %n_.i11.i = getelementptr inbounds nuw i8, ptr %center.i, i64 8 %n_3.i.i.i = getelementptr inbounds nuw i8, ptr %ref.tmp218, i64 8 + %umax = call i64 @llvm.umax.i64(i64 %add, i64 2) br label %do.body88 lpad67: ; preds = %for.body.i.i.i.preheader.i @@ -1607,7 +1608,7 @@ if.end139: ; preds = %if.else128, %for.bo %cmp146 = fcmp olt double %64, %67 %iLowest.1 = select i1 %cmp146, i64 %i94.1326, i64 %iLowest.0327 %inc150 = add nuw i64 %i94.1326, 1 - %exitcond347 = icmp eq i64 %i94.1326, %28 + %exitcond347 = icmp eq i64 %inc150, %umax br i1 %exitcond347, label %for.end151, label %for.body119, !llvm.loop !65 for.end151: ; preds = %if.end139, %for.end106 @@ -1725,7 +1726,7 @@ invoke.cont27.i: ; preds = %for.body23.i to label %invoke.cont29.i unwind label %lpad28.i invoke.cont29.i: ; preds = %invoke.cont27.i - %call1.i.i = call noundef double @sqrt(double noundef %call.i2223.i) #21, !tbaa !67 + %call1.i.i = call noundef double @sqrt(double noundef %call.i2223.i) #22, !tbaa !67 %add.i = fadd double %result.044.i, %call1.i.i %84 = load ptr, ptr %temp.i, align 8, !tbaa !20 %cmp.not.i.i24.i = icmp eq ptr %84, null @@ -3090,6 +3091,9 @@ declare void @llvm.memset.p0.i64(ptr writeonly captures(none), i8, i64, i1 immar ; Function Attrs: nocallback nofree nosync nounwind willreturn memory(inaccessiblemem: readwrite) declare void @llvm.experimental.noalias.scope.decl(metadata) #18 +; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none) +declare i64 @llvm.umax.i64(i64, i64) #19 + attributes #0 = { mustprogress uwtable "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cmov,+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" } attributes #1 = { inlinehint mustprogress uwtable "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cmov,+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" } attributes #2 = { mustprogress nocallback nofree nosync nounwind speculatable willreturn memory(none) } @@ -3109,11 +3113,12 @@ attributes #15 = { mustprogress nocallback nofree nounwind willreturn memory(arg attributes #16 = { mustprogress nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) } attributes #17 = { nocallback nofree nounwind willreturn memory(argmem: write) } attributes #18 = { nocallback nofree nosync nounwind willreturn memory(inaccessiblemem: readwrite) } -attributes #19 = { builtin allocsize(0) } -attributes #20 = { builtin nounwind } -attributes #21 = { nounwind } -attributes #22 = { noreturn } -attributes #23 = { noreturn nounwind } +attributes #19 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) } +attributes #20 = { builtin allocsize(0) } +attributes #21 = { builtin nounwind } +attributes #22 = { nounwind } +attributes #23 = { noreturn } +attributes #24 = { noreturn nounwind } !llvm.module.flags = !{!0, !1, !2} diff --git a/bench/z3/optimized/sls_seq_plugin.ll b/bench/z3/optimized/sls_seq_plugin.ll index b4a489616c5..8745c1b52fd 100644 --- a/bench/z3/optimized/sls_seq_plugin.ll +++ b/bench/z3/optimized/sls_seq_plugin.ll @@ -17779,6 +17779,7 @@ _ZN6vectorIjLb0EjE6resizeIiEEvjT_z.exit: ; preds = %.lr.ph.preheader.i, %umax85 = tail call i32 @llvm.umax.i32(i32 %20, i32 2) %wide.trip.count86 = zext i32 %umax85 to i64 %.pre = load ptr, ptr %6, align 8 + %wide.trip.count82 = zext i32 %11 to i64 br label %.preheader 95: ; preds = %.preheader61, %95 @@ -17893,7 +17894,7 @@ _ZN6vectorI7svectorIjjELb1EjED2Ev.exit: ; preds = %_ZN6vectorI7svector %147 = getelementptr inbounds nuw i32, ptr %.sink107, i64 %indvars.iv82 store i32 %.sink, ptr %147, align 4, !tbaa !130 %indvars.iv.next78 = add nuw nsw i64 %indvars.iv77, 1 - %exitcond81 = icmp eq i64 %indvars.iv.next78, %wide.trip.count + %exitcond81 = icmp eq i64 %indvars.iv.next78, %wide.trip.count82 br i1 %exitcond81, label %._crit_edge, label %121, !llvm.loop !241 .body: ; preds = %86, %72, %_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED2Ev.exit.thread.i @@ -22508,7 +22509,7 @@ _ZN6vectorI7svectorIjjELb1EjED2Ev.exit189: ; preds = %_ZN6vectorI7svector br i1 %.not152, label %_ZNK6vectorI7svectorIjjELb1EjE4sizeEv.exit.i.i.i, label %.preheader, !llvm.loop !277 229: ; preds = %.preheader, %.thread551 - %.0375 = phi i32 [ 1, %.preheader ], [ %751, %.thread551 ] + %.0375 = phi i32 [ 1, %.preheader ], [ %751, %.thread552 ] %230 = add i32 %.0375, -1 %231 = load ptr, ptr %1, align 8, !tbaa !136 %232 = zext i32 %230 to i64 diff --git a/scripts/setup_pre_commit_patch.sh b/scripts/setup_pre_commit_patch.sh index c8d0fce0bf7..c39a504d91c 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/163021 export COMPTIME_MODE=0 export STAT_MODE=0 export STAT_NAME=""