Include arguments to the precondition check in failure messages

[saethlin]

View all comments

Trying to format the types we want using the built-in Display/Debug impls creates a lot of calls from compiler-builtins to core.

My solution for that is to provide a different Display impl though a wrapper type. It is easy to make the entire implementation to get monomorphized in compiler-builtins, which is some serious hoop-jumping because #122580 patches our call to panic_nounwind_fmt during codegen to just llvm.trap. So we're actually just making sure that dead code can't cause a linker error.

[saethlin]

@bors try @rust-timer queue

[bors]

⌛ Trying commit 65e5e12 with merge 3e5570d...

[bors]

☀️ Try build successful - checks-actions
Build commit: 3e5570d (3e5570d97bbdc7ad24c94a33f53de28891b51c2f)

[rust-timer]

Finished benchmarking commit (3e5570d): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	0.6%	[0.2%, 1.2%]	13
Regressions ❌ (secondary)	0.7%	[0.3%, 1.2%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.4%, -0.2%]	2
All ❌✅ (primary)	0.6%	[0.2%, 1.2%]	13

Max RSS (memory usage)

Results (primary 0.2%, secondary 2.2%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	3.3%	[1.0%, 6.9%]	5
Regressions ❌ (secondary)	2.2%	[0.7%, 3.7%]	3
Improvements ✅ (primary)	-3.7%	[-6.8%, -1.8%]	4
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[-6.8%, 6.9%]	9

Cycles

Results (primary 1.5%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.5%	[1.5%, 1.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.5%	[1.5%, 1.5%]	1

Binary size

Results (primary 0.4%, secondary 1.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.5%	[0.1%, 4.2%]	67
Regressions ❌ (secondary)	1.5%	[0.3%, 7.0%]	7
Improvements ✅ (primary)	-0.3%	[-0.4%, -0.0%]	9
Improvements ✅ (secondary)	-0.2%	[-0.2%, -0.2%]	3
All ❌✅ (primary)	0.4%	[-0.4%, 4.2%]	76

Bootstrap: 759.925s -> 762.008s (0.27%)
Artifact size: 325.47 MiB -> 325.53 MiB (0.02%)

[saethlin]

The most-regressed benchmark jumped from 2 CGUs to 4 CGUs. I wonder if that means that the overhead here is coming from having both macros in the codebase.

[saethlin]

@bors try @rust-timer queue

[bors]

⌛ Trying commit 4dc2e6c with merge ab6d099...

[bors]

☀️ Try build successful - checks-actions
Build commit: ab6d099 (ab6d099e757160119c73b5a102cc1bc7a5dae9ca)

[rust-timer]

Finished benchmarking commit (ab6d099): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	0.7%	[0.2%, 2.2%]	26
Regressions ❌ (secondary)	3.1%	[0.1%, 12.0%]	40
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.4%	[-1.5%, -0.2%]	10
All ❌✅ (primary)	0.7%	[0.2%, 2.2%]	26

Max RSS (memory usage)

Results (primary -2.2%, secondary 2.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	2.8%	[2.0%, 3.2%]	3
Regressions ❌ (secondary)	3.0%	[1.2%, 5.0%]	21
Improvements ✅ (primary)	-4.1%	[-8.1%, -1.0%]	8
Improvements ✅ (secondary)	-1.8%	[-2.4%, -1.3%]	2
All ❌✅ (primary)	-2.2%	[-8.1%, 3.2%]	11

Cycles

Results (primary 1.8%, secondary 4.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.8%	[1.2%, 2.4%]	3
Regressions ❌ (secondary)	4.7%	[2.4%, 12.1%]	21
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.6%	[-1.6%, -1.6%]	1
All ❌✅ (primary)	1.8%	[1.2%, 2.4%]	3

Binary size

Results (primary 1.0%, secondary 1.8%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.1%	[0.0%, 7.1%]	69
Regressions ❌ (secondary)	1.9%	[0.0%, 4.7%]	32
Improvements ✅ (primary)	-0.3%	[-0.6%, -0.2%]	7
Improvements ✅ (secondary)	-0.1%	[-0.1%, -0.1%]	3
All ❌✅ (primary)	1.0%	[-0.6%, 7.1%]	76

Bootstrap: 761.022s -> 762.055s (0.14%)
Artifact size: 325.49 MiB -> 325.53 MiB (0.01%)

[bors]

☔ The latest upstream changes (presumably #137231) made this pull request unmergeable. Please resolve the merge conflicts.

[saethlin]

@bors try @rust-timer queue

[rust-bors]

☀️ Try build successful (CI)
Build commit: c7fe794 (c7fe7941f204ae9bbe7557707916ff3505bc34a7, parent: 2300c2aef7dbc2a7bbbeaa9894d07d459abd9bc6)

[rust-timer]

Finished benchmarking commit (c7fe794): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please do so in sufficient writing along with @rustbot label: +perf-regression-triaged. If not, please fix the regressions and do another perf run. If its results are neutral or positive, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	0.7%	[0.2%, 3.4%]	35
Regressions ❌ (secondary)	1.6%	[0.1%, 8.8%]	46
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-0.4%	[-2.4%, -0.0%]	15
All ❌✅ (primary)	0.7%	[-0.5%, 3.4%]	36

Max RSS (memory usage)

Results (primary 0.8%, secondary 4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	2.5%	[0.5%, 7.3%]	8
Regressions ❌ (secondary)	4.3%	[0.9%, 7.0%]	19
Improvements ✅ (primary)	-5.9%	[-9.2%, -2.5%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.8%	[-9.2%, 7.3%]	10

Cycles

Results (primary 3.0%, secondary 2.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	3.0%	[2.2%, 4.7%]	4
Regressions ❌ (secondary)	3.8%	[1.6%, 9.2%]	22
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.2%	[-4.2%, -2.2%]	4
All ❌✅ (primary)	3.0%	[2.2%, 4.7%]	4

Binary size

Results (primary 0.7%, secondary 1.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	1.1%	[0.0%, 7.3%]	65
Regressions ❌ (secondary)	2.2%	[0.0%, 7.3%]	40
Improvements ✅ (primary)	-0.1%	[-0.5%, -0.0%]	31
Improvements ✅ (secondary)	-0.1%	[-2.6%, -0.0%]	39
All ❌✅ (primary)	0.7%	[-0.5%, 7.3%]	96

Bootstrap: 472.507s -> 472.273s (-0.05%)
Artifact size: 388.12 MiB -> 388.15 MiB (0.01%)

[bors]

☔ The latest upstream changes (presumably #148789) made this pull request unmergeable. Please resolve the merge conflicts.

[saethlin]

@bors try @rust-timer queue

[rust-log-analyzer]

The job x86_64-gnu-gcc failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

---- [run-make] tests/run-make-cargo/compiler-builtins stdout ----

error: rmake recipe failed to complete
status: exit status: 101
command: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-cargo/compiler-builtins/rmake_out" && env -u RUSTFLAGS -u __RUSTC_DEBUG_ASSERTIONS_ENABLED -u __STD_DEBUG_ASSERTIONS_ENABLED -u __STD_REMAP_DEBUGINFO_ENABLED AR="ar" BUILD_ROOT="/checkout/obj/build/x86_64-unknown-linux-gnu" CARGO="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/cargo" CC="cc" CC_DEFAULT_FLAGS="-ffunction-sections -fdata-sections -fPIC -m64" CXX="c++" CXX_DEFAULT_FLAGS="-ffunction-sections -fdata-sections -fPIC -m64" HOST_RUSTC_DYLIB_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin" LLVM_COMPONENTS="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils abi aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgputargetmca amdgpuutils analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cas cfguard cgdata codegen codegentypes core coroutines coverage csky cskyasmparser cskycodegen cskydesc cskydisassembler cskyinfo debuginfobtf debuginfocodeview debuginfodwarf debuginfodwarflowlevel debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dtlto dwarfcfichecker dwarflinker dwarflinkerclassic dwarflinkerparallel dwp engine executionengine extensions filecheck frontendatomic frontenddirective frontenddriver frontendhlsl frontendoffloading frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo hipstdpar instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink libdriver lineeditor linker loongarch loongarchasmparser loongarchcodegen loongarchdesc loongarchdisassembler loongarchinfo lto m68k m68kasmparser m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts objcopy object objectyaml option orcdebugging orcjit orcshared orctargetprocess passes plugins powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvtargetmca runtimedyld sandboxir scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support supportlsp symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target targetparser telemetry textapi textapibinaryreader transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xray xtensa xtensaasmparser xtensacodegen xtensadesc xtensadisassembler xtensainfo" LLVM_FILECHECK="/checkout/obj/build/x86_64-unknown-linux-gnu/ci-llvm/bin/FileCheck" PYTHON="/usr/bin/python3" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUSTDOC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" SOURCE_ROOT="/checkout" TARGET="x86_64-unknown-linux-gnu" TARGET_EXE_DYLIB_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" __BOOTSTRAP_JOBS="4" __RMAKE_VERBOSE_SUBPROCESS_OUTPUT="1" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-cargo/compiler-builtins/rmake"
--- stdout -------------------------------
Testing compiler_builtins for x86_64-unknown-linux-gnu
------------------------------------------
--- stderr -------------------------------
CARGO_TARGET_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-cargo/compiler-builtins/rmake_out/target" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make-cargo/compiler-builtins/rmake_out:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib" LIB="" RUSTC_BOOTSTRAP="1" RUSTFLAGS="-Copt-level=0 -Cdebug-assertions=yes" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/cargo" "build" "--manifest-path" "Cargo.toml" "-Zbuild-std=core" "--target" "x86_64-unknown-linux-gnu"
output status: `exit status: 0`
=== STDOUT ===



=== STDERR ===
    Blocking waiting for file lock on package cache
---

thread 'main' (88411) panicked at /checkout/tests/run-make-cargo/compiler-builtins/rmake.rs:110:9:
compiler_builtins must not link against core, but it does. 
These symbols may be undefined in a debug build of compiler_builtins:
{"_RNvXsd_NtCs7gy1j8pMBNe_4core14displaywrapperINtB5_14DisplayWrapperjENtNtB7_3fmt7Display3fmt", "_RNvXNtCs7gy1j8pMBNe_4core14displaywrapperINtB2_14DisplayWrapperPuENtNtB4_3fmt7Display3fmt", "_RNvXs_NtCs7gy1j8pMBNe_4core14displaywrapperINtB4_14DisplayWrapperOuENtNtB6_3fmt7Display3fmt"}
stack backtrace:
   0: __rustc::rust_begin_unwind
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/std/src/panicking.rs:689:5
   1: core::panicking::panic_fmt
             at /rustc/0417c25868d6dfbd1c291dfeae950504faa6f790/library/core/src/panicking.rs:80:14

For more information how to resolve CI failures of this job, visit this link.

[rust-bors]

☀️ Try build successful (CI)
Build commit: e159cd0 (e159cd0072f8d194dff7644cd8682c83d36588ef, parent: 1a30ed949b00abd96ffd9a6719905aac7320d405)

[rust-timer]

Finished benchmarking commit (e159cd0): comparison URL.

Overall result: ❌ regressions - please read:

Benchmarking means the PR may be perf-sensitive. It's automatically marked not fit for rolling up. Overriding is possible but disadvised: it risks changing compiler perf.

Next, please: If you can, justify the regressions found in this try perf run in writing along with @rustbot label: +perf-regression-triaged. If not, fix the regressions and do another perf run. Neutral or positive results will clear the label automatically.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	0.5%	[0.2%, 2.4%]	20
Regressions ❌ (secondary)	0.7%	[0.2%, 1.9%]	24
Improvements ✅ (primary)	-0.3%	[-0.3%, -0.3%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.5%	[-0.3%, 2.4%]	21

Max RSS (memory usage)

Results (primary 1.3%, secondary 1.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	2.5%	[0.5%, 4.4%]	3
Regressions ❌ (secondary)	2.7%	[1.2%, 7.5%]	6
Improvements ✅ (primary)	-2.1%	[-2.1%, -2.1%]	1
Improvements ✅ (secondary)	-1.8%	[-2.4%, -1.5%]	3
All ❌✅ (primary)	1.3%	[-2.1%, 4.4%]	4

Cycles

Results (primary 2.5%, secondary -0.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	2.5%	[2.5%, 2.5%]	1
Regressions ❌ (secondary)	3.0%	[2.1%, 5.1%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.5%	[-6.1%, -1.4%]	7
All ❌✅ (primary)	2.5%	[2.5%, 2.5%]	1

Binary size

Results (primary 0.5%, secondary 0.6%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	0.7%	[0.0%, 3.2%]	63
Regressions ❌ (secondary)	0.7%	[0.0%, 2.4%]	46
Improvements ✅ (primary)	-0.1%	[-0.4%, -0.0%]	19
Improvements ✅ (secondary)	-0.5%	[-1.7%, -0.1%]	4
All ❌✅ (primary)	0.5%	[-0.4%, 3.2%]	82

Bootstrap: 516.688s -> 529.511s (2.48%)
Artifact size: 401.49 MiB -> 403.47 MiB (0.49%)