Mark drop calls in landing pads `cold` instead of `noinline` #92419

erikdesjardins · 2021-12-29T20:49:56Z

Now that deferred inlining has been disabled in LLVM (#92110), this shouldn't cause catastrophic size blowup.

I confirmed that the test cases from #41696 (comment) still compile quickly (<1s) after this change. Although note that I wasn't able to reproduce the original issue using a recent rustc/llvm with deferred inlining enabled, so those tests may no longer be representative. I was also unable to create a modified test case that reproduced the original issue. (edit: I reproduced it on CI by accident--the first commit timed out on the LLVM 12 builder, because I forgot to make it conditional on LLVM version)

r? @nagisa
cc @arielb1 (this effectively reverts #42771 "mark calls in the unwind path as !noinline")
cc @RalfJung (fixes #46515)

edit: also fixes #87055

Now that deferred inlining has been disabled in LLVM, this shouldn't cause catastrophic size blowup.

rust-highfive · 2021-12-29T20:49:59Z

Some changes occured to rustc_codegen_gcc

cc @antoyo

erikdesjardins · 2021-12-30T04:23:34Z

compiler/rustc_codegen_llvm/src/builder.rs

+
+        // In LLVM versions with deferred inlining (currently, system LLVM < 14),
+        // inlining drop glue can lead to exponential size blowup, see #41696 and #92110.
+        if !llvm_util::is_rust_llvm() && llvm_util::get_version() < (14, 0, 0) {


Checking for non-system llvm feels a bit hacky, not sure if I should just wait for the LLVM 14 release.

(this code is also assuming that https://reviews.llvm.org/D115497 won't be reverted upstream before then)

This seems sufficiently reasonable thing to do to me if this does in fact yield any significant benefits. I wouldn't want to land changes that potentially significantly affect performance at some time in the future as it would make those other changes non-representative on their own merits.

lqd · 2021-12-31T15:08:26Z

@bors try @rust-timer queue

rust-timer · 2021-12-31T15:08:28Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2021-12-31T15:08:40Z

⌛ Trying commit 64da730 with merge 40a35d7d35511ad25b80d1201e4c95c862e1a59b...

bors · 2021-12-31T16:38:14Z

☀️ Try build successful - checks-actions
Build commit: 40a35d7d35511ad25b80d1201e4c95c862e1a59b (40a35d7d35511ad25b80d1201e4c95c862e1a59b)

rust-timer · 2021-12-31T16:38:16Z

Queued 40a35d7d35511ad25b80d1201e4c95c862e1a59b with parent e670844, future comparison URL.

rust-timer · 2021-12-31T18:53:18Z

Finished benchmarking commit (40a35d7d35511ad25b80d1201e4c95c862e1a59b): comparison url.

Summary: This change led to very large relevant mixed results 🤷 in compiler performance.

Very large improvement in instruction counts (up to -8.4% on full builds of issue-46449)
Moderate regression in instruction counts (up to 1.3% on incr-full builds of ripgrep)

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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 led 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-review -S-waiting-on-perf +perf-regression

nagisa · 2021-12-31T19:00:59Z

Looks like where there are benefits they are both in the LLVM spending less time optimizing the IR (i.e. the IR is simpler) as well as rustc itself running faster (e.g. spending less time in typeck when checking keccak crate). Naturally the first class of changes have mean some regressions such as the beforementioned ripgrep.

The overall shape is very positive though.

@bors r+

bors · 2021-12-31T19:01:01Z

📌 Commit 64da730 has been approved by nagisa

bors · 2022-01-01T08:19:04Z

⌛ Testing commit 64da730 with merge f13cfdc16b312612a0b9ac8a8cf79a9119778ed2...

rust-log-analyzer · 2022-01-01T09:06:40Z

The job x86_64-msvc-2 failed! Check out the build log: (web) (plain)

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

9 note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
10 


The actual run.stderr differed from the expected run.stderr.
Actual run.stderr saved to D:\a\rust\rust\build\x86_64-pc-windows-msvc\test\ui\panics\panic-short-backtrace-windows-x86_64\panic-short-backtrace-windows-x86_64.run.stderr
error: 1 errors occurred comparing run output.
status: exit code: 101
status: exit code: 101
command: PATH="D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2\lib\rustlib\x86_64-pc-windows-msvc\lib;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.29.30133\bin\HostX64\x64;D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0-bootstrap-tools\x86_64-pc-windows-msvc\release\deps;D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0\bin;D:\a\rust\rust\ninja;D:\a\rust\rust\msys2\mingw64\bin;C:\hostedtoolcache\windows\Python\3.10.1\x64\Scripts;C:\hostedtoolcache\windows\Python\3.10.1\x64;C:\msys64\usr\bin;D:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.7.3\x64;C:\cabal\bin;C:\ghcup\bin;C:\tools\ghc-9.2.1\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.1.2\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\bin;C:\Program Files (x86)\pipx_bin;C:\hostedtoolcache\windows\go\1.15.15\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.312-7\x64\bin;C:\npm\prefix;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\Docker;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\dotnet;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files\nodejs;C:\Program Files\OpenSSL\bin;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\CMake\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.8.4\bin;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\test\\ui\\panics\\panic-short-backtrace-windows-x86_64\\a.exe"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
thread 'main' panicked at 'd was called', D:\a\rust\rust\src/test\ui\panics\panic-short-backtrace-windows-x86_64.rs:48:5
   0: std::panicking::begin_panic
   1: d
   2: c
   3: b
---

Some tests failed in compiletest suite=ui mode=ui host=x86_64-pc-windows-msvc target=x86_64-pc-windows-msvc


command did not execute successfully: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0-tools-bin\\compiletest.exe" "--compile-lib-path" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\bin" "--run-lib-path" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib" "--rustc-path" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2\\bin\\rustc.exe" "--src-base" "D:\\a\\rust\\rust\\src/test\\ui" "--build-base" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\test\\ui" "--stage-id" "stage2-x86_64-pc-windows-msvc" "--suite" "ui" "--mode" "ui" "--target" "x86_64-pc-windows-msvc" "--host" "x86_64-pc-windows-msvc" "--llvm-filecheck" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\llvm\\build\\bin\\FileCheck.exe" "--nodejs" "C:\\Program Files\\nodejs\\node" "--npm" "C:\\Program Files\\nodejs\\npm" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\native\\rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\native\\rust-test-helpers" "--docck-python" "C:\\hostedtoolcache\\windows\\Python\\3.10.1\\x64\\python3.exe" "--lldb-python" "C:\\hostedtoolcache\\windows\\Python\\3.10.1\\x64\\python3.exe" "--gdb" "C:\\msys64\\usr\\bin\\gdb" "--llvm-version" "13.0.0-rust-1.59.0-nightly" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets 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 cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwp engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink libdriver lineeditor linker 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 object objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always"


Build completed unsuccessfully in 0:42:42
Build completed unsuccessfully in 0:42:42
make: *** [Makefile:74: ci-subset-2] Error 1

bors · 2022-01-01T09:07:17Z

💔 Test failed - checks-actions

Mark drop calls in landing pads `cold` instead of `noinline` Now that deferred inlining has been disabled in LLVM (rust-lang#92110), this shouldn't cause catastrophic size blowup. I confirmed that the test cases from rust-lang#41696 (comment) still compile quickly (<1s) after this change. ~Although note that I wasn't able to reproduce the original issue using a recent rustc/llvm with deferred inlining enabled, so those tests may no longer be representative. I was also unable to create a modified test case that reproduced the original issue.~ (edit: I reproduced it on CI by accident--the first commit timed out on the LLVM 12 builder, because I forgot to make it conditional on LLVM version) r? `@nagisa` cc `@arielb1` (this effectively reverts rust-lang#42771 "mark calls in the unwind path as !noinline") cc `@RalfJung` (fixes rust-lang#46515) edit: also fixes rust-lang#87055

…gisa" This reverts commit 4f49627, reversing changes made to 028c6f1.

Revert "Auto merge of rust-lang#92419 - erikdesjardins:coldland, r=nagisa" Should fix (untested) rust-lang#94390 Reopens rust-lang#46515, rust-lang#87055 r? `@ehuss`

…gisa" This reverts commit 4f49627, reversing changes made to 028c6f1.

…=nikic Rebased: Mark drop calls in landing pads cold instead of noinline I noticed that certain inlining optimizations were missing while staring at some compiled code output. I'd like to see this relanded, so I rebased the PR from ``@erikdesjardins`` (PR rust-lang#94823). This PR reapplies rust-lang#92419, which was reverted in rust-lang#94402 due to rust-lang#94390. Fixes rust-lang#46515, fixes rust-lang#87055. Update: fixes rust-lang#97217.

…ikic Rebased: Mark drop calls in landing pads cold instead of noinline I noticed that certain inlining optimizations were missing while staring at some compiled code output. I'd like to see this relanded, so I rebased the PR from `@erikdesjardins` (PR rust-lang#94823). This PR reapplies rust-lang#92419, which was reverted in rust-lang#94402 due to rust-lang#94390. Fixes rust-lang#46515, fixes rust-lang#87055. Update: fixes rust-lang#97217.

Rebased: Mark drop calls in landing pads cold instead of noinline I noticed that certain inlining optimizations were missing while staring at some compiled code output. I'd like to see this relanded, so I rebased the PR from `@erikdesjardins` (PR #94823). This PR reapplies rust-lang/rust#92419, which was reverted in rust-lang/rust#94402 due to rust-lang/rust#94390. Fixes rust-lang/rust#46515, fixes rust-lang/rust#87055. Update: fixes #97217.

Mark drop calls in landing pads cold instead of noinline

2b66221

Now that deferred inlining has been disabled in LLVM, this shouldn't cause catastrophic size blowup.

rust-highfive assigned nagisa Dec 29, 2021

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 29, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 29, 2021

erikdesjardins commented Dec 30, 2021

View reviewed changes

This comment has been minimized.

Sign in to view

keep noinline for system llvm < 14

e4463b2

erikdesjardins force-pushed the coldland branch from 800dc6f to e4463b2 Compare December 30, 2021 05:16

add test for noop drop in landing pad

64da730

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Dec 31, 2021

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Dec 31, 2021

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 31, 2021

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 1, 2022

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jan 4, 2022

ehuss mentioned this pull request Feb 26, 2022

Rust 1.59 rustc greatly increased compile time with include_str! #94390

Open

erikdesjardins added a commit to erikdesjardins/rust that referenced this pull request Feb 28, 2022

Revert "Auto merge of rust-lang#92419 - erikdesjardins:coldland, r=na…

851fcc7

…gisa" This reverts commit 4f49627, reversing changes made to 028c6f1.

bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Mar 26, 2022

Revert "Auto merge of rust-lang#92419 - erikdesjardins:coldland, r=na…

962b8cf

…gisa" This reverts commit 4f49627, reversing changes made to 028c6f1.

erikdesjardins mentioned this pull request Apr 24, 2022

Reapply: Mark drop calls in landing pads cold instead of noinline #94823

Closed

luqmana mentioned this pull request May 31, 2022

windows: x.py test failure from codegen test suite #96464

Open

erikdesjardins mentioned this pull request Jun 30, 2022

Heap allocation in Box optimized out with rustc 1.60 but not with 1.61+ #98679

Closed

InnovativeInventor mentioned this pull request Sep 21, 2022

Rebased: Mark drop calls in landing pads cold instead of noinline #102099

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mark drop calls in landing pads `cold` instead of `noinline` #92419

Mark drop calls in landing pads `cold` instead of `noinline` #92419

erikdesjardins commented Dec 29, 2021 •

edited

Loading

rust-highfive commented Dec 29, 2021

erikdesjardins Dec 30, 2021

nagisa Dec 31, 2021

This comment has been minimized.

lqd commented Dec 31, 2021

rust-timer commented Dec 31, 2021

bors commented Dec 31, 2021

bors commented Dec 31, 2021

rust-timer commented Dec 31, 2021

rust-timer commented Dec 31, 2021

nagisa commented Dec 31, 2021

bors commented Dec 31, 2021

bors commented Jan 1, 2022

rust-log-analyzer commented Jan 1, 2022

bors commented Jan 1, 2022

Mark drop calls in landing pads cold instead of noinline #92419

Mark drop calls in landing pads cold instead of noinline #92419

Conversation

erikdesjardins commented Dec 29, 2021 • edited Loading

rust-highfive commented Dec 29, 2021

erikdesjardins Dec 30, 2021

Choose a reason for hiding this comment

nagisa Dec 31, 2021

Choose a reason for hiding this comment

This comment has been minimized.

lqd commented Dec 31, 2021

rust-timer commented Dec 31, 2021

bors commented Dec 31, 2021

bors commented Dec 31, 2021

rust-timer commented Dec 31, 2021

rust-timer commented Dec 31, 2021

nagisa commented Dec 31, 2021

bors commented Dec 31, 2021

bors commented Jan 1, 2022

rust-log-analyzer commented Jan 1, 2022

bors commented Jan 1, 2022

Mark drop calls in landing pads `cold` instead of `noinline` #92419

Mark drop calls in landing pads `cold` instead of `noinline` #92419

erikdesjardins commented Dec 29, 2021 •

edited

Loading