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

Avoid erase_regions_ty queries if there are no regions to erase #57674

Merged
merged 1 commit into from
Jan 29, 2019

Conversation

dotdash
Copy link
Contributor

@dotdash dotdash commented Jan 16, 2019

It's overall faster to perform this extra check than to perform the
query, even if the result is already in the query cache.

@rust-highfive
Copy link
Collaborator

r? @varkor

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 16, 2019
@dotdash
Copy link
Contributor Author

dotdash commented Jan 16, 2019

screen shot 2019-01-16 at 19 40 12-fullpage

local rustc-perf run, I hope I got everything correctly setup and the numbers are correct

@varkor
Copy link
Member

varkor commented Jan 16, 2019

@bors try

@rust-highfive
Copy link
Collaborator

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:05fca5af:start=1547664051058777848,finish=1547664052337147155,duration=1278369307
$ 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
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:06:54]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:06:58] error[E0425]: cannot find value `values` in this scope
[00:06:58]   --> src/librustc/ty/erase_regions.rs:25:13
[00:06:58]    |
[00:06:58] 25 |         if !values.has_erasable_regions() {
[00:06:58] 
travis_time:end:100e1cb2:start=1547664062089716078,finish=1547664509266816551,duration=447177100473
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0a1b302c

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)

@bors
Copy link
Contributor

bors commented Jan 16, 2019

⌛ Trying commit 960498296aaf009ad950bcd5ffc2a9dfe947539b with merge 4f087d9f32e4d9779b3a947acb2d361457b65957...

@varkor
Copy link
Member

varkor commented Jan 16, 2019

Whoops, I was a bit premature there.

@dotdash
Copy link
Contributor Author

dotdash commented Jan 16, 2019

Haha, that's what you get when you manually copy a change into a different working space

@dotdash
Copy link
Contributor Author

dotdash commented Jan 16, 2019

@bors try

@bors
Copy link
Contributor

bors commented Jan 16, 2019

⌛ Trying commit dae6e8f with merge afaba22...

bors added a commit that referenced this pull request Jan 16, 2019
Avoid erase_regions_ty queries if there are no regions to erase

It's overall faster to perform this extra check than to perform the
query, even if the result is already in the query cache.
@rust-highfive
Copy link
Collaborator

The job dist-x86_64-linux 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_fold:end:services

travis_fold:start:git.checkout
travis_time:start:27b478ea
$ git clone --depth=2 --branch=try https://github.com/rust-lang/rust.git rust-lang/rust
---
[00:09:01]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:09:05] error[E0425]: cannot find value `values` in this scope
[00:09:05]   --> src/librustc/ty/erase_regions.rs:25:13
[00:09:05]    |
[00:09:05] 25 |         if !values.has_erasable_regions() {
[00:09:05] 
[00:09:33] error: aborting due to previous error
[00:09:33] 
[00:09:33] For more information about this error, try `rustc --explain E0425`.
---
travis_time:end:02b8a31e:start=1547665189670058274,finish=1547665189694319926,duration=24261652
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:15407ff7
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:02425368
travis_time:start:02425368
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0f007cf6
$ dmesg | grep -i kill

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)

@rust-highfive
Copy link
Collaborator

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:008ab739:start=1547664771180217585,finish=1547664772216389000,duration=1036171415
$ 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
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[01:11:39] ...................................i................................................................ 2400/2942
[01:11:51] .................................................................................................... 2500/2942
[01:12:23] .................................................................................................... 2600/2942
[01:12:33] .................................................................................................... 2700/2942
[01:12:43] ....................................F............................................................... 2800/2942
[01:13:00] ..........................................
[01:13:00] failures:
[01:13:00] 
[01:13:00] ---- [run-pass] run-pass/type-id-higher-rank.rs stdout ----
---
[01:13:00] ------------------------------------------
[01:13:00] stderr:
[01:13:00] ------------------------------------------
[01:13:00] thread 'main' panicked at 'assertion failed: `(left == right)`
[01:13:00]   left: `TypeId { t: 15076019611076229820 }`,
[01:13:00]  right: `TypeId { t: 14349794804050306325 }`', /checkout/src/test/run-pass/type-id-higher-rank.rs:21:9
[01:13:00] 
[01:13:00] ------------------------------------------
[01:13:00] 
[01:13:00] thread '[run-pass] run-pass/type-id-higher-rank.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3245:9
---
[01:13:00] 
[01:13:00] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:495:22
[01:13:00] 
[01:13:00] 
[01:13:00] command did not execute successfully: "/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/run-pass" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "run-pass" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -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" "6.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"
[01:13:00] 
[01:13:00] 
[01:13:00] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:13:00] Build completed unsuccessfully in 0:10:29
[01:13:00] Build completed unsuccessfully in 0:10:29
[01:13:00] Makefile:48: recipe for target 'check' failed
[01:13:00] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:05d64965
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Jan 16 20:06:03 UTC 2019
---
172064 ./obj/build/x86_64-unknown-linux-gnu/stage2/lib
162608 ./obj/build/bootstrap/debug/incremental
153292 ./src/tools/clang
146492 ./obj/build/bootstrap/debug/incremental/bootstrap-1o7ipylf5x405
146488 ./obj/build/bootstrap/debug/incremental/bootstrap-1o7ipylf5x405/s-f8lnhxnjs3-m28ewj-3sgufgpmw18gi
139036 ./obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu
139032 ./obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release
136692 ./obj/build/x86_64-unknown-linux-gnu/stage0-rustc/x86_64-unknown-linux-gnu/release/deps
124932 ./obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu
---
56896 ./src/llvm/test/MC
56100 ./obj/build/x86_64-unknown-linux-gnu/test/run-pass/proc-macro
56088 ./.git/modules/src/tools
54428 ./obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/release/build
"$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:054d476f
travis_time:start:054d476f
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:01f9b92d
$ dmesg | grep -i kill

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)

@bors
Copy link
Contributor

bors commented Jan 16, 2019

☀️ Test successful - checks-travis
State: approved= try=True

@dotdash
Copy link
Contributor Author

dotdash commented Jan 16, 2019

Missed the part about anonymizing late bound regions, thought I had that covered compared to an earlier attempt. Building/benchmarking a new version now, will check back tomorrow.

It's overall faster to perform this extra check than to perform the
query, even if the result is already in the query cache.
@dotdash
Copy link
Contributor Author

dotdash commented Jan 17, 2019

@bors try

@bors
Copy link
Contributor

bors commented Jan 17, 2019

⌛ Trying commit da06898 with merge 1c626d926dbde0110dff961226373f8f28946470...

@dotdash
Copy link
Contributor Author

dotdash commented Jan 17, 2019

This passes tests for me, except for a reproducible-build test, but that one also fails on master here, so...

@bors
Copy link
Contributor

bors commented Jan 17, 2019

☀️ Test successful - checks-travis
State: approved= try=True

@dotdash
Copy link
Contributor Author

dotdash commented Jan 17, 2019

@varkor could you start a timing run for this PR?

@varkor
Copy link
Member

varkor commented Jan 17, 2019

@rust-timer build 1c626d926dbde0110dff961226373f8f28946470

@rust-timer
Copy link
Collaborator

Success: Queued 1c626d926dbde0110dff961226373f8f28946470 with parent 722b4d6, comparison URL.

@dotdash
Copy link
Contributor Author

dotdash commented Jan 19, 2019

Seems that prlo got stuck

cc @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

Ah -- the parent commit for this try build was the accidental beta merge to master -- @bors try

I've deleted the job from perf and we'll want to re-start that once the try build finishes

@dotdash
Copy link
Contributor Author

dotdash commented Jan 19, 2019

Do I need to push a rebased version of this to make that work?

@Mark-Simulacrum
Copy link
Member

Uh, I think hopefully no -- maybe @bors try- retry try will make bors behave?

@Mark-Simulacrum
Copy link
Member

@bors retry

@bors 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 Jan 19, 2019
@Mark-Simulacrum
Copy link
Member

@bors try

@bors
Copy link
Contributor

bors commented Jan 19, 2019

⌛ Trying commit da06898 with merge 9bb2812b2691b02ac6212836cf29f93d9d47b78f...

@bors
Copy link
Contributor

bors commented Jan 20, 2019

☀️ Test successful - checks-travis
State: approved= try=True

@dotdash
Copy link
Contributor Author

dotdash commented Jan 20, 2019

@Mark-Simulacrum could you queue this for prlo again? Thanks!

@Mark-Simulacrum
Copy link
Member

@rust-timer build 9bb2812b2691b02ac6212836cf29f93d9d47b78f

@rust-timer
Copy link
Collaborator

Success: Queued 9bb2812b2691b02ac6212836cf29f93d9d47b78f with parent 52fec81, comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit 9bb2812b2691b02ac6212836cf29f93d9d47b78f

@dotdash dotdash 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 24, 2019
@dotdash
Copy link
Contributor Author

dotdash commented Jan 28, 2019

@varkor just wanted to check if you think you could review this, or whether I should ask someone else. Thanks.

@varkor
Copy link
Member

varkor commented Jan 28, 2019

@dotdash: sorry for taking so long! It looks good to me.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 28, 2019

📌 Commit da06898 has been approved by varkor

@bors 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 Jan 28, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 28, 2019
Avoid erase_regions_ty queries if there are no regions to erase

It's overall faster to perform this extra check than to perform the
query, even if the result is already in the query cache.
bors added a commit that referenced this pull request Jan 29, 2019
Rollup of 7 pull requests

Successful merges:

 - #57045 (Kill remaining uses of mem::uninitialized in libcore, liballoc)
 - #57674 (Avoid erase_regions_ty queries if there are no regions to erase)
 - #57833 (Print a slightly clearer message when failing to launch a thread)
 - #57859 (Fix invalid background color)
 - #57904 (add typo suggestion to unknown attribute error)
 - #57915 (Pretty print `$crate` as `crate` or `crate_name` in more cases)
 - #57950 (Extend E0106, E0261)

Failed merges:

r? @ghost
@bors bors merged commit da06898 into rust-lang:master Jan 29, 2019
@dotdash dotdash deleted the erase_reg branch January 20, 2020 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants