Clean up handling of `-Z pgo-gen` commandline option.#59874

michaelwoerister · 2019-04-11T10:04:52Z

This PR adapts the -Z pgo-gen flag to how Clang and GCC handle the corresponding -fprofile-generate flag. In particular, the flag now optionally takes a directory to place the profiling data in and allows to omit the argument (instead of having to pass an empty string).

rust-highfive · 2019-04-11T10:04:55Z

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

rust-highfive · 2019-04-11T11:42:30Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (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.

travis_time:end:00587fc0:start=1554977160569481951,finish=1554977247893722900,duration=87324240949
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:13:04] 
[01:13:04] running 9 tests
[01:13:04] iiiiiiiii
[01:13:04] 
[01:13:04]  finished in 0.149
[01:13:04] travis_fold:end:test_assembly

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:13:20] 
[01:13:20] running 121 tests
[01:13:45] .iiiii...i.....i..i...i..i.i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i. 100/121
[01:13:49] i.i......iii.i.....ii
[01:13:49] 
[01:13:49]  finished in 29.804
[01:13:49] travis_fold:end:test_debuginfo

---
[01:34:12]    Compiling rustc v0.0.0 (/checkout/src/librustc)
[01:34:38] error[E0308]: mismatched types
[01:34:38]     --> src/librustc/session/config.rs:3153:39
[01:34:38]      |
[01:34:38] 3153 |         opts.debugging_opts.pgo_gen = Some(String::from("abc"));
[01:34:38]      |                                       ^^^^^^^^^^^^^^^^^^^^^^^^^ expected enum `session::config::PgoGenerate`, found enum `std::option::Option`
[01:34:38]      |
[01:34:38]      = note: expected type `session::config::PgoGenerate`
[01:34:38] 
[01:34:47] error: aborting due to previous error
[01:34:47] 
[01:34:47] For more information about this error, try `rustc --explain E0308`.
[01:34:47] For more information about this error, try `rustc --explain E0308`.
[01:34:47] error: Could not compile `rustc`.
[01:34:47] 
[01:34:47] To learn more, run the command again with --verbose.
[01:34:47] 
[01:34:47] 
[01:34:47] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "-p" "rustc" "--" "--quiet"
[01:34:47] 
[01:34:47] 
[01:34:47] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:34:47] Build completed unsuccessfully in 0:33:17
[01:34:47] Build completed unsuccessfully in 0:33:17
[01:34:47] make: *** [check] Error 1
[01:34:47] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0d71c444
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Apr 11 11:42:24 UTC 2019

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)

cramertj · 2019-04-11T16:40:38Z

@bors r+

bors · 2019-04-11T16:40:40Z

📌 Commit 7b1df42 has been approved by cramertj

cramertj · 2019-04-11T16:40:42Z

@bors r+

bors · 2019-04-11T16:40:43Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Miri: unsized locals and by-value dyn traits #59780

bors · 2019-04-11T16:40:44Z

📌 Commit 7b1df42 has been approved by cramertj

…ramertj Clean up handling of `-Z pgo-gen` commandline option. This PR adapts the `-Z pgo-gen` flag to how Clang and GCC handle the corresponding `-fprofile-generate` flag. In particular, the flag now optionally takes a directory to place the profiling data in and allows to omit the argument (instead of having to pass an empty string).

@ghost

Rollup of 9 pull requests Successful merges: - rust-lang#59655 (Use a proc macro to declare preallocated symbols) - rust-lang#59769 (compiletest normalization: preserve non-JSON lines such as ICEs) - rust-lang#59776 (Apply resource-suffix to search-index and source-files scripts as well) - rust-lang#59784 (Suggest importing macros from the crate root) - rust-lang#59812 (Exclude profiler-generated symbols from MSVC __imp_-symbol workaround.) - rust-lang#59856 (update polonius-engine) - rust-lang#59874 (Clean up handling of `-Z pgo-gen` commandline option.) - rust-lang#59890 (Don't generate empty json variables) - rust-lang#59911 (Revert "compile crates under test w/ -Zemit-stack-sizes") Failed merges: r? @ghost

…ramertj Clean up handling of `-Z pgo-gen` commandline option. This PR adapts the `-Z pgo-gen` flag to how Clang and GCC handle the corresponding `-fprofile-generate` flag. In particular, the flag now optionally takes a directory to place the profiling data in and allows to omit the argument (instead of having to pass an empty string).

@ghost

Rollup of 6 pull requests Successful merges: - #59776 (Apply resource-suffix to search-index and source-files scripts as well) - #59784 (Suggest importing macros from the crate root) - #59812 (Exclude profiler-generated symbols from MSVC __imp_-symbol workaround.) - #59874 (Clean up handling of `-Z pgo-gen` commandline option.) - #59890 (Don't generate empty json variables) - #59911 (Revert "compile crates under test w/ -Zemit-stack-sizes") Failed merges: r? @ghost

…lexcrichton Add codegen test for PGO instrumentation. This PR adds a codegen test that makes sure that LLVM actually generates instrumentation code when we enable PGO instrumentation in `rustc`. The second commit updates a test case to the new commandline option syntax introduced in rust-lang#59874. Without the fix the test still works, but it confusingly creates a directory called `test.profraw`, which usually is the name of the _file_ where profiling data is collected.

rust-highfive assigned cramertj Apr 11, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2019

Clean up handling of -Zpgo-gen commandline option.

7b1df42

michaelwoerister force-pushed the pgo-updates-1 branch from 80a6af8 to 7b1df42 Compare April 11, 2019 12:50

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 Apr 11, 2019

michaelwoerister mentioned this pull request Apr 12, 2019

Tracking Issue for stabilizing Profile-Guided Optimization support #59913

Closed

16 tasks

Centril mentioned this pull request Apr 13, 2019

Rollup of 9 pull requests #59938

Closed

Centril mentioned this pull request Apr 13, 2019

Rollup of 8 pull requests #59942

Closed

Centril mentioned this pull request Apr 13, 2019

Rollup of 6 pull requests #59950

Merged

bors merged commit 7b1df42 into rust-lang:master Apr 14, 2019

michaelwoerister mentioned this pull request Apr 17, 2019

Add codegen test for PGO instrumentation. #60038

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Clean up handling of `-Z pgo-gen` commandline option.#59874