Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use function attribute "frame-pointer" instead of "no-frame-pointer-elim" #67748

Merged
merged 1 commit into from Dec 31, 2019

Conversation

@MaskRay
Copy link
Contributor

MaskRay commented Dec 31, 2019

LLVM 8 (D56351) introduced "frame-pointer". In LLVM 10 (D71863),
"no-frame-pointer-elim"/"no-frame-pointer-elim-non-leaf" will be
ignored.


In the LLVM monorepo, run git show origin/release/8.x:llvm/lib/CodeGen/TargetOptionsImpl.cpp to see that "frame-pointer" is available since LLVM 8.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Dec 31, 2019

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @zackmdavis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@MaskRay MaskRay force-pushed the MaskRay:frame-pointer branch from 931f6a4 to 9328abe Dec 31, 2019
@Centril

This comment has been minimized.

Copy link
Member

Centril commented Dec 31, 2019

@rust-highfive rust-highfive assigned rkruppe and unassigned zackmdavis Dec 31, 2019
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Dec 31, 2019

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-12-31T05:54:55.0110225Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-31T05:54:55.5338099Z ##[command]git config gc.auto 0
2019-12-31T05:54:55.5341733Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-31T05:54:55.5344103Z ##[command]git config --get-all http.proxy
2019-12-31T05:54:55.5347143Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67748/merge:refs/remotes/pull/67748/merge
---
2019-12-31T06:56:43.8772755Z .................................................................................................... 1500/9464
2019-12-31T06:56:49.9401832Z .................................................................................................... 1600/9464
2019-12-31T06:56:55.0617895Z .................................................................................................... 1700/9464
2019-12-31T06:57:04.6458697Z .................................................................................................... 1800/9464
2019-12-31T06:57:12.8514572Z i................................................................................................... 1900/9464
2019-12-31T06:57:19.6709884Z ......................................................................................iiiii......... 2000/9464
2019-12-31T06:57:41.9642172Z .................................................................................................... 2200/9464
2019-12-31T06:57:44.4166358Z .................................................................................................... 2300/9464
2019-12-31T06:57:46.9551083Z .................................................................................................... 2400/9464
2019-12-31T06:57:53.1359612Z .................................................................................................... 2500/9464
---
2019-12-31T07:00:54.9323584Z .................i...............i.................................................................. 4900/9464
2019-12-31T07:01:05.0204295Z .................................................................................................... 5000/9464
2019-12-31T07:01:10.9245691Z ..............................................................i..................................... 5100/9464
2019-12-31T07:01:19.3764255Z .................................................................................................... 5200/9464
2019-12-31T07:01:27.1439038Z .............................ii.ii...........i...................................................... 5300/9464
2019-12-31T07:01:36.6209804Z .................................................................................................... 5500/9464
2019-12-31T07:01:46.9341690Z .................................................................................................... 5600/9464
2019-12-31T07:01:54.1328535Z ............i....................................................................................... 5700/9464
2019-12-31T07:02:00.4006748Z .................................................................................................... 5800/9464
2019-12-31T07:02:00.4006748Z .................................................................................................... 5800/9464
2019-12-31T07:02:11.4444752Z .................................................................................................... 5900/9464
2019-12-31T07:02:23.2059162Z ii...i..ii...........i.............................................................................. 6000/9464
2019-12-31T07:02:41.5187804Z .................................................................................................... 6200/9464
2019-12-31T07:02:48.9911252Z .................................................................................................... 6300/9464
2019-12-31T07:02:48.9911252Z .................................................................................................... 6300/9464
2019-12-31T07:03:07.3768527Z ...........................i..ii.................................................................... 6400/9464
2019-12-31T07:03:27.8669594Z .................................................................................................... 6600/9464
2019-12-31T07:03:30.0599820Z ...i................................................................................................ 6700/9464
2019-12-31T07:03:32.4682625Z .................................................................................................... 6800/9464
2019-12-31T07:03:35.1342597Z ..i................................................................................................. 6900/9464
---
2019-12-31T07:05:14.7682645Z .................................................................................................... 7500/9464
2019-12-31T07:05:20.0153992Z .................................................................................................... 7600/9464
2019-12-31T07:05:25.6975722Z .................................................................................................... 7700/9464
2019-12-31T07:05:36.0097810Z .................................................................................................... 7800/9464
2019-12-31T07:05:43.8437234Z ..................................iiii.............................................................. 7900/9464
2019-12-31T07:05:59.2934889Z .................................................................................................... 8100/9464
2019-12-31T07:06:08.2256503Z .................................................................................................... 8200/9464
2019-12-31T07:06:22.7605807Z .................................................................................................... 8300/9464
2019-12-31T07:06:30.5996774Z .................................................................................................... 8400/9464
---
2019-12-31T07:08:53.2625045Z  finished in 6.704
2019-12-31T07:08:53.2831970Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-12-31T07:08:53.4762296Z 
2019-12-31T07:08:53.4767346Z running 166 tests
2019-12-31T07:08:56.6747401Z iiii......i........ii..iiii...i.....F...........F...........i..i..................i....i............ 100/166
2019-12-31T07:08:58.8442248Z i.i.i...iii..iiiiiii.......................iii............ii......
2019-12-31T07:08:58.8442666Z 
2019-12-31T07:08:58.8443050Z ---- [codegen] codegen/force-frame-pointers.rs stdout ----
2019-12-31T07:08:58.8443088Z 
2019-12-31T07:08:58.8443088Z 
2019-12-31T07:08:58.8443360Z error: verification with 'FileCheck' failed
2019-12-31T07:08:58.8443411Z status: exit code: 1
2019-12-31T07:08:58.8443836Z command: "/usr/lib/llvm-7/bin/FileCheck" "/usr/lib/llvm-7/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/force-frame-pointers/force-frame-pointers.ll" "/checkout/src/test/codegen/force-frame-pointers.rs"
2019-12-31T07:08:58.8444138Z ------------------------------------------
2019-12-31T07:08:58.8444170Z 
2019-12-31T07:08:58.8444682Z ------------------------------------------
2019-12-31T07:08:58.8444739Z stderr:
2019-12-31T07:08:58.8444739Z stderr:
2019-12-31T07:08:58.8444997Z ------------------------------------------
2019-12-31T07:08:58.8445306Z /checkout/src/test/codegen/force-frame-pointers.rs:6:11: error: CHECK: expected string not found in input
2019-12-31T07:08:58.8445564Z // CHECK: attributes #{{.*}} "frame-pointer"="all"
2019-12-31T07:08:58.8445781Z           ^
2019-12-31T07:08:58.8446194Z /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/force-frame-pointers/force-frame-pointers.ll:1:1: note: scanning from here
2019-12-31T07:08:58.8446624Z ; ModuleID = 'force_frame_pointers.3a1fbbbh-cgu.0'
2019-12-31T07:08:58.8446680Z ^
2019-12-31T07:08:58.8447061Z /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/force-frame-pointers/force-frame-pointers.ll:13:1: note: possible intended match here
2019-12-31T07:08:58.8447574Z attributes #0 = { nonlazybind uwtable "no-frame-pointer-elim"="true" "probe-stack"="__rust_probestack" "target-cpu"="x86-64" }
2019-12-31T07:08:58.8447660Z 
2019-12-31T07:08:58.8447899Z ------------------------------------------
2019-12-31T07:08:58.8447931Z 
2019-12-31T07:08:58.8447957Z 
2019-12-31T07:08:58.8447957Z 
2019-12-31T07:08:58.8448388Z ---- [codegen] codegen/instrument-mcount.rs stdout ----
2019-12-31T07:08:58.8448465Z 
2019-12-31T07:08:58.8448883Z error: verification with 'FileCheck' failed
2019-12-31T07:08:58.8448939Z status: exit code: 1
2019-12-31T07:08:58.8449536Z command: "/usr/lib/llvm-7/bin/FileCheck" "/usr/lib/llvm-7/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/instrument-mcount/instrument-mcount.ll" "/checkout/src/test/codegen/instrument-mcount.rs"
2019-12-31T07:08:58.8450259Z ------------------------------------------
2019-12-31T07:08:58.8450302Z 
2019-12-31T07:08:58.8451364Z ------------------------------------------
2019-12-31T07:08:58.8451425Z stderr:
2019-12-31T07:08:58.8451425Z stderr:
2019-12-31T07:08:58.8451641Z ------------------------------------------
2019-12-31T07:08:58.8451947Z /checkout/src/test/codegen/instrument-mcount.rs:6:11: error: CHECK: expected string not found in input
2019-12-31T07:08:58.8452232Z // CHECK: attributes #{{.*}} "frame-pointer"="all" "instrument-function-entry-inlined"="{{.*}}mcount{{.*}}"
2019-12-31T07:08:58.8452464Z           ^
2019-12-31T07:08:58.8452825Z /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/instrument-mcount/instrument-mcount.ll:1:1: note: scanning from here
2019-12-31T07:08:58.8453062Z ; ModuleID = 'instrument_mcount.3a1fbbbh-cgu.0'
2019-12-31T07:08:58.8453193Z ^
2019-12-31T07:08:58.8453559Z /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/instrument-mcount/instrument-mcount.ll:13:22: note: possible intended match here
2019-12-31T07:08:58.8453946Z attributes #0 = { norecurse nounwind nonlazybind readnone uwtable "instrument-function-entry-inlined"="mcount" "no-frame-pointer-elim"="true" "probe-stack"="__rust_probestack" "target-cpu"="x86-64" }
2019-12-31T07:08:58.8454050Z 
2019-12-31T07:08:58.8454265Z ------------------------------------------
2019-12-31T07:08:58.8454296Z 
2019-12-31T07:08:58.8454321Z 
---
2019-12-31T07:08:58.8458593Z test result: FAILED. 130 passed; 2 failed; 34 ignored; 0 measured; 0 filtered out
2019-12-31T07:08:58.8458655Z 
2019-12-31T07:08:58.8458682Z 
2019-12-31T07:08:58.8458706Z 
2019-12-31T07:08:58.8461032Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/codegen" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "codegen" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-7/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "7.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-12-31T07:08:58.8461345Z 
2019-12-31T07:08:58.8461552Z 
2019-12-31T07:08:58.8465552Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:385:22
2019-12-31T07:08:58.8465645Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-12-31T07:08:58.8465645Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-12-31T07:08:58.8468884Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-12-31T07:08:58.8468945Z Build completed unsuccessfully in 1:07:13
2019-12-31T07:08:58.8519063Z == clock drift check ==
2019-12-31T07:08:58.8542712Z   local time: Tue Dec 31 07:08:58 UTC 2019
2019-12-31T07:08:59.3948443Z   network time: Tue, 31 Dec 2019 07:08:59 GMT
2019-12-31T07:08:59.3949187Z == end clock drift check ==
2019-12-31T07:09:05.0505775Z 
2019-12-31T07:09:05.0608475Z ##[error]Bash exited with code '1'.
2019-12-31T07:09:05.0669301Z ##[section]Starting: Checkout
2019-12-31T07:09:05.0671206Z ==============================================================================
2019-12-31T07:09:05.0671278Z Task         : Get sources
2019-12-31T07:09:05.0671321Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

…lim"

LLVM 8 (D56351) introduced "frame-pointer". In LLVM 10 (D71863),
"no-frame-pointer-elim"/"no-frame-pointer-elim-non-leaf" will be
ignored.
@MaskRay MaskRay force-pushed the MaskRay:frame-pointer branch from 9328abe to b40dc30 Dec 31, 2019
@MaskRay

This comment has been minimized.

Copy link
Contributor Author

MaskRay commented Dec 31, 2019

I see that I can add // min-llvm-version 8.0 to disable tests on LLVM < 8.0 . Amended my commit.

@rkruppe

This comment has been minimized.

Copy link
Member

rkruppe commented Dec 31, 2019

Thanks!

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 31, 2019

📌 Commit b40dc30 has been approved by rkruppe

Centril added a commit to Centril/rust that referenced this pull request Dec 31, 2019
Use function attribute "frame-pointer" instead of "no-frame-pointer-elim"

LLVM 8 ([D56351](http://reviews.llvm.org/D56351)) introduced "frame-pointer". In LLVM 10 (D71863),
"no-frame-pointer-elim"/"no-frame-pointer-elim-non-leaf" will be
ignored.

-----

In the LLVM monorepo, run `git show origin/release/8.x:llvm/lib/CodeGen/TargetOptionsImpl.cpp` to see that `"frame-pointer"` is available since LLVM 8.
bors added a commit that referenced this pull request Dec 31, 2019
Rollup of 6 pull requests

Successful merges:

 - #67574 (Extract `rustc_ast_lowering` crate from `rustc`)
 - #67685 (Constify Result)
 - #67702 (Add symbol normalization for proc_macro_server.)
 - #67730 (Cleanup pattern type checking, fix diagnostics bugs (+ improvements))
 - #67744 (parser: reduce diversity in error handling mechanisms)
 - #67748 (Use function attribute "frame-pointer" instead of "no-frame-pointer-elim")

Failed merges:

r? @ghost
@bors bors merged commit b40dc30 into rust-lang:master Dec 31, 2019
4 checks passed
4 checks passed
pr Build #20191231.15 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-7) Linux x86_64-gnu-llvm-7 succeeded
Details
pr (Linux x86_64-gnu-tools) Linux x86_64-gnu-tools succeeded
Details
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 31, 2019

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

@MaskRay MaskRay deleted the MaskRay:frame-pointer branch Dec 31, 2019
@MaskRay

This comment has been minimized.

Copy link
Contributor Author

MaskRay commented Dec 31, 2019

@bors Dear bot, this has been merged as commit b40dc30 as far as I can tell, so closing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.